diff --git a/.editorconfig b/.editorconfig
index f6bce9cb76..c7a381b730 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -156,6 +156,9 @@ indent_size = 2
 [*.{props,targets,config,nuspec}]
 indent_size = 2
 
+[*.json]
+indent_size = 2
+
 # Shell scripts
 [*.sh]
 end_of_line = lf
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..80716520d9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Windows, Mac, Linux (State distribution)]
+ - Version [e.g. 0.10.0-rc1 or 0.9.12]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..bbcbbe7d61
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.gitignore b/.gitignore
index b5a46e16f4..7d672c7755 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,6 +117,7 @@ ClientBin/
 *.[Pp]ublish.xml
 *.pfx
 *.publishsettings
+Events_Avalonia.cs
 
 # RIA/Silverlight projects
 Generated_Code/
diff --git a/.gitmodules b/.gitmodules
index 10c780c09f..2d11fdfa9e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,5 +2,5 @@
 	path = nukebuild/Numerge
 	url = https://github.com/kekekeks/Numerge.git
 [submodule "src/Markup/Avalonia.Markup.Xaml/XamlIl/xamlil.github"]
-	path = src/Markup/Avalonia.Markup.Xaml/XamlIl/xamlil.github
-	url = https://github.com/kekekeks/XamlIl.git
+	path = src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
+	url = https://github.com/kekekeks/XamlX.git
diff --git a/.ncrunch/Avalonia.Build.Tasks.v3.ncrunchproject b/.ncrunch/Avalonia.Build.Tasks.v3.ncrunchproject
index 319cd523ce..95a483b433 100644
--- a/.ncrunch/Avalonia.Build.Tasks.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Build.Tasks.v3.ncrunchproject
@@ -1,5 +1,3 @@
 <ProjectConfiguration>
-  <Settings>
-    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
-  </Settings>
+  <Settings />
 </ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/Avalonia.Controls.UnitTests.net47.v3.ncrunchproject b/.ncrunch/Avalonia.Controls.UnitTests.net47.v3.ncrunchproject
index e9d39b0c74..f30a20df78 100644
--- a/.ncrunch/Avalonia.Controls.UnitTests.net47.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Controls.UnitTests.net47.v3.ncrunchproject
@@ -3,5 +3,6 @@
     <HiddenComponentWarnings>
       <Value>MissingOrIgnoredProjectReference</Value>
     </HiddenComponentWarnings>
+        <FixtureName>Avalonia.Controls.UnitTests.TimePickerTests</FixtureName>
   </Settings>
 </ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/Avalonia.MicroCom.v3.ncrunchproject b/.ncrunch/Avalonia.MicroCom.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/Avalonia.MicroCom.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/BindingDemo.v3.ncrunchproject b/.ncrunch/BindingDemo.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/BindingDemo.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/NativeEmbedSample.v3.ncrunchproject b/.ncrunch/NativeEmbedSample.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/NativeEmbedSample.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/RenderDemo.v3.ncrunchproject b/.ncrunch/RenderDemo.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/RenderDemo.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/Sandbox.v3.ncrunchproject b/.ncrunch/Sandbox.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/Sandbox.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/.ncrunch/VirtualizationDemo.v3.ncrunchproject b/.ncrunch/VirtualizationDemo.v3.ncrunchproject
new file mode 100644
index 0000000000..319cd523ce
--- /dev/null
+++ b/.ncrunch/VirtualizationDemo.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/Avalonia.sln b/Avalonia.sln
index e40ebae4d6..75f1dd8407 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -87,16 +87,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "iOS", "iOS", "{0CB0B92E-6CF
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.iOS", "src\iOS\Avalonia.iOS\Avalonia.iOS.csproj", "{4488AD85-1495-4809-9AA4-DDFE0A48527E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.iOSTestApplication", "src\iOS\Avalonia.iOSTestApplication\Avalonia.iOSTestApplication.csproj", "{8C923867-8A8F-4F6B-8B80-47D9E8436166}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.LeakTests", "tests\Avalonia.LeakTests\Avalonia.LeakTests.csproj", "{E1AA3DBF-9056-4530-9376-18119A7A3FFE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.UnitTests", "tests\Avalonia.UnitTests\Avalonia.UnitTests.csproj", "{88060192-33D5-4932-B0F9-8BD2763E857D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Benchmarks", "tests\Avalonia.Benchmarks\Avalonia.Benchmarks.csproj", "{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Logging.Serilog", "src\Avalonia.Logging.Serilog\Avalonia.Logging.Serilog.csproj", "{B61B66A3-B82D-4875-8001-89D3394FE0C9}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.DesignerSupport", "src\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj", "{799A7BB5-3C2C-48B6-85A7-406A12C420DA}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog", "samples\ControlCatalog\ControlCatalog.csproj", "{D0A739B9-3C68-4BA6-A328-41606954B6BD}"
@@ -125,10 +121,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.NetCore", "s
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1-27F5-4255-9AFC-04ABFD11683A}"
 	ProjectSection(SolutionItems) = preProject
+		build\AndroidWorkarounds.props = build\AndroidWorkarounds.props
+		build\ApiDiff.props = build\ApiDiff.props
 		build\Base.props = build\Base.props
 		build\Binding.props = build\Binding.props
-		build\BuildTargets.targets = build\BuildTargets.targets
+		build\CoreLibraries.props = build\CoreLibraries.props
+		build\EmbedXaml.props = build\EmbedXaml.props
 		build\HarfBuzzSharp.props = build\HarfBuzzSharp.props
+		build\iOSWorkarounds.props = build\iOSWorkarounds.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
@@ -138,17 +138,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1
 		build\NetCore.props = build\NetCore.props
 		build\NetFX.props = build\NetFX.props
 		build\ReactiveUI.props = build\ReactiveUI.props
+		build\ReferenceCoreLibraries.props = build\ReferenceCoreLibraries.props
 		build\Rx.props = build\Rx.props
 		build\SampleApp.props = build\SampleApp.props
-		build\Serilog.props = build\Serilog.props
+		build\SharedVersion.props = build\SharedVersion.props
 		build\SharpDX.props = build\SharpDX.props
 		build\SkiaSharp.props = build\SkiaSharp.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
+		build\UnitTests.NetFX.props = build\UnitTests.NetFX.props
 		build\XUnit.props = build\XUnit.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{4D6FAF79-58B4-482F-9122-0668C346364C}"
 	ProjectSection(SolutionItems) = preProject
+		build\BuildTargets.targets = build\BuildTargets.targets
+		build\LegacyProject.targets = build\LegacyProject.targets
 		build\UnitTests.NetCore.targets = build\UnitTests.NetCore.targets
 	EndProjectSection
 EndProject
@@ -204,14 +210,35 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Dialogs", "src\Ava
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.FreeDesktop", "src\Avalonia.FreeDesktop\Avalonia.FreeDesktop.csproj", "{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}"
 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}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Headless.Vnc", "src\Avalonia.Headless.Vnc\Avalonia.Headless.Vnc.csproj", "{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Markup.Xaml.Loader", "src\Markup\Avalonia.Markup.Xaml.Loader\Avalonia.Markup.Xaml.Loader.csproj", "{909A8CBD-7D0E-42FD-B841-022AD8925820}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.ReactiveUI.Events", "src\Avalonia.ReactiveUI.Events\Avalonia.ReactiveUI.Events.csproj", "{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sandbox", "samples\Sandbox\Sandbox.csproj", "{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MicroComGenerator", "src\tools\MicroComGenerator\MicroComGenerator.csproj", "{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.MicroCom", "src\Avalonia.MicroCom\Avalonia.MicroCom.csproj", "{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiniMvvm", "samples\MiniMvvm\MiniMvvm.csproj", "{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{3c4c0cb4-0c0f-4450-a37b-148c84ff905f}*SharedItemsImports = 13
-		src\Shared\RenderHelpers\RenderHelpers.projitems*{3e908f67-5543-4879-a1dc-08eace79b3cd}*SharedItemsImports = 4
-		src\Shared\PlatformSupport\PlatformSupport.projitems*{4488ad85-1495-4809-9aa4-ddfe0a48527e}*SharedItemsImports = 4
-		src\Shared\PlatformSupport\PlatformSupport.projitems*{7b92af71-6287-4693-9dcb-bd5b6e927e23}*SharedItemsImports = 4
-		src\Shared\RenderHelpers\RenderHelpers.projitems*{7d2d3083-71dd-4cc9-8907-39a0d86fb322}*SharedItemsImports = 4
-		tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{dabfd304-d6a4-4752-8123-c2ccf7ac7831}*SharedItemsImports = 4
+		src\Shared\RenderHelpers\RenderHelpers.projitems*{3e908f67-5543-4879-a1dc-08eace79b3cd}*SharedItemsImports = 5
+		src\Shared\PlatformSupport\PlatformSupport.projitems*{7b92af71-6287-4693-9dcb-bd5b6e927e23}*SharedItemsImports = 5
+		src\Shared\RenderHelpers\RenderHelpers.projitems*{7d2d3083-71dd-4cc9-8907-39a0d86fb322}*SharedItemsImports = 5
+		src\Shared\PlatformSupport\PlatformSupport.projitems*{88060192-33d5-4932-b0f9-8bd2763e857d}*SharedItemsImports = 5
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{e4d9629c-f168-4224-3f51-a5e482ffbc42}*SharedItemsImports = 13
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -931,26 +958,6 @@ Global
 		{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
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.AppStore|iPhone.Build.0 = AppStore|iPhone
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Debug|Any CPU.ActiveCfg = Debug|iPhone
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Debug|iPhone.Build.0 = Debug|iPhone
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Release|Any CPU.ActiveCfg = Release|iPhone
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Release|iPhone.ActiveCfg = Release|iPhone
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Release|iPhone.Build.0 = Release|iPhone
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
 		{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
@@ -1023,30 +1030,6 @@ Global
 		{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
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|iPhone.Build.0 = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B61B66A3-B82D-4875-8001-89D3394FE0C9}.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
@@ -1895,6 +1878,270 @@ Global
 		{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
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.Release|iPhone.Build.0 = Release|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{28F18757-C3E6-4BBE-A37D-11BA2AB9177C}.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
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|iPhone.Build.0 = Release|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1921,7 +2168,6 @@ Global
 		{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}
-		{8C923867-8A8F-4F6B-8B80-47D9E8436166} = {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}
@@ -1951,6 +2197,12 @@ Global
 		{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}
+		{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}
+		{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
+		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {87366D66-1391-4D90-8999-95A620AD786A}
diff --git a/Avalonia.sln.DotSettings b/Avalonia.sln.DotSettings
index 7060f4a62a..25d62b0494 100644
--- a/Avalonia.sln.DotSettings
+++ b/Avalonia.sln.DotSettings
@@ -37,4 +37,5 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypeParameters/@EntryIndexedValue">&lt;Policy Inspect="False" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypesAndNamespaces/@EntryIndexedValue">&lt;Policy Inspect="False" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002EDaemon_002ESettings_002EMigration_002ESwaWarningsModeSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Avalonia/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Avalonia.v3.ncrunchsolution b/Avalonia.v3.ncrunchsolution
index a2208a9a91..b97a8e54f5 100644
--- a/Avalonia.v3.ncrunchsolution
+++ b/Avalonia.v3.ncrunchsolution
@@ -3,8 +3,14 @@
     <AdditionalFilesToIncludeForSolution>
       <Value>tests\TestFiles\**.*</Value>
       <Value>src\Avalonia.Build.Tasks\bin\Debug\netstandard2.0\Avalonia.Build.Tasks.dll</Value>
+      <Value>src\Avalonia.Build.Tasks\bin\Debug\netstandard2.0\Mono.Cecil.dll</Value>
+      <Value>src\Avalonia.Build.Tasks\bin\Debug\netstandard2.0\Mono.Cecil.Rocks.dll</Value>
+      <Value>src\Avalonia.Build.Tasks\bin\Debug\netstandard2.0\Mono.Cecil.Pdb.dll</Value>
     </AdditionalFilesToIncludeForSolution>
     <AllowParallelTestExecution>True</AllowParallelTestExecution>
+    <CustomBuildProperties>
+      <Value>RunApiCompat = false</Value>
+    </CustomBuildProperties>
     <ProjectConfigStoragePathRelativeToSolutionDir>.ncrunch</ProjectConfigStoragePathRelativeToSolutionDir>
     <SolutionConfigured>True</SolutionConfigured>
   </Settings>
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index dc57a73f48..fde2931bf9 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,76 +1,130 @@
+
 # Contributor Covenant Code of Conduct
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment
-include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic
- address, without explicit permission
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
- professional setting
+  professional setting
 
-## Our Responsibilities
+## Enforcement Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at steven@avaloniaui.net. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
+reported to the community leaders responsible for enforcement at
+steven@avaloniaui.net.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
 
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
 
 [homepage]: https://www.contributor-covenant.org
 
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.
+
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000..dcf95ce33c
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,69 @@
+# Contributing to Avalonia
+
+## Before You Start
+
+Drop into our [gitter chat room](https://gitter.im/AvaloniaUI/Avalonia) and let us know what you're thinking of doing. We might be able to give you guidance or let you know if someone else is already working on the feature.
+
+## Style
+
+The codebase uses [.net core](https://github.com/dotnet/runtime/blob/master/docs/coding-guidelines/coding-style.md) coding style.
+
+Try to keep lines of code around 100 characters in length or less, though this is not a hard limit.
+If you're a few characters over then don't worry too much.
+
+**DO NOT USE #REGIONS** full stop.
+
+## Pull requests
+
+A single pull request should be submitted for each change. If you're making more than one change,
+please submit separate pull requests for each change for easy review. Rebase your changes to make
+sense, so a history that looks like:
+
+* Add class A
+* Feature A didn't set Foo when Bar was set
+* Fix spacing
+* Add class B
+* Sort using statements
+
+Should be rebased to read:
+
+* Add class A
+* Add class B
+
+Again, this makes review much easier.
+
+Please try not to submit pull requests that don't add new features (e.g. moving stuff around)
+unless you see something that is obviously wrong or that could be written in a more terse or
+idiomatic style. It takes time to review each pull request - time that I'd prefer to spend writing
+new features!
+
+Prefer terseness to verbosity but don't try to be too clever.
+
+## Tests
+
+There are two types of tests currently in the codebase; unit tests and render tests.
+
+Unit tests should be contained in a class name that mirrors the class being tested with the suffix
+-Tests, e.g.
+
+    Avalonia.Controls.UnitTests.Presenters.TextPresenterTests
+
+Where Avalonia.Controls.UnitTests is the name of the project.
+
+Unit test methods should be named in a sentence style, separated by underscores, that describes in
+English what the test is testing, e.g.
+
+```csharp
+    void Calling_Foo_Should_Increment_Bar()
+```
+
+Render tests should describe what the produced image is:
+
+```csharp
+    void Rectangle_2px_Stroke_Filled()
+```
+
+## Code of Conduct
+
+This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behavior in our community.
+For more information see the [Contributor Covenant Code of Conduct](https://dotnetfoundation.org/code-of-conduct)
diff --git a/Directory.Build.props b/Directory.Build.props
index 1f26df9bbc..c6610695c4 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,8 @@
 <Project>
   <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>
   </PropertyGroup>
 </Project>
diff --git a/Documentation/build.md b/Documentation/build.md
new file mode 100644
index 0000000000..5f75290424
--- /dev/null
+++ b/Documentation/build.md
@@ -0,0 +1,75 @@
+# Windows
+
+Avalonia requires at least Visual Studio 2019 and .NET Core SDK 3.1 to build on Windows.
+
+###  Clone the Avalonia repository
+
+```
+git clone https://github.com/AvaloniaUI/Avalonia.git
+git submodule update --init
+```
+
+###  Open in Visual Studio
+
+Open the `Avalonia.sln` solution in Visual Studio 2019 or newer. The free Visual Studio Community
+edition works fine. Run the `Samples\ControlCatalog.Desktop` project to see the sample application.
+
+# Linux/macOS
+
+It's *not* possible to build the *whole* project on Linux/macOS. You can only build the subset targeting .NET Standard and .NET Core (which is, however, sufficient to get UI working on Linux/macOS). If you want to something that involves changing platform-specific APIs you'll need a Windows machine.
+
+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 .NET Core
+
+Go to https://www.microsoft.com/net/core and follow instructions for your OS. You need SDK (not just "runtime") package.
+
+###  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.
+
+Linux operating systems ship with their own respective package managers however we will use [Homebrew](https://brew.sh/) to manage packages on macOS.  To install follow the instructions [here](https://docs.brew.sh/Installation).
+
+###  Install CastXML (pre Nov 2020)
+
+Avalonia requires [CastXML](https://github.com/CastXML/CastXML) for XML processing during the build process.  The easiest way to install this is via the operating system's package managers, such as below.
+
+On macOS:
+```
+brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/8a004a91a7fcd3f6620d5b01b6541ff0a640ffba/Formula/castxml.rb
+```
+
+On Debian based Linux (Debian, Ubuntu, Mint, etc):
+```
+sudo apt install castxml
+```
+
+On Red Hat based Linux (Fedora, CentOS, RHEL, etc) using `yum` (`dnf` takes same arguments though):
+```
+sudo yum install castxml
+```
+
+
+###  Clone the Avalonia repository
+
+```
+git clone https://github.com/AvaloniaUI/Avalonia.git
+cd Avalonia
+git submodule update --init --recursive
+```
+
+### 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.
+
+```bash
+./build.sh CompileNative
+```
+
+###  Build and Run Avalonia
+
+```
+cd samples/ControlCatalog.NetCore
+dotnet restore
+dotnet run
+```
diff --git a/NOTICE.md b/NOTICE.md
new file mode 100644
index 0000000000..92fd725957
--- /dev/null
+++ b/NOTICE.md
@@ -0,0 +1,305 @@
+# WPF
+
+https://github.com/dotnet/wpf
+
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and Contributors
+
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+# SharpDX
+
+https://github.com/sharpdx/SharpDX
+
+Copyright (c) 2010-2014 SharpDX - Alexandre Mutel
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+# Silverlight Toolkit
+
+https://github.com/microsoftarchive/SilverlightToolkit
+
+Microsoft Public License (MS-PL)
+
+This license governs use of the accompanying software. If you use the software, you
+accept this license. If you do not accept the license, do not use the software.
+
+1. Definitions
+The terms "reproduce," "reproduction," "derivative works," and "distribution" have the
+same meaning here as under U.S. copyright law.
+A "contribution" is the original software, or any additions or changes to the software.
+A "contributor" is any person that distributes its contribution under this license.
+"Licensed patents" are a contributor's patent claims that read directly on its contribution.
+
+2. Grant of Rights
+(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
+(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
+
+3. Conditions and Limitations
+(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
+(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
+(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
+(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
+(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
+
+# wayland-protocols
+
+https://github.com/wayland-project/wayland-protocols
+
+Copyright � 2008-2013 Kristian H�gsberg
+Copyright � 2010-2013 Intel Corporation
+Copyright � 2013      Rafael Antognolli
+Copyright � 2013      Jasper St. Pierre
+Copyright � 2014      Jonas �dahl
+Copyright � 2014      Jason Ekstrand
+Copyright � 2014-2015 Collabora, Ltd.
+Copyright � 2015      Red Hat Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+# Metsys.Bson
+
+Copyright (c) 2010, Karl Seguin - http://www.openmymind.net/
+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 name of the <organization> nor the
+      names of its 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 <COPYRIGHT HOLDER> 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.
+
+# RichTextKit
+
+https://github.com/toptensoftware/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.
+
+# Mono
+
+https://github.com/mono/mono
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# Collections.Pooled
+
+https://github.com/jtmueller/Collections.Pooled
+
+The MIT License (MIT)
+
+Copyright (c) Joel Mueller
+
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+# EllipticalArc.java
+
+http://www.spaceroots.org/documents/ellipse/EllipticalArc.java
+http://www.spaceroots.org/documents/ellipse/elliptical-arc.pdf
+
+Copyright (c) 2003-2004, Luc Maisonobe
+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.
+
+# WinUI
+
+https://github.com/microsoft/microsoft-ui-xaml
+
+MIT License
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE
+
+# Chromium
+
+https://github.com/chromium/chromium
+
+// Copyright 2015 The Chromium Authors. 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 name of Google Inc. nor the names of its
+// 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.
\ No newline at end of file
diff --git a/NuGet.Config b/NuGet.Config
index 2a1e0af74d..7a1f28bea7 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <configuration>
   <packageSources>
     <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" />
   </packageSources>
 </configuration>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 603308ef9a..15392278c9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -3,18 +3,11 @@ jobs:
   pool:
     vmImage: 'ubuntu-16.04'
   steps:
-  - task: CmdLine@2
-    displayName: 'Install CastXML'
-    inputs:
-      script: |
-        sudo apt-get update
-        sudo apt-get install castxml
-
   - task: CmdLine@2
     displayName: 'Install Nuke'
     inputs:
       script: |
-         dotnet tool install --global Nuke.GlobalTool --version 0.12.3
+         dotnet tool install --global Nuke.GlobalTool --version 0.24.0
   - task: CmdLine@2
     displayName: 'Run Nuke'
     inputs:
@@ -31,12 +24,15 @@ jobs:
     condition: not(canceled())
      
 - job: macOS
+  variables:
+    SolutionDir: '$(Build.SourcesDirectory)'
   pool:
-    vmImage: 'macOS-10.14'
+    vmImage: 'macOS-10.15'
   steps:
-  - task: DotNetCoreInstaller@0
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core SDK 3.1.401'
     inputs:
-      version: '2.1.403'
+      version: 3.1.401
 
   - task: CmdLine@2
     displayName: 'Install Mono 5.18'
@@ -45,28 +41,27 @@ jobs:
         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 /
 
+  - task: CmdLine@2
+    displayName: 'Generate avalonia-native'
+    inputs:
+      script: |
+        cd src/tools/MicroComGenerator; dotnet run -i ../../Avalonia.Native/avn.idl --cpp ../../../native/Avalonia.Native/inc/avalonia-native.h
+
   - task: Xcode@5
     inputs:
       actions: 'build'
       scheme: ''
-      sdk: 'macosx10.14'
+      sdk: 'macosx11.0'
       configuration: 'Release'
       xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace'
-      xcodeVersion: '10' # Options: 8, 9, default, specifyPath
+      xcodeVersion: '12' # Options: 8, 9, default, specifyPath
       args: '-derivedDataPath ./'
 
-  - task: CmdLine@2
-    displayName: 'Install CastXML'
-    inputs:
-      script: |
-        brew update
-        brew install castxml
-
   - task: CmdLine@2
     displayName: 'Install Nuke'
     inputs:
       script: |
-       dotnet tool install --global Nuke.GlobalTool --version 0.12.3 
+       dotnet tool install --global Nuke.GlobalTool --version 0.24.0
 
   - task: CmdLine@2
     displayName: 'Run Nuke'
@@ -80,7 +75,7 @@ jobs:
         export PATH="$PATH:$HOME/.dotnet/tools"
         dotnet --info
         printenv
-        nuke --target CiAzureOSX --configuration Release
+        nuke --target CiAzureOSX --configuration Release --skip-previewer
 
   - task: PublishTestResults@2
     inputs:
@@ -103,12 +98,19 @@ jobs:
 - job: Windows
   pool:
     vmImage: 'windows-2019'
+  variables:
+    SolutionDir: '$(Build.SourcesDirectory)'
   steps:
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core SDK 3.1.401'
+    inputs:
+      version: 3.1.401
+
   - task: CmdLine@2
     displayName: 'Install Nuke'
     inputs:
       script: |
-       dotnet tool install --global Nuke.GlobalTool --version 0.12.3 
+       dotnet tool install --global Nuke.GlobalTool --version 0.24.0 
 
   - task: CmdLine@2
     displayName: 'Run Nuke'
diff --git a/build.ps1 b/build.ps1
index 57e2f80075..985e8abcee 100644
--- a/build.ps1
+++ b/build.ps1
@@ -43,7 +43,7 @@ if (Test-Path $DotNetGlobalFile) {
 }
 
 # If dotnet is installed locally, and expected version is not set or installation matches the expected version
-if ((Get-Command "dotnet" -ErrorAction SilentlyContinue) -ne $null -and `
+if ($null -ne (Get-Command "dotnet" -ErrorAction SilentlyContinue) -and `
      (!(Test-Path variable:DotNetVersion) -or $(& dotnet --version) -eq $DotNetVersion)) {
     $env:DOTNET_EXE = (Get-Command "dotnet").Path
 }
@@ -53,7 +53,7 @@ else {
 
     # Download install script
     $DotNetInstallFile = "$TempDirectory\dotnet-install.ps1"
-    md -force $TempDirectory > $null
+    mkdir -force $TempDirectory > $null
     (New-Object System.Net.WebClient).DownloadFile($DotNetInstallUrl, $DotNetInstallFile)
 
     # Install by channel or version
@@ -62,6 +62,8 @@ else {
     } else {
         ExecSafe { & $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
     }
+
+    $env:PATH="$DotNetDirectory;$env:PATH"
 }
 
 Write-Output "Microsoft (R) .NET Core SDK version $(& $env:DOTNET_EXE --version)"
diff --git a/build.sh b/build.sh
index 40b1c225a6..bd162fab9b 100755
--- a/build.sh
+++ b/build.sh
@@ -47,7 +47,7 @@ if [ -f "$DOTNET_GLOBAL_FILE" ]; then
 fi
 
 # If dotnet is installed locally, and expected version is not set or installation matches the expected version
-if [[ -x "$(command -v dotnet)" && (-z ${DOTNET_VERSION+x} || $(dotnet --version) == "$DOTNET_VERSION") ]]; then
+if [[ -x "$(command -v dotnet)" && (-z ${DOTNET_VERSION+x} || $(dotnet --version) == "$DOTNET_VERSION") || "$SKIP_DOTNET_DOWNLOAD" == "1" ]]; then
     export DOTNET_EXE="$(command -v dotnet)"
 else
     DOTNET_DIRECTORY="$TEMP_DIRECTORY/dotnet-unix"
@@ -67,6 +67,8 @@ else
     fi
 fi
 
+export PATH=$DOTNET_DIRECTORY:$PATH
+
 echo "Microsoft (R) .NET Core SDK version $("$DOTNET_EXE" --version)"
 
 "$DOTNET_EXE" run --project "$BUILD_PROJECT_FILE" -- ${BUILD_ARGUMENTS[@]}
diff --git a/build/ApiDiff.props b/build/ApiDiff.props
new file mode 100644
index 0000000000..da59ad4bf2
--- /dev/null
+++ b/build/ApiDiff.props
@@ -0,0 +1,12 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ApiContractPackageVersion>0.10.0-rc1</ApiContractPackageVersion>
+    <NugetPackageName Condition="'$(PackageId)' != ''">$(PackageId)</NugetPackageName>
+    <NugetPackageName Condition="'$(PackageId)' == ''">Avalonia</NugetPackageName>
+  </PropertyGroup>
+    <ItemGroup>
+      <PackageDownload Include="$(NugetPackageName)" Version="[$(ApiContractPackageVersion)]" />
+      <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20372.2" PrivateAssets="All" />
+      <ResolvedMatchingContract Include="$(NuGetPackageRoot)\$(NugetPackageName.ToLowerInvariant())\$(ApiContractPackageVersion)\lib\$(TargetFramework)\$(AssemblyName).dll" />
+    </ItemGroup>
+</Project>
diff --git a/build/Assets/Icon.png b/build/Assets/Icon.png
new file mode 100644
index 0000000000..41a2a618fb
Binary files /dev/null and b/build/Assets/Icon.png differ
diff --git a/build/CoreLibraries.props b/build/CoreLibraries.props
index 3923bdeeda..fff00041c3 100644
--- a/build/CoreLibraries.props
+++ b/build/CoreLibraries.props
@@ -4,18 +4,18 @@
       <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.Diagnostics/Avalonia.Diagnostics.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.Logging.Serilog/Avalonia.Logging.Serilog.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'" />
   </ItemGroup>
 </Project>
diff --git a/build/EmbedXaml.props b/build/EmbedXaml.props
index 7ce0366dea..0bb8da4f47 100644
--- a/build/EmbedXaml.props
+++ b/build/EmbedXaml.props
@@ -4,8 +4,9 @@
      <Compile Update="**\*.xaml.cs">
       <DependentUpon>%(Filename)</DependentUpon>
     </Compile>
+    <None Remove="**\*.xaml"/>
     <AvaloniaResource Include="**\*.xaml">
       <SubType>Designer</SubType>
     </AvaloniaResource>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/HarfBuzzSharp.props b/build/HarfBuzzSharp.props
index f8767c7599..e636461ad9 100644
--- a/build/HarfBuzzSharp.props
+++ b/build/HarfBuzzSharp.props
@@ -1,6 +1,6 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="HarfBuzzSharp" Version="2.6.1-rc.153" />
-    <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.6.1-rc.153" />
+    <PackageReference Include="HarfBuzzSharp" Version="2.6.1.6" />
+    <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.6.1.6" />
   </ItemGroup>
 </Project>
diff --git a/build/MicroCom.targets b/build/MicroCom.targets
new file mode 100644
index 0000000000..b48e377fd4
--- /dev/null
+++ b/build/MicroCom.targets
@@ -0,0 +1,33 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Ensure that code generator is actually built -->
+  <ItemGroup>
+    <ProjectReference Include="$(MSBuildThisFileDirectory)\..\src\tools\MicroComGenerator\MicroComGenerator.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <ExcludeAssets>all</ExcludeAssets>
+      <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
+    </ProjectReference>
+  </ItemGroup>
+  
+  <Target Name="GenerateAvaloniaNativeComInterop"
+          BeforeTargets="CoreCompile"
+          DependsOnTargets="ResolveReferences"
+          Inputs="@(AvnComIdl);$(MSBuildThisFileDirectory)../src/tools/MicroComGenerator/**/*.cs"
+          Outputs="%(AvnComIdl.OutputFile)">
+    <Message Importance="high" Text="Generating file %(AvnComIdl.OutputFile) from @(AvnComIdl)" />
+    <Exec Command="dotnet $(MSBuildThisFileDirectory)../src/tools/MicroComGenerator/bin/$(Configuration)/netcoreapp3.1/MicroComGenerator.dll -i @(AvnComIdl) --cs %(AvnComIdl.OutputFile)" LogStandardErrorAsError="true" />
+    <ItemGroup>
+      <!-- Remove and re-add generated file, this is needed for the clean build -->
+      <Compile Remove="%(AvnComIdl.OutputFile)"/>
+      <Compile Include="%(AvnComIdl.OutputFile)"/>
+    </ItemGroup>
+  </Target>
+  <ItemGroup>
+    <UpToDateCheckInput Include="@(AvnComIdl)"/>
+    <UpToDateCheckInput Include="$(MSBuildThisFileDirectory)/../src/tools/MicroComGenerator/**/*.cs"/>
+  </ItemGroup>
+  <PropertyGroup>
+    <_AvaloniaPatchComInterop>true</_AvaloniaPatchComInterop>
+  </PropertyGroup>
+  <Import Project="$(MSBuildThisFileDirectory)/BuildTargets.targets" />
+</Project>
diff --git a/build/Moq.props b/build/Moq.props
index 7de9b6b6ba..9e2fd1db5d 100644
--- a/build/Moq.props
+++ b/build/Moq.props
@@ -1,5 +1,5 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.7.99" />
+    <PackageReference Include="Moq" Version="4.14.1" />
   </ItemGroup>
 </Project>
diff --git a/build/NetFX.props b/build/NetFX.props
index ed5cb6dd69..8ffc9ec561 100644
--- a/build/NetFX.props
+++ b/build/NetFX.props
@@ -1,7 +1,7 @@
 <Project>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/build/ReactiveUI.props b/build/ReactiveUI.props
index f827cb9a32..f74ab07e31 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="10.3.6" />
+    <PackageReference Include="ReactiveUI" Version="12.1.1" />
   </ItemGroup>
 </Project>
diff --git a/build/Rx.props b/build/Rx.props
index edff0af160..fde1f80ea1 100644
--- a/build/Rx.props
+++ b/build/Rx.props
@@ -1,5 +1,5 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="System.Reactive" Version="4.1.6" />
+    <PackageReference Include="System.Reactive" Version="5.0" />
   </ItemGroup>
 </Project>
diff --git a/build/Serilog.props b/build/Serilog.props
deleted file mode 100644
index a814cf998d..0000000000
--- a/build/Serilog.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.5.0" />
-    <PackageReference Include="Serilog.Sinks.Trace" Version="2.1.0" />
-    <PackageReference Include="Serilog.Sinks.Debug" Version="1.0.0" />
-  </ItemGroup>
-</Project>
diff --git a/build/SharedVersion.props b/build/SharedVersion.props
index 44d5c239ef..43ec995ed9 100644
--- a/build/SharedVersion.props
+++ b/build/SharedVersion.props
@@ -2,18 +2,25 @@
   xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Product>Avalonia</Product>
-    <Version>0.8.999</Version>
-    <Copyright>Copyright 2019 &#169; The AvaloniaUI Project</Copyright>
+    <Version>0.10.999</Version>
+    <Copyright>Copyright 2020 &#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>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageIconUrl>https://avatars2.githubusercontent.com/u/14075148?s=200</PackageIconUrl>
+    <PackageIcon>Icon.png</PackageIcon>
     <PackageDescription>Avalonia is a WPF/UWP-inspired cross-platform XAML-based UI framework providing a flexible styling system and supporting a wide range of Operating Systems such as Windows (.NET Framework, .NET Core), Linux (via Xorg), MacOS and with experimental support for Android and iOS.</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>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\avalonia.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <DefineConstants Condition="$(SignAssembly) == true">$(DefineConstants);SIGNED_BUILD</DefineConstants>
   </PropertyGroup>
+
+  <ItemGroup Label="PackageIcon">
+    <None Include="$(MSBuildThisFileDirectory)/Assets/Icon.png" Pack="true" PackagePath=""/>
+  </ItemGroup>
 </Project>
diff --git a/build/SkiaSharp.props b/build/SkiaSharp.props
index 796bd8e596..f2e7df36cd 100644
--- a/build/SkiaSharp.props
+++ b/build/SkiaSharp.props
@@ -1,6 +1,6 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="1.68.1-rc.153" />
-    <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="SkiaSharp.NativeAssets.Linux" Version="1.68.1-rc.153" />
+    <PackageReference Include="SkiaSharp" Version="2.80.2" />
+    <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="SkiaSharp.NativeAssets.Linux" Version="2.80.2" />
   </ItemGroup>
 </Project>
diff --git a/build/SourceLink.props b/build/SourceLink.props
index 0c9b6a34f8..e27727c9e8 100644
--- a/build/SourceLink.props
+++ b/build/SourceLink.props
@@ -1,5 +1,5 @@
 <Project>
   <ItemGroup>
-    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.0" PrivateAssets="All" />
+    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/XUnit.props b/build/XUnit.props
index 079565d184..a75e1bac86 100644
--- a/build/XUnit.props
+++ b/build/XUnit.props
@@ -11,4 +11,8 @@
     <PackageReference Include="Xunit.SkippableFact" Version="1.3.6" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
   </ItemGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\avalonia.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>False</SignAssembly>
+  </PropertyGroup>
 </Project>
diff --git a/build/avalonia.snk b/build/avalonia.snk
new file mode 100644
index 0000000000..10b49deb31
Binary files /dev/null and b/build/avalonia.snk differ
diff --git a/build/iOSWorkarounds.props b/build/iOSWorkarounds.props
deleted file mode 100644
index fe46295770..0000000000
--- a/build/iOSWorkarounds.props
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project>
-  <PropertyGroup Condition="'$(iOSRoslynPathHackRequired)' == 'true'">
-    <CscToolPath>$(MSBuildToolsPath)\..\Roslyn</CscToolPath>
-  </PropertyGroup>
-</Project>
diff --git a/build/readme.md b/build/readme.md
index 387afb3425..e147556b1c 100644
--- a/build/readme.md
+++ b/build/readme.md
@@ -9,8 +9,6 @@
 <Import Project="..\..\build\Moq.props" />
 <Import Project="..\..\build\NetCore.props" />
 <Import Project="..\..\build\Rx.props" />
-<Import Project="..\..\build\Serilog.props" />
-<Import Project="..\..\build\Serilog.Sinks.Trace.props" />
 <Import Project="..\..\build\SharpDX.props" />
 <Import Project="..\..\build\SkiaSharp.Desktop.props" />
 <Import Project="..\..\build\SkiaSharp.props" />
@@ -22,4 +20,4 @@
 
 ```XML
 <Import Project="..\..\build\UnitTests.NetCore.targets" />
-```
\ No newline at end of file
+```
diff --git a/dirs.proj b/dirs.proj
index 4b3b1183f0..594f2c22d3 100644
--- a/dirs.proj
+++ b/dirs.proj
@@ -6,20 +6,22 @@
     <ProjectReference Include="packages/**/*.*proj" />
     <ProjectReference Remove="**/*.shproj" />
     <ProjectReference Remove="src/Markup/Avalonia.Markup.Xaml/PortableXaml/**/*.*proj" />
-    <ProjectReference Remove="src/Markup/Avalonia.Markup.Xaml/XamlIl/**/*.*proj" />
+    <ProjectReference Remove="src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github/**/*.*proj" />
+    <ProjectReference Remove="tests/Avalonia.ReactiveUI.Events.UnitTests/Avalonia.ReactiveUI.Events.UnitTests.csproj" />
   </ItemGroup>
   <!--<ItemGroup Condition="!Exists('$(MSBuildExtensionsPath)\Xamarin\Android')">-->
   <ItemGroup>
     <ProjectReference Remove="src/Android/**/*.*proj" />
     <ProjectReference Remove="samples/ControlCatalog.Android/ControlCatalog.Android.csproj" />
   </ItemGroup>
-  <ItemGroup Condition="!Exists('$(MSBuildExtensionsPath)\Xamarin\iOS') Or $([MSBuild]::IsOsPlatform('Windows')) ">
+  <ItemGroup Condition="!Exists('$(MSBuildExtensionsPath)\Xamarin\iOS')">
     <ProjectReference Remove="src/iOS/**/*.*proj" />
     <ProjectReference Remove="samples/ControlCatalog.iOS/ControlCatalog.iOS.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>
 
   <ItemGroup>
diff --git a/global.json b/global.json
index 1e599211d4..b2b2da7c4f 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,10 @@
 {
+	"sdk": {
+		"version": "3.1.401"
+	},
     "msbuild-sdks": {
         "Microsoft.Build.Traversal": "1.0.43",
-        "MSBuild.Sdk.Extras": "2.0.46",
+        "MSBuild.Sdk.Extras": "2.0.54",
         "AggregatePackage.NuGet.Sdk" : "0.1.12"
     }
 }
diff --git a/licence.md b/licence.md
index d730e936db..d18aef99ad 100644
--- a/licence.md
+++ b/licence.md
@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Steven Kirk
+Copyright (c) .NET Foundation and Contributors
+All Rights Reserved
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +19,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
+SOFTWARE.
diff --git a/native/Avalonia.Native/inc/.gitignore b/native/Avalonia.Native/inc/.gitignore
new file mode 100644
index 0000000000..e7aa7fc6a5
--- /dev/null
+++ b/native/Avalonia.Native/inc/.gitignore
@@ -0,0 +1 @@
+avalonia-native.h
diff --git a/native/Avalonia.Native/inc/avalonia-native-guids.h b/native/Avalonia.Native/inc/avalonia-native-guids.h
index 439008fd4b..64fec729a2 100644
--- a/native/Avalonia.Native/inc/avalonia-native-guids.h
+++ b/native/Avalonia.Native/inc/avalonia-native-guids.h
@@ -1,5 +1,2 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 #define COM_GUIDS_MATERIALIZE
 #include "avalonia-native.h"
diff --git a/native/Avalonia.Native/inc/avalonia-native.h b/native/Avalonia.Native/inc/avalonia-native.h
deleted file mode 100644
index f1c7664c3e..0000000000
--- a/native/Avalonia.Native/inc/avalonia-native.h
+++ /dev/null
@@ -1,401 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-#include "com.h"
-#include "key.h"
-
-#define AVNCOM(name, id) COMINTERFACE(name, 2e2cda0a, 9ae5, 4f1b, 8e, 20, 08, 1a, 04, 27, 9f, id)
-
-struct IAvnWindowEvents;
-struct IAvnWindow;
-struct IAvnPopup;
-struct IAvnMacOptions;
-struct IAvnPlatformThreadingInterface;
-struct IAvnSystemDialogEvents;
-struct IAvnSystemDialogs;
-struct IAvnScreens;
-struct IAvnClipboard;
-struct IAvnCursor;
-struct IAvnCursorFactory;
-struct IAvnGlFeature;
-struct IAvnGlContext;
-struct IAvnGlDisplay;
-struct IAvnGlSurfaceRenderTarget;
-struct IAvnGlSurfaceRenderingSession;
-struct IAvnAppMenu;
-struct IAvnAppMenuItem;
-
-struct AvnSize
-{
-    double Width, Height;
-};
-
-struct AvnPixelSize
-{
-    int Width, Height;
-};
-
-struct AvnRect
-{
-    double X, Y, Width, Height;
-};
-
-struct AvnVector
-{
-    double X, Y;
-};
-
-struct AvnPoint
-{
-    double X, Y;
-};
-
-struct AvnScreen
-{
-    AvnRect Bounds;
-    AvnRect WorkingArea;
-    float PixelDensity;
-    bool Primary;
-};
-
-enum AvnPixelFormat
-{
-    kAvnRgb565,
-    kAvnRgba8888,
-    kAvnBgra8888
-};
-
-struct AvnFramebuffer
-{
-    void* Data;
-    int Width;
-    int Height;
-    int Stride;
-    AvnVector Dpi;
-    AvnPixelFormat PixelFormat;
-};
-
-struct AvnColor
-{
-    unsigned char Alpha;
-    unsigned char Red;
-    unsigned char Green;
-    unsigned char Blue;
-};
-
-enum AvnRawMouseEventType
-{
-    LeaveWindow,
-    LeftButtonDown,
-    LeftButtonUp,
-    RightButtonDown,
-    RightButtonUp,
-    MiddleButtonDown,
-    MiddleButtonUp,
-    Move,
-    Wheel,
-    NonClientLeftButtonDown
-};
-
-enum AvnRawKeyEventType
-{
-    KeyDown,
-    KeyUp
-};
-
-enum AvnInputModifiers
-{
-    AvnInputModifiersNone = 0,
-    Alt = 1,
-    Control = 2,
-    Shift = 4,
-    Windows = 8,
-    LeftMouseButton = 16,
-    RightMouseButton = 32,
-    MiddleMouseButton = 64
-};
-
-enum AvnWindowState
-{
-    Normal,
-    Minimized,
-    Maximized,
-};
-
-enum AvnStandardCursorType
-{
-    CursorArrow,
-    CursorIbeam,
-    CursorWait,
-    CursorCross,
-    CursorUpArrow,
-    CursorSizeWestEast,
-    CursorSizeNorthSouth,
-    CursorSizeAll,
-    CursorNo,
-    CursorHand,
-    CursorAppStarting,
-    CursorHelp,
-    CursorTopSide,
-    CursorBottomSize,
-    CursorLeftSide,
-    CursorRightSide,
-    CursorTopLeftCorner,
-    CursorTopRightCorner,
-    CursorBottomLeftCorner,
-    CursorBottomRightCorner,
-    CursorDragMove,
-    CursorDragCopy,
-    CursorDragLink,
-    CursorNone
-};
-
-enum AvnWindowEdge
-{
-    WindowEdgeNorthWest,
-    WindowEdgeNorth,
-    WindowEdgeNorthEast,
-    WindowEdgeWest,
-    WindowEdgeEast,
-    WindowEdgeSouthWest,
-    WindowEdgeSouth,
-    WindowEdgeSouthEast
-};
-
-AVNCOM(IAvaloniaNativeFactory, 01) : IUnknown
-{
-public:
-    virtual HRESULT Initialize() = 0;
-    virtual IAvnMacOptions* GetMacOptions() = 0;
-    virtual HRESULT CreateWindow(IAvnWindowEvents* cb, IAvnWindow** ppv) = 0;
-    virtual HRESULT CreatePopup (IAvnWindowEvents* cb, IAvnPopup** ppv) = 0;
-    virtual HRESULT CreatePlatformThreadingInterface(IAvnPlatformThreadingInterface** ppv) = 0;
-    virtual HRESULT CreateSystemDialogs (IAvnSystemDialogs** ppv) = 0;
-    virtual HRESULT CreateScreens (IAvnScreens** ppv) = 0;
-    virtual HRESULT CreateClipboard(IAvnClipboard** ppv) = 0;
-    virtual HRESULT CreateCursorFactory(IAvnCursorFactory** ppv) = 0;
-    virtual HRESULT ObtainGlFeature(IAvnGlFeature** ppv) = 0;
-    virtual HRESULT ObtainAppMenu(IAvnAppMenu** retOut) = 0;
-    virtual HRESULT SetAppMenu(IAvnAppMenu* menu) = 0;
-    virtual HRESULT CreateMenu (IAvnAppMenu** ppv) = 0;
-    virtual HRESULT CreateMenuItem (IAvnAppMenuItem** ppv) = 0;
-    virtual HRESULT CreateMenuItemSeperator (IAvnAppMenuItem** ppv) = 0;
-};
-
-AVNCOM(IAvnString, 17) : IUnknown
-{
-    virtual HRESULT Pointer(void**retOut) = 0;
-    virtual HRESULT Length(int*ret) = 0;
-};
-
-AVNCOM(IAvnWindowBase, 02) : IUnknown
-{
-    virtual HRESULT Show() = 0;
-    virtual HRESULT Hide () = 0;
-    virtual HRESULT Close() = 0;
-    virtual HRESULT Activate () = 0;
-    virtual HRESULT GetClientSize(AvnSize*ret) = 0;
-    virtual HRESULT GetScaling(double*ret)=0;
-    virtual HRESULT SetMinMaxSize(AvnSize minSize, AvnSize maxSize) = 0;
-    virtual HRESULT Resize(double width, double height) = 0;
-    virtual HRESULT Invalidate (AvnRect rect) = 0;
-    virtual HRESULT BeginMoveDrag () = 0;
-    virtual HRESULT BeginResizeDrag (AvnWindowEdge edge) = 0;
-    virtual HRESULT GetPosition (AvnPoint*ret) = 0;
-    virtual HRESULT SetPosition (AvnPoint point) = 0;
-    virtual HRESULT PointToClient (AvnPoint point, AvnPoint*ret) = 0;
-    virtual HRESULT PointToScreen (AvnPoint point, AvnPoint*ret) = 0;
-    virtual HRESULT ThreadSafeSetSwRenderedFrame(AvnFramebuffer* fb, IUnknown* dispose) = 0;
-    virtual HRESULT SetTopMost (bool value) = 0;
-    virtual HRESULT SetCursor(IAvnCursor* cursor) = 0;
-    virtual HRESULT CreateGlRenderTarget(IAvnGlSurfaceRenderTarget** ret) = 0;
-    virtual HRESULT GetSoftwareFramebuffer(AvnFramebuffer*ret) = 0;
-    virtual HRESULT SetMainMenu(IAvnAppMenu* menu) = 0;
-    virtual HRESULT ObtainMainMenu(IAvnAppMenu** retOut) = 0;
-    virtual bool TryLock() = 0;
-    virtual void Unlock() = 0;
-};
-
-AVNCOM(IAvnPopup, 03) : virtual IAvnWindowBase
-{
-    
-};
-
-AVNCOM(IAvnWindow, 04) : virtual IAvnWindowBase
-{
-    virtual HRESULT ShowDialog (IAvnWindow* parent) = 0;
-    virtual HRESULT SetCanResize(bool value) = 0;
-    virtual HRESULT SetHasDecorations(bool value) = 0;
-    virtual HRESULT SetTitle (void* utf8Title) = 0;
-    virtual HRESULT SetTitleBarColor (AvnColor color) = 0;
-    virtual HRESULT SetWindowState(AvnWindowState state) = 0;
-    virtual HRESULT GetWindowState(AvnWindowState*ret) = 0;
-};
-
-AVNCOM(IAvnWindowBaseEvents, 05) : IUnknown
-{
-    virtual HRESULT Paint() = 0;
-    virtual void Closed() = 0;
-    virtual void Activated() = 0;
-    virtual void Deactivated() = 0;
-    virtual void Resized(const AvnSize& size) = 0;
-    virtual void PositionChanged (AvnPoint position) = 0;
-    virtual void RawMouseEvent (AvnRawMouseEventType type,
-                                unsigned int timeStamp,
-                                AvnInputModifiers modifiers,
-                                AvnPoint point,
-                                AvnVector delta) = 0;
-    virtual bool RawKeyEvent (AvnRawKeyEventType type, unsigned int timeStamp, AvnInputModifiers modifiers, unsigned int key) = 0;
-    virtual bool RawTextInputEvent (unsigned int timeStamp, const char* text) = 0;
-    virtual void ScalingChanged(double scaling) = 0;
-    virtual void RunRenderPriorityJobs() = 0;
-};
-
-
-AVNCOM(IAvnWindowEvents, 06) : IAvnWindowBaseEvents
-{
-    /**
-     * Closing Event
-     * Called when the user presses the OS window close button.
-     * return true to allow the close, return false to prevent close.
-     */
-    virtual bool Closing () = 0;
-    
-    virtual void WindowStateChanged (AvnWindowState state) = 0;
-};
-
-AVNCOM(IAvnMacOptions, 07) : IUnknown
-{
-    virtual HRESULT SetShowInDock(int show) = 0;
-    virtual HRESULT SetApplicationTitle (void* utf8string) = 0;
-};
-
-AVNCOM(IAvnActionCallback, 08) : IUnknown
-{
-    virtual void Run() = 0;
-};
-
-AVNCOM(IAvnSignaledCallback, 09) : IUnknown
-{
-    virtual void Signaled(int priority, bool priorityContainsMeaningfulValue) = 0;
-};
-
-AVNCOM(IAvnLoopCancellation, 0a) : IUnknown
-{
-    virtual void Cancel() = 0;
-};
-
-AVNCOM(IAvnPlatformThreadingInterface, 0b) : IUnknown
-{
-    virtual bool GetCurrentThreadIsLoopThread() = 0;
-    virtual void SetSignaledCallback(IAvnSignaledCallback* cb) = 0;
-    virtual IAvnLoopCancellation* CreateLoopCancellation() = 0;
-    virtual HRESULT RunLoop(IAvnLoopCancellation* cancel) = 0;
-    // Can't pass int* to sharpgentools for some reason
-    virtual void Signal(int priority) = 0;
-    virtual IUnknown* StartTimer(int priority, int ms, IAvnActionCallback* callback) = 0;
-};
-
-AVNCOM(IAvnSystemDialogEvents, 0c) : IUnknown
-{
-    virtual void OnCompleted (int numResults, void* ptrFirstResult) = 0;
-};
-
-AVNCOM(IAvnSystemDialogs, 0d) : IUnknown
-{
-    virtual void SelectFolderDialog (IAvnWindow* parentWindowHandle,
-                                     IAvnSystemDialogEvents* events,
-                                     const char* title,
-                                     const char* initialPath) = 0;
-    
-    virtual void OpenFileDialog (IAvnWindow* parentWindowHandle,
-                                 IAvnSystemDialogEvents* events,
-                                 bool allowMultiple,
-                                 const char* title,
-                                 const char* initialDirectory,
-                                 const char* initialFile,
-                                 const char* filters) = 0;
-    
-    virtual void SaveFileDialog (IAvnWindow* parentWindowHandle,
-                                 IAvnSystemDialogEvents* events,
-                                 const char* title,
-                                 const char* initialDirectory,
-                                 const char* initialFile,
-                                 const char* filters) = 0;
-};
-
-AVNCOM(IAvnScreens, 0e) : IUnknown
-{
-    virtual HRESULT GetScreenCount (int* ret) = 0;
-    virtual HRESULT GetScreen (int index, AvnScreen* ret) = 0;
-};
-
-AVNCOM(IAvnClipboard, 0f) : IUnknown
-{
-    virtual HRESULT GetText (IAvnString**ppv) = 0;
-    virtual HRESULT SetText (void* utf8Text) = 0;
-    virtual HRESULT Clear() = 0;
-};
-
-AVNCOM(IAvnCursor, 10) : IUnknown
-{
-};
-
-AVNCOM(IAvnCursorFactory, 11) : IUnknown
-{
-    virtual HRESULT GetCursor (AvnStandardCursorType cursorType, IAvnCursor** retOut) = 0;
-};
-
-
-AVNCOM(IAvnGlFeature, 12) : IUnknown
-{
-    virtual HRESULT ObtainDisplay(IAvnGlDisplay**retOut) = 0;
-    virtual HRESULT ObtainImmediateContext(IAvnGlContext**retOut) = 0;
-};
-
-AVNCOM(IAvnGlDisplay, 13) : IUnknown
-{
-    virtual HRESULT GetSampleCount(int* ret) = 0;
-    virtual HRESULT GetStencilSize(int* ret) = 0;
-    virtual HRESULT ClearContext() = 0;
-    virtual void* GetProcAddress(char* proc) = 0;
-};
-
-AVNCOM(IAvnGlContext, 14) : IUnknown
-{
-    virtual HRESULT MakeCurrent() = 0;
-};
-
-AVNCOM(IAvnGlSurfaceRenderTarget, 15) : IUnknown
-{
-    virtual HRESULT BeginDrawing(IAvnGlSurfaceRenderingSession** ret) = 0;
-};
-
-AVNCOM(IAvnGlSurfaceRenderingSession, 16) : IUnknown
-{
-    virtual HRESULT GetPixelSize(AvnPixelSize* ret) = 0;
-    virtual HRESULT GetScaling(double* ret) = 0;
-};
-
-AVNCOM(IAvnAppMenu, 17) : IUnknown
-{
-    virtual HRESULT AddItem (IAvnAppMenuItem* item) = 0;
-    virtual HRESULT RemoveItem (IAvnAppMenuItem* item) = 0;
-    virtual HRESULT SetTitle (void* utf8String) = 0;
-    virtual HRESULT Clear () = 0;
-};
-
-AVNCOM(IAvnPredicateCallback, 18) : IUnknown
-{
-    virtual bool Evaluate() = 0;
-};
-
-AVNCOM(IAvnAppMenuItem, 19) : IUnknown
-{
-    virtual HRESULT SetSubMenu (IAvnAppMenu* menu) = 0;
-    virtual HRESULT SetTitle (void* utf8String) = 0;
-    virtual HRESULT SetGesture (void* utf8String, AvnInputModifiers modifiers) = 0;
-    virtual HRESULT SetAction (IAvnPredicateCallback* predicate, IAvnActionCallback* callback) = 0;
-};
-
-extern "C" IAvaloniaNativeFactory* CreateAvaloniaNative();
diff --git a/native/Avalonia.Native/inc/com.h b/native/Avalonia.Native/inc/com.h
index 22fb4a11a3..df251514ef 100644
--- a/native/Avalonia.Native/inc/com.h
+++ b/native/Avalonia.Native/inc/com.h
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 #pragma clang diagnostic push
 #pragma ide diagnostic ignored "OCUnusedGlobalDeclarationInspection"
 #ifndef COM_H_INCLUDED
diff --git a/native/Avalonia.Native/inc/comimpl.h b/native/Avalonia.Native/inc/comimpl.h
index cf1aa4c735..0ff64b7215 100644
--- a/native/Avalonia.Native/inc/comimpl.h
+++ b/native/Avalonia.Native/inc/comimpl.h
@@ -162,6 +162,19 @@ public:
         return _obj;
     }
     
+    TInterface* getRetainedReference()
+    {
+        if(_obj == NULL)
+            return NULL;
+        _obj->AddRef();
+        return _obj;
+    }
+    
+    TInterface** getPPV()
+    {
+        return &_obj;
+    }
+    
     operator TInterface*() const
     {
         return _obj;
diff --git a/native/Avalonia.Native/inc/key.h b/native/Avalonia.Native/inc/key.h
deleted file mode 100644
index cdc9658e29..0000000000
--- a/native/Avalonia.Native/inc/key.h
+++ /dev/null
@@ -1,1023 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-#ifndef _KEY_H_
-#define _KEY_H_
-
-/// <summary>
-/// Defines the keys available on a keyboard.
-/// </summary>
-enum AvnKey
-{
-    /// <summary>
-    /// No key pressed.
-    /// </summary>
-    AvnKeyNone = 0,
-    
-    /// <summary>
-    /// The Cancel key.
-    /// </summary>
-    AvnKeyCancel = 1,
-    
-    /// <summary>
-    /// The Back key.
-    /// </summary>
-    AvnKeyBack = 2,
-    
-    /// <summary>
-    /// The Tab key.
-    /// </summary>
-    AvnKeyTab = 3,
-    
-    /// <summary>
-    /// The Linefeed key.
-    /// </summary>
-    AvnKeyLineFeed = 4,
-    
-    /// <summary>
-    /// The Clear key.
-    /// </summary>
-    AvnKeyClear = 5,
-    
-    /// <summary>
-    /// The Return key.
-    /// </summary>
-    AvnKeyReturn = 6,
-    
-    /// <summary>
-    /// The Enter key.
-    /// </summary>
-    AvnKeyEnter = 6,
-    
-    /// <summary>
-    /// The Pause key.
-    /// </summary>
-    AvnKeyPause = 7,
-    
-    /// <summary>
-    /// The Caps Lock key.
-    /// </summary>
-    AvnKeyCapsLock = 8,
-    
-    /// <summary>
-    /// The Caps Lock key.
-    /// </summary>
-    AvnKeyCapital = 8,
-    
-    /// <summary>
-    /// The IME Hangul mode key.
-    /// </summary>
-    AvnKeyHangulMode = 9,
-    
-    /// <summary>
-    /// The IME Kana mode key.
-    /// </summary>
-    AvnKeyKanaMode = 9,
-    
-    /// <summary>
-    /// The IME Junja mode key.
-    /// </summary>
-    AvnKeyJunjaMode = 10,
-    
-    /// <summary>
-    /// The IME Final mode key.
-    /// </summary>
-    AvnKeyFinalMode = 11,
-    
-    /// <summary>
-    /// The IME Kanji mode key.
-    /// </summary>
-    AvnKeyKanjiMode = 12,
-    
-    /// <summary>
-    /// The IME Hanja mode key.
-    /// </summary>
-    HanjaMode = 12,
-    
-    /// <summary>
-    /// The Escape key.
-    /// </summary>
-    Escape = 13,
-    
-    /// <summary>
-    /// The IME Convert key.
-    /// </summary>
-    ImeConvert = 14,
-    
-    /// <summary>
-    /// The IME NonConvert key.
-    /// </summary>
-    ImeNonConvert = 15,
-    
-    /// <summary>
-    /// The IME Accept key.
-    /// </summary>
-    ImeAccept = 16,
-    
-    /// <summary>
-    /// The IME Mode change key.
-    /// </summary>
-    ImeModeChange = 17,
-    
-    /// <summary>
-    /// The space bar.
-    /// </summary>
-    Space = 18,
-    
-    /// <summary>
-    /// The Page Up key.
-    /// </summary>
-    PageUp = 19,
-    
-    /// <summary>
-    /// The Page Up key.
-    /// </summary>
-    Prior = 19,
-    
-    /// <summary>
-    /// The Page Down key.
-    /// </summary>
-    PageDown = 20,
-    
-    /// <summary>
-    /// The Page Down key.
-    /// </summary>
-    Next = 20,
-    
-    /// <summary>
-    /// The End key.
-    /// </summary>
-    End = 21,
-    
-    /// <summary>
-    /// The Home key.
-    /// </summary>
-    Home = 22,
-    
-    /// <summary>
-    /// The Left arrow key.
-    /// </summary>
-    Left = 23,
-    
-    /// <summary>
-    /// The Up arrow key.
-    /// </summary>
-    Up = 24,
-    
-    /// <summary>
-    /// The Right arrow key.
-    /// </summary>
-    Right = 25,
-    
-    /// <summary>
-    /// The Down arrow key.
-    /// </summary>
-    Down = 26,
-    
-    /// <summary>
-    /// The Select key.
-    /// </summary>
-    Select = 27,
-    
-    /// <summary>
-    /// The Print key.
-    /// </summary>
-    Print = 28,
-    
-    /// <summary>
-    /// The Execute key.
-    /// </summary>
-    Execute = 29,
-    
-    /// <summary>
-    /// The Print Screen key.
-    /// </summary>
-    Snapshot = 30,
-    
-    /// <summary>
-    /// The Print Screen key.
-    /// </summary>
-    PrintScreen = 30,
-    
-    /// <summary>
-    /// The Insert key.
-    /// </summary>
-    Insert = 31,
-    
-    /// <summary>
-    /// The Delete key.
-    /// </summary>
-    Delete = 32,
-    
-    /// <summary>
-    /// The Help key.
-    /// </summary>
-    Help = 33,
-    
-    /// <summary>
-    /// The 0 key.
-    /// </summary>
-    D0 = 34,
-    
-    /// <summary>
-    /// The 1 key.
-    /// </summary>
-    D1 = 35,
-    
-    /// <summary>
-    /// The 2 key.
-    /// </summary>
-    D2 = 36,
-    
-    /// <summary>
-    /// The 3 key.
-    /// </summary>
-    D3 = 37,
-    
-    /// <summary>
-    /// The 4 key.
-    /// </summary>
-    D4 = 38,
-    
-    /// <summary>
-    /// The 5 key.
-    /// </summary>
-    D5 = 39,
-    
-    /// <summary>
-    /// The 6 key.
-    /// </summary>
-    D6 = 40,
-    
-    /// <summary>
-    /// The 7 key.
-    /// </summary>
-    D7 = 41,
-    
-    /// <summary>
-    /// The 8 key.
-    /// </summary>
-    D8 = 42,
-    
-    /// <summary>
-    /// The 9 key.
-    /// </summary>
-    D9 = 43,
-    
-    /// <summary>
-    /// The A key.
-    /// </summary>
-    A = 44,
-    
-    /// <summary>
-    /// The B key.
-    /// </summary>
-    B = 45,
-    
-    /// <summary>
-    /// The C key.
-    /// </summary>
-    C = 46,
-    
-    /// <summary>
-    /// The D key.
-    /// </summary>
-    D = 47,
-    
-    /// <summary>
-    /// The E key.
-    /// </summary>
-    E = 48,
-    
-    /// <summary>
-    /// The F key.
-    /// </summary>
-    F = 49,
-    
-    /// <summary>
-    /// The G key.
-    /// </summary>
-    G = 50,
-    
-    /// <summary>
-    /// The H key.
-    /// </summary>
-    H = 51,
-    
-    /// <summary>
-    /// The I key.
-    /// </summary>
-    I = 52,
-    
-    /// <summary>
-    /// The J key.
-    /// </summary>
-    J = 53,
-    
-    /// <summary>
-    /// The K key.
-    /// </summary>
-    AvnKeyK = 54,
-    
-    /// <summary>
-    /// The L key.
-    /// </summary>
-    L = 55,
-    
-    /// <summary>
-    /// The M key.
-    /// </summary>
-    M = 56,
-    
-    /// <summary>
-    /// The N key.
-    /// </summary>
-    N = 57,
-    
-    /// <summary>
-    /// The O key.
-    /// </summary>
-    O = 58,
-    
-    /// <summary>
-    /// The P key.
-    /// </summary>
-    P = 59,
-    
-    /// <summary>
-    /// The Q key.
-    /// </summary>
-    Q = 60,
-    
-    /// <summary>
-    /// The R key.
-    /// </summary>
-    R = 61,
-    
-    /// <summary>
-    /// The S key.
-    /// </summary>
-    S = 62,
-    
-    /// <summary>
-    /// The T key.
-    /// </summary>
-    T = 63,
-    
-    /// <summary>
-    /// The U key.
-    /// </summary>
-    U = 64,
-    
-    /// <summary>
-    /// The V key.
-    /// </summary>
-    V = 65,
-    
-    /// <summary>
-    /// The W key.
-    /// </summary>
-    W = 66,
-    
-    /// <summary>
-    /// The X key.
-    /// </summary>
-    X = 67,
-    
-    /// <summary>
-    /// The Y key.
-    /// </summary>
-    Y = 68,
-    
-    /// <summary>
-    /// The Z key.
-    /// </summary>
-    Z = 69,
-    
-    /// <summary>
-    /// The left Windows key.
-    /// </summary>
-    LWin = 70,
-    
-    /// <summary>
-    /// The right Windows key.
-    /// </summary>
-    RWin = 71,
-    
-    /// <summary>
-    /// The Application key.
-    /// </summary>
-    Apps = 72,
-    
-    /// <summary>
-    /// The Sleep key.
-    /// </summary>
-    Sleep = 73,
-    
-    /// <summary>
-    /// The 0 key on the numeric keypad.
-    /// </summary>
-    NumPad0 = 74,
-    
-    /// <summary>
-    /// The 1 key on the numeric keypad.
-    /// </summary>
-    NumPad1 = 75,
-    
-    /// <summary>
-    /// The 2 key on the numeric keypad.
-    /// </summary>
-    NumPad2 = 76,
-    
-    /// <summary>
-    /// The 3 key on the numeric keypad.
-    /// </summary>
-    NumPad3 = 77,
-    
-    /// <summary>
-    /// The 4 key on the numeric keypad.
-    /// </summary>
-    NumPad4 = 78,
-    
-    /// <summary>
-    /// The 5 key on the numeric keypad.
-    /// </summary>
-    NumPad5 = 79,
-    
-    /// <summary>
-    /// The 6 key on the numeric keypad.
-    /// </summary>
-    NumPad6 = 80,
-    
-    /// <summary>
-    /// The 7 key on the numeric keypad.
-    /// </summary>
-    NumPad7 = 81,
-    
-    /// <summary>
-    /// The 8 key on the numeric keypad.
-    /// </summary>
-    NumPad8 = 82,
-    
-    /// <summary>
-    /// The 9 key on the numeric keypad.
-    /// </summary>
-    NumPad9 = 83,
-    
-    /// <summary>
-    /// The Multiply key.
-    /// </summary>
-    Multiply = 84,
-    
-    /// <summary>
-    /// The Add key.
-    /// </summary>
-    Add = 85,
-    
-    /// <summary>
-    /// The Separator key.
-    /// </summary>
-    Separator = 86,
-    
-    /// <summary>
-    /// The Subtract key.
-    /// </summary>
-    Subtract = 87,
-    
-    /// <summary>
-    /// The Decimal key.
-    /// </summary>
-    Decimal = 88,
-    
-    /// <summary>
-    /// The Divide key.
-    /// </summary>
-    Divide = 89,
-    
-    /// <summary>
-    /// The F1 key.
-    /// </summary>
-    F1 = 90,
-    
-    /// <summary>
-    /// The F2 key.
-    /// </summary>
-    F2 = 91,
-    
-    /// <summary>
-    /// The F3 key.
-    /// </summary>
-    F3 = 92,
-    
-    /// <summary>
-    /// The F4 key.
-    /// </summary>
-    F4 = 93,
-    
-    /// <summary>
-    /// The F5 key.
-    /// </summary>
-    F5 = 94,
-    
-    /// <summary>
-    /// The F6 key.
-    /// </summary>
-    F6 = 95,
-    
-    /// <summary>
-    /// The F7 key.
-    /// </summary>
-    F7 = 96,
-    
-    /// <summary>
-    /// The F8 key.
-    /// </summary>
-    F8 = 97,
-    
-    /// <summary>
-    /// The F9 key.
-    /// </summary>
-    F9 = 98,
-    
-    /// <summary>
-    /// The F10 key.
-    /// </summary>
-    F10 = 99,
-    
-    /// <summary>
-    /// The F11 key.
-    /// </summary>
-    F11 = 100,
-    
-    /// <summary>
-    /// The F12 key.
-    /// </summary>
-    F12 = 101,
-    
-    /// <summary>
-    /// The F13 key.
-    /// </summary>
-    F13 = 102,
-    
-    /// <summary>
-    /// The F14 key.
-    /// </summary>
-    F14 = 103,
-    
-    /// <summary>
-    /// The F15 key.
-    /// </summary>
-    F15 = 104,
-    
-    /// <summary>
-    /// The F16 key.
-    /// </summary>
-    F16 = 105,
-    
-    /// <summary>
-    /// The F17 key.
-    /// </summary>
-    F17 = 106,
-    
-    /// <summary>
-    /// The F18 key.
-    /// </summary>
-    F18 = 107,
-    
-    /// <summary>
-    /// The F19 key.
-    /// </summary>
-    F19 = 108,
-    
-    /// <summary>
-    /// The F20 key.
-    /// </summary>
-    F20 = 109,
-    
-    /// <summary>
-    /// The F21 key.
-    /// </summary>
-    F21 = 110,
-    
-    /// <summary>
-    /// The F22 key.
-    /// </summary>
-    F22 = 111,
-    
-    /// <summary>
-    /// The F23 key.
-    /// </summary>
-    F23 = 112,
-    
-    /// <summary>
-    /// The F24 key.
-    /// </summary>
-    F24 = 113,
-    
-    /// <summary>
-    /// The Numlock key.
-    /// </summary>
-    NumLock = 114,
-    
-    /// <summary>
-    /// The Scroll key.
-    /// </summary>
-    Scroll = 115,
-    
-    /// <summary>
-    /// The left Shift key.
-    /// </summary>
-    LeftShift = 116,
-    
-    /// <summary>
-    /// The right Shift key.
-    /// </summary>
-    RightShift = 117,
-    
-    /// <summary>
-    /// The left Ctrl key.
-    /// </summary>
-    LeftCtrl = 118,
-    
-    /// <summary>
-    /// The right Ctrl key.
-    /// </summary>
-    RightCtrl = 119,
-    
-    /// <summary>
-    /// The left Alt key.
-    /// </summary>
-    LeftAlt = 120,
-    
-    /// <summary>
-    /// The right Alt key.
-    /// </summary>
-    RightAlt = 121,
-    
-    /// <summary>
-    /// The browser Back key.
-    /// </summary>
-    BrowserBack = 122,
-    
-    /// <summary>
-    /// The browser Forward key.
-    /// </summary>
-    BrowserForward = 123,
-    
-    /// <summary>
-    /// The browser Refresh key.
-    /// </summary>
-    BrowserRefresh = 124,
-    
-    /// <summary>
-    /// The browser Stop key.
-    /// </summary>
-    BrowserStop = 125,
-    
-    /// <summary>
-    /// The browser Search key.
-    /// </summary>
-    BrowserSearch = 126,
-    
-    /// <summary>
-    /// The browser Favorites key.
-    /// </summary>
-    BrowserFavorites = 127,
-    
-    /// <summary>
-    /// The browser Home key.
-    /// </summary>
-    BrowserHome = 128,
-    
-    /// <summary>
-    /// The Volume Mute key.
-    /// </summary>
-    VolumeMute = 129,
-    
-    /// <summary>
-    /// The Volume Down key.
-    /// </summary>
-    VolumeDown = 130,
-    
-    /// <summary>
-    /// The Volume Up key.
-    /// </summary>
-    VolumeUp = 131,
-    
-    /// <summary>
-    /// The media Next Track key.
-    /// </summary>
-    MediaNextTrack = 132,
-    
-    /// <summary>
-    /// The media Previous Track key.
-    /// </summary>
-    MediaPreviousTrack = 133,
-    
-    /// <summary>
-    /// The media Stop key.
-    /// </summary>
-    MediaStop = 134,
-    
-    /// <summary>
-    /// The media Play/Pause key.
-    /// </summary>
-    MediaPlayPause = 135,
-    
-    /// <summary>
-    /// The Launch Mail key.
-    /// </summary>
-    LaunchMail = 136,
-    
-    /// <summary>
-    /// The Select Media key.
-    /// </summary>
-    SelectMedia = 137,
-    
-    /// <summary>
-    /// The Launch Application 1 key.
-    /// </summary>
-    LaunchApplication1 = 138,
-    
-    /// <summary>
-    /// The Launch Application 2 key.
-    /// </summary>
-    LaunchApplication2 = 139,
-    
-    /// <summary>
-    /// The OEM Semicolon key.
-    /// </summary>
-    OemSemicolon = 140,
-    
-    /// <summary>
-    /// The OEM 1 key.
-    /// </summary>
-    Oem1 = 140,
-    
-    /// <summary>
-    /// The OEM Plus key.
-    /// </summary>
-    OemPlus = 141,
-    
-    /// <summary>
-    /// The OEM Comma key.
-    /// </summary>
-    OemComma = 142,
-    
-    /// <summary>
-    /// The OEM Minus key.
-    /// </summary>
-    OemMinus = 143,
-    
-    /// <summary>
-    /// The OEM Period key.
-    /// </summary>
-    OemPeriod = 144,
-    
-    /// <summary>
-    /// The OEM Question Mark key.
-    /// </summary>
-    OemQuestion = 145,
-    
-    /// <summary>
-    /// The OEM 2 key.
-    /// </summary>
-    Oem2 = 145,
-    
-    /// <summary>
-    /// The OEM Tilde key.
-    /// </summary>
-    OemTilde = 146,
-    
-    /// <summary>
-    /// The OEM 3 key.
-    /// </summary>
-    Oem3 = 146,
-    
-    /// <summary>
-    /// The ABNT_C1 (Brazilian) key.
-    /// </summary>
-    AbntC1 = 147,
-    
-    /// <summary>
-    /// The ABNT_C2 (Brazilian) key.
-    /// </summary>
-    AbntC2 = 148,
-    
-    /// <summary>
-    /// The OEM Open Brackets key.
-    /// </summary>
-    OemOpenBrackets = 149,
-    
-    /// <summary>
-    /// The OEM 4 key.
-    /// </summary>
-    Oem4 = 149,
-    
-    /// <summary>
-    /// The OEM Pipe key.
-    /// </summary>
-    OemPipe = 150,
-    
-    /// <summary>
-    /// The OEM 5 key.
-    /// </summary>
-    Oem5 = 150,
-    
-    /// <summary>
-    /// The OEM Close Brackets key.
-    /// </summary>
-    OemCloseBrackets = 151,
-    
-    /// <summary>
-    /// The OEM 6 key.
-    /// </summary>
-    Oem6 = 151,
-    
-    /// <summary>
-    /// The OEM Quotes key.
-    /// </summary>
-    OemQuotes = 152,
-    
-    /// <summary>
-    /// The OEM 7 key.
-    /// </summary>
-    Oem7 = 152,
-    
-    /// <summary>
-    /// The OEM 8 key.
-    /// </summary>
-    Oem8 = 153,
-    
-    /// <summary>
-    /// The OEM Backslash key.
-    /// </summary>
-    OemBackslash = 154,
-    
-    /// <summary>
-    /// The OEM 3 key.
-    /// </summary>
-    Oem102 = 154,
-    
-    /// <summary>
-    /// A special key masking the real key being processed by an IME.
-    /// </summary>
-    ImeProcessed = 155,
-    
-    /// <summary>
-    /// A special key masking the real key being processed as a system key.
-    /// </summary>
-    System = 156,
-    
-    /// <summary>
-    /// The OEM ATTN key.
-    /// </summary>
-    OemAttn = 157,
-    
-    /// <summary>
-    /// The DBE_ALPHANUMERIC key.
-    /// </summary>
-    DbeAlphanumeric = 157,
-    
-    /// <summary>
-    /// The OEM Finish key.
-    /// </summary>
-    OemFinish = 158,
-    
-    /// <summary>
-    /// The DBE_KATAKANA key.
-    /// </summary>
-    DbeKatakana = 158,
-    
-    /// <summary>
-    /// The DBE_HIRAGANA key.
-    /// </summary>
-    DbeHiragana = 159,
-    
-    /// <summary>
-    /// The OEM Copy key.
-    /// </summary>
-    OemCopy = 159,
-    
-    /// <summary>
-    /// The DBE_SBCSCHAR key.
-    /// </summary>
-    DbeSbcsChar = 160,
-    
-    /// <summary>
-    /// The OEM Auto key.
-    /// </summary>
-    OemAuto = 160,
-    
-    /// <summary>
-    /// The DBE_DBCSCHAR key.
-    /// </summary>
-    DbeDbcsChar = 161,
-    
-    /// <summary>
-    /// The OEM ENLW key.
-    /// </summary>
-    OemEnlw = 161,
-    
-    /// <summary>
-    /// The OEM BackTab key.
-    /// </summary>
-    OemBackTab = 162,
-    
-    /// <summary>
-    /// The DBE_ROMAN key.
-    /// </summary>
-    DbeRoman = 162,
-    
-    /// <summary>
-    /// The DBE_NOROMAN key.
-    /// </summary>
-    DbeNoRoman = 163,
-    
-    /// <summary>
-    /// The ATTN key.
-    /// </summary>
-    Attn = 163,
-    
-    /// <summary>
-    /// The CRSEL key.
-    /// </summary>
-    CrSel = 164,
-    
-    /// <summary>
-    /// The DBE_ENTERWORDREGISTERMODE key.
-    /// </summary>
-    DbeEnterWordRegisterMode = 164,
-    
-    /// <summary>
-    /// The EXSEL key.
-    /// </summary>
-    ExSel = 165,
-    
-    /// <summary>
-    /// The DBE_ENTERIMECONFIGMODE key.
-    /// </summary>
-    DbeEnterImeConfigureMode = 165,
-    
-    /// <summary>
-    /// The ERASE EOF Key.
-    /// </summary>
-    EraseEof = 166,
-    
-    /// <summary>
-    /// The DBE_FLUSHSTRING key.
-    /// </summary>
-    DbeFlushString = 166,
-    
-    /// <summary>
-    /// The Play key.
-    /// </summary>
-    Play = 167,
-    
-    /// <summary>
-    /// The DBE_CODEINPUT key.
-    /// </summary>
-    DbeCodeInput = 167,
-    
-    /// <summary>
-    /// The DBE_NOCODEINPUT key.
-    /// </summary>
-    DbeNoCodeInput = 168,
-    
-    /// <summary>
-    /// The Zoom key.
-    /// </summary>
-    Zoom = 168,
-    
-    /// <summary>
-    /// Reserved for future use.
-    /// </summary>
-    NoName = 169,
-    
-    /// <summary>
-    /// The DBE_DETERMINESTRING key.
-    /// </summary>
-    DbeDetermineString = 169,
-    
-    /// <summary>
-    /// The DBE_ENTERDLGCONVERSIONMODE key.
-    /// </summary>
-    DbeEnterDialogConversionMode = 170,
-    
-    /// <summary>
-    /// The PA1 key.
-    /// </summary>
-    Pa1 = 170,
-    
-    /// <summary>
-    /// The OEM Clear key.
-    /// </summary>
-    OemClear = 171,
-    
-    /// <summary>
-    /// The key is used with another key to create a single combined character.
-    /// </summary>
-    DeadCharProcessed = 172,
-};
-
-#endif
diff --git a/native/Avalonia.Native/inc/rendertarget.h b/native/Avalonia.Native/inc/rendertarget.h
new file mode 100644
index 0000000000..2b0338d099
--- /dev/null
+++ b/native/Avalonia.Native/inc/rendertarget.h
@@ -0,0 +1,12 @@
+
+@protocol IRenderTarget
+-(void) setNewLayer: (CALayer*) layer;
+-(HRESULT) setSwFrame: (AvnFramebuffer*) fb;
+-(void) resize: (AvnPixelSize) size withScale: (float) scale;
+-(AvnPixelSize) pixelSize;
+-(IAvnGlSurfaceRenderTarget*) createSurfaceRenderTarget;
+@end
+
+@interface IOSurfaceRenderTarget : NSObject<IRenderTarget>
+-(IOSurfaceRenderTarget*) initWithOpenGlContext: (IAvnGlContext*) context;
+@end
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 c0a49382a7..dba3ee6d31 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
@@ -8,17 +8,24 @@
 
 /* Begin PBXBuildFile section */
 		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 */; };
+		1A3E5EAA23E9F26C00EDE661 /* IOSurface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A3E5EA923E9F26C00EDE661 /* IOSurface.framework */; };
+		1A3E5EAE23E9FB1300EDE661 /* cgl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A3E5EAD23E9FB1300EDE661 /* cgl.mm */; };
+		1A3E5EB023E9FE8300EDE661 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A3E5EAF23E9FE8300EDE661 /* QuartzCore.framework */; };
+		1A465D10246AB61600C5858B /* dnd.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A465D0F246AB61600C5858B /* dnd.mm */; };
+		1AFD334123E03C4F0042899B /* controlhost.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFD334023E03C4F0042899B /* controlhost.mm */; };
 		37155CE4233C00EB0034DCE9 /* menu.h in Headers */ = {isa = PBXBuildFile; fileRef = 37155CE3233C00EB0034DCE9 /* menu.h */; };
 		37A517B32159597E00FBA241 /* Screens.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37A517B22159597E00FBA241 /* Screens.mm */; };
 		37C09D8821580FE4006A6758 /* SystemDialogs.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37C09D8721580FE4006A6758 /* SystemDialogs.mm */; };
 		37DDA9B0219330F8002E132B /* AvnString.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37DDA9AF219330F8002E132B /* AvnString.mm */; };
 		37E2330F21583241000CB7E2 /* KeyTransform.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37E2330E21583241000CB7E2 /* KeyTransform.mm */; };
 		520624B322973F4100C4DCEF /* menu.mm in Sources */ = {isa = PBXBuildFile; fileRef = 520624B222973F4100C4DCEF /* menu.mm */; };
+		522D5959258159C1006F7F7A /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 522D5958258159C1006F7F7A /* Carbon.framework */; };
 		5B21A982216530F500CEE36E /* cursor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5B21A981216530F500CEE36E /* cursor.mm */; };
 		5B8BD94F215BFEA6005ED2A7 /* clipboard.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5B8BD94E215BFEA6005ED2A7 /* clipboard.mm */; };
 		AB00E4F72147CA920032A60A /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB00E4F62147CA920032A60A /* main.mm */; };
 		AB1E522C217613570091CD71 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB1E522B217613570091CD71 /* OpenGL.framework */; };
-		AB573DC4217605E400D389A2 /* gl.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB573DC3217605E400D389A2 /* gl.mm */; };
 		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 */; };
@@ -26,6 +33,13 @@
 
 /* Begin PBXFileReference section */
 		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>"; };
+		1A3E5EA923E9F26C00EDE661 /* IOSurface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOSurface.framework; path = System/Library/Frameworks/IOSurface.framework; sourceTree = SDKROOT; };
+		1A3E5EAD23E9FB1300EDE661 /* cgl.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = cgl.mm; sourceTree = "<group>"; };
+		1A3E5EAF23E9FE8300EDE661 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
+		1A465D0F246AB61600C5858B /* dnd.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = dnd.mm; sourceTree = "<group>"; };
+		1AFD334023E03C4F0042899B /* controlhost.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = controlhost.mm; sourceTree = "<group>"; };
 		37155CE3233C00EB0034DCE9 /* menu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = menu.h; sourceTree = "<group>"; };
 		379860FE214DA0C000CD0246 /* KeyTransform.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KeyTransform.h; sourceTree = "<group>"; };
 		37A4E71A2178846A00EACBCD /* headers */ = {isa = PBXFileReference; lastKnownFileType = folder; name = headers; path = ../../inc; sourceTree = "<group>"; };
@@ -36,12 +50,12 @@
 		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>"; };
 		520624B222973F4100C4DCEF /* menu.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = menu.mm; sourceTree = "<group>"; };
+		522D5958258159C1006F7F7A /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
 		5B21A981216530F500CEE36E /* cursor.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = cursor.mm; sourceTree = "<group>"; };
 		5B8BD94E215BFEA6005ED2A7 /* clipboard.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = clipboard.mm; sourceTree = "<group>"; };
 		5BF943652167AD1D009CAE35 /* cursor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cursor.h; sourceTree = "<group>"; };
 		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; };
-		AB573DC3217605E400D389A2 /* gl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = gl.mm; sourceTree = "<group>"; };
 		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>"; };
@@ -54,7 +68,10 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				1A3E5EB023E9FE8300EDE661 /* QuartzCore.framework in Frameworks */,
+				1A3E5EAA23E9F26C00EDE661 /* IOSurface.framework in Frameworks */,
 				AB1E522C217613570091CD71 /* OpenGL.framework in Frameworks */,
+				522D5959258159C1006F7F7A /* Carbon.framework in Frameworks */,
 				AB661C1E2148230F00291242 /* AppKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -65,6 +82,9 @@
 		AB661C1C2148230E00291242 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				522D5958258159C1006F7F7A /* Carbon.framework */,
+				1A3E5EAF23E9FE8300EDE661 /* QuartzCore.framework */,
+				1A3E5EA923E9F26C00EDE661 /* IOSurface.framework */,
 				AB1E522B217613570091CD71 /* OpenGL.framework */,
 				AB661C1D2148230F00291242 /* AppKit.framework */,
 			);
@@ -74,14 +94,17 @@
 		AB7A61E62147C814003C5833 = {
 			isa = PBXGroup;
 			children = (
+				1A1852DB23E05814008F0DED /* deadlock.mm */,
 				1A002B9D232135EE00021753 /* app.mm */,
 				37DDA9B121933371002E132B /* AvnString.h */,
 				37DDA9AF219330F8002E132B /* AvnString.mm */,
 				37A4E71A2178846A00EACBCD /* headers */,
-				AB573DC3217605E400D389A2 /* gl.mm */,
+				1A3E5EAD23E9FB1300EDE661 /* cgl.mm */,
+				1AFD334023E03C4F0042899B /* controlhost.mm */,
 				5BF943652167AD1D009CAE35 /* cursor.h */,
 				5B21A981216530F500CEE36E /* cursor.mm */,
 				5B8BD94E215BFEA6005ED2A7 /* clipboard.mm */,
+				1A465D0F246AB61600C5858B /* dnd.mm */,
 				AB8F7D6A21482D7F0057DBA5 /* platformthreading.mm */,
 				AB661C212148288600291242 /* common.h */,
 				379860FE214DA0C000CD0246 /* KeyTransform.h */,
@@ -91,6 +114,7 @@
 				AB00E4F62147CA920032A60A /* main.mm */,
 				37155CE3233C00EB0034DCE9 /* menu.h */,
 				520624B222973F4100C4DCEF /* menu.mm */,
+				1A3E5EA723E9E83B00EDE661 /* rendertarget.mm */,
 				37A517B22159597E00FBA241 /* Screens.mm */,
 				37C09D8721580FE4006A6758 /* SystemDialogs.mm */,
 				AB7A61F02147C815003C5833 /* Products */,
@@ -177,15 +201,19 @@
 			files = (
 				1A002B9E232135EE00021753 /* app.mm in Sources */,
 				5B8BD94F215BFEA6005ED2A7 /* clipboard.mm in Sources */,
+				1A1852DC23E05814008F0DED /* deadlock.mm in Sources */,
 				5B21A982216530F500CEE36E /* cursor.mm in Sources */,
 				37DDA9B0219330F8002E132B /* AvnString.mm in Sources */,
 				AB8F7D6B21482D7F0057DBA5 /* platformthreading.mm in Sources */,
+				1A3E5EA823E9E83B00EDE661 /* rendertarget.mm in Sources */,
+				1A3E5EAE23E9FB1300EDE661 /* cgl.mm in Sources */,
 				37E2330F21583241000CB7E2 /* KeyTransform.mm in Sources */,
 				520624B322973F4100C4DCEF /* menu.mm in Sources */,
 				37A517B32159597E00FBA241 /* Screens.mm in Sources */,
+				1AFD334123E03C4F0042899B /* controlhost.mm in Sources */,
+				1A465D10246AB61600C5858B /* dnd.mm in Sources */,
 				AB00E4F72147CA920032A60A /* main.mm in Sources */,
 				37C09D8821580FE4006A6758 /* SystemDialogs.mm in Sources */,
-				AB573DC4217605E400D389A2 /* gl.mm in Sources */,
 				AB661C202148286E00291242 /* window.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 1a665d3ea5..5d20a135b9 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
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -58,12 +56,10 @@
       </MacroExpansion>
       <CommandLineArguments>
          <CommandLineArgument
-            argument = "bin/Debug/netcoreapp2.0/ControlCatalog.NetCore.dll"
+            argument = "bin/Debug/netcoreapp3.1/ControlCatalog.NetCore.dll"
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/native/Avalonia.Native/src/OSX/AvnString.h b/native/Avalonia.Native/src/OSX/AvnString.h
index 9a8f5a1318..5d299374e5 100644
--- a/native/Avalonia.Native/src/OSX/AvnString.h
+++ b/native/Avalonia.Native/src/OSX/AvnString.h
@@ -10,5 +10,7 @@
 #define AvnString_h
 
 extern IAvnString* CreateAvnString(NSString* string);
-
+extern IAvnStringArray* CreateAvnStringArray(NSArray<NSString*>* array);
+extern IAvnStringArray* CreateAvnStringArray(NSString* string);
+extern IAvnString* CreateByteArray(void* data, int len);
 #endif /* AvnString_h */
diff --git a/native/Avalonia.Native/src/OSX/AvnString.mm b/native/Avalonia.Native/src/OSX/AvnString.mm
index b62fe8a968..00b748ef63 100644
--- a/native/Avalonia.Native/src/OSX/AvnString.mm
+++ b/native/Avalonia.Native/src/OSX/AvnString.mm
@@ -7,6 +7,7 @@
 //
 
 #include "common.h"
+#include <vector>
 
 class AvnStringImpl : public virtual ComSingleObject<IAvnString, &IID_IAvnString>
 {
@@ -28,6 +29,13 @@ public:
         memcpy((void*)_cstring, (void*)cstring, _length);
     }
     
+    AvnStringImpl(void*ptr, int len)
+    {
+        _length = len;
+        _cstring = (const char*)malloc(_length);
+        memcpy((void*)_cstring, ptr, len);
+    }
+    
     virtual ~AvnStringImpl()
     {
         free((void*)_cstring);
@@ -61,7 +69,60 @@ public:
     }
 };
 
+class AvnStringArrayImpl : public virtual ComSingleObject<IAvnStringArray, &IID_IAvnStringArray>
+{
+private:
+    std::vector<ComPtr<IAvnString>> _list;
+public:
+    FORWARD_IUNKNOWN()
+    AvnStringArrayImpl(NSArray<NSString*>* array)
+    {
+        for(int c = 0; c < [array count]; c++)
+        {
+            ComPtr<IAvnString> s;
+            *s.getPPV() = new AvnStringImpl([array objectAtIndex:c]);
+            _list.push_back(s);
+        }
+    }
+    
+    AvnStringArrayImpl(NSString* string)
+    {
+        ComPtr<IAvnString> s;
+        *s.getPPV() = new AvnStringImpl(string);
+        _list.push_back(s);
+    }
+    
+    virtual unsigned int GetCount() override
+    {
+        return (unsigned int)_list.size();
+    }
+    
+    virtual HRESULT Get(unsigned int index, IAvnString**ppv) override
+    {
+        if(_list.size() <= index)
+            return E_INVALIDARG;
+        *ppv = _list[index].getRetainedReference();
+        return S_OK;
+    }
+};
+
 IAvnString* CreateAvnString(NSString* string)
 {
     return new AvnStringImpl(string);
 }
+
+
+IAvnStringArray* CreateAvnStringArray(NSArray<NSString*> * array)
+{
+    return new AvnStringArrayImpl(array);
+}
+
+IAvnStringArray* CreateAvnStringArray(NSString* string)
+{
+    return new AvnStringArrayImpl(string);
+}
+
+IAvnString* CreateByteArray(void* data, int len)
+{
+    return new AvnStringImpl(data, len);
+}
diff --git a/native/Avalonia.Native/src/OSX/KeyTransform.h b/native/Avalonia.Native/src/OSX/KeyTransform.h
index c4466020c3..2f434570c9 100644
--- a/native/Avalonia.Native/src/OSX/KeyTransform.h
+++ b/native/Avalonia.Native/src/OSX/KeyTransform.h
@@ -1,12 +1,14 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 #ifndef keytransform_h
 #define keytransform_h
 #include "common.h"
-#include "key.h"
 #include <map>
 
 extern std::map<int, AvnKey> s_KeyMap;
 
+extern std::map<AvnKey, int> s_AvnKeyMap;
+
+extern std::map<int, const char*> s_QwertyKeyMap;
+
+extern std::map<AvnKey, int> s_UnicodeKeyMap;
+
 #endif
diff --git a/native/Avalonia.Native/src/OSX/KeyTransform.mm b/native/Avalonia.Native/src/OSX/KeyTransform.mm
index 971bcf24f8..6b7d95b619 100644
--- a/native/Avalonia.Native/src/OSX/KeyTransform.mm
+++ b/native/Avalonia.Native/src/OSX/KeyTransform.mm
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 #include "KeyTransform.h"
 
 const int kVK_ANSI_A = 0x00;
@@ -123,6 +120,138 @@ const int kVK_UpArrow = 0x7E;
 //const int kVK_JIS_Eisu = 0x66;
 const int kVK_JIS_Kana = 0x68;
 
+// converts from AvaloniaKeys to UnicodeSpecial keys.
+std::map<AvnKey, int> s_UnicodeKeyMap =
+{
+    { Up, NSUpArrowFunctionKey },
+    { Down, NSDownArrowFunctionKey },
+    { Left, NSLeftArrowFunctionKey },
+    { Right, NSRightArrowFunctionKey },
+    { F1, NSF1FunctionKey },
+    { F2, NSF2FunctionKey },
+    { F3, NSF3FunctionKey },
+    { F4, NSF4FunctionKey },
+    { F5, NSF5FunctionKey },
+    { F6, NSF6FunctionKey },
+    { F7, NSF7FunctionKey },
+    { F8, NSF8FunctionKey },
+    { F9, NSF9FunctionKey },
+    { F10, NSF10FunctionKey },
+    { F11, NSF11FunctionKey },
+    { F12, NSF12FunctionKey },
+    { F13, NSF13FunctionKey },
+    { F14, NSF14FunctionKey },
+    { F15, NSF15FunctionKey },
+    { F16, NSF16FunctionKey },
+    { F17, NSF17FunctionKey },
+    { F18, NSF18FunctionKey },
+    { F19, NSF19FunctionKey },
+    { F20, NSF20FunctionKey },
+    { F21, NSF21FunctionKey },
+    { F22, NSF22FunctionKey },
+    { F23, NSF23FunctionKey },
+    { F24, NSF24FunctionKey },
+    { Insert, NSInsertFunctionKey },
+    { Delete, NSDeleteFunctionKey },
+    { Home, NSHomeFunctionKey },
+    //{ Begin, NSBeginFunctionKey },
+    { End, NSEndFunctionKey },
+    { PageUp, NSPageUpFunctionKey },
+    { PageDown, NSPageDownFunctionKey },
+    { PrintScreen, NSPrintScreenFunctionKey },
+    { Scroll, NSScrollLockFunctionKey },
+    //{ SysReq, NSSysReqFunctionKey },
+    //{ Break, NSBreakFunctionKey },
+    //{ Reset, NSResetFunctionKey },
+    //{ Stop, NSStopFunctionKey },
+    //{ Menu, NSMenuFunctionKey },
+    //{ UserFunction, NSUserFunctionKey },
+    //{ SystemFunction, NSSystemFunctionKey },
+    { Print, NSPrintFunctionKey },
+    //{ ClearLine, NSClearLineFunctionKey },
+    //{ ClearDisplay, NSClearDisplayFunctionKey },
+};
+
+// Converts from Ansi virtual keys to Qwerty Keyboard map.
+std::map<int, const char*> s_QwertyKeyMap =
+{
+    { 0, "a" },
+    { 1, "s" },
+    { 2, "d" },
+    { 3, "f" },
+    { 4, "h" },
+    { 5, "g" },
+    { 6, "z" },
+    { 7, "x" },
+    { 8, "c" },
+    { 9, "v" },
+    { 10, "§" },
+    { 11, "b" },
+    { 12, "q" },
+    { 13, "w" },
+    { 14, "e" },
+    { 15, "r" },
+    { 16, "y" },
+    { 17, "t" },
+    { 18, "1" },
+    { 19, "2" },
+    { 20, "3" },
+    { 21, "4" },
+    { 22, "6" },
+    { 23, "5" },
+    { 24, "=" },
+    { 25, "9" },
+    { 26, "7" },
+    { 27, "-" },
+    { 28, "8" },
+    { 29, "0" },
+    { 30, "]" },
+    { 31, "o" },
+    { 32, "u" },
+    { 33, "[" },
+    { 34, "i" },
+    { 35, "p" },
+    { 37, "l" },
+    { 38, "j" },
+    { 39, "'" },
+    { 40, "k" },
+    { 41, ";" },
+    { 42, "\\" },
+    { 43, "," },
+    { 44, "/" },
+    { 45, "n" },
+    { 46, "m" },
+    { 47, "." },
+    { 49, " " },
+    { 50, "`" },
+    { 51, "" },
+    { 52, "" },
+    { 53, "" },
+    { 65, "." },
+    { 66, "" },
+    { 67, "*" },
+    { 69, "+" },
+    { 70, "" },
+    { 71, "" },
+    { 72, "" },
+    { 75, "/" },
+    { 76, "" },
+    { 77, "" },
+    { 78, "-" },
+    { 81, "=" },
+    { 82, "0" },
+    { 83, "1" },
+    { 84, "2" },
+    { 85, "3" },
+    { 86, "4" },
+    { 87, "5" },
+    { 88, "6" },
+    { 89, "7" },
+    { 91, "8" },
+    { 92, "9" }
+};
+
+// converts from ansi virtualkeys to AvnKeys.
  std::map<int, AvnKey> s_KeyMap =
  {
     {kVK_ANSI_A, A},
@@ -240,3 +369,22 @@ const int kVK_JIS_Kana = 0x68;
     {kVK_UpArrow, Up},
     {kVK_JIS_Kana, AvnKeyKanaMode},
 };
+
+static std::map<AvnKey, int> BuildAvnKeyMap ()
+{
+    std::map<AvnKey, int> result;
+    
+    for( auto it = s_KeyMap.begin(); it != s_KeyMap.end(); ++it )
+    {
+        int key = it->first;
+        AvnKey value = it->second;
+        
+        result[value] = key;
+    }
+    
+    return result;
+}
+
+// Converts AvnKeys to Ansi VirtualKeys
+std::map<AvnKey, int> s_AvnKeyMap = BuildAvnKeyMap();
+
diff --git a/native/Avalonia.Native/src/OSX/Screens.mm b/native/Avalonia.Native/src/OSX/Screens.mm
index e7f009787a..455cfa2e41 100644
--- a/native/Avalonia.Native/src/OSX/Screens.mm
+++ b/native/Avalonia.Native/src/OSX/Screens.mm
@@ -1,12 +1,17 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 #include "common.h"
 
 class Screens : public ComSingleObject<IAvnScreens, &IID_IAvnScreens>
 {
     public:
     FORWARD_IUNKNOWN()
+    
+    private:
+    CGFloat PrimaryDisplayHeight()
+    {
+      return NSMaxY([[[NSScreen screens] firstObject] frame]);
+    }
+    
+public:
     virtual HRESULT GetScreenCount (int* ret) override
     {
         @autoreleasepool
@@ -28,15 +33,15 @@ class Screens : public ComSingleObject<IAvnScreens, &IID_IAvnScreens>
             
             auto screen = [[NSScreen screens] objectAtIndex:index];
             
-            ret->Bounds.X = [screen frame].origin.x;
-            ret->Bounds.Y = [screen frame].origin.y;
             ret->Bounds.Height = [screen frame].size.height;
             ret->Bounds.Width = [screen frame].size.width;
+            ret->Bounds.X = [screen frame].origin.x;
+            ret->Bounds.Y = PrimaryDisplayHeight() - [screen frame].origin.y - ret->Bounds.Height;
             
-            ret->WorkingArea.X = [screen visibleFrame].origin.x;
-            ret->WorkingArea.Y = [screen visibleFrame].origin.y;
             ret->WorkingArea.Height = [screen visibleFrame].size.height;
             ret->WorkingArea.Width = [screen visibleFrame].size.width;
+            ret->WorkingArea.X = [screen visibleFrame].origin.x;
+            ret->WorkingArea.Y = ret->Bounds.Height - [screen visibleFrame].origin.y - ret->WorkingArea.Height;
             
             ret->PixelDensity = [screen backingScaleFactor];
             
diff --git a/native/Avalonia.Native/src/OSX/SystemDialogs.mm b/native/Avalonia.Native/src/OSX/SystemDialogs.mm
index 567dd7f747..a47221056b 100644
--- a/native/Avalonia.Native/src/OSX/SystemDialogs.mm
+++ b/native/Avalonia.Native/src/OSX/SystemDialogs.mm
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 #include "common.h"
 #include "window.h"
 
@@ -23,6 +20,7 @@ public:
             
             if(title != nullptr)
             {
+                panel.message = [NSString stringWithUTF8String:title];
                 panel.title = [NSString stringWithUTF8String:title];
             }
             
@@ -97,6 +95,7 @@ public:
             
             if(title != nullptr)
             {
+                panel.message = [NSString stringWithUTF8String:title];
                 panel.title = [NSString stringWithUTF8String:title];
             }
             
@@ -185,6 +184,7 @@ public:
             
             if(title != nullptr)
             {
+                panel.message = [NSString stringWithUTF8String:title];
                 panel.title = [NSString stringWithUTF8String:title];
             }
             
diff --git a/native/Avalonia.Native/src/OSX/app.mm b/native/Avalonia.Native/src/OSX/app.mm
index 81855995b7..814b91cb62 100644
--- a/native/Avalonia.Native/src/OSX/app.mm
+++ b/native/Avalonia.Native/src/OSX/app.mm
@@ -1,24 +1,71 @@
 #include "common.h"
 @interface AvnAppDelegate : NSObject<NSApplicationDelegate>
 @end
-extern NSApplicationActivationPolicy AvnDesiredActivationPolicy = NSApplicationActivationPolicyRegular;
+
+NSApplicationActivationPolicy AvnDesiredActivationPolicy = NSApplicationActivationPolicyRegular;
+
 @implementation AvnAppDelegate
 - (void)applicationWillFinishLaunching:(NSNotification *)notification
 {
-    [[NSApplication sharedApplication] setActivationPolicy: AvnDesiredActivationPolicy];
+    if([[NSApplication sharedApplication] activationPolicy] != AvnDesiredActivationPolicy)
+    {
+        for (NSRunningApplication * app in [NSRunningApplication runningApplicationsWithBundleIdentifier:@"com.apple.dock"]) {
+            [app activateWithOptions:NSApplicationActivateIgnoringOtherApps];
+            break;
+        }
+        
+        [[NSApplication sharedApplication] setActivationPolicy: AvnDesiredActivationPolicy];
+        
+        [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"NSFullScreenMenuItemEverywhere"];
+        
+        [[NSApplication sharedApplication] setHelpMenu: [[NSMenu new] initWithTitle:@""]];
+    }
 }
 
 - (void)applicationDidFinishLaunching:(NSNotification *)notification
 {
-    [NSApp activateIgnoringOtherApps:true];
+    [[NSRunningApplication currentApplication] activateWithOptions:NSApplicationActivateIgnoringOtherApps];
+}
+
+@end
+
+@interface AvnApplication : NSApplication
+
+
+@end
+
+@implementation AvnApplication
+{
+    BOOL _isHandlingSendEvent;
+}
+
+- (void)sendEvent:(NSEvent *)event
+{
+    bool oldHandling = _isHandlingSendEvent;
+    _isHandlingSendEvent = true;
+    @try {
+        [super sendEvent: event];
+    } @finally {
+        _isHandlingSendEvent = oldHandling;
+    }
+}
+
+// This is needed for certain embedded controls
+- (BOOL) isHandlingSendEvent
+{
+    return _isHandlingSendEvent;
+}
+
+- (void)setHandlingSendEvent:(BOOL)handlingSendEvent
+{
+    _isHandlingSendEvent = handlingSendEvent;
 }
 
 @end
 
 extern void InitializeAvnApp()
 {
-    NSApplication* app = [NSApplication sharedApplication];
+    NSApplication* app = [AvnApplication sharedApplication];
     id delegate = [AvnAppDelegate new];
     [app setDelegate:delegate];
-    
 }
diff --git a/native/Avalonia.Native/src/OSX/cgl.mm b/native/Avalonia.Native/src/OSX/cgl.mm
new file mode 100644
index 0000000000..a9d94cdf04
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/cgl.mm
@@ -0,0 +1,166 @@
+#include "common.h"
+#include <dlfcn.h>
+
+static CGLContextObj CreateCglContext(CGLContextObj share)
+{
+    int attributes[] = {
+        kCGLPFAAccelerated,
+        kCGLPFAOpenGLProfile, (CGLPixelFormatAttribute)kCGLOGLPVersion_3_2_Core,
+        kCGLPFADepthSize, 8,
+        kCGLPFAStencilSize, 8,
+        kCGLPFAColorSize, 32,
+        0
+    };
+    
+    CGLPixelFormatObj pix;
+    CGLError errorCode;
+    GLint num; // stores the number of possible pixel formats
+    errorCode = CGLChoosePixelFormat( (CGLPixelFormatAttribute*)attributes, &pix, &num );
+    if(errorCode != 0)
+        return nil;
+    CGLContextObj ctx = nil;
+    errorCode = CGLCreateContext(pix, share, &ctx );
+    CGLDestroyPixelFormat( pix );
+    if(errorCode != 0)
+        return nil;
+    return ctx;
+};
+
+
+
+class AvnGlContext : public virtual ComSingleObject<IAvnGlContext, &IID_IAvnGlContext>
+{
+    // Debug
+    int _usageCount = 0;
+public:
+    CGLContextObj Context;
+    int SampleCount = 0, StencilBits = 0;
+    FORWARD_IUNKNOWN()
+    
+    class SavedGlContext : public virtual ComUnknownObject
+    {
+        CGLContextObj _savedContext;
+        ComPtr<AvnGlContext> _parent;
+    public:
+        SavedGlContext(CGLContextObj saved, AvnGlContext* parent)
+        {
+            _savedContext = saved;
+            _parent = parent;
+            _parent->_usageCount++;
+        }
+        
+        ~SavedGlContext()
+        {
+            if(_parent->Context == CGLGetCurrentContext())
+                CGLSetCurrentContext(_savedContext);
+            _parent->_usageCount--;
+            CGLUnlockContext(_parent->Context);
+        }
+    };
+    
+    AvnGlContext(CGLContextObj context)
+    {
+        Context = context;
+        CGLPixelFormatObj fmt = CGLGetPixelFormat(context);
+        CGLDescribePixelFormat(fmt, 0, kCGLPFASamples, &SampleCount);
+        CGLDescribePixelFormat(fmt, 0, kCGLPFAStencilSize, &StencilBits);
+        
+    }
+    
+    virtual HRESULT LegacyMakeCurrent() override
+    {
+        if(CGLSetCurrentContext(Context) != 0)
+            return E_FAIL;
+        return S_OK;
+    }
+    
+    virtual HRESULT MakeCurrent(IUnknown** ppv) override
+    {
+        CGLContextObj saved = CGLGetCurrentContext();
+        CGLLockContext(Context);
+        if(CGLSetCurrentContext(Context) != 0)
+        {
+            CGLUnlockContext(Context);
+            return E_FAIL;
+        }
+        *ppv = new SavedGlContext(saved, this);
+        
+        return S_OK;
+    }
+    
+    virtual int GetSampleCount() override
+    {
+        return SampleCount;
+    }
+    
+    virtual int GetStencilSize() override
+    {
+        return StencilBits;
+    }
+    
+    virtual void* GetNativeHandle() override
+    {
+        return Context;
+    }
+    
+    ~AvnGlContext()
+    {
+        CGLReleaseContext(Context);
+    }
+};
+
+class AvnGlDisplay : public virtual ComSingleObject<IAvnGlDisplay, &IID_IAvnGlDisplay>
+{
+    void* _libgl;
+    
+public:
+    FORWARD_IUNKNOWN()
+    
+    AvnGlDisplay()
+    {
+        _libgl = dlopen("/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib", RTLD_LAZY);
+    }
+    
+    virtual void* GetProcAddress(char* proc)  override
+    {
+        return dlsym(_libgl, proc);
+    }
+    
+    virtual HRESULT CreateContext(IAvnGlContext* share, IAvnGlContext**ppv) override
+    {
+        CGLContextObj shareContext = nil;
+        if(share != nil)
+        {
+            AvnGlContext* shareCtx = dynamic_cast<AvnGlContext*>(share);
+            if(shareCtx != nil)
+                shareContext = shareCtx->Context;
+        }
+        CGLContextObj ctx = ::CreateCglContext(shareContext);
+        if(ctx == nil)
+            return E_FAIL;
+        *ppv = new AvnGlContext(ctx);
+        return S_OK;
+    }
+    
+    virtual HRESULT WrapContext(void* native, IAvnGlContext**ppv) override
+    {
+        if(native == nil)
+            return E_INVALIDARG;
+        *ppv = new AvnGlContext((CGLContextObj) native);
+        return S_OK;
+    }
+    
+    virtual void LegacyClearCurrentContext() override
+    {
+        CGLSetCurrentContext(nil);
+    }
+};
+
+static IAvnGlDisplay* GlDisplay = new AvnGlDisplay();
+
+
+extern IAvnGlDisplay* GetGlDisplay()
+{
+    return GlDisplay;
+};
+
diff --git a/native/Avalonia.Native/src/OSX/clipboard.mm b/native/Avalonia.Native/src/OSX/clipboard.mm
index 6e4d3ce668..303f727317 100644
--- a/native/Avalonia.Native/src/OSX/clipboard.mm
+++ b/native/Avalonia.Native/src/OSX/clipboard.mm
@@ -1,21 +1,29 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 #include "common.h"
 #include "AvnString.h"
 
 class Clipboard : public ComSingleObject<IAvnClipboard, &IID_IAvnClipboard>
 {
+private:
+    NSPasteboard* _pb;
+    NSPasteboardItem* _item;
 public:
     FORWARD_IUNKNOWN()
     
-    Clipboard()
+    Clipboard(NSPasteboard* pasteboard, NSPasteboardItem* item)
     {
-        NSPasteboard *pasteBoard = [NSPasteboard generalPasteboard];
-        [pasteBoard stringForType:NSPasteboardTypeString];
+        if(pasteboard == nil && item == nil)
+            pasteboard = [NSPasteboard generalPasteboard];
+
+        _pb = pasteboard;
+        _item = item;
     }
     
-    virtual HRESULT GetText (IAvnString**ppv) override
+    NSPasteboardItem* TryGetItem()
+    {
+        return _item;
+    }
+   
+    virtual HRESULT GetText (char* type, IAvnString**ppv) override
     {
         @autoreleasepool
         {
@@ -23,39 +31,124 @@ public:
             {
                 return E_POINTER;
             }
+            NSString* typeString = [NSString stringWithUTF8String:(const char*)type];
+            NSString* string = _item == nil ? [_pb stringForType:typeString] : [_item stringForType:typeString];
             
-            *ppv = CreateAvnString([[NSPasteboard generalPasteboard] stringForType:NSPasteboardTypeString]);
+            *ppv = CreateAvnString(string);
             
             return S_OK;
         }
     }
     
-    virtual HRESULT SetText (void* utf8String) override
+    virtual HRESULT GetStrings(char* type, IAvnStringArray**ppv) override
     {
         @autoreleasepool
         {
-            NSPasteboard *pasteBoard = [NSPasteboard generalPasteboard];
-            [pasteBoard clearContents];
-            [pasteBoard setString:[NSString stringWithUTF8String:(const char*)utf8String] forType:NSPasteboardTypeString];
+            *ppv= nil;
+            NSString* typeString = [NSString stringWithUTF8String:(const char*)type];
+            NSObject* data = _item == nil ? [_pb propertyListForType: typeString] : [_item propertyListForType: typeString];
+            if(data == nil)
+                return S_OK;
+            
+            if([data isKindOfClass: [NSString class]])
+            {
+                *ppv = CreateAvnStringArray((NSString*) data);
+                return S_OK;
+            }
+            
+            NSArray* arr = (NSArray*)data;
+            
+            for(int c = 0; c < [arr count]; c++)
+                if(![[arr objectAtIndex:c] isKindOfClass:[NSString class]])
+                    return E_INVALIDARG;
+            
+            *ppv = CreateAvnStringArray(arr);
+            return S_OK;
+        }
+    }
+    
+    virtual HRESULT SetText (char* type, char* utf8String) override
+    {
+        Clear();
+        @autoreleasepool
+        {
+            auto string = [NSString stringWithUTF8String:(const char*)utf8String];
+            auto typeString = [NSString stringWithUTF8String:(const char*)type];
+            if(_item == nil)
+                [_pb setString: string forType: typeString];
+            else
+                [_item setString: string forType:typeString];
         }
         
         return S_OK;
     }
+    
+    virtual HRESULT SetBytes(char* type, void* bytes, int len) override
+    {
+        auto typeString = [NSString stringWithUTF8String:(const char*)type];
+        auto data = [NSData dataWithBytes:bytes length:len];
+        if(_item == nil)
+            [_pb setData:data forType:typeString];
+        else
+            [_item setData:data forType:typeString];
+        return S_OK;
+    }
+       
+    virtual HRESULT GetBytes(char* type, IAvnString**ppv) override
+    {
+        *ppv = nil;
+        auto typeString = [NSString stringWithUTF8String:(const char*)type];
+        NSData*data;
+        @try
+        {
+            if(_item)
+                data = [_item dataForType:typeString];
+            else
+                data = [_pb dataForType:typeString];
+            if(data == nil)
+                return E_FAIL;
+        }
+        @catch(NSException* e)
+        {
+            return E_FAIL;
+        }
+        *ppv = CreateByteArray((void*)data.bytes, (int)data.length);
+        return S_OK;
+    }
+
 
     virtual HRESULT Clear() override
     {
         @autoreleasepool
         {
-            NSPasteboard *pasteBoard = [NSPasteboard generalPasteboard];
-            [pasteBoard clearContents];
-            [pasteBoard setString:@"" forType:NSPasteboardTypeString];
+            if(_item != nil)
+                _item = [NSPasteboardItem new];
+            else
+            {
+                [_pb clearContents];
+                [_pb setString:@"" forType:NSPasteboardTypeString];
+            }
         }
         
         return S_OK;
     }
+    
+    virtual HRESULT ObtainFormats(IAvnStringArray** ppv) override
+    {
+        *ppv = CreateAvnStringArray(_item == nil ? [_pb types] : [_item types]);
+        return S_OK;
+    }
 };
 
-extern IAvnClipboard* CreateClipboard()
+extern IAvnClipboard* CreateClipboard(NSPasteboard* pb, NSPasteboardItem* item)
+{
+    return new Clipboard(pb, item);
+}
+
+extern NSPasteboardItem* TryGetPasteboardItem(IAvnClipboard*cb)
 {
-    return new Clipboard();
+    auto clipboard = dynamic_cast<Clipboard*>(cb);
+    if(clipboard == nil)
+        return nil;
+    return clipboard->TryGetItem();
 }
diff --git a/native/Avalonia.Native/src/OSX/common.h b/native/Avalonia.Native/src/OSX/common.h
index 10534dea26..871bca086d 100644
--- a/native/Avalonia.Native/src/OSX/common.h
+++ b/native/Avalonia.Native/src/OSX/common.h
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 #ifndef common_h
 #define common_h
 #include "comimpl.h"
@@ -11,19 +8,25 @@
 #include <pthread.h>
 
 extern IAvnPlatformThreadingInterface* CreatePlatformThreading();
-extern IAvnWindow* CreateAvnWindow(IAvnWindowEvents*events);
-extern IAvnPopup* CreateAvnPopup(IAvnWindowEvents*events);
+extern void FreeAvnGCHandle(void* handle);
+extern IAvnWindow* CreateAvnWindow(IAvnWindowEvents*events, IAvnGlContext* gl);
+extern IAvnPopup* CreateAvnPopup(IAvnWindowEvents*events, IAvnGlContext* gl);
 extern IAvnSystemDialogs* CreateSystemDialogs();
 extern IAvnScreens* CreateScreens();
-extern IAvnClipboard* CreateClipboard();
+extern IAvnClipboard* CreateClipboard(NSPasteboard*, NSPasteboardItem*);
+extern NSPasteboardItem* TryGetPasteboardItem(IAvnClipboard*);
+extern NSObject<NSDraggingSource>* CreateDraggingSource(NSDragOperation op, IAvnDndResultCallback* cb, void* handle);
+extern void* GetAvnDataObjectHandleFromDraggingInfo(NSObject<NSDraggingInfo>* info);
+extern NSString* GetAvnCustomDataType();
+extern AvnDragDropEffects ConvertDragDropEffects(NSDragOperation nsop);
 extern IAvnCursorFactory* CreateCursorFactory();
-extern IAvnGlFeature* GetGlFeature();
-extern IAvnGlSurfaceRenderTarget* CreateGlRenderTarget(NSWindow* window, NSView* view);
-extern IAvnAppMenu* CreateAppMenu();
-extern IAvnAppMenuItem* CreateAppMenuItem();
-extern IAvnAppMenuItem* CreateAppMenuItemSeperator();
-extern void SetAppMenu (NSString* appName, IAvnAppMenu* appMenu);
-extern IAvnAppMenu* GetAppMenu ();
+extern IAvnGlDisplay* GetGlDisplay();
+extern IAvnMenu* CreateAppMenu(IAvnMenuEvents* events);
+extern IAvnMenuItem* CreateAppMenuItem();
+extern IAvnMenuItem* CreateAppMenuItemSeperator();
+extern IAvnNativeControlHost* CreateNativeControlHost(NSView* parent);
+extern void SetAppMenu (NSString* appName, IAvnMenu* appMenu);
+extern IAvnMenu* GetAppMenu ();
 extern NSMenuItem* GetAppMenuItem ();
 
 extern void InitializeAvnApp();
@@ -52,4 +55,12 @@ template<typename T> inline T* objc_cast(id from) {
 - (void) action;
 @end
 
+class AvnInsidePotentialDeadlock
+{
+public:
+    static bool IsInside();
+    AvnInsidePotentialDeadlock();
+    ~AvnInsidePotentialDeadlock();
+};
+
 #endif
diff --git a/native/Avalonia.Native/src/OSX/controlhost.mm b/native/Avalonia.Native/src/OSX/controlhost.mm
new file mode 100644
index 0000000000..5ee2344ac7
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/controlhost.mm
@@ -0,0 +1,160 @@
+#include "common.h"
+
+
+IAvnNativeControlHostTopLevelAttachment* CreateAttachment();
+
+class AvnNativeControlHost :
+    public ComSingleObject<IAvnNativeControlHost, &IID_IAvnNativeControlHost>
+{
+public:
+    FORWARD_IUNKNOWN();
+    NSView* View;
+    AvnNativeControlHost(NSView* view)
+    {
+        View = view;
+    }
+    
+    virtual HRESULT CreateDefaultChild(void* parent, void** retOut) override
+    {
+        NSView* view = [NSView new];
+        [view setWantsLayer: true];
+        
+        *retOut = (__bridge_retained void*)view;
+        return S_OK;
+    };
+    
+    virtual IAvnNativeControlHostTopLevelAttachment* CreateAttachment() override
+    {
+        return ::CreateAttachment();
+    };
+    
+    virtual void DestroyDefaultChild(void* child) override
+    {
+        // ARC will release the object for us
+        (__bridge_transfer NSView*) child;
+    }
+};
+
+class AvnNativeControlHostTopLevelAttachment :
+public ComSingleObject<IAvnNativeControlHostTopLevelAttachment, &IID_IAvnNativeControlHostTopLevelAttachment>
+{
+    NSView* _holder;
+    NSView* _child;
+public:
+    FORWARD_IUNKNOWN();
+    
+    AvnNativeControlHostTopLevelAttachment()
+    {
+        _holder = [NSView new];
+        [_holder setWantsLayer:true];
+    }
+    
+    virtual ~AvnNativeControlHostTopLevelAttachment()
+    {
+        if(_child != nil && [_child superview] == _holder)
+        {
+            [_child removeFromSuperview];
+        }
+        
+        if([_holder superview] != nil)
+        {
+            [_holder removeFromSuperview];
+        }
+    }
+    
+    virtual void* GetParentHandle() override
+    {
+        return (__bridge void*)_holder;
+    };
+    
+    virtual HRESULT InitializeWithChildHandle(void* child) override
+    {
+        if(_child != nil)
+            return E_FAIL;
+        _child = (__bridge NSView*)child;
+        if(_child == nil)
+            return E_FAIL;
+        [_holder addSubview:_child];
+        [_child setHidden: false];
+        return S_OK;
+    };
+    
+    virtual HRESULT AttachTo(IAvnNativeControlHost* host) override
+    {
+        if(host == nil)
+        {
+            [_holder removeFromSuperview];
+            [_holder setHidden: true];
+        }
+        else
+        {
+            AvnNativeControlHost* chost = dynamic_cast<AvnNativeControlHost*>(host);
+            if(chost == nil || chost->View == nil)
+                return E_FAIL;
+            [_holder setHidden:true];
+            [chost->View addSubview:_holder];
+        }
+        return S_OK;
+    };
+    
+    virtual void ShowInBounds(float x, float y, float width, float height) override
+    {
+        if(_child == nil)
+            return;
+        if(AvnInsidePotentialDeadlock::IsInside())
+        {
+            IAvnNativeControlHostTopLevelAttachment* slf = this;
+            slf->AddRef();
+            dispatch_async(dispatch_get_main_queue(), ^{
+                slf->ShowInBounds(x, y, width, height);
+                slf->Release();
+            });
+            return;
+        }
+        
+        NSRect childFrame = {0, 0, width, height};
+        NSRect holderFrame = {x, y, width, height};
+        
+        [_child setFrame: childFrame];
+        [_holder setFrame: holderFrame];
+        [_holder setHidden: false];
+        if([_holder superview] != nil)
+            [[_holder superview] setNeedsDisplay:true];
+    }
+    
+    virtual void HideWithSize(float width, float height) override
+    {
+        if(_child == nil)
+            return;
+        if(AvnInsidePotentialDeadlock::IsInside())
+        {
+            IAvnNativeControlHostTopLevelAttachment* slf = this;
+            slf->AddRef();
+            dispatch_async(dispatch_get_main_queue(), ^{
+                slf->HideWithSize(width, height);
+                slf->Release();
+            });
+            return;
+        }
+        
+        NSRect frame = {0, 0, width, height};
+        [_holder setHidden: true];
+        [_child setFrame: frame];
+    }
+    
+    virtual void ReleaseChild() override
+    {
+        [_child removeFromSuperview];
+        _child = nil;
+    }
+};
+
+IAvnNativeControlHostTopLevelAttachment* CreateAttachment()
+{
+    return new AvnNativeControlHostTopLevelAttachment();
+}
+
+extern IAvnNativeControlHost* CreateNativeControlHost(NSView* parent)
+{
+    return new AvnNativeControlHost(parent);
+}
diff --git a/native/Avalonia.Native/src/OSX/cursor.h b/native/Avalonia.Native/src/OSX/cursor.h
index cfe91955d8..75a9c3d2ad 100644
--- a/native/Avalonia.Native/src/OSX/cursor.h
+++ b/native/Avalonia.Native/src/OSX/cursor.h
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 #ifndef cursor_h
 #define cursor_h
 
diff --git a/native/Avalonia.Native/src/OSX/cursor.mm b/native/Avalonia.Native/src/OSX/cursor.mm
index 799fa9e8e6..b6f9ed5071 100644
--- a/native/Avalonia.Native/src/OSX/cursor.mm
+++ b/native/Avalonia.Native/src/OSX/cursor.mm
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 #include "common.h"
 #include "cursor.h"
 #include <map>
diff --git a/native/Avalonia.Native/src/OSX/deadlock.mm b/native/Avalonia.Native/src/OSX/deadlock.mm
new file mode 100644
index 0000000000..cb1767c90f
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/deadlock.mm
@@ -0,0 +1,17 @@
+#include "common.h"
+
+static int Counter = 0;
+AvnInsidePotentialDeadlock::AvnInsidePotentialDeadlock()
+{
+    Counter++;
+}
+
+AvnInsidePotentialDeadlock::~AvnInsidePotentialDeadlock()
+{
+    Counter--;
+}
+
+bool AvnInsidePotentialDeadlock::IsInside()
+{
+    return Counter!=0;
+}
diff --git a/native/Avalonia.Native/src/OSX/dnd.mm b/native/Avalonia.Native/src/OSX/dnd.mm
new file mode 100644
index 0000000000..294b8ee8ea
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/dnd.mm
@@ -0,0 +1,89 @@
+#include "common.h"
+
+extern AvnDragDropEffects ConvertDragDropEffects(NSDragOperation nsop)
+{
+    int effects = 0;
+    if((nsop & NSDragOperationCopy) != 0)
+        effects |= (int)AvnDragDropEffects::Copy;
+    if((nsop & NSDragOperationMove) != 0)
+        effects |= (int)AvnDragDropEffects::Move;
+    if((nsop & NSDragOperationLink) != 0)
+        effects |= (int)AvnDragDropEffects::Link;
+    return (AvnDragDropEffects)effects;
+};
+
+extern NSString* GetAvnCustomDataType()
+{
+    char buffer[256];
+    sprintf(buffer, "net.avaloniaui.inproc.uti.n%in", getpid());
+    return [NSString stringWithUTF8String:buffer];
+}
+
+@interface AvnDndSource : NSObject<NSDraggingSource>
+
+@end
+
+@implementation AvnDndSource
+{
+    NSDragOperation _operation;
+    ComPtr<IAvnDndResultCallback> _cb;
+    void* _sourceHandle;
+};
+
+- (NSDragOperation)draggingSession:(nonnull NSDraggingSession *)session sourceOperationMaskForDraggingContext:(NSDraggingContext)context
+{
+    return NSDragOperationCopy;
+}
+
+- (AvnDndSource*) initWithOperation: (NSDragOperation)operation
+                        andCallback: (IAvnDndResultCallback*) cb
+                    andSourceHandle: (void*) handle
+{
+    self = [super init];
+    _operation = operation;
+    _cb = cb;
+    _sourceHandle = handle;
+    return self;
+}
+
+- (void)draggingSession:(NSDraggingSession *)session
+           endedAtPoint:(NSPoint)screenPoint
+              operation:(NSDragOperation)operation
+{
+    if(_cb != nil)
+    {
+        auto cb = _cb;
+        _cb = nil;
+        cb->OnDragAndDropComplete(ConvertDragDropEffects(operation));
+    }
+    if(_sourceHandle != nil)
+    {
+        FreeAvnGCHandle(_sourceHandle);
+        _sourceHandle = nil;
+    }
+}
+
+- (void*) gcHandle
+{
+    return _sourceHandle;
+}
+
+@end
+
+extern NSObject<NSDraggingSource>* CreateDraggingSource(NSDragOperation op, IAvnDndResultCallback* cb, void* handle)
+{
+    return [[AvnDndSource alloc] initWithOperation:op andCallback:cb andSourceHandle:handle];
+};
+
+extern void* GetAvnDataObjectHandleFromDraggingInfo(NSObject<NSDraggingInfo>* info)
+{
+    id obj = [info draggingSource];
+    if(obj == nil)
+        return nil;
+    if([obj isKindOfClass: [AvnDndSource class]])
+    {
+        auto src = (AvnDndSource*)obj;
+        return [src gcHandle];
+    }
+    return nil;
+}
diff --git a/native/Avalonia.Native/src/OSX/gl.mm b/native/Avalonia.Native/src/OSX/gl.mm
deleted file mode 100644
index 083adc927d..0000000000
--- a/native/Avalonia.Native/src/OSX/gl.mm
+++ /dev/null
@@ -1,253 +0,0 @@
-#include "common.h"
-#include <OpenGL/gl.h>
-#include <dlfcn.h>
-
-template <typename T, size_t N> char (&ArrayCounter(T (&a)[N]))[N];
-#define ARRAY_COUNT(a) (sizeof(ArrayCounter(a)))
-
-NSOpenGLPixelFormat* CreateFormat()
-{
-    NSOpenGLPixelFormatAttribute attribs[] =
-    {
-        NSOpenGLPFADoubleBuffer,
-        NSOpenGLPFAColorSize, 32,
-        NSOpenGLPFAStencilSize, 8,
-        NSOpenGLPFADepthSize, 8,
-        0
-    };
-    return [[NSOpenGLPixelFormat alloc] initWithAttributes:attribs];
-}
-
-class AvnGlContext : public virtual ComSingleObject<IAvnGlContext, &IID_IAvnGlContext>
-{
-public:
-    FORWARD_IUNKNOWN()
-    NSOpenGLContext* GlContext;
-    GLuint Framebuffer, RenderBuffer, StencilBuffer;
-    AvnGlContext(NSOpenGLContext* gl, bool offscreen)
-    {
-        Framebuffer = 0;
-        RenderBuffer = 0;
-        StencilBuffer = 0;
-        GlContext = gl;
-        if(offscreen)
-        {
-            [GlContext makeCurrentContext];
-
-            glGenFramebuffersEXT(1, &Framebuffer);
-            glBindFramebufferEXT(GL_FRAMEBUFFER, Framebuffer);
-            glGenRenderbuffersEXT(1, &RenderBuffer);
-            glGenRenderbuffersEXT(1, &StencilBuffer);
-
-            glBindRenderbufferEXT(GL_RENDERBUFFER, StencilBuffer);
-            glFramebufferRenderbufferEXT(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, StencilBuffer);
-            glBindRenderbufferEXT(GL_RENDERBUFFER, RenderBuffer);
-            glFramebufferRenderbufferEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, RenderBuffer);
-        }
-        
-    }
-    
-    
-    virtual HRESULT MakeCurrent()  override
-    {
-        [GlContext makeCurrentContext];/*
-        glBindFramebufferEXT(GL_FRAMEBUFFER, Framebuffer);
-        glBindRenderbufferEXT(GL_RENDERBUFFER, RenderBuffer);
-        glFramebufferRenderbufferEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, RenderBuffer);
-        glBindRenderbufferEXT(GL_RENDERBUFFER, StencilBuffer);
-        glFramebufferRenderbufferEXT(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, StencilBuffer);*/
-        return S_OK;
-    }
-};
-
-class AvnGlDisplay : public virtual ComSingleObject<IAvnGlDisplay, &IID_IAvnGlDisplay>
-{
-    int _sampleCount, _stencilSize;
-    void* _libgl;
-    
-public:
-    FORWARD_IUNKNOWN()
-    
-    AvnGlDisplay(int sampleCount, int stencilSize)
-    {
-        _sampleCount = sampleCount;
-        _stencilSize = stencilSize;
-        _libgl = dlopen("/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib", RTLD_LAZY);
-    }
-    
-    virtual HRESULT GetSampleCount(int* ret)  override
-    {
-        *ret = _sampleCount;
-        return S_OK;
-    }
-    virtual HRESULT GetStencilSize(int* ret) override
-    {
-        *ret = _stencilSize;
-        return S_OK;
-    }
-    
-    virtual HRESULT ClearContext()  override
-    {
-        [NSOpenGLContext clearCurrentContext];
-        return S_OK;
-    }
-    
-    virtual void* GetProcAddress(char* proc)  override
-    {
-        return dlsym(_libgl, proc);
-    }
-};
-
-
-class GlFeature : public virtual ComSingleObject<IAvnGlFeature, &IID_IAvnGlFeature>
-{
-    IAvnGlDisplay* _display;
-    AvnGlContext *_immediate;
-    NSOpenGLContext* _shared;
-public:
-    FORWARD_IUNKNOWN()
-    NSOpenGLPixelFormat* _format;
-    GlFeature(IAvnGlDisplay* display, AvnGlContext* immediate, NSOpenGLPixelFormat* format)
-    {
-        _display = display;
-        _immediate = immediate;
-        _format = format;
-        _shared = [[NSOpenGLContext alloc] initWithFormat:_format shareContext:_immediate->GlContext];
-    }
-    
-    NSOpenGLContext* CreateContext()
-    {
-        return _shared;
-        //return [[NSOpenGLContext alloc] initWithFormat:_format shareContext:nil];
-    }
-    
-    virtual HRESULT ObtainDisplay(IAvnGlDisplay**retOut)  override
-    {
-        *retOut = _display;
-        _display->AddRef();
-        return S_OK;
-    }
-    
-    virtual HRESULT ObtainImmediateContext(IAvnGlContext**retOut)  override
-    {
-        *retOut = _immediate;
-        _immediate->AddRef();
-        return S_OK;
-    }
-};
-
-static GlFeature* Feature;
-
-GlFeature* CreateGlFeature()
-{
-    auto format = CreateFormat();
-    if(format == nil)
-    {
-        NSLog(@"Unable to choose pixel format");
-        return NULL;
-    }
-    
-    auto immediateContext = [[NSOpenGLContext alloc] initWithFormat:format shareContext:nil];
-    if(immediateContext == nil)
-    {
-        NSLog(@"Unable to create NSOpenGLContext");
-        return NULL;
-    }
-
-    int stencilBits = 0, sampleCount = 0;
-    
-    auto fmt = CGLGetPixelFormat([immediateContext CGLContextObj]);
-    CGLDescribePixelFormat(fmt, 0, kCGLPFASamples, &sampleCount);
-    CGLDescribePixelFormat(fmt, 0, kCGLPFAStencilSize, &stencilBits);
-    
-    auto offscreen = new AvnGlContext(immediateContext, true);
-    auto display = new AvnGlDisplay(sampleCount, stencilBits);
-    
-    return new GlFeature(display, offscreen, format);
-}
-
-
-static GlFeature* GetFeature()
-{
-    if(Feature == nil)
-        Feature = CreateGlFeature();
-    return Feature;
-}
-
-extern IAvnGlFeature* GetGlFeature()
-{
-    return GetFeature();
-}
-
-class AvnGlRenderingSession : public ComSingleObject<IAvnGlSurfaceRenderingSession, &IID_IAvnGlSurfaceRenderingSession>
-{
-    NSView* _view;
-    NSWindow* _window;
-    NSOpenGLContext* _context;
-public:
-    FORWARD_IUNKNOWN()
-    AvnGlRenderingSession(NSWindow*window, NSView* view, NSOpenGLContext* context)
-    {
-        _context = context;
-        _window = window;
-        _view = view;
-    }
-    
-    virtual HRESULT GetPixelSize(AvnPixelSize* ret)  override
-    {
-        auto fsize = [_view convertSizeToBacking: [_view frame].size];
-        ret->Width = (int)fsize.width;
-        ret->Height = (int)fsize.height;
-        return S_OK;
-    }
-    virtual HRESULT GetScaling(double* ret)  override
-    {
-        *ret = [_window backingScaleFactor];
-        return S_OK;
-    }
-    
-    virtual ~AvnGlRenderingSession()
-    {
-        [_context flushBuffer];
-        [NSOpenGLContext clearCurrentContext];
-        CGLUnlockContext([_context CGLContextObj]);
-        [_view unlockFocus];
-    }
-};
-
-class AvnGlRenderTarget : public ComSingleObject<IAvnGlSurfaceRenderTarget, &IID_IAvnGlSurfaceRenderTarget>
-{
-    NSView* _view;
-    NSWindow* _window;
-    NSOpenGLContext* _context;
-public:
-    FORWARD_IUNKNOWN()
-    AvnGlRenderTarget(NSWindow* window, NSView*view)
-    {
-        _window = window;
-        _view = view;
-        _context = GetFeature()->CreateContext();
-    }
-    
-    virtual HRESULT BeginDrawing(IAvnGlSurfaceRenderingSession** ret)  override
-    {
-        auto f = GetFeature();
-        if(f == NULL)
-            return E_FAIL;
-        if(![_view lockFocusIfCanDraw])
-            return E_ABORT;
-        
-        auto gl = _context;
-        CGLLockContext([_context CGLContextObj]);
-        [gl setView: _view];
-        [gl update];
-        [gl makeCurrentContext];
-        *ret = new AvnGlRenderingSession(_window, _view, gl);
-        return S_OK;
-    }
-};
-
-extern IAvnGlSurfaceRenderTarget* CreateGlRenderTarget(NSWindow* window, NSView* view)
-{
-    return new AvnGlRenderTarget(window, view);
-}
diff --git a/native/Avalonia.Native/src/OSX/main.mm b/native/Avalonia.Native/src/OSX/main.mm
index 9418782fd1..cd6ef73826 100644
--- a/native/Avalonia.Native/src/OSX/main.mm
+++ b/native/Avalonia.Native/src/OSX/main.mm
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 //This file will contain actual IID structures
 #define COM_GUIDS_MATERIALIZE
 #include "common.h"
@@ -95,12 +92,11 @@ void SetProcessName(NSString* appTitle) {
     PrivateLSASN asn = ls_get_current_application_asn_func();
     // Constant used by WebKit; what exactly it means is unknown.
     const int magic_session_constant = -2;
-    OSErr err =
+    
     ls_set_application_information_item_func(magic_session_constant, asn,
                                              ls_display_name_key,
                                              process_name,
                                              NULL /* optional out param */);
-    //LOG_IF(ERROR, err) << "Call to set process name failed, err " << err;
 }
 
 class MacOptions : public ComSingleObject<IAvnMacOptions, &IID_IAvnMacOptions>
@@ -108,9 +104,9 @@ class MacOptions : public ComSingleObject<IAvnMacOptions, &IID_IAvnMacOptions>
 public:
     FORWARD_IUNKNOWN()
     
-    virtual HRESULT SetApplicationTitle(void* utf8String) override
+    virtual HRESULT SetApplicationTitle(char* utf8String) override
     {
-        auto appTitle = [NSString stringWithUTF8String:(const char*)utf8String];
+        auto appTitle = [NSString stringWithUTF8String: utf8String];
         
         [[NSProcessInfo processInfo] setProcessName:appTitle];
         
@@ -154,14 +150,15 @@ public:
 }
 @end
 
-
+static ComPtr<IAvnGCHandleDeallocatorCallback> _deallocator;
 class AvaloniaNative : public ComSingleObject<IAvaloniaNativeFactory, &IID_IAvaloniaNativeFactory>
 {
     
 public:
     FORWARD_IUNKNOWN()
-    virtual HRESULT Initialize() override
+    virtual HRESULT Initialize(IAvnGCHandleDeallocatorCallback* deallocator) override
     {
+        _deallocator = deallocator;
         @autoreleasepool{
             [[ThreadingInitializer new] do];
         }
@@ -174,20 +171,20 @@ public:
         return (IAvnMacOptions*)new MacOptions();
     }
     
-    virtual HRESULT CreateWindow(IAvnWindowEvents* cb, IAvnWindow** ppv)  override
+    virtual HRESULT CreateWindow(IAvnWindowEvents* cb, IAvnGlContext* gl, IAvnWindow** ppv)  override
     {
         if(cb == nullptr || ppv == nullptr)
             return E_POINTER;
-        *ppv = CreateAvnWindow(cb);
+        *ppv = CreateAvnWindow(cb, gl);
         return S_OK;
     };
     
-    virtual HRESULT CreatePopup(IAvnWindowEvents* cb, IAvnPopup** ppv) override
+    virtual HRESULT CreatePopup(IAvnWindowEvents* cb, IAvnGlContext* gl, IAvnPopup** ppv) override
     {
         if(cb == nullptr || ppv == nullptr)
             return E_POINTER;
         
-        *ppv = CreateAvnPopup(cb);
+        *ppv = CreateAvnPopup(cb, gl);
         return S_OK;
     }
     
@@ -211,7 +208,13 @@ public:
 
     virtual HRESULT CreateClipboard(IAvnClipboard** ppv) override
     {
-        *ppv = ::CreateClipboard ();
+        *ppv = ::CreateClipboard (nil, nil);
+        return S_OK;
+    }
+    
+    virtual HRESULT CreateDndClipboard(IAvnClipboard** ppv) override
+    {
+        *ppv = ::CreateClipboard (nil, [NSPasteboardItem new]);
         return S_OK;
     }
 
@@ -221,9 +224,9 @@ public:
         return S_OK;
     }
     
-    virtual HRESULT ObtainGlFeature(IAvnGlFeature** ppv) override
+    virtual HRESULT ObtainGlDisplay(IAvnGlDisplay** ppv) override
     {
-        auto rv = ::GetGlFeature();
+        auto rv = ::GetGlDisplay();
         if(rv == NULL)
             return E_FAIL;
         rv->AddRef();
@@ -231,41 +234,29 @@ public:
         return S_OK;
     }
     
-    virtual HRESULT CreateMenu (IAvnAppMenu** ppv) override
+    virtual HRESULT CreateMenu (IAvnMenuEvents* cb, IAvnMenu** ppv) override
     {
-        *ppv = ::CreateAppMenu();
+        *ppv = ::CreateAppMenu(cb);
         return S_OK;
     }
     
-    virtual HRESULT CreateMenuItem (IAvnAppMenuItem** ppv) override
+    virtual HRESULT CreateMenuItem (IAvnMenuItem** ppv) override
     {
         *ppv = ::CreateAppMenuItem();
         return S_OK;
     }
     
-    virtual HRESULT CreateMenuItemSeperator (IAvnAppMenuItem** ppv) override
+    virtual HRESULT CreateMenuItemSeperator (IAvnMenuItem** ppv) override
     {
         *ppv = ::CreateAppMenuItemSeperator();
         return S_OK;
     }
     
-    virtual HRESULT SetAppMenu (IAvnAppMenu* appMenu) override
+    virtual HRESULT SetAppMenu (IAvnMenu* appMenu) override
     {
         ::SetAppMenu(s_appTitle, appMenu);
         return S_OK;
     }
-    
-    virtual HRESULT ObtainAppMenu(IAvnAppMenu** retOut) override
-    {
-        if(retOut == nullptr)
-        {
-            return E_POINTER;
-        }
-        
-        *retOut = ::GetAppMenu();
-        
-        return S_OK;
-    }
 };
 
 extern "C" IAvaloniaNativeFactory* CreateAvaloniaNative()
@@ -273,6 +264,12 @@ extern "C" IAvaloniaNativeFactory* CreateAvaloniaNative()
     return new AvaloniaNative();
 };
 
+extern void FreeAvnGCHandle(void* handle)
+{
+    if(_deallocator != nil)
+        _deallocator->FreeGCHandle(handle);
+}
+
 NSSize ToNSSize (AvnSize s)
 {
     NSSize result;
diff --git a/native/Avalonia.Native/src/OSX/menu.h b/native/Avalonia.Native/src/OSX/menu.h
index befbe6a7e0..564fdc132b 100644
--- a/native/Avalonia.Native/src/OSX/menu.h
+++ b/native/Avalonia.Native/src/OSX/menu.h
@@ -14,8 +14,10 @@
 class AvnAppMenuItem;
 class AvnAppMenu;
 
-@interface AvnMenu : NSMenu // for some reason it doesnt detect nsmenu here but compiler doesnt complain
-- (void)setMenu:(NSMenu*) menu;
+@interface AvnMenu : NSMenu
+- (id) initWithDelegate: (NSObject<NSMenuDelegate>*) del;
+- (void) setHasGlobalMenuItem: (bool) value;
+- (bool) hasGlobalMenuItem;
 @end
 
 @interface AvnMenuItem : NSMenuItem
@@ -23,13 +25,14 @@ class AvnAppMenu;
 - (void)didSelectItem:(id)sender;
 @end
 
-class AvnAppMenuItem : public ComSingleObject<IAvnAppMenuItem, &IID_IAvnAppMenuItem>
+class AvnAppMenuItem : public ComSingleObject<IAvnMenuItem, &IID_IAvnMenuItem>
 {
 private:
     NSMenuItem* _native; // here we hold a pointer to an AvnMenuItem
     IAvnActionCallback* _callback;
     IAvnPredicateCallback* _predicate;
     bool _isSeperator;
+    bool _isCheckable;
     
 public:
     FORWARD_IUNKNOWN()
@@ -38,43 +41,54 @@ public:
     
     NSMenuItem* GetNative();
     
-    virtual HRESULT SetSubMenu (IAvnAppMenu* menu) override;
+    virtual HRESULT SetSubMenu (IAvnMenu* menu) override;
     
-    virtual HRESULT SetTitle (void* utf8String) override;
+    virtual HRESULT SetTitle (char* utf8String) override;
     
-    virtual HRESULT SetGesture (void* key, AvnInputModifiers modifiers) override;
+    virtual HRESULT SetGesture (AvnKey key, AvnInputModifiers modifiers) override;
     
     virtual HRESULT SetAction (IAvnPredicateCallback* predicate, IAvnActionCallback* callback) override;
     
+    virtual HRESULT SetIsChecked (bool isChecked) override;
+    
+    virtual HRESULT SetToggleType (AvnMenuItemToggleType toggleType) override;
+    
+    virtual HRESULT SetIcon (void* data, size_t length) override;
+    
     bool EvaluateItemEnabled();
     
     void RaiseOnClicked();
 };
 
 
-class AvnAppMenu : public ComSingleObject<IAvnAppMenu, &IID_IAvnAppMenu>
+class AvnAppMenu : public ComSingleObject<IAvnMenu, &IID_IAvnMenu>
 {
 private:
     AvnMenu* _native;
+    ComPtr<IAvnMenuEvents> _baseEvents;
     
 public:
     FORWARD_IUNKNOWN()
     
-    AvnAppMenu();
-    
-    AvnAppMenu(AvnMenu* native);
-    
+    AvnAppMenu(IAvnMenuEvents* events);
+        
     AvnMenu* GetNative();
     
-    virtual HRESULT AddItem (IAvnAppMenuItem* item) override;
+    void RaiseNeedsUpdate ();
+    
+    virtual HRESULT InsertItem (int index, IAvnMenuItem* item) override;
     
-    virtual HRESULT RemoveItem (IAvnAppMenuItem* item) override;
+    virtual HRESULT RemoveItem (IAvnMenuItem* item) override;
     
-    virtual HRESULT SetTitle (void* utf8String) override;
+    virtual HRESULT SetTitle (char* utf8String) override;
     
     virtual HRESULT Clear () override;
 };
 
 
+@interface AvnMenuDelegate : NSObject<NSMenuDelegate>
+- (id) initWithParent: (AvnAppMenu*) parent;
+@end
+
 #endif
 
diff --git a/native/Avalonia.Native/src/OSX/menu.mm b/native/Avalonia.Native/src/OSX/menu.mm
index 1d2f075ccb..198b01714f 100644
--- a/native/Avalonia.Native/src/OSX/menu.mm
+++ b/native/Avalonia.Native/src/OSX/menu.mm
@@ -2,8 +2,35 @@
 #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. */
 
 @implementation AvnMenu
+{
+    bool _isReparented;
+    NSObject<NSMenuDelegate>* _wtf;
+}
+
+- (id) initWithDelegate: (NSObject<NSMenuDelegate>*)del
+{
+    self = [super init];
+    self.delegate = del;
+    _wtf = del;
+    _isReparented = false;
+    return self;
+}
+
+- (bool)hasGlobalMenuItem
+{
+    return _isReparented;
+}
+
+- (void)setHasGlobalMenuItem:(bool)value
+{
+    _isReparented = value;
+}
+
 @end
 
 @implementation AvnMenuItem
@@ -46,6 +73,7 @@
 
 AvnAppMenuItem::AvnAppMenuItem(bool isSeperator)
 {
+    _isCheckable = false;
     _isSeperator = isSeperator;
     
     if(isSeperator)
@@ -65,49 +93,168 @@ NSMenuItem* AvnAppMenuItem::GetNative()
     return _native;
 }
 
-HRESULT AvnAppMenuItem::SetSubMenu (IAvnAppMenu* menu)
+HRESULT AvnAppMenuItem::SetSubMenu (IAvnMenu* menu)
 {
-    auto nsMenu = dynamic_cast<AvnAppMenu*>(menu)->GetNative();
-    
-    [_native setSubmenu: nsMenu];
-    
-    return S_OK;
+    @autoreleasepool
+    {
+        if(menu != nullptr)
+        {
+            auto nsMenu = dynamic_cast<AvnAppMenu*>(menu)->GetNative();
+            
+            [_native setSubmenu: nsMenu];
+        }
+        else
+        {
+            [_native setSubmenu: nullptr];
+        }
+        
+        return S_OK;
+    }
 }
 
-HRESULT AvnAppMenuItem::SetTitle (void* utf8String)
+HRESULT AvnAppMenuItem::SetTitle (char* utf8String)
 {
-    if (utf8String != nullptr)
+    @autoreleasepool
     {
-        [_native setTitle:[NSString stringWithUTF8String:(const char*)utf8String]];
+        if (utf8String != nullptr)
+        {
+            [_native setTitle:[NSString stringWithUTF8String:(const char*)utf8String]];
+        }
+        
+        return S_OK;
     }
-    
-    return S_OK;
 }
 
-HRESULT AvnAppMenuItem::SetGesture (void* key, AvnInputModifiers modifiers)
+
+HRESULT AvnAppMenuItem::SetGesture (AvnKey key, AvnInputModifiers modifiers)
 {
-    NSEventModifierFlags flags = 0;
-    
-    if (modifiers & Control)
-        flags |= NSEventModifierFlagControl;
-    if (modifiers & Shift)
-        flags |= NSEventModifierFlagShift;
-    if (modifiers & Alt)
-        flags |= NSEventModifierFlagOption;
-    if (modifiers & Windows)
-        flags |= NSEventModifierFlagCommand;
-    
-    [_native setKeyEquivalent:[NSString stringWithUTF8String:(const char*)key]];
-    [_native setKeyEquivalentModifierMask:flags];
-    
-    return S_OK;
+    @autoreleasepool
+    {
+        if(key != AvnKeyNone)
+        {
+            NSEventModifierFlags flags = 0;
+            
+            if (modifiers & Control)
+                flags |= NSEventModifierFlagControl;
+            if (modifiers & Shift)
+                flags |= NSEventModifierFlagShift;
+            if (modifiers & Alt)
+                flags |= NSEventModifierFlagOption;
+            if (modifiers & Windows)
+                flags |= NSEventModifierFlagCommand;
+            
+            auto it = s_UnicodeKeyMap.find(key);
+            
+            if(it != s_UnicodeKeyMap.end())
+            {
+                auto keyString= [NSString stringWithFormat:@"%C", (unsigned short)it->second];
+                
+                [_native setKeyEquivalent: keyString];
+                [_native setKeyEquivalentModifierMask:flags];
+                
+                return S_OK;
+            }
+            else
+            {
+                auto it = s_AvnKeyMap.find(key); // check if a virtual key is mapped.
+                
+                if(it != s_AvnKeyMap.end())
+                {
+                    auto it1 = s_QwertyKeyMap.find(it->second); // convert virtual key to qwerty string.
+                    
+                    if(it1 != s_QwertyKeyMap.end())
+                    {
+                        [_native setKeyEquivalent: [NSString  stringWithUTF8String: it1->second]];
+                        [_native setKeyEquivalentModifierMask:flags];
+                        
+                        return S_OK;
+                    }
+                }
+            }
+        }
+        
+        // Nothing matched... clear.
+        [_native setKeyEquivalent: @""];
+        [_native setKeyEquivalentModifierMask: 0];
+        
+        return S_OK;
+    }
 }
 
 HRESULT AvnAppMenuItem::SetAction (IAvnPredicateCallback* predicate, IAvnActionCallback* callback)
 {
-    _predicate = predicate;
-    _callback = callback;
-    return S_OK;
+    @autoreleasepool
+    {
+        _predicate = predicate;
+        _callback = callback;
+        return S_OK;
+    }
+}
+
+HRESULT AvnAppMenuItem::SetIsChecked (bool isChecked)
+{
+    @autoreleasepool
+    {
+        [_native setState:(isChecked && _isCheckable ? NSOnState : NSOffState)];
+        return S_OK;
+    }
+}
+
+HRESULT AvnAppMenuItem::SetToggleType(AvnMenuItemToggleType toggleType)
+{
+    @autoreleasepool
+    {
+        switch(toggleType)
+        {
+            case AvnMenuItemToggleType::None:
+                [_native setOnStateImage: [NSImage imageNamed:@"NSMenuCheckmark"]];
+                
+                _isCheckable = false;
+                break;
+                
+            case AvnMenuItemToggleType::CheckMark:
+                [_native setOnStateImage: [NSImage imageNamed:@"NSMenuCheckmark"]];
+                
+                _isCheckable = true;
+                break;
+                
+            case AvnMenuItemToggleType::Radio:
+                [_native setOnStateImage: [NSImage imageNamed:@"NSMenuItemBullet"]];
+                
+                _isCheckable = true;
+                break;
+        }
+        
+        return S_OK;
+    }
+}
+
+HRESULT AvnAppMenuItem::SetIcon(void *data, size_t length)
+{
+    @autoreleasepool
+    {
+        if(data != nullptr)
+        {
+            NSData *imageData = [NSData dataWithBytes:data length:length];
+            NSImage *image = [[NSImage alloc] initWithData:imageData];
+            
+            NSSize originalSize = [image size];
+             
+            NSSize size;
+            size.height = [[NSFont menuFontOfSize:0] pointSize] * 1.333333;
+            
+            auto scaleFactor = size.height / originalSize.height;
+            size.width = originalSize.width * scaleFactor;
+            
+            [image setSize: size];
+            [_native setImage:image];
+        }
+        else
+        {
+            [_native setImage:nullptr];
+        }
+        return S_OK;
+    }
 }
 
 bool AvnAppMenuItem::EvaluateItemEnabled()
@@ -130,71 +277,123 @@ void AvnAppMenuItem::RaiseOnClicked()
     }
 }
 
-AvnAppMenu::AvnAppMenu()
+AvnAppMenu::AvnAppMenu(IAvnMenuEvents* events)
 {
-    _native = [AvnMenu new];
+    _baseEvents = events;
+    id del = [[AvnMenuDelegate alloc] initWithParent: this];
+    _native = [[AvnMenu alloc] initWithDelegate: del];
 }
 
-AvnAppMenu::AvnAppMenu(AvnMenu* native)
-{
-    _native = native;
-}
 
 AvnMenu* AvnAppMenu::GetNative()
 {
     return _native;
 }
 
-HRESULT AvnAppMenu::AddItem (IAvnAppMenuItem* item)
+void AvnAppMenu::RaiseNeedsUpdate()
 {
-    auto avnMenuItem = dynamic_cast<AvnAppMenuItem*>(item);
-    
-    if(avnMenuItem != nullptr)
+    if(_baseEvents != nullptr)
     {
-        [_native addItem: avnMenuItem->GetNative()];
+        _baseEvents->NeedsUpdate();
     }
-    
-    return S_OK;
 }
 
-HRESULT AvnAppMenu::RemoveItem (IAvnAppMenuItem* item)
+HRESULT AvnAppMenu::InsertItem(int index, IAvnMenuItem *item)
 {
-    auto avnMenuItem = dynamic_cast<AvnAppMenuItem*>(item);
-    
-    if(avnMenuItem != nullptr)
+    @autoreleasepool
     {
-        [_native removeItem:avnMenuItem->GetNative()];
+        if([_native hasGlobalMenuItem])
+        {
+            index++;
+        }
+        
+        auto avnMenuItem = dynamic_cast<AvnAppMenuItem*>(item);
+        
+        if(avnMenuItem != nullptr)
+        {
+            [_native insertItem: avnMenuItem->GetNative() atIndex:index];
+        }
+        
+        return S_OK;
     }
-    
-    return S_OK;
 }
 
-HRESULT AvnAppMenu::SetTitle (void* utf8String)
+HRESULT AvnAppMenu::RemoveItem (IAvnMenuItem* item)
 {
-    if (utf8String != nullptr)
+    @autoreleasepool
     {
-        [_native setTitle:[NSString stringWithUTF8String:(const char*)utf8String]];
+        auto avnMenuItem = dynamic_cast<AvnAppMenuItem*>(item);
+        
+        if(avnMenuItem != nullptr)
+        {
+            [_native removeItem:avnMenuItem->GetNative()];
+        }
+        
+        return S_OK;
+    }
+}
+
+HRESULT AvnAppMenu::SetTitle (char* utf8String)
+{
+    @autoreleasepool
+    {
+        if (utf8String != nullptr)
+        {
+            [_native setTitle:[NSString stringWithUTF8String:(const char*)utf8String]];
+        }
+        
+        return S_OK;
     }
-    
-    return S_OK;
 }
 
 HRESULT AvnAppMenu::Clear()
 {
-    [_native removeAllItems];
-    return S_OK;
+    @autoreleasepool
+    {
+        [_native removeAllItems];
+        return S_OK;
+    }
+}
+
+@implementation AvnMenuDelegate
+{
+    ComPtr<AvnAppMenu> _parent;
 }
+- (id) initWithParent:(AvnAppMenu *)parent
+{
+    self = [super init];
+    _parent = parent;
+    return self;
+}
+- (BOOL)menu:(NSMenu *)menu updateItem:(NSMenuItem *)item atIndex:(NSInteger)index shouldCancel:(BOOL)shouldCancel
+{
+    if(shouldCancel)
+        return NO;
+    return YES;
+}
+
+- (NSInteger)numberOfItemsInMenu:(NSMenu *)menu
+{
+    return [menu numberOfItems];
+}
+
+- (void)menuNeedsUpdate:(NSMenu *)menu
+{
+    _parent->RaiseNeedsUpdate();
+}
+
+
+@end
 
-extern IAvnAppMenu* CreateAppMenu()
+extern IAvnMenu* CreateAppMenu(IAvnMenuEvents* cb)
 {
     @autoreleasepool
     {
-        id menuBar = [NSMenu new];
-        return new AvnAppMenu(menuBar);
+        return new AvnAppMenu(cb);
     }
 }
 
-extern IAvnAppMenuItem* CreateAppMenuItem()
+extern IAvnMenuItem* CreateAppMenuItem()
 {
     @autoreleasepool
     {
@@ -202,7 +401,7 @@ extern IAvnAppMenuItem* CreateAppMenuItem()
     }
 }
 
-extern IAvnAppMenuItem* CreateAppMenuItemSeperator()
+extern IAvnMenuItem* CreateAppMenuItemSeperator()
 {
     @autoreleasepool
     {
@@ -210,10 +409,10 @@ extern IAvnAppMenuItem* CreateAppMenuItemSeperator()
     }
 }
 
-static IAvnAppMenu* s_appMenu = nullptr;
+static IAvnMenu* s_appMenu = nullptr;
 static NSMenuItem* s_appMenuItem = nullptr;
 
-extern void SetAppMenu (NSString* appName, IAvnAppMenu* menu)
+extern void SetAppMenu (NSString* appName, IAvnMenu* menu)
 {
     s_appMenu = menu;
     
@@ -294,7 +493,7 @@ extern void SetAppMenu (NSString* appName, IAvnAppMenu* menu)
     }
 }
 
-extern IAvnAppMenu* GetAppMenu ()
+extern IAvnMenu* GetAppMenu ()
 {
     return s_appMenu;
 }
diff --git a/native/Avalonia.Native/src/OSX/platformthreading.mm b/native/Avalonia.Native/src/OSX/platformthreading.mm
index e7abedae51..e83bf53331 100644
--- a/native/Avalonia.Native/src/OSX/platformthreading.mm
+++ b/native/Avalonia.Native/src/OSX/platformthreading.mm
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 #include "common.h"
 
 class PlatformThreadingInterface;
@@ -57,9 +54,11 @@ private:
     {
     public:
         FORWARD_IUNKNOWN()
+        
         bool Running = false;
         bool Cancelled = false;
-        virtual void Cancel()
+        
+        virtual void Cancel() override
         {
             Cancelled = true;
             if(Running)
@@ -102,7 +101,7 @@ public:
     
     virtual bool GetCurrentThreadIsLoopThread() override
     {
-        return [[NSThread currentThread] isMainThread];
+        return [NSThread isMainThread];
     }
     virtual void SetSignaledCallback(IAvnSignaledCallback* cb) override
     {
@@ -157,11 +156,14 @@ NSArray<NSString*>* _modes;
 
 -(void) perform
 {
+    ComPtr<IAvnSignaledCallback> cb;
     @synchronized (self) {
         _signaled  = false;
-        if(_parent != NULL && _parent->SignaledCallback != NULL)
-            _parent->SignaledCallback->Signaled(0, false);
+        if(_parent != NULL)
+            cb = _parent->SignaledCallback;
     }
+    if(cb != nullptr)
+        cb->Signaled(0, false);
 }
 
 -(void) setParent:(PlatformThreadingInterface *)parent
diff --git a/native/Avalonia.Native/src/OSX/rendertarget.mm b/native/Avalonia.Native/src/OSX/rendertarget.mm
new file mode 100644
index 0000000000..00b6dab219
--- /dev/null
+++ b/native/Avalonia.Native/src/OSX/rendertarget.mm
@@ -0,0 +1,292 @@
+#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
+
+@implementation IOSurfaceHolder
+{
+    @public IOSurfaceRef surface;
+    @public AvnPixelSize size;
+    @public float scale;
+    ComPtr<IAvnGlContext> _context;
+    GLuint _framebuffer, _texture, _renderbuffer;
+}
+
+- (IOSurfaceHolder*) initWithSize: (AvnPixelSize) size
+                        withScale: (float)scale
+                withOpenGlContext: (IAvnGlContext*) context
+{
+    long bytesPerRow = IOSurfaceAlignProperty(kIOSurfaceBytesPerRow, size.Width * 4);
+    long allocSize = IOSurfaceAlignProperty(kIOSurfaceAllocSize, size.Height * bytesPerRow);
+    NSDictionary* options = @{
+                              (id)kIOSurfaceWidth: @(size.Width),
+                              (id)kIOSurfaceHeight:  @(size.Height),
+                              (id)kIOSurfacePixelFormat: @((uint)'BGRA'),
+                              (id)kIOSurfaceBytesPerElement: @(4),
+                              (id)kIOSurfaceBytesPerRow: @(bytesPerRow),
+                              (id)kIOSurfaceAllocSize: @(allocSize),
+                              
+                              //(id)kIOSurfaceCacheMode: @(kIOMapWriteCombineCache),
+                              (id)kIOSurfaceElementWidth: @(1),
+                              (id)kIOSurfaceElementHeight: @(1)
+                              };
+    
+    surface = IOSurfaceCreate((CFDictionaryRef)options);
+    self->scale = scale;
+    self->size = size;
+    self->_context = context;
+    return self;
+}
+
+-(HRESULT) prepareForGlRender
+{
+    if(_context == nil)
+        return E_FAIL;
+    if(CGLGetCurrentContext() != _context->GetNativeHandle())
+        return E_FAIL;
+    if(_framebuffer == 0)
+        glGenFramebuffersEXT(1, &_framebuffer);
+    
+    
+    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, _framebuffer);
+    if(_texture == 0)
+    {
+        glGenTextures(1, &_texture);
+    
+        glBindTexture(GL_TEXTURE_RECTANGLE_EXT, _texture);
+        CGLError res = CGLTexImageIOSurface2D((CGLContextObj)_context->GetNativeHandle(),
+                               GL_TEXTURE_RECTANGLE_EXT, GL_RGBA8,
+                               size.Width, size.Height, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, surface, 0);
+        glBindTexture(GL_TEXTURE_RECTANGLE_EXT, 0);
+        
+        if(res != 0)
+        {
+            glDeleteTextures(1, &_texture);
+            _texture = 0;
+            glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+            return E_FAIL;
+        }
+        glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_RECTANGLE_EXT, _texture, 0);
+    }
+    
+    if(_renderbuffer == 0)
+    {
+        glGenRenderbuffers(1, &_renderbuffer);
+        glBindRenderbuffer(GL_RENDERBUFFER, _renderbuffer);
+        glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, size.Width, size.Height);
+        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, _renderbuffer);
+    }
+    
+    return S_OK;
+}
+
+-(void) finishDraw
+{
+    ComPtr<IUnknown> release;
+    _context->MakeCurrent(release.getPPV());
+    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+    glFlush();
+}
+
+-(void) dealloc
+{
+    
+    if(_framebuffer != 0)
+    {
+        ComPtr<IUnknown> release;
+        _context->MakeCurrent(release.getPPV());
+        glDeleteFramebuffers(1, &_framebuffer);
+        if(_texture != 0)
+            glDeleteTextures(1, &_texture);
+        if(_renderbuffer != 0)
+            glDeleteRenderbuffers(1, &_renderbuffer);
+    }
+    CFRelease(surface);
+}
+@end
+
+static IAvnGlSurfaceRenderTarget* CreateGlRenderTarget(IOSurfaceRenderTarget* target);
+
+@implementation IOSurfaceRenderTarget
+{
+    CALayer* _layer;
+    @public IOSurfaceHolder* surface;
+    @public NSObject* lock;
+    ComPtr<IAvnGlContext> _glContext;
+}
+
+- (IOSurfaceRenderTarget*) initWithOpenGlContext: (IAvnGlContext*) context;
+{
+    self = [super init];
+    _glContext = context;
+    lock = [NSObject new];
+    surface  = nil;
+    [self resize:{1,1} withScale: 1];
+    
+    return self;
+}
+
+- (AvnPixelSize) pixelSize {
+    return {1, 1};
+}
+
+- (CALayer *)layer {
+    return _layer;
+}
+
+- (void)resize:(AvnPixelSize)size withScale: (float) scale{
+    @synchronized (lock) {
+        if(surface == nil
+           || surface->size.Width != size.Width
+           || surface->size.Height != size.Height
+           || surface->scale != scale)
+        {
+            surface = [[IOSurfaceHolder alloc] initWithSize:size withScale:scale withOpenGlContext:_glContext.getRaw()];
+            
+            [self updateLayer];
+        }
+    }
+}
+
+- (void)updateLayer {
+    if ([NSThread isMainThread])
+    {
+        @synchronized (lock) {
+            if(_layer == nil)
+                return;
+            [CATransaction begin];
+            [_layer setContents: nil];
+            if(surface != nil)
+            {
+                [_layer setContentsScale: surface->scale];
+                [_layer setContents: (__bridge IOSurface*) surface->surface];
+            }
+            [CATransaction commit];
+            [CATransaction flush];
+        }
+    }
+    else
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self updateLayer];
+        });
+}
+
+- (void) setNewLayer:(CALayer *)layer {
+    _layer = layer;
+    [self updateLayer];
+}
+
+- (HRESULT)setSwFrame:(AvnFramebuffer *)fb {
+    @synchronized (lock) {
+        if(fb->PixelFormat == AvnPixelFormat::kAvnRgb565)
+            return E_INVALIDARG;
+        if(surface == nil)
+            return E_FAIL;
+        IOSurfaceRef surf = surface->surface;
+        if(IOSurfaceLock(surf, 0, nil))
+            return E_FAIL;
+        size_t w = MIN(fb->Width, IOSurfaceGetWidth(surf));
+        size_t h = MIN(fb->Height, IOSurfaceGetHeight(surf));
+        size_t wbytes = w*4;
+        size_t sstride = IOSurfaceGetBytesPerRow(surf);
+        size_t fstride = fb->Stride;
+        char*pSurface = (char*)IOSurfaceGetBaseAddress(surf);
+        char*pFb = (char*)fb->Data;
+        for(size_t y = 0; y < h; y++)
+        {
+            memcpy(pSurface + y*sstride, pFb + y*fstride, wbytes);
+        }
+        IOSurfaceUnlock(surf, 0, nil);
+        [self updateLayer];
+        return S_OK;
+    }
+}
+
+-(IAvnGlSurfaceRenderTarget*) createSurfaceRenderTarget
+{
+    return CreateGlRenderTarget(self);
+}
+
+@end
+
+class AvnGlRenderingSession : public ComSingleObject<IAvnGlSurfaceRenderingSession, &IID_IAvnGlSurfaceRenderingSession>
+{
+    ComPtr<IUnknown> _releaseContext;
+    IOSurfaceRenderTarget* _target;
+    IOSurfaceHolder* _surface;
+public:
+    FORWARD_IUNKNOWN()
+    AvnGlRenderingSession(IOSurfaceRenderTarget* target, ComPtr<IUnknown> releaseContext)
+    {
+        _target = target;
+        // This happens in a synchronized block set up by AvnRenderTarget, so we take the current surface for this
+        // particular render session
+        _surface = _target->surface;
+        _releaseContext = releaseContext;
+    }
+    
+    virtual HRESULT GetPixelSize(AvnPixelSize* ret)  override
+    {
+        if(!_surface)
+            return E_FAIL;
+        *ret = _surface->size;
+        return S_OK;
+    }
+    
+    virtual HRESULT GetScaling(double* ret)  override
+    {
+        if(!_surface)
+            return E_FAIL;
+        *ret = _surface->scale;
+        return S_OK;
+    }
+    
+    virtual ~AvnGlRenderingSession()
+    {
+        [_surface finishDraw];
+        [_target updateLayer];
+        _releaseContext = nil;
+    }
+};
+
+class AvnGlRenderTarget : public ComSingleObject<IAvnGlSurfaceRenderTarget, &IID_IAvnGlSurfaceRenderTarget>
+{
+    IOSurfaceRenderTarget* _target;
+public:
+    FORWARD_IUNKNOWN()
+    AvnGlRenderTarget(IOSurfaceRenderTarget* target)
+    {
+        _target = target;
+    }
+    
+    virtual HRESULT BeginDrawing(IAvnGlSurfaceRenderingSession** ret)  override
+    {
+        ComPtr<IUnknown> releaseContext;
+        @synchronized (_target->lock) {
+            if(_target->surface == nil)
+                return E_FAIL;
+            _target->_glContext->MakeCurrent(releaseContext.getPPV());
+            HRESULT res = [_target->surface prepareForGlRender];
+            if(res)
+                return res;
+            *ret = new AvnGlRenderingSession(_target, releaseContext);
+            return S_OK;
+        }
+    }
+};
+
+
+static IAvnGlSurfaceRenderTarget* CreateGlRenderTarget(IOSurfaceRenderTarget* target)
+{
+    return new AvnGlRenderTarget(target);
+}
diff --git a/native/Avalonia.Native/src/OSX/window.h b/native/Avalonia.Native/src/OSX/window.h
index 932bc56a2e..b1f64bca88 100644
--- a/native/Avalonia.Native/src/OSX/window.h
+++ b/native/Avalonia.Native/src/OSX/window.h
@@ -1,17 +1,23 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 #ifndef window_h
 #define window_h
 
 class WindowBaseImpl;
 
-@interface AvnView : NSView<NSTextInputClient>
+@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;
+@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>
@@ -21,7 +27,13 @@ class WindowBaseImpl;
 -(void) pollModalSession: (NSModalSession _Nonnull) session;
 -(void) restoreParentWindow;
 -(bool) shouldTryToHandleEvents;
--(void) applyMenu:(NSMenu *)menu;
+-(void) setEnabled: (bool) enable;
+-(void) showAppMenuOnly;
+-(void) showWindowMenuWithAppMenu;
+-(void) applyMenu:(NSMenu* _Nullable)menu;
+-(double) getScaling;
+-(double) getExtendedTitleBarHeight;
+-(void) setIsExtended:(bool)value;
 @end
 
 struct INSWindowHolder
@@ -32,6 +44,10 @@ struct INSWindowHolder
 struct IWindowStateChanged
 {
     virtual void WindowStateChanged () = 0;
+    virtual void StartStateTransition () = 0;
+    virtual void EndStateTransition () = 0;
+    virtual SystemDecorations Decorations () = 0;
+    virtual AvnWindowState WindowState () = 0;
 };
 
 #endif /* window_h */
diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
index 0e85332555..8419258fe9 100644
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ b/native/Avalonia.Native/src/OSX/window.mm
@@ -1,50 +1,10 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 #include "common.h"
 #include "window.h"
 #include "KeyTransform.h"
 #include "cursor.h"
 #include "menu.h"
 #include <OpenGL/gl.h>
-
-class SoftwareDrawingOperation
-{
-public:
-    void* Data = 0;
-    AvnFramebuffer Desc;
-    void Alloc(NSView* view)
-    {
-        auto logicalSize = [view frame].size;
-        auto pixelSize = [view convertSizeToBacking:logicalSize];
-        int w = pixelSize.width;
-        int h = pixelSize.height;
-        int stride = w * 4;
-        Data = malloc(h * stride);
-        Desc = {
-            .Data = Data,
-            .Stride = stride,
-            .Width = w,
-            .Height = h,
-            .PixelFormat = kAvnRgba8888,
-            .Dpi = AvnVector { .X = w / logicalSize.width * 96, .Y = h / logicalSize.height * 96}
-        };
-    }
-    
-    void Dealloc()
-    {
-        if(Data != NULL)
-        {
-            free(Data);
-            Data = NULL;
-        }
-    }
-    
-    ~SoftwareDrawingOperation()
-    {
-        Dealloc();
-    }
-};
+#include "rendertarget.h"
 
 class WindowBaseImpl : public virtual ComSingleObject<IAvnWindowBase, &IID_IAvnWindowBase>, public INSWindowHolder
 {
@@ -58,19 +18,27 @@ public:
         View = NULL;
         Window = NULL;
     }
+    AutoFitContentView* StandardContainer;
     AvnView* View;
     AvnWindow* Window;
     ComPtr<IAvnWindowBaseEvents> BaseEvents;
-    SoftwareDrawingOperation CurrentSwDrawingOperation;
+    ComPtr<IAvnGlContext> _glContext;
+    NSObject<IRenderTarget>* renderTarget;
     AvnPoint lastPositionSet;
     NSString* _lastTitle;
-    IAvnAppMenu* _mainMenu;
+    IAvnMenu* _mainMenu;
+    
+    bool _shown;
     
-    WindowBaseImpl(IAvnWindowBaseEvents* events)
+    WindowBaseImpl(IAvnWindowBaseEvents* events, IAvnGlContext* gl)
     {
+        _shown = 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];
         
@@ -80,7 +48,57 @@ public:
         
         [Window setStyleMask:NSWindowStyleMaskBorderless];
         [Window setBackingType:NSBackingStoreBuffered];
-        [Window setContentView: View];
+        
+        [Window setOpaque:false];
+        [Window setContentView: StandardContainer];
+    }
+    
+    virtual HRESULT ObtainNSWindowHandle(void** ret) override
+    {
+        if (ret == nullptr)
+        {
+            return E_POINTER;
+        }
+        
+        *ret =  (__bridge void*)Window;
+        
+        return S_OK;
+    }
+    
+    virtual HRESULT ObtainNSWindowHandleRetained(void** ret) override
+    {
+        if (ret == nullptr)
+        {
+            return E_POINTER;
+        }
+        
+        *ret =  (__bridge_retained void*)Window;
+        
+        return S_OK;
+    }
+    
+    virtual HRESULT ObtainNSViewHandle(void** ret) override
+    {
+        if (ret == nullptr)
+        {
+            return E_POINTER;
+        }
+        
+        *ret =  (__bridge void*)View;
+        
+        return S_OK;
+    }
+    
+    virtual HRESULT ObtainNSViewHandleRetained(void** ret) override
+    {
+        if (ret == nullptr)
+        {
+            return E_POINTER;
+        }
+        
+        *ret =  (__bridge_retained void*)View;
+        
+        return S_OK;
     }
     
     virtual AvnWindow* GetNSWindow() override
@@ -88,23 +106,34 @@ public:
         return Window;
     }
     
-    virtual HRESULT Show() override
+    virtual HRESULT Show(bool activate) override
     {
         @autoreleasepool
         {
             SetPosition(lastPositionSet);
             UpdateStyle();
-            
-            [Window makeKeyAndOrderFront:Window];
-            [NSApp activateIgnoringOtherApps:YES];
-            
+            if(ShouldTakeFocusOnShow() && activate)
+            {
+                [Window makeKeyAndOrderFront:Window];
+                [NSApp activateIgnoringOtherApps:YES];
+            }
+            else
+            {
+                [Window orderFront: Window];
+            }
             [Window setTitle:_lastTitle];
-            [Window setTitleVisibility:NSWindowTitleVisible];
+            
+            _shown = true;
         
             return S_OK;
         }
     }
     
+    virtual bool ShouldTakeFocusOnShow()
+    {
+        return true;
+    }
+    
     virtual HRESULT Hide () override
     {
         @autoreleasepool
@@ -147,7 +176,11 @@ public:
     {
         @autoreleasepool
         {
-            [Window close];
+            if (Window != nullptr)
+            {
+                [Window close];
+            }
+            
             return S_OK;
         }
     }
@@ -198,6 +231,29 @@ public:
     {
         @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;
+            }
+            
             [Window setContentSize:NSSize{x, y}];
             
             return S_OK;
@@ -214,7 +270,7 @@ public:
         }
     }
     
-    virtual HRESULT SetMainMenu(IAvnAppMenu* menu) override
+    virtual HRESULT SetMainMenu(IAvnMenu* menu) override
     {
         _mainMenu = menu;
         
@@ -224,37 +280,14 @@ public:
         
         [Window applyMenu:nsmenu];
         
-        return S_OK;
-    }
-    
-    virtual HRESULT ObtainMainMenu(IAvnAppMenu** ret) override
-    {
-        if(ret == nullptr)
+        if ([Window isKeyWindow])
         {
-            return E_POINTER;
+            [Window showWindowMenuWithAppMenu];
         }
         
-        *ret = _mainMenu;
-        
         return S_OK;
     }
     
-    virtual bool TryLock() override
-    {
-        @autoreleasepool
-        {
-            return [View lockFocusIfCanDraw] == YES;
-        }
-    }
-    
-    virtual void Unlock() override
-    {
-        @autoreleasepool
-        {
-            [View unlockFocus];
-        }
-    }
-    
     virtual HRESULT BeginMoveDrag () override
     {
         @autoreleasepool
@@ -349,16 +382,6 @@ public:
         return S_OK;
     }
     
-    virtual HRESULT GetSoftwareFramebuffer(AvnFramebuffer*ret) override
-    {
-        if(![[NSThread currentThread] isMainThread])
-            return E_FAIL;
-        if(CurrentSwDrawingOperation.Data == NULL)
-            CurrentSwDrawingOperation.Alloc(View);
-        *ret = CurrentSwDrawingOperation.Desc;
-        return S_OK;
-    }
-    
     virtual HRESULT SetCursor(IAvnCursor* cursor) override
     {
         @autoreleasepool
@@ -392,7 +415,66 @@ public:
     {
         if(View == NULL)
             return E_FAIL;
-        *ppv = ::CreateGlRenderTarget(Window, View);
+        *ppv = [renderTarget createSurfaceRenderTarget];
+        return *ppv == nil ? E_FAIL : S_OK;
+    }
+    
+    virtual HRESULT CreateNativeControlHost(IAvnNativeControlHost** retOut) override
+    {
+        if(View == NULL)
+            return E_FAIL;
+        *retOut = ::CreateNativeControlHost(View);
+        return S_OK;
+    }
+    
+    virtual HRESULT SetBlurEnabled (bool enable) override
+    {
+        [StandardContainer ShowBlur:enable];
+        
+        return S_OK;
+    }
+    
+    virtual HRESULT BeginDragAndDropOperation(AvnDragDropEffects effects, AvnPoint point,
+                                              IAvnClipboard* clipboard, IAvnDndResultCallback* cb,
+                                              void* sourceHandle) override
+    {
+        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;
     }
 
@@ -404,9 +486,10 @@ protected:
     
     void UpdateStyle()
     {
-        [Window setStyleMask:GetStyle()];
+        [Window setStyleMask: GetStyle()];
     }
     
+public:
     virtual void OnResized ()
     {
         
@@ -416,10 +499,15 @@ protected:
 class WindowImpl : public virtual WindowBaseImpl, public virtual IAvnWindow, public IWindowStateChanged
 {
 private:
-    bool _canResize = true;
-    bool _hasDecorations = true;
-    CGRect _lastUndecoratedFrame;
+    bool _canResize;
+    bool _fullScreenActive;
+    SystemDecorations _decorations;
     AvnWindowState _lastWindowState;
+    bool _inSetWindowState;
+    NSRect _preZoomSize;
+    bool _transitioningWindowState;
+    bool _isClientAreaExtended;
+    AvnExtendClientAreaChromeHints _extendClientHints;
     
     FORWARD_IUNKNOWN()
     BEGIN_INTERFACE_MAP()
@@ -431,26 +519,70 @@ private:
     }
     
     ComPtr<IAvnWindowEvents> WindowEvents;
-    WindowImpl(IAvnWindowEvents* events) : WindowBaseImpl(events)
-    {
+    WindowImpl(IAvnWindowEvents* events, IAvnGlContext* gl) : WindowBaseImpl(events, gl)
+    {
+        _isClientAreaExtended = false;
+        _extendClientHints = AvnDefaultChrome;
+        _fullScreenActive = false;
+        _canResize = true;
+        _decorations = SystemDecorationsFull;
+        _transitioningWindowState = false;
+        _inSetWindowState = false;
+        _lastWindowState = Normal;
         WindowEvents = events;
         [Window setCanBecomeKeyAndMain];
         [Window disableCursorRects];
+        [Window setTabbingMode:NSWindowTabbingModeDisallowed];
     }
     
-    virtual HRESULT Show () override
+    void HideOrShowTrafficLights ()
+    {
+        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) override
     {
         @autoreleasepool
-        {
-            if([Window parentWindow] != nil)
-                [[Window parentWindow] removeChildWindow:Window];
-            WindowBaseImpl::Show();
+        {            
+            WindowBaseImpl::Show(activate);
+            
+            HideOrShowTrafficLights();
             
-            return SetWindowState(Normal);
+            return SetWindowState(_lastWindowState);
+        }
+    }
+    
+    virtual HRESULT SetEnabled (bool enable) override
+    {
+        @autoreleasepool
+        {
+            [Window setEnabled:enable];
+            return S_OK;
         }
     }
     
-    virtual HRESULT ShowDialog (IAvnWindow* parent) override
+    virtual HRESULT SetParent (IAvnWindow* parent) override
     {
         @autoreleasepool
         {
@@ -462,43 +594,102 @@ private:
                 return E_INVALIDARG;
             
             [cparent->Window addChildWindow:Window ordered:NSWindowAbove];
-            WindowBaseImpl::Show();
+            
+            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
     {
-        AvnWindowState state;
-        GetWindowState(&state);
-        WindowEvents->WindowStateChanged(state);
+        if(!_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;
+                WindowEvents->WindowStateChanged(state);
+            }
+        }
     }
     
     bool UndecoratedIsMaximized ()
     {
-        return CGRectEqualToRect([Window frame], [Window screen].visibleFrame);
+        auto windowSize = [Window frame];
+        auto available = [Window screen].visibleFrame;
+        return CGRectEqualToRect(windowSize, available);
     }
     
     bool IsZoomed ()
     {
-        return _hasDecorations ? [Window isZoomed] : UndecoratedIsMaximized();
+        return _decorations == SystemDecorationsFull ? [Window isZoomed] : UndecoratedIsMaximized();
     }
     
     void DoZoom()
     {
-        if (_hasDecorations)
+        switch (_decorations)
         {
-            [Window performZoom:Window];
-        }
-        else
-        {
-            if (!UndecoratedIsMaximized())
-            {
-                _lastUndecoratedFrame = [Window frame];
-            }
+            case SystemDecorationsNone:
+            case SystemDecorationsBorderOnly:
+                [Window setFrame:[Window screen].visibleFrame display:true];
+                break;
+
             
-            [Window zoom:Window];
+            case SystemDecorationsFull:
+                [Window performZoom:Window];
+                break;
         }
     }
     
@@ -512,24 +703,77 @@ private:
         }
     }
     
-    virtual HRESULT SetHasDecorations(bool value) override
+    virtual HRESULT SetDecorations(SystemDecorations value) override
     {
         @autoreleasepool
         {
-            _hasDecorations = value;
+            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 (void* utf8title) override
+    virtual HRESULT SetTitle (char* utf8title) override
     {
         @autoreleasepool
         {
             _lastTitle = [NSString stringWithUTF8String:(const char*)utf8title];
             [Window setTitle:_lastTitle];
-            [Window setTitleVisibility:NSWindowTitleVisible];
             
             return S_OK;
         }
@@ -573,13 +817,19 @@ private:
                 return E_POINTER;
             }
             
+            if(([Window styleMask] & NSWindowStyleMaskFullScreen) == NSWindowStyleMaskFullScreen)
+            {
+                *ret = FullScreen;
+                return S_OK;
+            }
+            
             if([Window isMiniaturized])
             {
                 *ret = Minimized;
                 return S_OK;
             }
             
-            if([Window isZoomed])
+            if(IsZoomed())
             {
                 *ret = Maximized;
                 return S_OK;
@@ -591,76 +841,366 @@ private:
         }
     }
     
+    virtual HRESULT TakeFocusFromChildren () override
+    {
+        if(Window == nil)
+            return S_OK;
+        if([Window isKeyWindow])
+            [Window makeFirstResponder: View];
+        
+        return S_OK;
+    }
+    
+    virtual HRESULT SetExtendClientArea (bool enable) override
+    {
+        _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
+    {
+        _extendClientHints = hints;
+        
+        SetExtendClientArea(_isClientAreaExtended);
+        return S_OK;
+    }
+    
+    virtual HRESULT GetExtendTitleBarHeight (double*ret) override
+    {
+        if(ret == nullptr)
+        {
+            return E_POINTER;
+        }
+        
+        *ret = [Window getExtendedTitleBarHeight];
+        
+        return S_OK;
+    }
+    
+    virtual HRESULT SetExtendTitleBarHeight (double value) override
+    {
+        [StandardContainer SetTitleBarHeightHint:value];
+        return S_OK;
+    }
+    
+    void EnterFullScreenMode ()
+    {
+        _fullScreenActive = true;
+        
+        [Window setHasShadow:YES];
+        [Window setTitleVisibility:NSWindowTitleVisible];
+        [Window setTitlebarAppearsTransparent:NO];
+        [Window setTitle:_lastTitle];
+        
+        Window.styleMask = Window.styleMask | NSWindowStyleMaskTitled | NSWindowStyleMaskResizable;
+        Window.styleMask = Window.styleMask & ~NSWindowStyleMaskFullSizeContentView;
+    
+        [Window toggleFullScreen:nullptr];
+    }
+    
+    void ExitFullScreenMode ()
+    {
+        [Window toggleFullScreen:nullptr];
+        
+        _fullScreenActive = false;
+        
+        SetDecorations(_decorations);
+    }
+    
     virtual HRESULT SetWindowState (AvnWindowState state) override
     {
         @autoreleasepool
         {
+            if(_lastWindowState == state)
+            {
+                return S_OK;
+            }
+            
+            _inSetWindowState = true;
+            
+            auto currentState = _lastWindowState;
             _lastWindowState = state;
             
-            switch (state) {
-                case Maximized:
-                    lastPositionSet.X = 0;
-                    lastPositionSet.Y = 0;
-                    
-                    if([Window isMiniaturized])
-                    {
-                        [Window deminiaturize:Window];
-                    }
-                    
-                    if(!IsZoomed())
-                    {
-                        DoZoom();
-                    }
-                    break;
-                    
-                case Minimized:
-                    [Window miniaturize:Window];
-                    break;
-                    
-                default:
-                    if([Window isMiniaturized])
-                    {
-                        [Window deminiaturize:Window];
-                    }
-                    
-                    if(IsZoomed())
-                    {
-                        DoZoom();
-                    }
-                    break;
+            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;
+                }
             }
             
+            _inSetWindowState = false;
+            
             return S_OK;
         }
     }
-    
-protected:
+
     virtual void OnResized () override
     {
-        auto windowState = [Window isMiniaturized] ? Minimized
-        : (IsZoomed() ? Maximized : Normal);
-        
-        if (windowState != _lastWindowState)
+        if(_shown && !_inSetWindowState && !_transitioningWindowState)
         {
-            _lastWindowState = windowState;
-            
-            WindowEvents->WindowStateChanged(windowState);
+            WindowStateChanged();
         }
     }
     
+protected:
     virtual NSWindowStyleMask GetStyle() override
     {
         unsigned long s = NSWindowStyleMaskBorderless;
-        if(_hasDecorations)
-            s = s | NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable;
-        if(_canResize)
-            s = s | NSWindowStyleMaskResizable;
+
+        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;
+    
+    [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];
+    
+    [_blurBehind setFrameSize:newSize];
+    [_content 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;
@@ -668,18 +1208,25 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     AvnFramebuffer _swRenderedFrameBuffer;
     bool _queuedDisplayFromThread;
     NSTrackingArea* _area;
-    bool _isLeftPressed, _isMiddlePressed, _isRightPressed, _isMouseOver;
+    bool _isLeftPressed, _isMiddlePressed, _isRightPressed, _isXButton1Pressed, _isXButton2Pressed, _isMouseOver;
+    AvnInputModifiers _modifierState;
     NSEvent* _lastMouseDownEvent;
     bool _lastKeyHandled;
+    AvnPixelSize _lastPixelSize;
+    NSObject<IRenderTarget>* _renderTarget;
 }
 
-- (void)dealloc
+- (void)onClosed
 {
+    @synchronized (self)
+    {
+        _parent = nullptr;
+    }
 }
 
-- (void)onClosed
+-(AvnPixelSize) getPixelSize
 {
-    _parent = NULL;
+    return _lastPixelSize;
 }
 
 - (NSEvent*) lastMouseDownEvent
@@ -687,15 +1234,45 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     return _lastMouseDownEvent;
 }
 
+- (void) updateRenderTarget
+{
+    [_renderTarget resize:_lastPixelSize withScale: [[self window] backingScaleFactor]];
+    [self setNeedsDisplayInRect:[self frame]];
+}
+
 -(AvnView*)  initWithParent: (WindowBaseImpl*) parent
 {
     self = [super init];
-    [self setWantsBestResolutionOpenGLSurface:true];
+    _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;
@@ -725,7 +1302,12 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
         [self removeTrackingArea:_area];
         _area = nullptr;
     }
-    
+
+    if (_parent == nullptr)
+    {
+        return;
+    }
+
     NSRect rect = NSZeroRect;
     rect.size = newSize;
     
@@ -734,81 +1316,47 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     [self addTrackingArea:_area];
     
     _parent->UpdateCursor();
-
-    _parent->BaseEvents->Resized(AvnSize{newSize.width, newSize.height});
-}
-
-- (void) drawFb: (AvnFramebuffer*) fb
-{
-    auto colorSpace = CGColorSpaceCreateDeviceRGB();
-    auto dataProvider = CGDataProviderCreateWithData(NULL, fb->Data, fb->Height*fb->Stride, NULL);
-
     
-    auto image = CGImageCreate(fb->Width, fb->Height, 8, 32, fb->Stride, colorSpace, kCGBitmapByteOrderDefault | kCGImageAlphaPremultipliedLast,
-                               dataProvider, nullptr, false, kCGRenderingIntentDefault);
+    auto fsize = [self convertSizeToBacking: [self frame].size];
     
-    auto ctx = [NSGraphicsContext currentContext];
-    
-    [ctx saveGraphicsState];
-    auto cgc = [ctx CGContext];
-    
-    CGContextDrawImage(cgc, CGRect{0,0, fb->Width/(fb->Dpi.X/96), fb->Height/(fb->Dpi.Y/96)}, image);
-    CGImageRelease(image);
-    CGColorSpaceRelease(colorSpace);
-    CGDataProviderRelease(dataProvider);
+    if(_lastPixelSize.Width != (int)fsize.width || _lastPixelSize.Height != (int)fsize.height)
+    {
+        _lastPixelSize.Width = (int)fsize.width;
+        _lastPixelSize.Height = (int)fsize.height;
+        [self updateRenderTarget];
     
-    [ctx restoreGraphicsState];
-
+        _parent->BaseEvents->Resized(AvnSize{newSize.width, newSize.height});
+    }
 }
 
-- (void)drawRect:(NSRect)dirtyRect
+- (void)updateLayer
 {
-    _parent->BaseEvents->RunRenderPriorityJobs();
-    @synchronized (self) {
-        if(_swRenderedFrame != NULL)
-        {
-            [self drawFb: &_swRenderedFrameBuffer];
-            return;
-        }
+    AvnInsidePotentialDeadlock deadlock;
+    if (_parent == nullptr)
+    {
+        return;
     }
     
-    auto swOp = &_parent->CurrentSwDrawingOperation;
-    _parent->BaseEvents->Paint();
-    if(swOp->Data != NULL)
-        [self drawFb: &swOp->Desc];
+    _parent->BaseEvents->RunRenderPriorityJobs();
     
-    swOp->Dealloc();
-    return;
-}
-
--(void) redrawSelf
-{
-    @autoreleasepool
+    if (_parent == nullptr)
     {
-        @synchronized(self)
-        {
-            if(!_queuedDisplayFromThread)
-                return;
-            _queuedDisplayFromThread = false;
-        }
-        [self setNeedsDisplayInRect:[self frame]];
-        [self display];
-        
+        return;
     }
+        
+    _parent->BaseEvents->Paint();
+}
+
+- (void)drawRect:(NSRect)dirtyRect
+{
+    return;
 }
 
 -(void) setSwRenderedFrame: (AvnFramebuffer*) fb dispose: (IUnknown*) dispose
 {
     @autoreleasepool {
-        @synchronized (self) {
-            _swRenderedFrame = dispose;
-            _swRenderedFrameBuffer = *fb;
-            if(!_queuedDisplayFromThread)
-            {
-                _queuedDisplayFromThread = true;
-                [self performSelector:@selector(redrawSelf) onThread:[NSThread mainThread] withObject:NULL waitUntilDone:false modes: AllLoopModes];
-            }
-        }
+        [_renderTarget setSwFrame:fb];
+        dispose->Release();
     }
 }
 
@@ -830,24 +1378,45 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
 
 - (void) viewDidChangeBackingProperties
 {
-    _parent->BaseEvents->ScalingChanged([_parent->Window backingScaleFactor]);
+    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
 {
     auto parentWindow = objc_cast<AvnWindow>([self window]);
+    
     if(parentWindow == nil || ![parentWindow shouldTryToHandleEvents])
+    {
+        auto window = dynamic_cast<WindowImpl*>(_parent.getRaw());
+        
+        if(window != nullptr)
+        {
+            window->WindowEvents->GotInputWhenDisabled();
+        }
+        
         return TRUE;
+    }
+    
     return FALSE;
 }
 
 - (void)mouseEvent:(NSEvent *)event withType:(AvnRawMouseEventType) type
 {
     if([self ignoreUserInput])
+    {
         return;
+    }
     
-    [self becomeFirstResponder];
     auto localPoint = [self convertPoint:[event locationInWindow] toView:self];
     auto avnPoint = [self toAvnPoint:localPoint];
     auto point = [self translateLocalPoint:avnPoint];
@@ -874,11 +1443,31 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     auto timestamp = [event timestamp] * 1000;
     auto modifiers = [self getModifiers:[event modifierFlags]];
     
-    [self becomeFirstResponder];
-    _parent->BaseEvents->RawMouseEvent(type, timestamp, modifiers, point, delta);
+    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];
@@ -893,9 +1482,23 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
 
 - (void)otherMouseDown:(NSEvent *)event
 {
-    _isMiddlePressed = true;
     _lastMouseDownEvent = event;
-    [self mouseEvent:event withType:MiddleButtonDown];
+
+    switch(event.buttonNumber)
+    {
+        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
@@ -913,8 +1516,21 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
 
 - (void)otherMouseUp:(NSEvent *)event
 {
-    _isMiddlePressed = false;
-    [self mouseEvent:event withType:MiddleButtonUp];
+    switch(event.buttonNumber)
+    {
+        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
@@ -963,13 +1579,19 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
 - (void) keyboardEvent: (NSEvent *) event withType: (AvnRawKeyEventType)type
 {
     if([self ignoreUserInput])
+    {
         return;
+    }
+    
     auto key = s_KeyMap[[event keyCode]];
     
     auto timestamp = [event timestamp] * 1000;
     auto modifiers = [self getModifiers:[event modifierFlags]];
      
-    _lastKeyHandled = _parent->BaseEvents->RawKeyEvent(type, timestamp, modifiers, key);
+    if(_parent != nullptr)
+    {
+        _lastKeyHandled = _parent->BaseEvents->RawKeyEvent(type, timestamp, modifiers, key);
+    }
 }
 
 - (BOOL)performKeyEquivalent:(NSEvent *)event
@@ -981,6 +1603,63 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     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];
@@ -1013,6 +1692,10 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
         rv |= MiddleMouseButton;
     if (_isRightPressed)
         rv |= RightMouseButton;
+    if (_isXButton1Pressed)
+        rv |= XButton1MouseButton;
+    if (_isXButton2Pressed)
+        rv |= XButton2MouseButton;
     
     return (AvnInputModifiers)rv;
 }
@@ -1056,7 +1739,10 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
 {
     if(!_lastKeyHandled)
     {
-        _lastKeyHandled = _parent->BaseEvents->RawTextInputEvent(0, [string UTF8String]);
+        if(_parent != nullptr)
+        {
+            _lastKeyHandled = _parent->BaseEvents->RawTextInputEvent(0, [string UTF8String]);
+        }
     }
 }
 
@@ -1071,6 +1757,68 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     
     return result;
 }
+
+- (NSDragOperation)triggerAvnDragEvent: (AvnDragEventType) type info: (id <NSDraggingInfo>)info
+{
+    auto localPoint = [self convertPoint:[info draggingLocation] toView:self];
+    auto avnPoint = [self 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
+{
+    
+}
+
 @end
 
 
@@ -1079,8 +1827,42 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     ComPtr<WindowBaseImpl> _parent;
     bool _canBecomeKeyAndMain;
     bool _closed;
-    NSMenu* _menu;
-    bool _isAppMenuApplied;
+    bool _isEnabled;
+    bool _isExtended;
+    AvnMenu* _menu;
+    double _lastScaling;
+}
+
+-(void) setIsExtended:(bool)value;
+{
+    _isExtended = value;
+}
+
+-(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
@@ -1094,8 +1876,18 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     }
 }
 
-- (void)dealloc
+- (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
@@ -1115,30 +1907,62 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     }
 }
 
--(void) applyMenu:(NSMenu *)menu
+-(void) showWindowMenuWithAppMenu
 {
-    if(menu == nullptr)
+    if(_menu != nullptr)
     {
-        menu = [NSMenu new];
+        auto appMenuItem = ::GetAppMenuItem();
+        
+        if(appMenuItem != nullptr)
+        {
+            auto appMenu = [appMenuItem menu];
+            
+            [appMenu removeItem:appMenuItem];
+            
+            [_menu insertItem:appMenuItem atIndex:0];
+            
+            [_menu setHasGlobalMenuItem:true];
+        }
+        
+        [NSApp setMenu:_menu];
     }
+}
+
+-(void) showAppMenuOnly
+{
+    auto appMenuItem = ::GetAppMenuItem();
     
-    _menu = menu;
-    
-    if ([self isKeyWindow])
+    if(appMenuItem != nullptr)
     {
-        auto appMenu = ::GetAppMenuItem();
+        auto appMenu = ::GetAppMenu();
+        
+        auto nativeAppMenu = dynamic_cast<AvnAppMenu*>(appMenu);
         
-        if(appMenu != nullptr)
+        [[appMenuItem menu] removeItem:appMenuItem];
+        
+        if(_menu != nullptr)
         {
-            [[appMenu menu] removeItem:appMenu];
-            
-            [_menu insertItem:appMenu atIndex:0];
-            
-            _isAppMenuApplied = true;
+            [_menu setHasGlobalMenuItem:false];
         }
         
-        [NSApp setMenu:menu];
+        [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
@@ -1152,6 +1976,14 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     [self setReleasedWhenClosed:false];
     _parent = parent;
     [self setDelegate:self];
+    _closed = false;
+    _isEnabled = true;
+    
+    _lastScaling = [self backingScaleFactor];
+    [self setOpaque:NO];
+    [self setBackgroundColor: [NSColor clearColor]];
+    [self invalidateShadow];
+    _isExtended = false;
     return self;
 }
 
@@ -1167,6 +1999,11 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     return true;
 }
 
+- (void)windowDidChangeBackingProperties:(NSNotification *)notification
+{
+    _lastScaling = [self backingScaleFactor];
+}
+
 - (void)windowWillClose:(NSNotification *)notification
 {
     _closed = true;
@@ -1177,9 +2014,6 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
         [self restoreParentWindow];
         parent->BaseEvents->Closed();
         [parent->View onClosed];
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [self setContentView: nil];
-        });
     }
 }
 
@@ -1211,14 +2045,12 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
 
 -(bool)shouldTryToHandleEvents
 {
-    for(NSWindow* uch in [self childWindows])
-    {
-        auto ch = objc_cast<AvnWindow>(uch);
-        if(ch == nil)
-            continue;
-        return FALSE;
-    }
-    return TRUE;
+    return _isEnabled;
+}
+
+-(void) setEnabled:(bool)enable
+{
+    _isEnabled = enable;
 }
 
 -(void)makeKeyWindow
@@ -1233,25 +2065,13 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
 {
     if([self activateAppropriateChild: true])
     {
-        if(_menu == nullptr)
-        {
-            _menu = [NSMenu new];
-        }
-        
-        auto appMenu = ::GetAppMenuItem();
+        [self showWindowMenuWithAppMenu];
         
-        if(appMenu != nullptr)
+        if(_parent != nullptr)
         {
-            [[appMenu menu] removeItem:appMenu];
-            
-            [_menu insertItem:appMenu atIndex:0];
-            
-            _isAppMenuApplied = true;
+            _parent->BaseEvents->Activated();
         }
         
-        [NSApp setMenu:_menu];
-        
-        _parent->BaseEvents->Activated();
         [super becomeKeyWindow];
     }
 }
@@ -1286,58 +2106,95 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     }
 }
 
-- (BOOL)windowShouldZoom:(NSWindow *)window toFrame:(NSRect)newFrame
+- (void)windowDidResize:(NSNotification *)notification
 {
-    return true;
+    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
+    
+    if(parent != nullptr)
+    {
+        parent->WindowStateChanged();
+    }
 }
 
--(void)resignKeyWindow
+- (void)windowWillExitFullScreen:(NSNotification *)notification
 {
-    if(_parent)
-        _parent->BaseEvents->Deactivated();
+    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
     
-    auto appMenuItem = ::GetAppMenuItem();
+    if(parent != nullptr)
+    {
+        parent->StartStateTransition();
+    }
+}
+
+- (void)windowDidExitFullScreen:(NSNotification *)notification
+{
+    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
     
-    if(appMenuItem != nullptr)
+    if(parent != nullptr)
     {
-        auto appMenu = ::GetAppMenu();
-        
-        auto nativeAppMenu = dynamic_cast<AvnAppMenu*>(appMenu);
+        parent->EndStateTransition();
         
-        [[appMenuItem menu] removeItem:appMenuItem];
+        if(parent->Decorations() != SystemDecorationsFull && parent->WindowState() == Maximized)
+        {
+            NSRect screenRect = [[self screen] visibleFrame];
+            [self setFrame:screenRect display:YES];
+        }
         
-        [nativeAppMenu->GetNative() addItem:appMenuItem];
+        if(parent->WindowState() == Minimized)
+        {
+            [self miniaturize:nullptr];
+        }
         
-        [NSApp setMenu:nativeAppMenu->GetNative()];
+        parent->WindowStateChanged();
     }
-    else
+}
+
+- (void)windowWillEnterFullScreen:(NSNotification *)notification
+{
+    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
+    
+    if(parent != nullptr)
     {
-        [NSApp setMenu:nullptr];
+        parent->StartStateTransition();
     }
+}
+
+- (void)windowDidEnterFullScreen:(NSNotification *)notification
+{
+    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
     
-    // remove window menu items from appmenu?
-    
-    [super resignKeyWindow];
+    if(parent != nullptr)
+    {
+        parent->EndStateTransition();
+        parent->WindowStateChanged();
+    }
 }
 
-- (void)windowDidMove:(NSNotification *)notification
+- (BOOL)windowShouldZoom:(NSWindow *)window toFrame:(NSRect)newFrame
 {
-    AvnPoint position;
-    _parent->GetPosition(&position);
-    _parent->BaseEvents->PositionChanged(position);
+    return true;
 }
 
-// TODO this breaks resizing.
-/*- (void)windowDidResize:(NSNotification *)notification
+-(void)resignKeyWindow
 {
+    if(_parent)
+        _parent->BaseEvents->Deactivated();
     
-    auto parent = dynamic_cast<IWindowStateChanged*>(_parent.operator->());
+    [self showAppMenuOnly];
     
-    if(parent != nullptr)
+    [super resignKeyWindow];
+}
+
+- (void)windowDidMove:(NSNotification *)notification
+{
+    AvnPoint position;
+    
+    if(_parent != nullptr)
     {
-        parent->WindowStateChanged();
+        _parent->GetPosition(&position);
+        _parent->BaseEvents->PositionChanged(position);
     }
-}*/
+}
 @end
 
 class PopupImpl : public virtual WindowBaseImpl, public IAvnPopup
@@ -1349,12 +2206,11 @@ private:
     END_INTERFACE_MAP()
     virtual ~PopupImpl(){}
     ComPtr<IAvnWindowEvents> WindowEvents;
-    PopupImpl(IAvnWindowEvents* events) : WindowBaseImpl(events)
+    PopupImpl(IAvnWindowEvents* events, IAvnGlContext* gl) : WindowBaseImpl(events, gl)
     {
         WindowEvents = events;
         [Window setLevel:NSPopUpMenuWindowLevel];
     }
-    
 protected:
     virtual NSWindowStyleMask GetStyle() override
     {
@@ -1368,25 +2224,31 @@ protected:
             [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)
+extern IAvnPopup* CreateAvnPopup(IAvnWindowEvents*events, IAvnGlContext* gl)
 {
     @autoreleasepool
     {
-        IAvnPopup* ptr = dynamic_cast<IAvnPopup*>(new PopupImpl(events));
+        IAvnPopup* ptr = dynamic_cast<IAvnPopup*>(new PopupImpl(events, gl));
         return ptr;
     }
 }
 
-extern IAvnWindow* CreateAvnWindow(IAvnWindowEvents*events)
+extern IAvnWindow* CreateAvnWindow(IAvnWindowEvents*events, IAvnGlContext* gl)
 {
     @autoreleasepool
     {
-        IAvnWindow* ptr = (IAvnWindow*)new WindowImpl(events);
+        IAvnWindow* ptr = (IAvnWindow*)new WindowImpl(events, gl);
         return ptr;
     }
 }
diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs
index dd2f27116d..8e331edab4 100644
--- a/nukebuild/Build.cs
+++ b/nukebuild/Build.cs
@@ -5,6 +5,7 @@ using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Xml.Linq;
 using Nuke.Common;
 using Nuke.Common.Git;
@@ -12,7 +13,10 @@ using Nuke.Common.ProjectModel;
 using Nuke.Common.Tooling;
 using Nuke.Common.Tools.DotNet;
 using Nuke.Common.Tools.MSBuild;
+using Nuke.Common.Tools.Npm;
 using Nuke.Common.Utilities;
+using Nuke.Common.Utilities.Collections;
+using Pharmacist.Core;
 using static Nuke.Common.EnvironmentInfo;
 using static Nuke.Common.IO.FileSystemTasks;
 using static Nuke.Common.IO.PathConstruction;
@@ -26,11 +30,13 @@ using static Nuke.Common.Tools.VSWhere.VSWhereTasks;
  running and debugging a particular target (optionally without deps) would be way easier
  ReSharper/Rider - https://plugins.jetbrains.com/plugin/10803-nuke-support
  VSCode - https://marketplace.visualstudio.com/items?itemName=nuke.support
- 
+
  */
 
 partial class Build : NukeBuild
 {
+    [Solution("Avalonia.sln")] readonly Solution Solution;
+
     static Lazy<string> MsBuildExe = new Lazy<string>(() =>
     {
         if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
@@ -54,7 +60,7 @@ partial class Build : NukeBuild
     protected override void OnBuildInitialized()
     {
         Parameters = new BuildParameters(this);
-        Information("Building version {0} of Avalonia ({1}) using version {2} of Nuke.", 
+        Information("Building version {0} of Avalonia ({1}) using version {2} of Nuke.",
             Parameters.Version,
             Parameters.Configuration,
             typeof(NukeBuild).Assembly.GetName().Version.ToString());
@@ -93,29 +99,24 @@ partial class Build : NukeBuild
         string projectFile,
         Configure<MSBuildSettings> configurator = null)
     {
-        return MSBuild(projectFile, c =>
-        {
+        return MSBuild(c => c
+            .SetProjectFile(projectFile)
             // This is required for VS2019 image on Azure Pipelines
-            if (Parameters.IsRunningOnWindows && Parameters.IsRunningOnAzure)
-            {
-                var javaSdk = Environment.GetEnvironmentVariable("JAVA_HOME_8_X64");
-                if (javaSdk != null)
-                    c = c.AddProperty("JavaSdkDirectory", javaSdk);
-            }
-
-            c = c.AddProperty("PackageVersion", Parameters.Version)
-                .AddProperty("iOSRoslynPathHackRequired", "true")
-                .SetToolPath(MsBuildExe.Value)
-                .SetConfiguration(Parameters.Configuration)
-                .SetVerbosity(MSBuildVerbosity.Minimal);
-            c = configurator?.Invoke(c) ?? c;
-            return c;
-        });
+            .When(Parameters.IsRunningOnWindows &&
+                  Parameters.IsRunningOnAzure, _ => _
+                .AddProperty("JavaSdkDirectory", GetVariable<string>("JAVA_HOME_8_X64")))
+            .AddProperty("PackageVersion", Parameters.Version)
+            .AddProperty("iOSRoslynPathHackRequired", true)
+            .SetProcessToolPath(MsBuildExe.Value)
+            .SetConfiguration(Parameters.Configuration)
+            .SetVerbosity(MSBuildVerbosity.Minimal)
+            .Apply(configurator));
     }
+
     Target Clean => _ => _.Executes(() =>
     {
-        DeleteDirectories(Parameters.BuildDirs);
-        EnsureCleanDirectories(Parameters.BuildDirs);
+        Parameters.BuildDirs.ForEach(DeleteDirectory);
+        Parameters.BuildDirs.ForEach(EnsureCleanDirectory);
         EnsureCleanDirectory(Parameters.ArtifactsDir);
         EnsureCleanDirectory(Parameters.NugetIntermediateRoot);
         EnsureCleanDirectory(Parameters.NugetRoot);
@@ -123,107 +124,173 @@ partial class Build : NukeBuild
         EnsureCleanDirectory(Parameters.TestResultsRoot);
     });
 
-    Target Compile => _ => _
+    Target CompileHtmlPreviewer => _ => _
         .DependsOn(Clean)
+        .OnlyWhenStatic(() => !Parameters.SkipPreviewer)
         .Executes(() =>
+        {
+            var webappDir = RootDirectory / "src" / "Avalonia.DesignerSupport" / "Remote" / "HtmlTransport" / "webapp";
+
+            NpmTasks.NpmInstall(c => c
+                .SetProcessWorkingDirectory(webappDir)
+                .SetProcessArgumentConfigurator(a => a.Add("--silent")));
+            NpmTasks.NpmRun(c => c
+                .SetProcessWorkingDirectory(webappDir)
+                .SetCommand("dist"));
+        });
+
+    Target CompileNative => _ => _
+        .DependsOn(Clean)
+        .DependsOn(GenerateCppHeaders)
+        .OnlyWhenStatic(() => EnvironmentInfo.IsOsx)
+        .Executes(() =>
+        {
+            var project = $"{RootDirectory}/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/";
+            var args = $"-project {project} -configuration {Parameters.Configuration} CONFIGURATION_BUILD_DIR={RootDirectory}/Build/Products/Release";
+            ProcessTasks.StartProcess("xcodebuild", args).AssertZeroExitCode();
+        });
+
+    Target Compile => _ => _
+        .DependsOn(Clean, CompileNative)
+        .DependsOn(CompileHtmlPreviewer)
+        .Executes(async () =>
         {
             if (Parameters.IsRunningOnWindows)
                 MsBuildCommon(Parameters.MSBuildSolution, c => c
-                    .SetArgumentConfigurator(a => a.Add("/r"))
+                    .SetProcessArgumentConfigurator(a => a.Add("/r"))
                     .AddTargets("Build")
                 );
 
             else
-                DotNetBuild(Parameters.MSBuildSolution, c => c
+                DotNetBuild(c => c
+                    .SetProjectFile(Parameters.MSBuildSolution)
                     .AddProperty("PackageVersion", Parameters.Version)
                     .SetConfiguration(Parameters.Configuration)
                 );
+
+            await CompileReactiveEvents();
         });
-    
-    void RunCoreTest(string project)
+
+    async Task CompileReactiveEvents()
+    {
+        var avaloniaBuildOutput = Path.Combine(RootDirectory, "packages", "Avalonia", "bin", Parameters.Configuration);
+        var avaloniaAssemblies = GlobFiles(avaloniaBuildOutput, "**/Avalonia*.dll")
+            .Where(file => !file.Contains("Avalonia.Build.Tasks") &&
+                            !file.Contains("Avalonia.Remote.Protocol"));
+
+        var eventsDirectory = GlobDirectories($"{RootDirectory}/src/**/Avalonia.ReactiveUI.Events").First();
+        var eventsBuildFile = Path.Combine(eventsDirectory, "Events_Avalonia.cs");
+        if (File.Exists(eventsBuildFile))
+            File.Delete(eventsBuildFile);
+
+        using (var stream = File.Create(eventsBuildFile))
+        using (var writer = new StreamWriter(stream))
+        {
+            await ObservablesForEventGenerator.ExtractEventsFromAssemblies(
+                writer, avaloniaAssemblies, new string[0], "netstandard2.0"
+            );
+        }
+
+        var eventsProject = Path.Combine(eventsDirectory, "Avalonia.ReactiveUI.Events.csproj");
+        if (Parameters.IsRunningOnWindows)
+            MsBuildCommon(eventsProject, c => c
+                .SetProcessArgumentConfigurator(a => a.Add("/r"))
+                .AddTargets("Build")
+            );
+        else
+            DotNetBuild(c => c
+                .SetProjectFile(eventsProject)
+                .AddProperty("PackageVersion", Parameters.Version)
+                .SetConfiguration(Parameters.Configuration)
+            );
+    }
+
+    void RunCoreTest(string projectName)
     {
-        if(!project.EndsWith(".csproj"))
-            project = System.IO.Path.Combine(project, System.IO.Path.GetFileName(project)+".csproj");
-        Information("Running tests from " + project);
-        XDocument xdoc;
-        using (var s = File.OpenRead(project))
-            xdoc = XDocument.Load(s);
-
-        List<string> frameworks = null;
-        var targets = xdoc.Root.Descendants("TargetFrameworks").FirstOrDefault();
-        if (targets != null)
-            frameworks = targets.Value.Split(';').Where(f => !string.IsNullOrWhiteSpace(f)).ToList();
-        else 
-            frameworks = new List<string> {xdoc.Root.Descendants("TargetFramework").First().Value};
-        
-        foreach(var fw in frameworks)
+        Information($"Running tests from {projectName}");
+        var project = Solution.GetProject(projectName).NotNull("project != null");
+
+        foreach (var fw in project.GetTargetFrameworks())
         {
             if (fw.StartsWith("net4")
-                && RuntimeInformation.IsOSPlatform(OSPlatform.Linux) 
+                && RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
                 && Environment.GetEnvironmentVariable("FORCE_LINUX_TESTS") != "1")
             {
-                Information($"Skipping {fw} tests on Linux - https://github.com/mono/mono/issues/13969");
+                Information($"Skipping {projectName} ({fw}) tests on Linux - https://github.com/mono/mono/issues/13969");
                 continue;
             }
 
-            Information("Running for " + fw);
-            DotNetTest(c =>
-            {
-                c = c
-                    .SetProjectFile(project)
-                    .SetConfiguration(Parameters.Configuration)
-                    .SetFramework(fw)
-                    .EnableNoBuild()
-                    .EnableNoRestore();
-                // NOTE: I can see that we could maybe add another extension method "Switch" or "If" to make this more  convenient
-                if (Parameters.PublishTestResults)
-                    c = c.SetLogger("trx").SetResultsDirectory(Parameters.TestResultsRoot);
-                return c;
-            });
+            Information($"Running for {projectName} ({fw}) ...");
+
+            DotNetTest(c => c
+                .SetProjectFile(project)
+                .SetConfiguration(Parameters.Configuration)
+                .SetFramework(fw)
+                .EnableNoBuild()
+                .EnableNoRestore()
+                .When(Parameters.PublishTestResults, _ => _
+                    .SetLogger("trx")
+                    .SetResultsDirectory(Parameters.TestResultsRoot)));
         }
     }
 
+    Target RunHtmlPreviewerTests => _ => _
+        .DependsOn(CompileHtmlPreviewer)
+        .OnlyWhenStatic(() => !(Parameters.SkipPreviewer || Parameters.SkipTests))
+        .Executes(() =>
+        {
+            var webappTestDir = RootDirectory / "tests" / "Avalonia.DesignerSupport.Tests" / "Remote" / "HtmlTransport" / "webapp";
+
+            NpmTasks.NpmInstall(c => c
+                .SetProcessWorkingDirectory(webappTestDir)
+                .SetProcessArgumentConfigurator(a => a.Add("--silent")));
+            NpmTasks.NpmRun(c => c
+                .SetProcessWorkingDirectory(webappTestDir)
+                .SetCommand("test"));
+        });
+
     Target RunCoreLibsTests => _ => _
-        .OnlyWhen(() => !Parameters.SkipTests)
+        .OnlyWhenStatic(() => !Parameters.SkipTests)
         .DependsOn(Compile)
         .Executes(() =>
         {
-            RunCoreTest("./tests/Avalonia.Animation.UnitTests");
-            RunCoreTest("./tests/Avalonia.Base.UnitTests");
-            RunCoreTest("./tests/Avalonia.Controls.UnitTests");
-            RunCoreTest("./tests/Avalonia.Input.UnitTests");
-            RunCoreTest("./tests/Avalonia.Interactivity.UnitTests");
-            RunCoreTest("./tests/Avalonia.Layout.UnitTests");
-            RunCoreTest("./tests/Avalonia.Markup.UnitTests");
-            RunCoreTest("./tests/Avalonia.Markup.Xaml.UnitTests");
-            RunCoreTest("./tests/Avalonia.Styling.UnitTests");
-            RunCoreTest("./tests/Avalonia.Visuals.UnitTests");
-            RunCoreTest("./tests/Avalonia.Skia.UnitTests");
-            RunCoreTest("./tests/Avalonia.ReactiveUI.UnitTests");
+            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");
         });
 
     Target RunRenderTests => _ => _
-        .OnlyWhen(() => !Parameters.SkipTests)
+        .OnlyWhenStatic(() => !Parameters.SkipTests)
         .DependsOn(Compile)
         .Executes(() =>
         {
-            RunCoreTest("./tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj");
+            RunCoreTest("Avalonia.Skia.RenderTests");
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                RunCoreTest("./tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj");
+                RunCoreTest("Avalonia.Direct2D1.RenderTests");
         });
-    
+
     Target RunDesignerTests => _ => _
-        .OnlyWhen(() => !Parameters.SkipTests && Parameters.IsRunningOnWindows)
+        .OnlyWhenStatic(() => !Parameters.SkipTests && Parameters.IsRunningOnWindows)
         .DependsOn(Compile)
         .Executes(() =>
         {
-            RunCoreTest("./tests/Avalonia.DesignerSupport.Tests");
+            RunCoreTest("Avalonia.DesignerSupport.Tests");
         });
 
     [PackageExecutable("JetBrains.dotMemoryUnit", "dotMemoryUnit.exe")] readonly Tool DotMemoryUnit;
 
     Target RunLeakTests => _ => _
-        .OnlyWhen(() => !Parameters.SkipTests && Parameters.IsRunningOnWindows)
+        .OnlyWhenStatic(() => !Parameters.SkipTests && Parameters.IsRunningOnWindows)
         .DependsOn(Compile)
         .Executes(() =>
         {
@@ -234,7 +301,7 @@ partial class Build : NukeBuild
         });
 
     Target ZipFiles => _ => _
-        .After(CreateNugetPackages, Compile, RunCoreLibsTests, Package)    
+        .After(CreateNugetPackages, Compile, RunCoreLibsTests, Package)
         .Executes(() =>
         {
             var data = Parameters;
@@ -258,47 +325,59 @@ partial class Build : NukeBuild
                 MsBuildCommon(Parameters.MSBuildSolution, c => c
                     .AddTargets("Pack"));
             else
-                DotNetPack(Parameters.MSBuildSolution, c =>
-                    c.SetConfiguration(Parameters.Configuration)
-                        .AddProperty("PackageVersion", Parameters.Version));
+                DotNetPack(c => c
+                    .SetProject(Parameters.MSBuildSolution)
+                    .SetConfiguration(Parameters.Configuration)
+                    .AddProperty("PackageVersion", Parameters.Version));
         });
 
     Target CreateNugetPackages => _ => _
         .DependsOn(CreateIntermediateNugetPackages)
         .Executes(() =>
         {
+            BuildTasksPatcher.PatchBuildTasksInPackage(Parameters.NugetIntermediateRoot / "Avalonia.Build.Tasks." +
+                                                       Parameters.Version + ".nupkg");
             var config = Numerge.MergeConfiguration.LoadFile(RootDirectory / "nukebuild" / "numerge.config");
             EnsureCleanDirectory(Parameters.NugetRoot);
             if(!Numerge.NugetPackageMerger.Merge(Parameters.NugetIntermediateRoot, Parameters.NugetRoot, config,
                 new NumergeNukeLogger()))
                 throw new Exception("Package merge failed");
         });
-    
+
     Target RunTests => _ => _
         .DependsOn(RunCoreLibsTests)
         .DependsOn(RunRenderTests)
         .DependsOn(RunDesignerTests)
+        .DependsOn(RunHtmlPreviewerTests)
         .DependsOn(RunLeakTests);
-    
+
     Target Package => _ => _
         .DependsOn(RunTests)
         .DependsOn(CreateNugetPackages);
-    
+
     Target CiAzureLinux => _ => _
         .DependsOn(RunTests);
-    
+
     Target CiAzureOSX => _ => _
         .DependsOn(Package)
         .DependsOn(ZipFiles);
-    
+
     Target CiAzureWindows => _ => _
         .DependsOn(Package)
         .DependsOn(ZipFiles);
 
-    
+
     public static int Main() =>
         RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
             ? Execute<Build>(x => x.Package)
             : Execute<Build>(x => x.RunTests);
 
 }
+
+public static class ToolSettingsExtensions
+{
+    public static T Apply<T>(this T settings, Configure<T> configurator)
+    {
+        return configurator != null ? configurator(settings) : settings;
+    }
+}
diff --git a/nukebuild/BuildParameters.cs b/nukebuild/BuildParameters.cs
index 65ba5e9756..c76019d9eb 100644
--- a/nukebuild/BuildParameters.cs
+++ b/nukebuild/BuildParameters.cs
@@ -4,28 +4,29 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Xml.Linq;
 using Nuke.Common;
-using Nuke.Common.BuildServers;
-using Nuke.Common.Execution;
+using Nuke.Common.CI.AzurePipelines;
 using Nuke.Common.IO;
-using static Nuke.Common.IO.FileSystemTasks;
 using static Nuke.Common.IO.PathConstruction;
-using static Nuke.Common.Tools.MSBuild.MSBuildTasks;
 
 public partial class Build
 {
     [Parameter("configuration")]
     public string Configuration { get; set; }
-    
+
     [Parameter("skip-tests")]
     public bool SkipTests { get; set; }
-    
+
     [Parameter("force-nuget-version")]
     public string ForceNugetVersion { get; set; }
-    
+
+    [Parameter("skip-previewer")]
+    public bool SkipPreviewer { get; set; }
+
     public class BuildParameters
     {
         public string Configuration { get; }
         public bool SkipTests { get; }
+        public bool SkipPreviewer {get;}
         public string MainRepo { get; }
         public string MasterBranch { get; }
         public string RepositoryName { get; }
@@ -61,11 +62,12 @@ public partial class Build
         public AbsolutePath ZipTargetControlCatalogDesktopDir { get; }
 
 
-       public BuildParameters(Build b)
+        public BuildParameters(Build b)
         {
             // ARGUMENTS
             Configuration = b.Configuration ?? "Release";
             SkipTests = b.SkipTests;
+            SkipPreviewer = b.SkipPreviewer;
 
             // CONFIGURATION
             MainRepo = "https://github.com/AvaloniaUI/Avalonia";
@@ -79,15 +81,15 @@ public partial class Build
             IsRunningOnUnix = Environment.OSVersion.Platform == PlatformID.Unix ||
                               Environment.OSVersion.Platform == PlatformID.MacOSX;
             IsRunningOnWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
-            IsRunningOnAzure = Host == HostType.TeamServices ||
+            IsRunningOnAzure = Host == HostType.AzurePipelines ||
                                Environment.GetEnvironmentVariable("LOGNAME") == "vsts";
 
             if (IsRunningOnAzure)
             {
-                RepositoryName = TeamServices.Instance.RepositoryUri;
-                RepositoryBranch = TeamServices.Instance.SourceBranch;
-                IsPullRequest = TeamServices.Instance.PullRequestId.HasValue;
-                IsMainRepo = StringComparer.OrdinalIgnoreCase.Equals(MainRepo, TeamServices.Instance.RepositoryUri);
+                RepositoryName = AzurePipelines.Instance.RepositoryUri;
+                RepositoryBranch = AzurePipelines.Instance.SourceBranch;
+                IsPullRequest = AzurePipelines.Instance.PullRequestId.HasValue;
+                IsMainRepo = StringComparer.OrdinalIgnoreCase.Equals(MainRepo, AzurePipelines.Instance.RepositoryUri);
             }
             IsMainRepo =
                 StringComparer.OrdinalIgnoreCase.Equals(MainRepo,
diff --git a/nukebuild/BuildTasksPatcher.cs b/nukebuild/BuildTasksPatcher.cs
new file mode 100644
index 0000000000..e3766ae23f
--- /dev/null
+++ b/nukebuild/BuildTasksPatcher.cs
@@ -0,0 +1,80 @@
+using System;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using ILRepacking;
+using Mono.Cecil;
+
+public class BuildTasksPatcher
+{
+    public static void PatchBuildTasksInPackage(string packagePath)
+    {
+        using (var archive = new ZipArchive(File.Open(packagePath, FileMode.Open, FileAccess.ReadWrite),
+            ZipArchiveMode.Update))
+        {
+
+            foreach (var entry in archive.Entries.ToList())
+            {
+                if (entry.Name == "Avalonia.Build.Tasks.dll")
+                {
+                    var temp = Path.Combine(Path.GetTempPath(), Guid.NewGuid() + ".dll");
+                    var output = temp + ".output";
+                    var patched = new MemoryStream();
+                    try
+                    {
+                        entry.ExtractToFile(temp, true);
+                        var repack = new ILRepacking.ILRepack(new RepackOptions()
+                        {
+                            Internalize = true,
+                            InputAssemblies = new[]
+                            {
+                                temp, typeof(Mono.Cecil.AssemblyDefinition).Assembly.GetModules()[0]
+                                    .FullyQualifiedName,
+                                typeof(Mono.Cecil.Rocks.MethodBodyRocks).Assembly.GetModules()[0].FullyQualifiedName,
+                                typeof(Mono.Cecil.Pdb.PdbReaderProvider).Assembly.GetModules()[0].FullyQualifiedName,
+                                typeof(Mono.Cecil.Mdb.MdbReaderProvider).Assembly.GetModules()[0].FullyQualifiedName
+                                
+                            },
+                            SearchDirectories = new string[0],
+                            OutputFile = output
+                        });
+                        repack.Repack();
+
+
+                        // 'hurr-durr assembly with the same name is already loaded' prevention
+                        using (var asm = AssemblyDefinition.ReadAssembly(output,
+                            new ReaderParameters { ReadWrite = true, InMemory = true, }))
+                        {
+                            asm.Name = new AssemblyNameDefinition(
+                                "Avalonia.Build.Tasks."
+                                + Guid.NewGuid().ToString().Replace("-", ""),
+                                new Version(0, 0, 0));
+                            asm.Write(patched);
+                            patched.Position = 0;
+                        }
+                    }
+                    finally
+                    {
+                        try
+                        {
+                            if (File.Exists(temp))
+                                File.Delete(temp);
+                            if (File.Exists(output))
+                                File.Delete(output);
+                        }
+                        catch
+                        {
+                            //ignore
+                        }
+                    }
+
+                    var fn = entry.FullName;
+                    entry.Delete();
+                    var newEntry = archive.CreateEntry(fn, CompressionLevel.Optimal);
+                    using (var s = newEntry.Open())
+                        patched.CopyTo(s);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/nukebuild/MicroComGen.cs b/nukebuild/MicroComGen.cs
new file mode 100644
index 0000000000..06c8acbf23
--- /dev/null
+++ b/nukebuild/MicroComGen.cs
@@ -0,0 +1,14 @@
+using System.IO;
+using MicroComGenerator;
+using Nuke.Common;
+
+partial class Build : NukeBuild
+{
+    Target GenerateCppHeaders => _ => _.Executes(() =>
+    {
+        var text = File.ReadAllText(RootDirectory / "src" / "Avalonia.Native" / "avn.idl");
+        var ast = AstParser.Parse(text);
+        File.WriteAllText(RootDirectory / "native" / "Avalonia.Native" / "inc" / "avalonia-native.h",
+            CppGen.GenerateCpp(ast));
+    });
+}
\ No newline at end of file
diff --git a/nukebuild/Numerge b/nukebuild/Numerge
index 4464343aef..aef10ae67d 160000
--- a/nukebuild/Numerge
+++ b/nukebuild/Numerge
@@ -1 +1 @@
-Subproject commit 4464343aef5c8ab7a42fcb20a483a6058199f8b8
+Subproject commit aef10ae67dc55c95f49b52a505a0be33bfa297a5
diff --git a/nukebuild/Shims.cs b/nukebuild/Shims.cs
index 461d617643..1ac14bf622 100644
--- a/nukebuild/Shims.cs
+++ b/nukebuild/Shims.cs
@@ -19,9 +19,9 @@ public partial class Build
         Logger.Info(info, args);
     }
 
-    private void Zip(PathConstruction.AbsolutePath target, params string[] paths) => Zip(target, paths.AsEnumerable());
+    private void Zip(AbsolutePath target, params string[] paths) => Zip(target, paths.AsEnumerable());
 
-    private void Zip(PathConstruction.AbsolutePath target, IEnumerable<string> paths)
+    private void Zip(AbsolutePath target, IEnumerable<string> paths)
     {
         var targetPath = target.ToString();
         bool finished = false, atLeastOneFileAdded = false;
@@ -38,7 +38,7 @@ public partial class Build
                         fileStream.CopyTo(entryStream);
                     atLeastOneFileAdded = true;
                 }
-                
+
                 foreach (var path in paths)
                 {
                     if (Directory.Exists(path))
@@ -64,7 +64,7 @@ public partial class Build
 
             finished = true;
         }
-        finally 
+        finally
         {
             try
             {
diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj
index 2a736e4653..b0380cc92b 100644
--- a/nukebuild/_build.csproj
+++ b/nukebuild/_build.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <RootNamespace></RootNamespace>
     <IsPackable>False</IsPackable>
@@ -10,21 +10,25 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="0.12.3" />
+    <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="vswhere" Version="2.6.7" Condition=" '$(OS)' == 'Windows_NT' " />
+    <PackageReference Include="ILRepack.NETStandard" Version="2.0.4" />
+    <!-- Keep in sync with Avalonia.Build.Tasks -->
+    <PackageReference Include="Mono.Cecil" Version="0.11.2" />
+    <PackageReference Include="Pharmacist.Core" Version="1.8.1" />
   </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="..\.nuke" />
     <None Include="..\global.json" Condition="Exists('..\global.json')" />
     <None Include="..\nuget.config" Condition="Exists('..\nuget.config')" />
     <None Include="..\Jenkinsfile" Condition="Exists('..\Jenkinsfile')" />
@@ -35,4 +39,8 @@
     <Compile Include="Numerge/Numerge/**/*.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\src\tools\MicroComGenerator\MicroComGenerator.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index 2c5a09bee7..75ee4a05cb 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -5,9 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj"/>
+      <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
       <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj" />
-
   </ItemGroup>
 
   <PropertyGroup>
@@ -15,9 +14,7 @@
   </PropertyGroup>
 
   <Target Name="AddDesignerHostAppsToPackage" BeforeTargets="GenerateNuspec">
-    <MSBuild Projects="$(DesignerHostAppPath)/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj"
-             Properties="Configuration=$(Configuration);
-                         Platform=$(Platform)" />
+    <MSBuild Projects="$(DesignerHostAppPath)/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj" Properties="Configuration=$(Configuration);&#xA;                         Platform=$(Platform)" />
 
     <ItemGroup>
       <_PackageFiles Include="$(DesignerHostAppPath)/Avalonia.Designer.HostApp/bin/$(Configuration)/netcoreapp2.0/Avalonia.Designer.HostApp.dll">
@@ -41,6 +38,10 @@
       <Pack>true</Pack>
       <PackagePath>build\</PackagePath>
     </Content>
+    <Content Include="AvaloniaItemSchema.xaml">
+      <Pack>true</Pack>
+      <PackagePath>build\</PackagePath>
+    </Content>
   </ItemGroup>
   <Import Project="..\..\build\SharedVersion.props" />
   <Import Project="..\..\build\NetFX.props" />
diff --git a/packages/Avalonia/AvaloniaBuildTasks.props b/packages/Avalonia/AvaloniaBuildTasks.props
index 30bafa37ee..deea3aa391 100644
--- a/packages/Avalonia/AvaloniaBuildTasks.props
+++ b/packages/Avalonia/AvaloniaBuildTasks.props
@@ -1,3 +1,11 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
+  <ItemGroup>
+    <AvailableItemName Include="AvaloniaXaml" />
+    <AvailableItemName Include="AvaloniaResource" />
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)AvaloniaItemSchema.xaml" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(EnableDefaultItems)'=='True'">
+    <AvaloniaXaml Include="**\*.axaml" SubType="Designer" />
+    <AvaloniaXaml Include="**\*.paml" SubType="Designer" />
+  </ItemGroup>
 </Project>
diff --git a/packages/Avalonia/AvaloniaBuildTasks.targets b/packages/Avalonia/AvaloniaBuildTasks.targets
index 552713f94b..45a7f1aa44 100644
--- a/packages/Avalonia/AvaloniaBuildTasks.targets
+++ b/packages/Avalonia/AvaloniaBuildTasks.targets
@@ -2,7 +2,24 @@
   <PropertyGroup>
     <_AvaloniaUseExternalMSBuild>$(AvaloniaUseExternalMSBuild)</_AvaloniaUseExternalMSBuild>
     <_AvaloniaUseExternalMSBuild Condition="'$(_AvaloniaForceInternalMSBuild)' == 'true'">false</_AvaloniaUseExternalMSBuild>
+    <AvaloniaXamlReportImportance Condition="'$(AvaloniaXamlReportImportance)' == ''">low</AvaloniaXamlReportImportance>
+    <_AvaloniaPatchComInterop Condition="'$(_AvaloniaPatchComInterop)' == ''">false</_AvaloniaPatchComInterop>
+    <_AvaloniaSkipXamlCompilation Condition="'$(_AvaloniaSkipXamlCompilation)' == ''">false</_AvaloniaSkipXamlCompilation>
   </PropertyGroup>
+
+  <!-- Unfortunately we have to update default items in .targets since custom nuget props are improted before Microsoft.NET.Sdk.DefaultItems.props -->
+  <ItemGroup Condition="'$(EnableDefaultItems)'=='True'">
+    <Compile Update="**\*.paml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="**\*.axaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <None Remove="**\*.axaml" />
+    <None Remove="**\*.paml" />
+  </ItemGroup>
   
   <UsingTask TaskName="GenerateAvaloniaResourcesTask"
              AssemblyFile="$(AvaloniaBuildTasksLocation)"
@@ -30,15 +47,19 @@
   
   <Target Name="GenerateAvaloniaResources" 
           BeforeTargets="CoreCompile;CoreResGen"
-          Inputs="@(AvaloniaResource);$(MSBuildAllProjects)"
+          Inputs="@(AvaloniaResource);@(AvaloniaXaml);$(MSBuildAllProjects)"
           Outputs="$(AvaloniaResourcesTemporaryFilePath)"
-          DependsOnTargets="$(BuildAvaloniaResourcesDependsOn)">
+	  DependsOnTargets="$(BuildAvaloniaResourcesDependsOn)">
+    <ItemGroup>
+        <AvaloniaResource Include="@(AvaloniaXaml)"/>
+    </ItemGroup>
     <GenerateAvaloniaResourcesTask
       Condition="'$(_AvaloniaUseExternalMSBuild)' != 'true'"
       Output="$(AvaloniaResourcesTemporaryFilePath)"
       Root="$(MSBuildProjectDirectory)"
       Resources="@(AvaloniaResource)"
-      EmbeddedResources="@(EmbeddedResources)"/>
+      EmbeddedResources="@(EmbeddedResources)"
+      ReportImportance="$(AvaloniaXamlReportImportance)"/>
     <Exec 
       Condition="'$(_AvaloniaUseExternalMSBuild)' == 'true'"
       Command="dotnet msbuild /nodereuse:false $(MSBuildProjectFile) /t:GenerateAvaloniaResources /p:_AvaloniaForceInternalMSBuild=true /p:Configuration=$(Configuration) /p:TargetFramework=$(TargetFramework) /p:BuildProjectReferences=false"/>
@@ -67,6 +88,12 @@
       OriginalCopyPath="$(AvaloniaXamlOriginalCopyFilePath)"
       ProjectDirectory="$(MSBuildProjectDirectory)"
       VerifyIl="$(AvaloniaXamlIlVerifyIl)"
+      ReportImportance="$(AvaloniaXamlReportImportance)"
+      AssemblyOriginatorKeyFile="$(AssemblyOriginatorKeyFile)"
+      SignAssembly="$(SignAssembly)"
+      DelaySign="$(DelaySign)"
+      EnableComInteropPatching="$(_AvaloniaPatchComInterop)"
+      SkipXamlCompilation="$(_AvaloniaSkipXamlCompilation)"
     />
     <Exec
       Condition="'$(_AvaloniaUseExternalMSBuild)' == 'true'"
@@ -76,5 +103,6 @@
   
   <ItemGroup>
     <UpToDateCheckInput Include="@(AvaloniaResource)" />
+    <UpToDateCheckInput Include="@(AvaloniaXaml)" />
   </ItemGroup>
 </Project>
diff --git a/packages/Avalonia/AvaloniaItemSchema.xaml b/packages/Avalonia/AvaloniaItemSchema.xaml
new file mode 100644
index 0000000000..a51ea3c0be
--- /dev/null
+++ b/packages/Avalonia/AvaloniaItemSchema.xaml
@@ -0,0 +1,18 @@
+<ProjectSchemaDefinitions xmlns="http://schemas.microsoft.com/build/2009/properties">
+    <ContentType
+        Name="AvaloniaXaml"
+        DisplayName="Avalonia XAML"
+        ItemType="AvaloniaXaml">
+      <NameValuePair Name="DependentFileExtensions" Value=".cs" />
+      <NameValuePair Name="DefaultMetadata_SubType" Value="Designer" />
+    </ContentType>
+
+    <ItemType Name="AvaloniaXaml" DisplayName="Avalonia XAML" />
+    <FileExtension Name=".axaml" ContentType="AvaloniaXaml" />
+    <FileExtension Name=".paml" ContentType="AvaloniaXaml" />
+    <ContentType
+        Name="AvaloniaResource"
+        DisplayName="Avalonia Resource"
+        ItemType="AvaloniaResource"
+    />
+</ProjectSchemaDefinitions>
diff --git a/readme.md b/readme.md
index 512b35a454..cfa08149cb 100644
--- a/readme.md
+++ b/readme.md
@@ -1,28 +1,26 @@
-<img src='https://avatars2.githubusercontent.com/u/14075148?s=200&v=4' width='100' />
+[![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) 
 
-# Avalonia
+<img alt="Avalonia" src="https://user-images.githubusercontent.com/6759207/84897744-cab6d800-b0ae-11ea-8214-e5174d71f5c8.png" width="400"/>
 
-| Gitter Chat | Build Status (Win, Linux, OSX) | Open Collective | NuGet | MyGet |
-|---|---|---|---|---|
-|  [![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) | [![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) | [![NuGet](https://img.shields.io/nuget/v/Avalonia.svg)](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) |
+## 📖 About AvaloniaUI 
 
-## About
+Avalonia is a cross-platform XAML-based UI framework providing a flexible styling system and supporting a wide range of Operating Systems such as Windows via .NET Framework and .NET Core, Linux via Xorg, macOS. Avalonia is ready for **General-Purpose Desktop App Development**. However, there may be some bugs and breaking changes as we continue along into this project's development. 
 
-**Avalonia** is a WPF/UWP-inspired cross-platform XAML-based UI framework providing a flexible styling system and supporting a wide range of Operating Systems such as Windows (.NET Framework, .NET Core), Linux (via Xorg), macOS and with experimental support for Android and iOS.
+<img src="https://user-images.githubusercontent.com/6759207/84751662-7c79da00-afc5-11ea-8780-dda28db70b76.png" width="700" />
 
-**Avalonia** is ready for **General-Purpose Desktop App Development**. However, there may be some bugs and breaking changes as we continue along into this project's development. To see the status of some of our features, please see our [Roadmap here](https://github.com/AvaloniaUI/Avalonia/issues/2239).
+([Xaml Control Gallery](https://github.com/AvaloniaUI/xamlcontrolsgallery))
 
-| Control catalog | Desktop platforms | Mobile platforms |
-|---|---|---|
-| <a href='https://youtu.be/wHcB3sGLVYg'><img width='300' src='http://avaloniaui.net/images/screen.png'></a> | <a href='https://www.youtube.com/watch?t=28&v=c_AB_XSILp0' target='_blank'><img width='300' src='http://avaloniaui.net/images/avalonia-video.png'></a> | <a href='https://www.youtube.com/watch?v=NJ9-hnmUbBM' target='_blank'><img width='300' src='https://i.ytimg.com/vi/NJ9-hnmUbBM/hqdefault.jpg'></a> |
+> **Note:** The UI theme you see in the picture above is still work-in-progress and will be available in the upcoming Avalonia 0.10.0 release. However, you can connect to our nightly build feed and install latest pre-release versions of Avalonia NuGet packages, if you are willing to help out with the development and testing. See [Using nightly build feed](https://github.com/AvaloniaUI/Avalonia/wiki/Using-nightly-build-feed) for more info.
 
-## Getting Started
+To see the status of some of our features, please see our [Roadmap](https://github.com/AvaloniaUI/Avalonia/issues/2239). You can also see what [breaking changes](https://github.com/AvaloniaUI/Avalonia/issues/3538) we have planned and what our [past breaking changes](https://github.com/AvaloniaUI/Avalonia/wiki/Breaking-Changes) have been. [Awesome Avalonia](https://github.com/AvaloniaCommunity/awesome-avalonia) is community-curated list of awesome Avalonia UI tools, libraries, projects and resources. Go and see what people are building with Avalonia!
 
-Avalonia [Visual Studio Extension](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.AvaloniaforVisualStudio) contains project and control templates that will help you get started. After installing it, open "New Project" dialog in Visual Studio, choose "Avalonia" in "Visual C#" section, select "Avalonia .NET Core Application" and press OK (<a href="http://avaloniaui.net/docs/quickstart/images/new-project-dialog.png">screenshot</a>). Now you can write code and markup that will work on multiple platforms!
+## 🚀 Getting Started
 
-For those without Visual Studio, a starter guide for .NET Core CLI can be found [here](http://avaloniaui.net/docs/quickstart/create-new-project#net-core).
+The Avalonia [Visual Studio Extension](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.AvaloniaforVisualStudio) contains project and control templates that will help you get started, or you can use the .NET Core CLI. For a starter guide see our [documentation](https://avaloniaui.net/docs/quickstart/create-new-project).
 
-Avalonia is delivered via <b>NuGet</b> package manager. You can find the packages here: ([stable(ish)](https://www.nuget.org/packages/Avalonia/), [nightly](https://github.com/AvaloniaUI/Avalonia/wiki/Using-nightly-build-feed))
+Avalonia is delivered via <b>NuGet</b> package manager. You can find the packages here: https://www.nuget.org/packages/Avalonia/
 
 Use these commands in the Package Manager console to install Avalonia manually:
 ```
@@ -30,32 +28,57 @@ Install-Package Avalonia
 Install-Package Avalonia.Desktop
 ```
 
-## Bleeding Edge Builds
+## Showcase
 
-or use nightly build feeds as described here:
-https://github.com/AvaloniaUI/Avalonia/wiki/Using-nightly-build-feed
+Examples of UIs built with Avalonia
+![image](https://user-images.githubusercontent.com/4672627/84707589-5b69a880-af35-11ea-87a6-7ad57a31d314.png)
 
-## Documentation
+([Synfonia](https://github.com/jmacato/Synfonia))
+
+![image](https://user-images.githubusercontent.com/4672627/85069644-d8419000-b18a-11ea-8732-be9055bb61fd.PNG)
+([Xaml Control Gallery](https://github.com/AvaloniaUI/xamlcontrolsgallery))
+
+![image](https://user-images.githubusercontent.com/4672627/85069659-dc6dad80-b18a-11ea-8375-39ef95315b5c.PNG)
+([Xaml Control Gallery](https://github.com/AvaloniaUI/xamlcontrolsgallery))
+
+![image](https://user-images.githubusercontent.com/4672627/84708947-c3b98980-af37-11ea-8c9d-503334615bbf.png)
+([Xaml Control Gallery](https://github.com/AvaloniaUI/xamlcontrolsgallery))
 
-You can take a look at the [getting started page](http://avaloniaui.net/docs/quickstart/) for an overview of how to get started but probably the best thing to do for now is to already know a little bit about WPF/Silverlight/UWP/XAML and ask questions in our [Gitter room](https://gitter.im/AvaloniaUI/Avalonia). 
+## JetBrains Rider
 
-There's also a high-level [architecture document](http://avaloniaui.net/architecture/project-structure) that is currently a little bit out of date, and I've also started writing blog posts on Avalonia at http://grokys.github.io/.
+[JetBrains Rider](https://www.jetbrains.com/rider/whatsnew/?mkt_tok=eyJpIjoiTURBNU1HSmhNV0kwTUdFMiIsInQiOiJtNnU2VEc1TlNLa1ZRVkROYmdZYVpYREJsaU1qdUhmS3dxSzRHczdYWHl0RVlTNDMwSFwvNUs3VENTNVM0bVcyNFdaRmVYZzVWTTF1N3VrQWNGTkJreEhlam1hMlB4UVVWcHBGM1dNOUxoXC95YnRQdGgyUXl1YmZCM3h3d3BVWWdBIn0%3D#avalonia-support) now has official support for Avalonia.
 
-Contributions for our docs are always welcome!
+Code completion, inspections and refactorings are supported out of the box, for XAML previewer add `https://plugins.jetbrains.com/plugins/dev/14839` to plugin repositories and install [AvaloniaRider](https://github.com/ForNeVeR/AvaloniaRider) plugin.
+
+## Bleeding Edge Builds
+
+We also have a [nightly build](https://github.com/AvaloniaUI/Avalonia/wiki/Using-nightly-build-feed) which tracks the current state of master. Although these packages are less stable than the release on NuGet.org, you'll get all the latest features and bugfixes right away and many of our users actually prefer this feed!
+
+## Documentation
+
+Documentation can be found on our website at https://avaloniaui.net/docs/. We also have a [tutorial](https://avaloniaui.net/docs/tutorial/) over there for newcomers.
 
 ## Building and Using
 
-See the [build instructions here](http://avaloniaui.net/contributing/build).
+See the [build instructions here](Documentation/build.md).
 
 ## Contributing
 
-Please read the [contribution guidelines](http://avaloniaui.net/contributing/contributing) before submitting a pull request.
+Please read the [contribution guidelines](CONTRIBUTING.md) before submitting a pull request.
 
-### Contributors
+## Code of Conduct
 
-This project exists thanks to all the people who contribute. [[Contribute](http://avaloniaui.net/contributing/contributing)].
-<a href="https://github.com/AvaloniaUI/Avalonia/graphs/contributors"><img src="https://opencollective.com/Avalonia/contributors.svg?width=890&button=false" /></a>
+This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behavior in our community.
+For more information see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct). 
+
+## Licence
 
+Avalonia is licenced under the [MIT licence](licence.md).
+
+## Contributors
+
+This project exists thanks to all the people who contribute. [[Contribute](https://avaloniaui.net/contributing)].
+<a href="https://github.com/AvaloniaUI/Avalonia/graphs/contributors"><img src="https://opencollective.com/Avalonia/contributors.svg?width=890&button=false" /></a>
 
 ### Backers
 
@@ -63,7 +86,6 @@ Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com
 
 <a href="https://opencollective.com/Avalonia#backers" target="_blank"><img src="https://opencollective.com/Avalonia/backers.svg?width=890"></a>
 
-
 ### Sponsors
 
 Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/Avalonia#sponsor)]
@@ -78,3 +100,7 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 <a href="https://opencollective.com/Avalonia/sponsor/7/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/7/avatar.svg"></a>
 <a href="https://opencollective.com/Avalonia/sponsor/8/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/8/avatar.svg"></a>
 <a href="https://opencollective.com/Avalonia/sponsor/9/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/9/avatar.svg"></a> 
+
+## .NET Foundation
+
+This project is supported by the [.NET Foundation](https://dotnetfoundation.org).
diff --git a/samples/BindingDemo/App.xaml.cs b/samples/BindingDemo/App.xaml.cs
index f2f44cd502..8a5364c70b 100644
--- a/samples/BindingDemo/App.xaml.cs
+++ b/samples/BindingDemo/App.xaml.cs
@@ -1,10 +1,6 @@
-using System;
 using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Logging.Serilog;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using Avalonia.ReactiveUI;
-using Serilog;
 
 namespace BindingDemo
 {
@@ -15,13 +11,19 @@ namespace BindingDemo
             AvaloniaXamlLoader.Load(this);
         }
 
-        private static void Main()
+        public override void OnFrameworkInitializationCompleted()
         {
-            AppBuilder.Configure<App>()
-                .UsePlatformDetect()
-                .UseReactiveUI()
-                .LogToDebug()
-                .Start<MainWindow>();
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                desktop.MainWindow = new MainWindow();
+            base.OnFrameworkInitializationCompleted();
         }
+
+        public static int Main(string[] args)
+            => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+
+        public static AppBuilder BuildAvaloniaApp()
+          => AppBuilder.Configure<App>()
+                .UsePlatformDetect()
+                .LogToTrace();
     }
 }
diff --git a/samples/BindingDemo/BindingDemo.csproj b/samples/BindingDemo/BindingDemo.csproj
index 3005fdbc51..d898b737a9 100644
--- a/samples/BindingDemo/BindingDemo.csproj
+++ b/samples/BindingDemo/BindingDemo.csproj
@@ -1,17 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
     <ProjectReference Include="..\..\src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj" />
+    <ProjectReference Include="..\MiniMvvm\MiniMvvm.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\SampleApp.props" />
   <Import Project="..\..\build\EmbedXaml.props" />
-  <Import Project="..\..\build\Serilog.props" />
   <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\ReactiveUI.props" />
   <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" />
   <Import Project="..\..\build\ReferenceCoreLibraries.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
diff --git a/samples/BindingDemo/MainWindow.xaml b/samples/BindingDemo/MainWindow.xaml
index b57a9a0a9e..b583503327 100644
--- a/samples/BindingDemo/MainWindow.xaml
+++ b/samples/BindingDemo/MainWindow.xaml
@@ -5,7 +5,8 @@
         xmlns:local="clr-namespace:BindingDemo"
         Title="AvaloniaUI Bindings Test"
         Width="800"
-        Height="600">
+        Height="600"
+        x:DataType="vm:MainWindowViewModel">
   <Window.Styles>
     <Style Selector="TextBlock.h1">
       <Setter Property="FontSize" Value="18"/>
@@ -60,7 +61,7 @@
             <TextBlock FontSize="16" Text="Scheduler"/>
             <TextBox Watermark="Background Thread" Text="{Binding CurrentTime, Mode=OneWay}"/>
             <TextBlock FontSize="16" Text="Stream Operator"/>
-            <TextBox Watermark="StreamOperator" Text="{Binding CurrentTimeObservable^, Mode=OneWay}"/>
+            <TextBox Watermark="StreamOperator" Text="{CompiledBinding CurrentTimeObservable^, Mode=OneWay}"/>
           </StackPanel>
         </StackPanel>
       </StackPanel>
@@ -74,11 +75,11 @@
         </StackPanel.DataTemplates>
         <StackPanel Margin="18" Spacing="4" Width="200">
           <TextBlock FontSize="16" Text="Multiple"/>
-          <ListBox Items="{Binding Items}" SelectionMode="Multiple" SelectedItems="{Binding SelectedItems}"/>
+          <ListBox Items="{Binding Items}" SelectionMode="Multiple" Selection="{Binding Selection}"/>
         </StackPanel>
         <StackPanel Margin="18" Spacing="4" Width="200">
           <TextBlock FontSize="16" Text="Multiple"/>
-          <ListBox Items="{Binding Items}" SelectionMode="Multiple" SelectedItems="{Binding SelectedItems}"/>
+          <ListBox Items="{Binding Items}" SelectionMode="Multiple" Selection="{Binding Selection}"/>
         </StackPanel>
         <ContentControl Content="{Binding SelectedItems[0]}">
           <ContentControl.DataTemplates>
@@ -115,6 +116,7 @@
         <RadioButton Content="Radio Button" IsChecked="{Binding !!BooleanFlag, Mode=OneWay}" Command="{Binding StringValueCommand}" CommandParameter="RadioButton"/>
         <TextBox Text="{Binding Path=StringValue}"/>
         <Button Content="Nested View Model Button" Name="NestedTest" Command="{Binding NestedModel.Command}" />
+        <Button Content="Command Method Do" Command="{Binding Do}" x:Name="ToDo"/>
       </StackPanel>
     </TabItem>
   </TabControl>
diff --git a/samples/BindingDemo/ViewModels/DataAnnotationsErrorViewModel.cs b/samples/BindingDemo/ViewModels/DataAnnotationsErrorViewModel.cs
index e274f9180e..391d1791d3 100644
--- a/samples/BindingDemo/ViewModels/DataAnnotationsErrorViewModel.cs
+++ b/samples/BindingDemo/ViewModels/DataAnnotationsErrorViewModel.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace BindingDemo.ViewModels
 {
diff --git a/samples/BindingDemo/ViewModels/ExceptionErrorViewModel.cs b/samples/BindingDemo/ViewModels/ExceptionErrorViewModel.cs
index df80931367..7de083351e 100644
--- a/samples/BindingDemo/ViewModels/ExceptionErrorViewModel.cs
+++ b/samples/BindingDemo/ViewModels/ExceptionErrorViewModel.cs
@@ -1,12 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using ReactiveUI;
+using MiniMvvm;
 using System;
 
 namespace BindingDemo.ViewModels
 {
-    public class ExceptionErrorViewModel : ReactiveObject
+    public class ExceptionErrorViewModel : ViewModelBase
     {
         private int _lessThan10;
 
diff --git a/samples/BindingDemo/ViewModels/IndeiErrorViewModel.cs b/samples/BindingDemo/ViewModels/IndeiErrorViewModel.cs
index bb3b4d64e9..9ae8d9558f 100644
--- a/samples/BindingDemo/ViewModels/IndeiErrorViewModel.cs
+++ b/samples/BindingDemo/ViewModels/IndeiErrorViewModel.cs
@@ -1,14 +1,11 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using ReactiveUI;
+using MiniMvvm;
 using System;
 using System.ComponentModel;
 using System.Collections;
 
 namespace BindingDemo.ViewModels
 {
-    public class IndeiErrorViewModel : ReactiveObject, INotifyDataErrorInfo
+    public class IndeiErrorViewModel : ViewModelBase, INotifyDataErrorInfo
     {
         private int _maximum = 10;
         private int _value;
diff --git a/samples/BindingDemo/ViewModels/MainWindowViewModel.cs b/samples/BindingDemo/ViewModels/MainWindowViewModel.cs
index 22d01e0765..18a7a01a69 100644
--- a/samples/BindingDemo/ViewModels/MainWindowViewModel.cs
+++ b/samples/BindingDemo/ViewModels/MainWindowViewModel.cs
@@ -5,11 +5,14 @@ using System.Reactive;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using System.Threading;
-using ReactiveUI;
+using MiniMvvm;
+using Avalonia.Controls;
+using Avalonia.Metadata;
+using Avalonia.Controls.Selection;
 
 namespace BindingDemo.ViewModels
 {
-    public class MainWindowViewModel : ReactiveObject
+    public class MainWindowViewModel : ViewModelBase
     {
         private string _booleanString = "True";
         private double _doubleValue = 5.0;
@@ -27,15 +30,15 @@ namespace BindingDemo.ViewModels
                     Detail = "Item " + x + " details",
                 }));
 
-            SelectedItems = new ObservableCollection<TestItem>();
+            Selection = new SelectionModel<TestItem> { SingleSelect = false };
 
-            ShuffleItems = ReactiveCommand.Create(() =>
+            ShuffleItems = MiniCommand.Create(() =>
             {
                 var r = new Random();
                 Items.Move(r.Next(Items.Count), 1);
             });
 
-            StringValueCommand = ReactiveCommand.Create<object>(param =>
+            StringValueCommand = MiniCommand.Create<object>(param =>
             {
                 BooleanFlag = !BooleanFlag;
                 StringValue = param.ToString();
@@ -52,12 +55,12 @@ namespace BindingDemo.ViewModels
             });
 
             CurrentTimeObservable = Observable.Timer(TimeSpan.Zero, TimeSpan.FromSeconds(1))
-                .Select(x => DateTimeOffset.Now.ToString());
+                .Select(x => DateTimeOffset.Now);
         }
 
         public ObservableCollection<TestItem> Items { get; }
-        public ObservableCollection<TestItem> SelectedItems { get; }
-        public ReactiveCommand<Unit, Unit> ShuffleItems { get; }
+        public SelectionModel<TestItem> Selection { get; }
+        public MiniCommand ShuffleItems { get; }
 
         public string BooleanString
         {
@@ -89,8 +92,8 @@ namespace BindingDemo.ViewModels
             private set { this.RaiseAndSetIfChanged(ref _currentTime, value); }
         }
 
-        public IObservable<string> CurrentTimeObservable { get; }
-        public ReactiveCommand<object, Unit> StringValueCommand { get; }
+        public IObservable<DateTimeOffset> CurrentTimeObservable { get; }
+        public MiniCommand StringValueCommand { get; }
 
         public DataAnnotationsErrorViewModel DataAnnotationsValidation { get; } = new DataAnnotationsErrorViewModel();
         public ExceptionErrorViewModel ExceptionDataValidation { get; } = new ExceptionErrorViewModel();
@@ -101,5 +104,16 @@ namespace BindingDemo.ViewModels
             get { return _nested; }
             private set { this.RaiseAndSetIfChanged(ref _nested, value); }
         }
+
+        public void Do(object parameter)
+        {
+
+        }
+
+        [DependsOn(nameof(BooleanFlag))]
+        bool CanDo(object parameter)
+        {
+            return BooleanFlag;
+        }
     }
 }
diff --git a/samples/BindingDemo/ViewModels/NestedCommandViewModel.cs b/samples/BindingDemo/ViewModels/NestedCommandViewModel.cs
index 0e9139ab98..1c2222b0b0 100644
--- a/samples/BindingDemo/ViewModels/NestedCommandViewModel.cs
+++ b/samples/BindingDemo/ViewModels/NestedCommandViewModel.cs
@@ -1,18 +1,18 @@
-using ReactiveUI;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
+using MiniMvvm;
 
 namespace BindingDemo.ViewModels
 {
-    public class NestedCommandViewModel : ReactiveObject
+    public class NestedCommandViewModel : ViewModelBase
     {
         public NestedCommandViewModel()
         {
-            Command = ReactiveCommand.Create(() => { });
+            Command = MiniCommand.Create(() => { });
         }
 
         public ICommand Command { get; }
diff --git a/samples/BindingDemo/ViewModels/TestItem.cs b/samples/BindingDemo/ViewModels/TestItem.cs
index 5a9f192f58..2f49a3c99f 100644
--- a/samples/BindingDemo/ViewModels/TestItem.cs
+++ b/samples/BindingDemo/ViewModels/TestItem.cs
@@ -1,8 +1,8 @@
-using ReactiveUI;
+using MiniMvvm;
 
 namespace BindingDemo.ViewModels
 {
-    public class TestItem : ReactiveObject
+    public class TestItem : ViewModelBase
     {
         private string _stringValue = "String Value";
         private string _detail;
diff --git a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
index 054de2a05f..c6405dabb6 100644
--- a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
+++ b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net461</TargetFramework>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,6 +11,5 @@
   </ItemGroup>
 
   <Import Project="..\..\build\SampleApp.props" />
-  <Import Project="..\..\build\Serilog.props" />
   <Import Project="..\..\build\NetFX.props" />
 </Project>
diff --git a/samples/ControlCatalog.Desktop/Program.cs b/samples/ControlCatalog.Desktop/Program.cs
index 2a8d288614..7b8b27fff7 100644
--- a/samples/ControlCatalog.Desktop/Program.cs
+++ b/samples/ControlCatalog.Desktop/Program.cs
@@ -2,31 +2,23 @@ using System;
 using System.Linq;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Logging.Serilog;
 using Avalonia.Platform;
-using Avalonia.ReactiveUI;
-using Serilog;
 
 namespace ControlCatalog
 {
     internal class Program
     {
         [STAThread]
-        static void Main(string[] args)
-        {
-            // TODO: Make this work with GTK/Skia/Cairo depending on command-line args
-            // again.
-            BuildAvaloniaApp().Start<MainWindow>();
-        }
+        public 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>()
-                .LogToDebug()
-                .UsePlatformDetect()
-                .UseReactiveUI();
+                .LogToTrace()
+                .UsePlatformDetect();
 
         private static void ConfigureAssetAssembly(AppBuilder builder)
         {
diff --git a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
index 7919c3ac5a..d5aedf7783 100644
--- a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
+++ b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
@@ -2,17 +2,17 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
   </PropertyGroup>
 
   <ItemGroup>
+    <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.Desktop\Avalonia.Desktop.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.X11\Avalonia.X11.csproj" />
-    <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2019013001"/>
+    <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2020091801" />
   </ItemGroup>
 
 
diff --git a/samples/ControlCatalog.NetCore/Program.cs b/samples/ControlCatalog.NetCore/Program.cs
index 854cae484c..d7c5bd4415 100644
--- a/samples/ControlCatalog.NetCore/Program.cs
+++ b/samples/ControlCatalog.NetCore/Program.cs
@@ -3,9 +3,14 @@ using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 using Avalonia;
-using Avalonia.ReactiveUI;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Dialogs;
+using Avalonia.Headless;
+using Avalonia.LogicalTree;
+using Avalonia.Threading;
 
 namespace ControlCatalog.NetCore
 {
@@ -40,6 +45,52 @@ namespace ControlCatalog.NetCore
                 SilenceConsole();
                 return builder.StartLinuxFbDev(args, scaling: GetScaling());
             }
+            else if (args.Contains("--vnc"))
+            {
+                return builder.StartWithHeadlessVncPlatform(null, 5901, args, ShutdownMode.OnMainWindowClose);
+            }
+            else if (args.Contains("--full-headless"))
+            {
+                return builder
+                    .UseHeadless(true)
+                    .AfterSetup(_ =>
+                    {
+                        DispatcherTimer.RunOnce(async () =>
+                        {
+                            var window = ((IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime)
+                                .MainWindow;
+                            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")
+                                    continue;
+                                Console.WriteLine("Selecting " + page.Header);
+                                tc.SelectedItem = page;
+                                await Task.Delay(500);
+                            }
+                            Console.WriteLine("Selecting the first page");
+                            tc.SelectedItem = tc.Items.OfType<object>().First();
+                            await Task.Delay(500);
+                            Console.WriteLine("Clicked through all pages, triggering GC");
+                            for (var c = 0; c < 3; c++)
+                            {
+                                GC.Collect(2, GCCollectionMode.Forced);
+                                await Task.Delay(500);
+                            }
+
+                            void FormatMem(string metric, long bytes)
+                            {
+                                Console.WriteLine(metric + ": " + bytes / 1024 / 1024 + "MB");
+                            }
+
+                            FormatMem("GC allocated bytes", GC.GetTotalMemory(true));
+                            FormatMem("WorkingSet64", Process.GetCurrentProcess().WorkingSet64);
+
+                        }, TimeSpan.FromSeconds(1));
+                    })
+                    .StartWithClassicDesktopLifetime(args);
+            }
             else if (args.Contains("--drm"))
             {
                 SilenceConsole();
@@ -62,12 +113,11 @@ namespace ControlCatalog.NetCore
                 })
                 .With(new Win32PlatformOptions
                 {
-                    EnableMultitouch = true,
-                    AllowEglInitialization = true
+                    EnableMultitouch = true
                 })
                 .UseSkia()
-                .UseReactiveUI()
-                .UseManagedSystemDialogs();
+                .UseManagedSystemDialogs()
+                .LogToTrace();
 
         static void SilenceConsole()
         {
diff --git a/samples/ControlCatalog.iOS/AppDelegate.cs b/samples/ControlCatalog.iOS/AppDelegate.cs
index a8fc6b30a0..f1c2241003 100644
--- a/samples/ControlCatalog.iOS/AppDelegate.cs
+++ b/samples/ControlCatalog.iOS/AppDelegate.cs
@@ -11,25 +11,8 @@ namespace ControlCatalog
     // User Interface of the application, as well as listening (and optionally responding) to 
     // application events from iOS.
     [Register("AppDelegate")]
-    public partial class AppDelegate : UIApplicationDelegate
+    public partial class AppDelegate : AvaloniaAppDelegate<App>
     {
-        public override UIWindow Window { get; set; }
-
-        //
-        // This method is invoked when the application has loaded and is ready to run. In this 
-        // method you should instantiate the window, load the UI into it and then make the window
-        // visible.
-        //
-        // You have 17 seconds to return from this method, or iOS will terminate your application.
-        //
-        public override bool FinishedLaunching(UIApplication uiapp, NSDictionary options)
-        {
-            AppBuilder.Configure<App>()
-                .UseiOS()
-                .UseSkia().SetupWithoutStarting();
-            Window = new AvaloniaWindow() {Content = new MainView(), StatusBarColor = Colors.LightSteelBlue};
-            Window.MakeKeyAndVisible();
-            return true;
-        }
+        
     }
-}
\ No newline at end of file
+}
diff --git a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
index 7596e4cfe2..db1e16166a 100644
--- a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
+++ b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
@@ -9,6 +9,10 @@
     <RootNamespace>ControlCatalog.iOS</RootNamespace>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
     <AssemblyName>ControlCatalogiOS</AssemblyName>
+    <MtouchEnableSGenConc>true</MtouchEnableSGenConc>
+    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+    <ProvisioningType>automatic</ProvisioningType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
     <DebugSymbols>true</DebugSymbols>
@@ -19,8 +23,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>i386</MtouchArch>
-    <MtouchLink>SdkOnly</MtouchLink>
+    <MtouchArch>x86_64</MtouchArch>
+    <MtouchLink>None</MtouchLink>
     <MtouchDebug>True</MtouchDebug>
     <MtouchSdkVersion>9.1</MtouchSdkVersion>
     <MtouchProfiling>False</MtouchProfiling>
@@ -43,7 +47,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchLink>None</MtouchLink>
-    <MtouchArch>i386</MtouchArch>
+    <MtouchArch>x86_64</MtouchArch>
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
@@ -173,8 +177,10 @@
       <Project>{d0a739b9-3c68-4ba6-a328-41606954b6bd}</Project>
       <Name>ControlCatalog</Name>
     </ProjectReference>
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.80.2-preview.33" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <Import Project="..\..\build\iOSWorkarounds.props" />
   <Import Project="..\..\build\LegacyProject.targets" />
+  <Import Project="..\..\build\SkiaSharp.props" />
+  <Import Project="..\..\build\HarfBuzzSharp.props" />
 </Project>
diff --git a/samples/ControlCatalog/App.xaml b/samples/ControlCatalog/App.xaml
index e40509dfda..6aad44c0d5 100644
--- a/samples/ControlCatalog/App.xaml
+++ b/samples/ControlCatalog/App.xaml
@@ -2,18 +2,25 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.App">
   <Application.Styles>
-    <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
-    <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
-    <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Default.xaml"/>
     <Style Selector="TextBlock.h1">
-      <Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}"/>
-      <Setter Property="FontWeight" Value="Medium"/>
+      <Setter Property="FontSize" Value="16" />
+      <Setter Property="FontWeight" Value="Medium" />
     </Style>
     <Style Selector="TextBlock.h2">
-      <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
+      <Setter Property="FontSize" Value="14" />
     </Style>
     <Style Selector="TextBlock.h3">
-      <Setter Property="FontSize" Value="{DynamicResource FontSizeSmall}"/>
+      <Setter Property="FontSize" Value="12" />
+    </Style>
+    <Style Selector="Label.h1">
+      <Setter Property="FontSize" Value="16" />
+      <Setter Property="FontWeight" Value="Medium" />
+    </Style>
+    <Style Selector="Label.h2">
+      <Setter Property="FontSize" Value="14" />
+    </Style>
+    <Style Selector="Label.h3">
+      <Setter Property="FontSize" Value="12" />
     </Style>
     <StyleInclude Source="/SideBar.xaml"/>
   </Application.Styles>
diff --git a/samples/ControlCatalog/App.xaml.cs b/samples/ControlCatalog/App.xaml.cs
index 958729e2e8..020fb2fff3 100644
--- a/samples/ControlCatalog/App.xaml.cs
+++ b/samples/ControlCatalog/App.xaml.cs
@@ -1,15 +1,88 @@
 using System;
 using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
+using Avalonia.Markup.Xaml.Styling;
+using Avalonia.Styling;
 
 namespace ControlCatalog
 {
     public class App : Application
     {
+        private static readonly StyleInclude DataGridFluent = new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
+        {
+            Source = new Uri("avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml")
+        };
+
+        private static readonly StyleInclude DataGridDefault = new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
+        {
+            Source = new Uri("avares://Avalonia.Controls.DataGrid/Themes/Default.xaml")
+        };
+
+        public static Styles FluentDark = new Styles
+        {
+            new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
+            {
+                Source = new Uri("avares://Avalonia.Themes.Fluent/FluentDark.xaml")
+            },
+            DataGridFluent
+        };
+
+        public static Styles FluentLight = new Styles
+        {
+            new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
+            {
+                Source = new Uri("avares://Avalonia.Themes.Fluent/FluentLight.xaml")
+            },
+            DataGridFluent
+        };
+
+        public static Styles DefaultLight = new Styles
+        {
+            new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
+            {
+                Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/Base.xaml")
+            },
+            new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
+            {
+                Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/BaseLight.xaml")
+            },
+            new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
+            {
+                Source = new Uri("avares://Avalonia.Themes.Default/Accents/BaseLight.xaml")
+            },
+            new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
+            {
+                Source = new Uri("avares://Avalonia.Themes.Default/DefaultTheme.xaml")
+            },
+            DataGridDefault
+        };
+
+        public static Styles DefaultDark = new Styles
+        {
+            new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
+            {
+                Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/Base.xaml")
+            },
+            new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
+            {
+                Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/BaseDark.xaml")
+            },
+            new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
+            {
+                Source = new Uri("avares://Avalonia.Themes.Default/Accents/BaseDark.xaml")
+            },
+            new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
+            {
+                Source = new Uri("avares://Avalonia.Themes.Default/DefaultTheme.xaml")
+            },
+            DataGridDefault
+        };
+
         public override void Initialize()
         {
+            Styles.Insert(0, FluentLight);
+
             AvaloniaXamlLoader.Load(this);
         }
 
@@ -19,7 +92,7 @@ namespace ControlCatalog
                 desktopLifetime.MainWindow = new MainWindow();
             else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewLifetime)
                 singleViewLifetime.MainView = new MainView();
-            
+
             base.OnFrameworkInitializationCompleted();
         }
     }
diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 4c2769bcc4..1aa926a2a6 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>    
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>    
   </PropertyGroup>
   <ItemGroup>
     <Compile Update="**\*.xaml.cs">
@@ -17,14 +18,15 @@
     <EmbeddedResource Include="Assets\Fonts\SourceSansPro-BoldItalic.ttf" />
     <EmbeddedResource Include="Assets\Fonts\SourceSansPro-Italic.ttf" />
     <EmbeddedResource Include="Assets\Fonts\SourceSansPro-Regular.ttf" />
+    <EmbeddedResource Include="Pages\teapot.bin" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
+    <ProjectReference Include="..\MiniMvvm\MiniMvvm.csproj" />
   </ItemGroup>
   
-  <Import Project="..\..\build\Serilog.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
 </Project>
diff --git a/samples/ControlCatalog/DecoratedWindow.xaml b/samples/ControlCatalog/DecoratedWindow.xaml
index 8e4c97b7f0..5251a2fa55 100644
--- a/samples/ControlCatalog/DecoratedWindow.xaml
+++ b/samples/ControlCatalog/DecoratedWindow.xaml
@@ -6,25 +6,21 @@
         <NativeMenu.Menu>
     <NativeMenu>
       <NativeMenuItem Header="Decorated">
-        <NativeMenuItem.Menu>
-          <NativeMenu>
-            <NativeMenuItem Header="Open"/>
-            <NativeMenuItem Header="Recent">
-              <NativeMenuItem.Menu>
-                <NativeMenu/>
-              </NativeMenuItem.Menu>
-            </NativeMenuItem>
-            <NativeMenuItem Header="Quit Avalonia" Gesture="CMD+Q"/>
-          </NativeMenu>
-        </NativeMenuItem.Menu>
+        <NativeMenu>
+          <NativeMenuItem Header="Open"/>
+          <NativeMenuItem Header="Recent">
+            <NativeMenuItem.Menu>
+              <NativeMenu/>
+            </NativeMenuItem.Menu>
+          </NativeMenuItem>
+          <NativeMenuItem Header="Quit Avalonia" Gesture="CMD+Q"/>
+        </NativeMenu>
       </NativeMenuItem>
       <NativeMenuItem Header="Edit">
-        <NativeMenuItem.Menu>
-          <NativeMenu>
-            <NativeMenuItem Header="Copy"/>
-            <NativeMenuItem Header="Paste"/>
-          </NativeMenu>
-        </NativeMenuItem.Menu>
+        <NativeMenu>
+          <NativeMenuItem Header="Copy"/>
+          <NativeMenuItem Header="Paste"/>
+        </NativeMenu>
       </NativeMenuItem>
     </NativeMenu>
   </NativeMenu.Menu>
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 874560a294..f001425964 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -1,10 +1,7 @@
 <UserControl xmlns="https://github.com/avaloniaui"
         xmlns:pages="clr-namespace:ControlCatalog.Pages"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="ControlCatalog.MainView"
-        Background="{DynamicResource ThemeBackgroundBrush}"
-        Foreground="{DynamicResource ThemeForegroundBrush}"
-        FontSize="{DynamicResource FontSizeNormal}">
+        x:Class="ControlCatalog.MainView">
   <Grid>
     <Grid.Styles>
         <Style Selector="TextBlock.h2">
@@ -14,6 +11,7 @@
         </Style>
     </Grid.Styles>  
     <TabControl Classes="sidebar" Name="Sidebar">
+      <TabItem Header="Acrylic"><pages:AcrylicPage/></TabItem>
       <TabItem Header="AutoCompleteBox"><pages:AutoCompleteBoxPage/></TabItem>
       <TabItem Header="Border"><pages:BorderPage/></TabItem>
       <TabItem Header="Button"><pages:ButtonPage/></TabItem>
@@ -29,35 +27,70 @@
                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
           <pages:DataGridPage/>
       </TabItem>
-      <TabItem Header="DatePicker"><pages:DatePickerPage/></TabItem>
+      <TabItem Header="Date/Time Picker">
+        <pages:DateTimePickerPage/>
+      </TabItem>
+      <TabItem Header="CalendarDatePicker">
+        <pages:CalendarDatePickerPage/></TabItem>
       <TabItem Header="Drag+Drop"><pages:DragAndDropPage/></TabItem>
       <TabItem Header="Expander"><pages:ExpanderPage/></TabItem>
-      <TabItem Header="Image"><pages:ImagePage/></TabItem>
+      <TabItem Header="Image"
+               ScrollViewer.VerticalScrollBarVisibility="Disabled"
+               ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+        <pages:ImagePage/>
+      </TabItem>
       <TabItem Header="ItemsRepeater"
                ScrollViewer.VerticalScrollBarVisibility="Disabled"
                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
         <pages:ItemsRepeaterPage/>
       </TabItem>
+      <TabItem Header="Label"><pages:LabelsPage/></TabItem>
       <TabItem Header="LayoutTransformControl"><pages:LayoutTransformControlPage/></TabItem>
-      <TabItem Header="ListBox"><pages:ListBoxPage/></TabItem>
+      <TabItem Header="ListBox"
+               ScrollViewer.VerticalScrollBarVisibility="Disabled">
+        <pages:ListBoxPage/>
+      </TabItem>
       <TabItem Header="Menu"><pages:MenuPage/></TabItem>
       <TabItem Header="Notifications"><pages:NotificationsPage/></TabItem>
 	    <TabItem Header="NumericUpDown"><pages:NumericUpDownPage/></TabItem>
+      <TabItem Header="OpenGL"><pages:OpenGlPage/></TabItem>
       <TabItem Header="Pointers (Touch)"><pages:PointersPage/></TabItem>
       <TabItem Header="ProgressBar"><pages:ProgressBarPage/></TabItem>
       <TabItem Header="RadioButton"><pages:RadioButtonPage/></TabItem>
+      <TabItem Header="RelativePanel"><pages:RelativePanelPage/></TabItem>
+      <TabItem Header="ScrollViewer"><pages:ScrollViewerPage/></TabItem>
       <TabItem Header="Slider"><pages:SliderPage/></TabItem>
+      <TabItem Header="SplitView"><pages:SplitViewPage/></TabItem>
       <TabItem Header="TabControl"><pages:TabControlPage/></TabItem>
       <TabItem Header="TabStrip"><pages:TabStripPage/></TabItem>
       <TabItem Header="TextBox"><pages:TextBoxPage/></TabItem>
+      <TabItem Header="TextBlock"><pages:TextBlockPage/></TabItem>
+      <TabItem Header="ToggleSwitch"><pages:ToggleSwitchPage/></TabItem>
       <TabItem Header="ToolTip"><pages:ToolTipPage/></TabItem>
       <TabItem Header="TreeView"><pages:TreeViewPage/></TabItem>
       <TabItem Header="Viewbox"><pages:ViewboxPage/></TabItem>
+      <TabItem Header="Window Customizations"><pages:WindowCustomizationsPage/></TabItem>
       <TabControl.Tag>
-        <ComboBox x:Name="Themes" SelectedIndex="0" Width="100" Margin="8" HorizontalAlignment="Right" VerticalAlignment="Bottom">
-            <ComboBoxItem>Light</ComboBoxItem>
-            <ComboBoxItem>Dark</ComboBoxItem>
-        </ComboBox>
+        <StackPanel Width="115" Spacing="4" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="8">
+          <ComboBox x:Name="Decorations" SelectedIndex="0">
+            <ComboBoxItem>No Decorations</ComboBoxItem>
+            <ComboBoxItem>Border Only</ComboBoxItem>
+            <ComboBoxItem>Full Decorations</ComboBoxItem>
+          </ComboBox>
+          <ComboBox x:Name="Themes" SelectedIndex="0">
+            <ComboBoxItem>Fluent - Light</ComboBoxItem>
+            <ComboBoxItem>Fluent - Dark</ComboBoxItem>
+            <ComboBoxItem>Simple - Light</ComboBoxItem>
+            <ComboBoxItem>Simple - Dark</ComboBoxItem>
+          </ComboBox>
+          <ComboBox x:Name="TransparencyLevels" SelectedIndex="{Binding TransparencyLevel}">
+            <ComboBoxItem>None</ComboBoxItem>
+            <ComboBoxItem>Transparent</ComboBoxItem>
+            <ComboBoxItem>Blur</ComboBoxItem>
+            <ComboBoxItem>AcrylicBlur</ComboBoxItem>
+          </ComboBox>
+          <ComboBox Items="{Binding WindowStates}" SelectedItem="{Binding WindowState}" />
+        </StackPanel>
       </TabControl.Tag>
     </TabControl>
   </Grid>
diff --git a/samples/ControlCatalog/MainView.xaml.cs b/samples/ControlCatalog/MainView.xaml.cs
index acb9bc5bc6..c84f2f06b6 100644
--- a/samples/ControlCatalog/MainView.xaml.cs
+++ b/samples/ControlCatalog/MainView.xaml.cs
@@ -32,30 +32,40 @@ namespace ControlCatalog
 
             }
 
-            var light = new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
-            {
-                Source = new Uri("resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default")
-            };
-            var dark = new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
-            {
-                Source = new Uri("resm:Avalonia.Themes.Default.Accents.BaseDark.xaml?assembly=Avalonia.Themes.Default")
-            };
-
-            
             var themes = this.Find<ComboBox>("Themes");
             themes.SelectionChanged += (sender, e) =>
             {
                 switch (themes.SelectedIndex)
                 {
                     case 0:
-                        Styles[0] = light;
+                        Application.Current.Styles[0] = App.FluentLight;
                         break;
                     case 1:
-                        Styles[0] = dark;
+                        Application.Current.Styles[0] = App.FluentDark;
+                        break;
+                    case 2:
+                        Application.Current.Styles[0] = App.DefaultLight;
+                        break;
+                    case 3:
+                        Application.Current.Styles[0] = App.DefaultDark;
                         break;
                 }
+            };            
+
+            var decorations = this.Find<ComboBox>("Decorations");
+            decorations.SelectionChanged += (sender, e) =>
+            {
+                if (VisualRoot is Window window)
+                    window.SystemDecorations = (SystemDecorations)decorations.SelectedIndex;
             };
-            Styles.Add(light);
+        }
+
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+            var decorations = this.Find<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 248f94082d..6a70bb082f 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -7,50 +7,76 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:vm="clr-namespace:ControlCatalog.ViewModels"
         xmlns:v="clr-namespace:ControlCatalog.Views"
-        x:Class="ControlCatalog.MainWindow">
-
+        ExtendClientAreaToDecorationsHint="{Binding ExtendClientAreaEnabled}"
+        ExtendClientAreaChromeHints="{Binding ChromeHints}"
+        ExtendClientAreaTitleBarHeightHint="{Binding TitleBarHeight}"
+        TransparencyLevelHint="{Binding TransparencyLevel}"        
+        x:Name="MainWindow"
+        x:Class="ControlCatalog.MainWindow" WindowState="{Binding WindowState, Mode=TwoWay}">
   <NativeMenu.Menu>
     <NativeMenu>
       <NativeMenuItem Header="File">
-        <NativeMenuItem.Menu>
-          <NativeMenu>
-            <NativeMenuItem Header="Open" Clicked="OnOpenClicked"/>
-            <NativeMenuItemSeperator/>
-            <NativeMenuItem Header="Recent">
-              <NativeMenuItem.Menu>
-                <NativeMenu/>
-              </NativeMenuItem.Menu>
-            </NativeMenuItem>
-            <NativeMenuItemSeperator/>
-            <NativeMenuItem Header="Quit Avalonia" Clicked="OnCloseClicked" Gesture="CMD+Q"/>
-          </NativeMenu>
-        </NativeMenuItem.Menu>
+        <NativeMenu>
+          <NativeMenuItem Icon="/Assets/test_icon.ico" Header="Open" Clicked="OnOpenClicked" Gesture="Ctrl+O"/>
+          <NativeMenuItemSeperator/>
+          <NativeMenuItem Icon="/Assets/github_icon.png" Header="Recent">
+            <NativeMenu/>
+          </NativeMenuItem>
+          <NativeMenuItemSeperator/>
+          <NativeMenuItem Header="{x:Static local:MainWindow.MenuQuitHeader}"
+                          Gesture="{x:Static local:MainWindow.MenuQuitGesture}"
+                          Clicked="OnCloseClicked" />
+        </NativeMenu>
       </NativeMenuItem>
       <NativeMenuItem Header="Edit">
-        <NativeMenuItem.Menu>
-          <NativeMenu>
-            <NativeMenuItem Header="Copy"/>
-            <NativeMenuItem Header="Paste"/>
-          </NativeMenu>
-        </NativeMenuItem.Menu>
+        <NativeMenu>
+          <NativeMenuItem Header="Copy"/>
+          <NativeMenuItem Header="Paste"/>
+        </NativeMenu>
+      </NativeMenuItem>
+      <NativeMenuItem Header="Options">
+        <NativeMenu>
+          <NativeMenuItem Header="Check Me (None)" 
+                          Command="{Binding ToggleMenuItemCheckedCommand}"
+                          ToggleType="None"
+                          IsChecked="{Binding IsMenuItemChecked}"  />
+          <NativeMenuItem Header="Check Me (CheckBox)" 
+                          Command="{Binding ToggleMenuItemCheckedCommand}"
+                          ToggleType="CheckBox"
+                          IsChecked="{Binding IsMenuItemChecked}"  />
+          <NativeMenuItem Header="Check Me (Radio)" 
+                          Command="{Binding ToggleMenuItemCheckedCommand}"
+                          ToggleType="Radio"
+                          IsChecked="{Binding IsMenuItemChecked}"  />
+        </NativeMenu>
       </NativeMenuItem>
     </NativeMenu>
   </NativeMenu.Menu>
 
- <Window.DataTemplates>
+  <Window.DataTemplates>
     <DataTemplate DataType="vm:NotificationViewModel">
       <v:CustomNotificationView />
     </DataTemplate>
   </Window.DataTemplates>
-  <DockPanel LastChildFill="True">
-    <Menu Name="MainMenu" DockPanel.Dock="Top">
-      <MenuItem Header="File">
-        <MenuItem Header="Exit" Command="{Binding ExitCommand}" />
-      </MenuItem>
-      <MenuItem Header="Help">
-        <MenuItem Header="About" Command="{Binding AboutCommand}" />
-      </MenuItem>
-    </Menu>
-    <local:MainView />
-  </DockPanel>
+  <Panel>
+    <Panel Margin="{Binding #MainWindow.OffScreenMargin}">
+      <DockPanel LastChildFill="True" Margin="{Binding #MainWindow.WindowDecorationMargin}">
+        <Menu Name="MainMenu" DockPanel.Dock="Top">
+          <MenuItem Header="File">
+            <MenuItem Header="Exit" Command="{Binding ExitCommand}" />
+          </MenuItem>
+          <MenuItem Header="Help">
+            <MenuItem Header="About" Command="{Binding AboutCommand}" />
+          </MenuItem>
+        </Menu>
+        <local:MainView />
+      </DockPanel>
+    </Panel>
+    <Border IsVisible="{Binding ExtendClientAreaEnabled}" BorderThickness="1 1 1 0" CornerRadius="4 4 0 0" BorderBrush="#55000000" Height="22" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="250 8 0 0">
+      <Border.Background>
+        <SolidColorBrush Color="White" Opacity="0.7" />
+      </Border.Background>
+      <TextBlock Margin="5 5 5 0" Text="Content In Title Bar" />
+    </Border>
+  </Panel>
 </Window>
diff --git a/samples/ControlCatalog/MainWindow.xaml.cs b/samples/ControlCatalog/MainWindow.xaml.cs
index 38cbde9d92..723351ae57 100644
--- a/samples/ControlCatalog/MainWindow.xaml.cs
+++ b/samples/ControlCatalog/MainWindow.xaml.cs
@@ -1,13 +1,11 @@
+using System;
+using System.Runtime.InteropServices;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Notifications;
-using Avalonia.Controls.Primitives;
+using Avalonia.Input;
 using Avalonia.Markup.Xaml;
-using Avalonia.Threading;
 using ControlCatalog.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace ControlCatalog
 {
@@ -31,10 +29,17 @@ namespace ControlCatalog
 
             DataContext = new MainWindowViewModel(_notificationArea);
             _recentMenu = ((NativeMenu.GetMenu(this).Items[0] as NativeMenuItem).Menu.Items[2] as NativeMenuItem).Menu;
+
             var mainMenu = this.FindControl<Menu>("MainMenu");
             mainMenu.AttachedToVisualTree += MenuAttached;
         }
 
+        public static string MenuQuitHeader => RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? "Quit Avalonia" : "E_xit";
+
+        public static KeyGesture MenuQuitGesture => RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ?
+            new KeyGesture(Key.Q, KeyModifiers.Meta) :
+            new KeyGesture(Key.F4, KeyModifiers.Alt);
+
         public void MenuAttached(object sender, VisualTreeAttachmentEventArgs e)
         {
             if (NativeMenu.GetIsNativeMenuExported(this) && sender is Menu mainMenu)
@@ -58,8 +63,18 @@ namespace ControlCatalog
             // TODO: iOS does not support dynamically loading assemblies
             // so we must refer to this resource DLL statically. For
             // now I am doing that here. But we need a better solution!!
-            var theme = new Avalonia.Themes.Default.DefaultTheme();
-            theme.TryGetResource("Button", out _);
+            // Note, theme swiching probably will not work in runtime for iOS.
+            if (Application.Current.Styles.Contains(App.FluentDark)
+                || Application.Current.Styles.Contains(App.FluentLight))
+            {
+                var theme = new Avalonia.Themes.Fluent.Controls.FluentControls();
+                theme.TryGetResource("Button", out _);
+            }
+            else
+            {
+                var theme = new Avalonia.Themes.Default.DefaultTheme();
+                theme.TryGetResource("Button", out _);
+            }
             AvaloniaXamlLoader.Load(this);
         }
     }
diff --git a/samples/ControlCatalog/Models/GDPValueConverter.cs b/samples/ControlCatalog/Models/GDPValueConverter.cs
index f7975ac604..1ca3e9c8e4 100644
--- a/samples/ControlCatalog/Models/GDPValueConverter.cs
+++ b/samples/ControlCatalog/Models/GDPValueConverter.cs
@@ -19,11 +19,11 @@ namespace ControlCatalog.Models
             if (value is int gdp)
             {
                 if (gdp <= 5000)
-                    return Brushes.Orange;
+                    return new SolidColorBrush(Colors.Orange, 0.6);
                 else if (gdp <= 10000)
-                    return Brushes.Yellow;
+                    return new SolidColorBrush(Colors.Yellow, 0.6);
                 else
-                    return Brushes.LightGreen;
+                    return new SolidColorBrush(Colors.LightGreen, 0.6);
             }
 
             return value;
@@ -34,4 +34,4 @@ namespace ControlCatalog.Models
             throw new NotImplementedException();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/ControlCatalog/Models/Person.cs b/samples/ControlCatalog/Models/Person.cs
index 4248cb8056..47f41bc584 100644
--- a/samples/ControlCatalog/Models/Person.cs
+++ b/samples/ControlCatalog/Models/Person.cs
@@ -15,18 +15,19 @@ namespace ControlCatalog.Models
     {
         string _firstName;
         string _lastName;
+        bool _isBanned;
 
         public string FirstName
         {
             get => _firstName;
             set
             {
+                _firstName = value;
                 if (string.IsNullOrWhiteSpace(value))
                     SetError(nameof(FirstName), "First Name Required");
                 else
                     SetError(nameof(FirstName), null);
 
-                _firstName = value;
                 OnPropertyChanged(nameof(FirstName));
             }
 
@@ -37,16 +38,27 @@ namespace ControlCatalog.Models
             get => _lastName;
             set
             {
+                _lastName = value;
                 if (string.IsNullOrWhiteSpace(value))
                     SetError(nameof(LastName), "Last Name Required");
                 else
                     SetError(nameof(LastName), null);
 
-                _lastName = value;
                 OnPropertyChanged(nameof(LastName));
             }
         }
 
+        public bool IsBanned
+        {
+            get => _isBanned;
+            set
+            {
+                _isBanned = value;
+
+                OnPropertyChanged(nameof(_isBanned));
+            }
+        }
+
         Dictionary<string, List<string>> _errorLookup = new Dictionary<string, List<string>>();
 
         void SetError(string propertyName, string error)
@@ -95,4 +107,4 @@ namespace ControlCatalog.Models
                 return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/ControlCatalog/Pages/AcrylicPage.xaml b/samples/ControlCatalog/Pages/AcrylicPage.xaml
new file mode 100644
index 0000000000..96cfcc5288
--- /dev/null
+++ b/samples/ControlCatalog/Pages/AcrylicPage.xaml
@@ -0,0 +1,139 @@
+<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="ControlCatalog.Pages.AcrylicPage">
+  <Border Padding="20" HorizontalAlignment="Center">
+    <StackPanel Spacing="20">
+
+      <ExperimentalAcrylicBorder Width="660" CornerRadius="5">
+        <ExperimentalAcrylicBorder.Material>
+          <ExperimentalAcrylicMaterial
+            TintColor="White"
+            BackgroundSource="Digger" />
+        </ExperimentalAcrylicBorder.Material>
+        <StackPanel Spacing="5" Margin="40 10">
+          <StackPanel Orientation="Horizontal">
+            <TextBlock Text="TintOpacity" Foreground="Black" />
+            <Slider Name="TintOpacitySlider" Minimum="0" Maximum="1" Value="0.9" Width="400" />
+            <TextBlock Text="{Binding #TintOpacitySlider.Value}" Foreground="Black" />
+          </StackPanel>
+          <StackPanel Orientation="Horizontal">
+            <TextBlock Text="MaterialOpacity" Foreground="Black" />
+            <Slider Name="MaterialOpacitySlider" Minimum="0" Maximum="1" Value="0.8" Width="400" />
+            <TextBlock Text="{Binding #MaterialOpacitySlider.Value}" Foreground="Black" />
+          </StackPanel>
+        </StackPanel>
+      </ExperimentalAcrylicBorder>
+
+
+      <StackPanel Orientation="Horizontal" Spacing="20">
+        <ExperimentalAcrylicBorder Height="200" Width="200" CornerRadius="5">
+          <ExperimentalAcrylicBorder.Material>
+            <ExperimentalAcrylicMaterial
+              TintColor="#FF0000"
+              TintOpacity="{Binding #TintOpacitySlider.Value}"
+              MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
+              BackgroundSource="Digger" />
+          </ExperimentalAcrylicBorder.Material>
+        </ExperimentalAcrylicBorder>
+
+        <ExperimentalAcrylicBorder Height="200" Width="200" CornerRadius="5">
+          <ExperimentalAcrylicBorder.Material>
+            <ExperimentalAcrylicMaterial
+              TintColor="#00FF00"
+              TintOpacity="{Binding #TintOpacitySlider.Value}"
+              MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
+              BackgroundSource="Digger" />
+          </ExperimentalAcrylicBorder.Material>
+        </ExperimentalAcrylicBorder>
+
+        <ExperimentalAcrylicBorder Height="200" Width="200" CornerRadius="5">
+          <ExperimentalAcrylicBorder.Material>
+            <ExperimentalAcrylicMaterial
+              TintColor="#000000"
+              TintOpacity="{Binding #TintOpacitySlider.Value}"
+              MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
+              BackgroundSource="Digger" />
+          </ExperimentalAcrylicBorder.Material>
+        </ExperimentalAcrylicBorder>
+      </StackPanel>
+
+
+      <StackPanel Orientation="Horizontal" Spacing="20">
+        <ExperimentalAcrylicBorder Height="200" Width="200" CornerRadius="5">
+          <ExperimentalAcrylicBorder.Material>
+            <ExperimentalAcrylicMaterial
+              TintColor="#0000FF"
+              TintOpacity="{Binding #TintOpacitySlider.Value}"
+              MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
+              BackgroundSource="Digger" />
+          </ExperimentalAcrylicBorder.Material>
+        </ExperimentalAcrylicBorder>
+
+        <ExperimentalAcrylicBorder Height="200" Width="200" CornerRadius="5">
+          <ExperimentalAcrylicBorder.Material>
+            <ExperimentalAcrylicMaterial
+              TintColor="#FFFF00"
+              TintOpacity="{Binding #TintOpacitySlider.Value}"
+              MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
+              BackgroundSource="Digger" />
+          </ExperimentalAcrylicBorder.Material>
+        </ExperimentalAcrylicBorder>
+
+        <ExperimentalAcrylicBorder Height="200" Width="200" CornerRadius="5">
+          <ExperimentalAcrylicBorder.Material>
+            <ExperimentalAcrylicMaterial
+              TintColor="#000000"
+              TintOpacity="{Binding #TintOpacitySlider.Value}"
+              MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
+              BackgroundSource="Digger" />
+          </ExperimentalAcrylicBorder.Material>
+        </ExperimentalAcrylicBorder>
+      </StackPanel>
+
+      <StackPanel Orientation="Horizontal" Spacing="20">
+        <ExperimentalAcrylicBorder Height="200" Width="200" CornerRadius="5">
+          <ExperimentalAcrylicBorder.Material>
+            <ExperimentalAcrylicMaterial
+              TintColor="White"
+              TintOpacity="{Binding #TintOpacitySlider.Value}"
+              MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
+              BackgroundSource="Digger" />
+          </ExperimentalAcrylicBorder.Material>
+        </ExperimentalAcrylicBorder>
+
+        <ExperimentalAcrylicBorder Height="200" Width="200" CornerRadius="5">
+          <ExperimentalAcrylicBorder.Material>
+            <ExperimentalAcrylicMaterial
+              TintColor="#3c3c3c"
+              TintOpacity="{Binding #TintOpacitySlider.Value}"
+              MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
+              BackgroundSource="Digger" />
+          </ExperimentalAcrylicBorder.Material>
+        </ExperimentalAcrylicBorder>
+
+        <ExperimentalAcrylicBorder Height="200" Width="200" CornerRadius="5">
+          <ExperimentalAcrylicBorder.Material>
+            <ExperimentalAcrylicMaterial
+              TintColor="White"
+              TintOpacity="{Binding #TintOpacitySlider.Value}"
+              MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
+              BackgroundSource="Digger" />
+          </ExperimentalAcrylicBorder.Material>
+        </ExperimentalAcrylicBorder>
+      </StackPanel>
+
+      <ExperimentalAcrylicBorder Height="200" Width="660" CornerRadius="5">
+        <ExperimentalAcrylicBorder.Material>
+          <ExperimentalAcrylicMaterial
+            TintColor="Red"
+            TintOpacity="{Binding #TintOpacitySlider.Value}"
+            MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
+            BackgroundSource="Digger" />
+        </ExperimentalAcrylicBorder.Material>
+      </ExperimentalAcrylicBorder>
+    </StackPanel>
+  </Border>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/AcrylicPage.xaml.cs b/samples/ControlCatalog/Pages/AcrylicPage.xaml.cs
new file mode 100644
index 0000000000..44e7c4b92b
--- /dev/null
+++ b/samples/ControlCatalog/Pages/AcrylicPage.xaml.cs
@@ -0,0 +1,19 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public class AcrylicPage : UserControl
+    {
+        public AcrylicPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
index f90a0c4658..1a53217842 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
@@ -1,5 +1,6 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=netstandard"
              x:Class="ControlCatalog.Pages.AutoCompleteBoxPage">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h1">AutoCompleteBox</TextBlock>
@@ -51,6 +52,21 @@
                          Width="200"
                          Margin="0,0,0,8"
                          FilterMode="None"/>
+        <TextBlock Text="Custom Autocomplete"/>
+        <AutoCompleteBox Name="CustomAutocompleteBox"
+                         Width="200"
+                         Margin="0,0,0,8"
+                         FilterMode="None"/>
+        
+        <TextBlock Text="With Validation Errors"/>
+        <AutoCompleteBox Name="ValidationErrors"
+                         Width="200"
+                         Margin="0,0,0,8"
+                         FilterMode="None">
+          <DataValidationErrors.Error>
+            <sys:Exception /> 
+          </DataValidationErrors.Error>
+        </AutoCompleteBox>
       </StackPanel>
     </StackPanel>
   </StackPanel>
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
index f9d6a72a3a..574cc79a7d 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
@@ -92,13 +92,28 @@ namespace ControlCatalog.Pages
         }
         public StateData[] States { get; private set; }
         
+        private LinkedList<string>[] BuildAllSentences()
+        {
+            return new string[]
+            {
+                "Hello world",
+                "No this is Patrick",
+                "Never gonna give you up",
+                "How does one patch KDE2 under FreeBSD"
+            }
+            .Select(x => new LinkedList<string>(x.Split(' ')))
+            .ToArray();
+        }
+        public LinkedList<string>[] Sentences { get; private set; }
+
         public AutoCompleteBoxPage()
         {
             this.InitializeComponent();
 
             States = BuildAllStates();
+            Sentences = BuildAllSentences();
 
-            foreach (AutoCompleteBox box in GetAllAutoCompleteBox())
+            foreach (AutoCompleteBox box in GetAllAutoCompleteBox().Where(x => x.Name != "CustomAutocompleteBox"))
             {
                 box.Items = States;
             }
@@ -116,6 +131,11 @@ namespace ControlCatalog.Pages
 
             var asyncBox = this.FindControl<AutoCompleteBox>("AsyncBox");
             asyncBox.AsyncPopulator = PopulateAsync;
+
+            var customAutocompleteBox = this.FindControl<AutoCompleteBox>("CustomAutocompleteBox");
+            customAutocompleteBox.Items = Sentences.SelectMany(x => x);
+            customAutocompleteBox.TextFilter = LastWordContains;
+            customAutocompleteBox.TextSelector = AppendWord;
         }
         private IEnumerable<AutoCompleteBox> GetAllAutoCompleteBox()
         {
@@ -137,6 +157,42 @@ namespace ControlCatalog.Pages
                       .ToList();
         }
 
+        private bool LastWordContains(string searchText, string item)
+        {
+            var words = searchText.Split(' ');
+            var options = Sentences.Select(x => x.First).ToArray();
+            for (var i = 0; i < words.Length; ++i)
+            {
+                var word = words[i];
+                for (var j = 0; 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
+                    {
+                        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)
+        {
+            string[] parts = text.Split(' ');
+            if (parts.Length == 0)
+                return item;
+
+            parts[parts.Length - 1] = item;
+            return string.Join(" ", parts);
+        }
+
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
diff --git a/samples/ControlCatalog/Pages/BorderPage.xaml b/samples/ControlCatalog/Pages/BorderPage.xaml
index c30056d5e5..bfd14cc627 100644
--- a/samples/ControlCatalog/Pages/BorderPage.xaml
+++ b/samples/ControlCatalog/Pages/BorderPage.xaml
@@ -9,26 +9,33 @@
                 Margin="0,16,0,0"
                 HorizontalAlignment="Center"
                 Spacing="16">
-      <Border BorderBrush="{DynamicResource ThemeAccentBrush}" BorderThickness="2" Padding="16">
+      <Border BorderBrush="{DynamicResource SystemAccentColor}" BorderThickness="2" Padding="16">
         <TextBlock>Border</TextBlock>
       </Border>
-      <Border Background="{DynamicResource ThemeAccentBrush2}" 
-              BorderBrush="{DynamicResource ThemeAccentBrush}" 
+      <Border Background="{DynamicResource SystemAccentColorDark1}" 
+              BorderBrush="{DynamicResource SystemAccentColor}" 
               BorderThickness="4" 
               Padding="16">
         <TextBlock>Border and Background</TextBlock>
       </Border>
-      <Border BorderBrush="{DynamicResource ThemeAccentBrush}"
+      <Border BorderBrush="{DynamicResource SystemAccentColor}"
               BorderThickness="4" 
               CornerRadius="8"
               Padding="16">
         <TextBlock>Rounded Corners</TextBlock>
       </Border>
-      <Border Background="{DynamicResource ThemeAccentBrush2}"
+      <Border Background="{DynamicResource SystemAccentColor}"
               CornerRadius="8"
               Padding="16">
         <TextBlock>Rounded Corners</TextBlock>
       </Border>
+      <Border Width="100" Height="100"
+              BorderThickness="0"
+              Background="White"
+              CornerRadius="100" ClipToBounds="True">
+        <Image Source="/Assets/maple-leaf-888807_640.jpg" Stretch="UniformToFill" />
+      </Border>
+      <TextBlock Text="Border with Clipping" HorizontalAlignment="Center" />
     </StackPanel>    
   </StackPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/ButtonPage.xaml b/samples/ControlCatalog/Pages/ButtonPage.xaml
index 39d89590c2..be114bbbc9 100644
--- a/samples/ControlCatalog/Pages/ButtonPage.xaml
+++ b/samples/ControlCatalog/Pages/ButtonPage.xaml
@@ -9,10 +9,10 @@
                 Margin="0,16,0,0"
                 HorizontalAlignment="Center"
                 Spacing="16">
-      <StackPanel Orientation="Vertical" Spacing="8" Width="150">
-        <Button>Button</Button>
+      <StackPanel Orientation="Vertical" Spacing="8" Width="200">
+        <Button>Standard XAML Button</Button>
         <Button Foreground="White">Foreground</Button>
-        <Button Background="{DynamicResource ThemeAccentBrush}">Background</Button>
+        <Button Background="{DynamicResource SystemAccentColor}">Background</Button>
         <Button IsEnabled="False">Disabled</Button>
         <Button Content="Re-themed">
           <Button.Styles>
@@ -20,17 +20,26 @@
               <Style.Resources>
                 <SolidColorBrush x:Key="ThemeBorderMidBrush">Red</SolidColorBrush>
                 <SolidColorBrush x:Key="ThemeControlHighBrush">DarkRed</SolidColorBrush>
+                <SolidColorBrush x:Key="ButtonBorderBrush">Red</SolidColorBrush>
+                <SolidColorBrush x:Key="ButtonBackground">DarkRed</SolidColorBrush>
+                <SolidColorBrush x:Key="ButtonBackgroundPointerOver">Red</SolidColorBrush>
+                <SolidColorBrush x:Key="ButtonBackgroundPressed">OrangeRed</SolidColorBrush>
               </Style.Resources>
             </Style>
           </Button.Styles>          
         </Button>
-      </StackPanel>
+        <RepeatButton Name="RepeatButton">
+          <TextBlock Name="RepeatButtonTextBlock" Text="Repeat Button: 0" />
+        </RepeatButton>
+        <ToggleButton Content="Toggle Button"/>
+    </StackPanel>
 
       <StackPanel Orientation="Vertical" Spacing="8" Width="150">
         <Button BorderThickness="0">No Border</Button>
-        <Button BorderBrush="{DynamicResource ThemeAccentBrush}">Border Color</Button>
-        <Button BorderBrush="{DynamicResource ThemeAccentBrush}" BorderThickness="4">Thick Border</Button>
-        <Button BorderBrush="{DynamicResource ThemeAccentBrush}" BorderThickness="4" IsEnabled="False">Disabled</Button>
+        <Button BorderBrush="{DynamicResource SystemAccentColor}">Border Color</Button>
+        <Button BorderBrush="{DynamicResource SystemAccentColor}" BorderThickness="4">Thick Border</Button>
+        <Button BorderBrush="{DynamicResource SystemAccentColor}" BorderThickness="4" IsEnabled="False">Disabled</Button>
+        <Button BorderBrush="{DynamicResource SystemAccentColor}" KeyboardNavigation.IsTabStop="False">IsTabStop=False</Button>
       </StackPanel>
     </StackPanel>    
   </StackPanel>
diff --git a/samples/ControlCatalog/Pages/ButtonPage.xaml.cs b/samples/ControlCatalog/Pages/ButtonPage.xaml.cs
index 1d0c228a0e..5e555c8c91 100644
--- a/samples/ControlCatalog/Pages/ButtonPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ButtonPage.xaml.cs
@@ -5,5 +5,25 @@ namespace ControlCatalog.Pages
 {
     public class ButtonPage : UserControl
     {
+        private int repeatButtonClickCount = 0;
+
+        public ButtonPage()
+        {
+            InitializeComponent();
+
+            this.FindControl<RepeatButton>("RepeatButton").Click += OnRepeatButtonClick;
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        public void OnRepeatButtonClick(object sender, object args)
+        {
+            repeatButtonClickCount++;
+            var textBlock = this.FindControl<TextBlock>("RepeatButtonTextBlock");
+            textBlock.Text = $"Repeat Button: {repeatButtonClickCount}";
+        }
     }
 }
diff --git a/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml
index c3f9f65dd9..4ac2330403 100644
--- a/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml
+++ b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml
@@ -1,6 +1,7 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.ButtonSpinnerPage">
+             x:Class="ControlCatalog.Pages.ButtonSpinnerPage"
+             xmlns:sys="clr-namespace:System;assembly=netstandard">
 
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h1">ButtonSpinner</TextBlock>
@@ -19,6 +20,14 @@
                      ShowButtonSpinner="{Binding #showSpinCheck.IsChecked}">
         <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="Everest"/>
       </ButtonSpinner>
+      <ButtonSpinner MinHeight="30" Spin="OnSpin" ButtonSpinnerLocation="Left"
+                     AllowSpin="{Binding #allowSpinCheck.IsChecked}"
+                     ShowButtonSpinner="{Binding #showSpinCheck.IsChecked}">
+        <DataValidationErrors.Error>
+          <sys:Exception /> 
+        </DataValidationErrors.Error>
+        <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="Everest"/>
+      </ButtonSpinner>
     </StackPanel>
   </StackPanel>
 
diff --git a/samples/ControlCatalog/Pages/DatePickerPage.xaml b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
similarity index 75%
rename from samples/ControlCatalog/Pages/DatePickerPage.xaml
rename to samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
index 30d5a7506f..107472105a 100644
--- a/samples/ControlCatalog/Pages/DatePickerPage.xaml
+++ b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
@@ -1,8 +1,8 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.DatePickerPage">
+             x:Class="ControlCatalog.Pages.CalendarDatePickerPage">
   <StackPanel Orientation="Vertical" Spacing="4">
-    <TextBlock Classes="h1">DatePicker</TextBlock>
+    <TextBlock Classes="h1">CalendarDatePicker</TextBlock>
     <TextBlock Classes="h2">A control for selecting dates with a calendar drop-down</TextBlock>
         
     <StackPanel Orientation="Horizontal"
@@ -12,34 +12,34 @@
       <StackPanel Orientation="Vertical"
                   Width="200">
         <TextBlock Text="SelectedDateFormat: Short"/>
-        <DatePicker Name="DatePicker1"
+        <CalendarDatePicker Name="DatePicker1"
                     SelectedDateFormat="Short"
                     Margin="0,0,0,8"/>
 
         <TextBlock Text="SelectedDateFormat: Long"/>
-        <DatePicker Name="DatePicker2"
+        <CalendarDatePicker Name="DatePicker2"
                     SelectedDateFormat="Long"
                     Margin="0,0,0,8"/>
 
         <TextBlock Text="SelectedDateFormat: Custom"/>
-        <DatePicker Name="DatePicker3"
+        <CalendarDatePicker Name="DatePicker3"
                     SelectedDateFormat="Custom"
                     CustomDateFormatString="ddd, MMM d"
                     Margin="0,0,0,8"/>
 
         <TextBlock Text="Blackout Dates"/>
-        <DatePicker Name="DatePicker4"
+        <CalendarDatePicker Name="DatePicker4"
                     Margin="0,0,0,8"/>
 
-        <DatePicker Margin="0,0,0,8"
+        <CalendarDatePicker Margin="0,0,0,8"
                     Watermark="Watermark"/>
-        <DatePicker Margin="0,0,0,8"
+        <CalendarDatePicker Margin="0,0,0,8"
                     Name="DatePicker5"
                     Watermark="Floating Watermark"
                     UseFloatingWatermark="True"/>
                 
         <TextBlock Text="Disabled"/>
-        <DatePicker IsEnabled="False"/>
+        <CalendarDatePicker IsEnabled="False"/>
       </StackPanel>
 
     </StackPanel> 
diff --git a/samples/ControlCatalog/Pages/DatePickerPage.xaml.cs b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml.cs
similarity index 57%
rename from samples/ControlCatalog/Pages/DatePickerPage.xaml.cs
rename to samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml.cs
index ef01887c9e..95bdeb363a 100644
--- a/samples/ControlCatalog/Pages/DatePickerPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml.cs
@@ -4,17 +4,17 @@ using System;
 
 namespace ControlCatalog.Pages
 {
-    public class DatePickerPage : UserControl
+    public class CalendarDatePickerPage : UserControl
     {
-        public DatePickerPage()
+        public CalendarDatePickerPage()
         {
             InitializeComponent();
             
-            var dp1 = this.FindControl<DatePicker>("DatePicker1");
-            var dp2 = this.FindControl<DatePicker>("DatePicker2");
-            var dp3 = this.FindControl<DatePicker>("DatePicker3");
-            var dp4 = this.FindControl<DatePicker>("DatePicker4");
-            var dp5 = this.FindControl<DatePicker>("DatePicker5");
+            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");
 
             dp1.SelectedDate = DateTime.Today;
             dp2.SelectedDate = DateTime.Today.AddDays(10);
diff --git a/samples/ControlCatalog/Pages/ComboBoxPage.xaml b/samples/ControlCatalog/Pages/ComboBoxPage.xaml
index bbfbd4b4cd..025b85492c 100644
--- a/samples/ControlCatalog/Pages/ComboBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/ComboBoxPage.xaml
@@ -1,12 +1,13 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.ComboBoxPage">
+             x:Class="ControlCatalog.Pages.ComboBoxPage"
+             xmlns:sys="clr-namespace:System;assembly=netstandard">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h1">ComboBox</TextBlock>
     <TextBlock Classes="h2">A drop-down list.</TextBlock>
 
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 16 0 0" Spacing="8">
-      <ComboBox SelectedIndex="0">
+      <ComboBox PlaceholderText="Pick an Item">
         <ComboBoxItem>Inline Items</ComboBoxItem>
         <ComboBoxItem>Inline Item 2</ComboBoxItem>
         <ComboBoxItem>Inline Item 3</ComboBoxItem>
@@ -16,7 +17,7 @@
       <ComboBox SelectedIndex="0">
         <ComboBoxItem>
           <Panel>
-            <Rectangle Fill="{DynamicResource ThemeAccentBrush}"/>
+            <Rectangle Fill="{DynamicResource SystemAccentColor}"/>
             <TextBlock Margin="8">Control Items</TextBlock>
           </Panel>
         </ComboBoxItem>
@@ -35,6 +36,16 @@
            </DataTemplate>
          </ComboBox.ItemTemplate>
        </ComboBox>
+      
+      <ComboBox PlaceholderText="Pick an Item">
+        <ComboBoxItem>Inline Items</ComboBoxItem>
+        <ComboBoxItem>Inline Item 2</ComboBoxItem>
+        <ComboBoxItem>Inline Item 3</ComboBoxItem>
+        <ComboBoxItem>Inline Item 4</ComboBoxItem>
+        <DataValidationErrors.Error>
+          <sys:Exception /> 
+        </DataValidationErrors.Error>
+      </ComboBox>
     </StackPanel>
 
   </StackPanel>
diff --git a/samples/ControlCatalog/Pages/ComboBoxPage.xaml.cs b/samples/ControlCatalog/Pages/ComboBoxPage.xaml.cs
index 3eb6d5b595..d50b051d9f 100644
--- a/samples/ControlCatalog/Pages/ComboBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ComboBoxPage.xaml.cs
@@ -1,5 +1,7 @@
+using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using Avalonia.Media;
 
 namespace ControlCatalog.Pages
 {
@@ -14,7 +16,7 @@ namespace ControlCatalog.Pages
         {
             AvaloniaXamlLoader.Load(this);
             var fontComboBox = this.Find<ComboBox>("fontComboBox");
-            fontComboBox.Items = Avalonia.Media.FontFamily.SystemFontFamilies;
+            fontComboBox.Items = FontManager.Current.GetInstalledFontFamilyNames().Select(x => new FontFamily(x));
             fontComboBox.SelectedIndex = 0;
         }
     }
diff --git a/samples/ControlCatalog/Pages/ContextMenuPage.xaml b/samples/ControlCatalog/Pages/ContextMenuPage.xaml
index 8f147638b5..260162ddb9 100644
--- a/samples/ControlCatalog/Pages/ContextMenuPage.xaml
+++ b/samples/ControlCatalog/Pages/ContextMenuPage.xaml
@@ -9,18 +9,19 @@
               Margin="0,16,0,0"
               HorizontalAlignment="Center"
               Spacing="16">
-            <Border Background="{DynamicResource ThemeAccentBrush}"
+            <Border Background="{DynamicResource SystemAccentColor}"
                     Margin="16"
                     Padding="48,48,48,48">
                 <Border.ContextMenu>
                     <ContextMenu>
-                        <MenuItem Header="Standard _Menu Item"/>
+                        <MenuItem Header="Standard _Menu Item" InputGesture="Ctrl+A" />
+                        <MenuItem Header="_Disabled Menu Item" IsEnabled="False" InputGesture="Ctrl+D" />
                         <Separator/>
                         <MenuItem Header="Menu with _Submenu">
                             <MenuItem Header="Submenu _1"/>
                             <MenuItem Header="Submenu _2"/>
                         </MenuItem>
-                        <MenuItem Header="Menu Item with _Icon">
+                        <MenuItem Header="Menu Item with _Icon" InputGesture="Ctrl+Shift+B">
                             <MenuItem.Icon>
                                 <Image Source="/Assets/github_icon.png"/>
                             </MenuItem.Icon>
@@ -34,7 +35,7 @@
                 </Border.ContextMenu>
                 <TextBlock Text="Defined in XAML"/>
             </Border>
-            <Border Background="{DynamicResource ThemeAccentBrush}"
+            <Border Background="{DynamicResource SystemAccentColor}"
                     Margin="16"
                     Padding="48,48,48,48">
                 <Border.ContextMenu>
diff --git a/samples/ControlCatalog/Pages/DataGridPage.xaml b/samples/ControlCatalog/Pages/DataGridPage.xaml
index d1742c12b7..cacc2204bd 100644
--- a/samples/ControlCatalog/Pages/DataGridPage.xaml
+++ b/samples/ControlCatalog/Pages/DataGridPage.xaml
@@ -11,14 +11,19 @@
       <Setter Property="Background" Value="{Binding Path=GDP, Mode=OneWay, Converter={StaticResource GDPConverter}}" />
     </Style>
   </UserControl.Styles>
-  <Grid RowDefinitions="Auto,*">
+  <Grid RowDefinitions="Auto,Auto,*">
     <StackPanel Orientation="Vertical" Spacing="4" Grid.Row="0">
       <TextBlock Classes="h1">DataGrid</TextBlock>
       <TextBlock Classes="h2">A control for displaying and interacting with a data source.</TextBlock>
     </StackPanel>
-    <TabControl Grid.Row="1">
+    <StackPanel Grid.Row="1" Spacing="4" Orientation="Horizontal" IsVisible="{Binding #EditableTab.IsSelected}">
+      <TextBlock Text="FontSize:" VerticalAlignment="Center"/>
+      <Slider x:Name="FontSizeSlider" Minimum="5" Maximum="30" Value="14" Width="100" VerticalAlignment="Center" />
+      <CheckBox x:Name="IsThreeStateCheckBox" IsChecked="False" Content="IsThreeState"/>
+    </StackPanel>
+    <TabControl Grid.Row="2">
       <TabItem Header="DataGrid">
-        <DataGrid Name="dataGrid1" Margin="12" CanUserResizeColumns="True" CanUserReorderColumns="True">
+        <DataGrid Name="dataGrid1" Margin="12" CanUserResizeColumns="True" CanUserReorderColumns="True" CanUserSortColumns="True" HeadersVisibility="All">
           <DataGrid.Columns>
             <DataGridTextColumn Header="Country" Binding="{Binding Name}" Width="6*" />
             <DataGridTextColumn Header="Region" Binding="{Binding Region}" Width="4*" />
@@ -39,12 +44,13 @@
           </DataGrid.Columns>
         </DataGrid>
       </TabItem>
-      <TabItem Header="Editable">
+      <TabItem x:Name="EditableTab" Header="Editable">
         <Grid RowDefinitions="*,Auto">
           <DataGrid Name="dataGridEdit" Margin="12" Grid.Row="0">
             <DataGrid.Columns>
-              <DataGridTextColumn Header="First Name" Binding="{Binding FirstName}" Width="2*" />
-              <DataGridTextColumn Header="Last" Binding="{Binding LastName}" Width="*" />
+              <DataGridTextColumn Header="First Name" Binding="{Binding FirstName}" Width="2*" FontSize="{Binding #FontSizeSlider.Value, Mode=OneWay}" />
+              <DataGridTextColumn Header="Last" Binding="{Binding LastName}" Width="2*" FontSize="{Binding #FontSizeSlider.Value, Mode=OneWay}" />
+              <DataGridCheckBoxColumn Header="Is Banned" Binding="{Binding IsBanned}" Width="*" IsThreeState="{Binding #IsThreeStateCheckBox.IsChecked, Mode=OneWay}" />
             </DataGrid.Columns>
           </DataGrid>
           <Button Grid.Row="1" Name="btnAdd" Margin="12,0,12,12" Content="Add" HorizontalAlignment="Right" />
diff --git a/samples/ControlCatalog/Pages/DataGridPage.xaml.cs b/samples/ControlCatalog/Pages/DataGridPage.xaml.cs
index b8f63cf3e3..2a30f4d91b 100644
--- a/samples/ControlCatalog/Pages/DataGridPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DataGridPage.xaml.cs
@@ -1,8 +1,12 @@
+using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using ControlCatalog.Models;
 using Avalonia.Collections;
+using Avalonia.Data;
 
 namespace ControlCatalog.Pages
 {
@@ -11,12 +15,22 @@ namespace ControlCatalog.Pages
         public DataGridPage()
         {
             this.InitializeComponent();
-            var dg1 = this.FindControl<DataGrid>("dataGrid1");
-            dg1.IsReadOnly = true;
 
+            var dataGridSortDescription = DataGridSortDescription.FromPath(nameof(Country.Region), ListSortDirection.Ascending, new ReversedStringComparer());
             var collectionView1 = new DataGridCollectionView(Countries.All);
-            //collectionView.GroupDescriptions.Add(new PathGroupDescription("Region"));
-
+            collectionView1.SortDescriptions.Add(dataGridSortDescription);
+            var dg1 = this.FindControl<DataGrid>("dataGrid1");
+            dg1.IsReadOnly = true;
+            dg1.LoadingRow += Dg1_LoadingRow;
+            dg1.Sorting += (s, a) =>
+            {
+                var property = ((a.Column as DataGridBoundColumn)?.Binding as Binding).Path;
+                if (property == dataGridSortDescription.PropertyPath
+                    && !collectionView1.SortDescriptions.Contains(dataGridSortDescription))
+                {
+                    collectionView1.SortDescriptions.Add(dataGridSortDescription);
+                }
+            };
             dg1.Items = collectionView1;
 
             var dg2 = this.FindControl<DataGrid>("dataGridGrouping");
@@ -33,7 +47,7 @@ namespace ControlCatalog.Pages
             var items = new List<Person>
             {
                 new Person { FirstName = "John", LastName = "Doe" },
-                new Person { FirstName = "Elizabeth", LastName = "Thomas" },
+                new Person { FirstName = "Elizabeth", LastName = "Thomas", IsBanned = true },
                 new Person { FirstName = "Zack", LastName = "Ward" }
             };
             var collectionView3 = new DataGridCollectionView(items);
@@ -44,9 +58,29 @@ namespace ControlCatalog.Pages
             addButton.Click += (a, b) => collectionView3.AddNew();
         }
 
+        private void Dg1_LoadingRow(object sender, DataGridRowEventArgs e)
+        {
+            e.Row.Header = e.Row.GetIndex() + 1;
+        }
+
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
         }
+
+        private class ReversedStringComparer : IComparer<object>, IComparer
+        {
+            public int Compare(object x, object y)
+            {
+                if (x is string left && y is string right)
+                {
+                    var reversedLeft = new string(left.Reverse().ToArray());
+                    var reversedRight = new string(right.Reverse().ToArray());
+                    return reversedLeft.CompareTo(reversedRight);
+                }
+
+                return Comparer.Default.Compare(x, y);
+            }
+        }
     }
 }
diff --git a/samples/ControlCatalog/Pages/DateTimePickerPage.xaml b/samples/ControlCatalog/Pages/DateTimePickerPage.xaml
new file mode 100644
index 0000000000..45056a9a76
--- /dev/null
+++ b/samples/ControlCatalog/Pages/DateTimePickerPage.xaml
@@ -0,0 +1,143 @@
+<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:sys="clr-namespace:System;assembly=netstandard"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="ControlCatalog.Pages.DateTimePickerPage">
+  <StackPanel Orientation="Vertical" Spacing="4" HorizontalAlignment="Stretch">
+    <TextBlock Classes="h1">DatePicker and TimePicker</TextBlock>
+    <TextBlock Name="DatePickerDesc" Classes="h2" TextWrapping="Wrap"/>
+    <TextBlock Name="TimePickerDesc" Classes="h2" TextWrapping="Wrap"/>
+
+    <StackPanel Orientation="Vertical"
+                Margin="16"
+                HorizontalAlignment="Stretch"
+                Spacing="16">
+      <TextBlock FontSize="18">A simple DatePicker with a header</TextBlock>
+      <StackPanel Orientation="Vertical">
+        <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
+                BorderThickness="1" Padding="15">
+          <DatePicker Header="Pick a date" />
+        </Border>
+        <Panel Background="{DynamicResource SystemControlBackgroundBaseLowBrush}">
+          <TextBlock Padding="15">
+            <TextBlock.Text>
+              <x:String>
+                &lt;DatePicker Header="Pick a date" /&gt;
+              </x:String>
+            </TextBlock.Text>
+          </TextBlock>
+        </Panel>
+      </StackPanel>
+      
+      
+      <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
+              BorderThickness="1" Padding="15">
+        <DatePicker Header="Pick a date">
+          <DataValidationErrors.Error>
+            <sys:Exception /> 
+          </DataValidationErrors.Error>
+        </DatePicker>
+      </Border>
+      
+      <TextBlock FontSize="18">A DatePicker with day formatted and year hidden.</TextBlock>
+      <StackPanel Orientation="Vertical">
+        <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
+                BorderThickness="1" Padding="15">
+          <DatePicker x:Name="Control2" DayFormat="d (ddd)"
+                             YearVisible="False" />
+        </Border>
+        <Panel Background="{DynamicResource SystemControlBackgroundBaseLowBrush}">
+          <TextBlock Padding="15">
+            <TextBlock.Text>
+              <x:String>
+                &lt;DatePicker DayFormat="d (ddd)" YearVisible="False" /&gt;
+              </x:String>
+            </TextBlock.Text>
+          </TextBlock>
+        </Panel>
+      </StackPanel>
+
+      <Border Background="{DynamicResource SystemControlHighlightBaseLowBrush}" BorderThickness="1" Margin="15" />
+
+      <TextBlock FontSize="18">A simple TimePicker.</TextBlock>
+      <StackPanel Orientation="Vertical">
+        <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
+                BorderThickness="1" Padding="15">
+          <TimePicker />
+        </Border>
+        <Panel Background="{DynamicResource SystemControlBackgroundBaseLowBrush}">
+          <TextBlock Padding="15">
+            <TextBlock.Text>
+              <x:String>
+                &lt;TimePicker /&gt;
+              </x:String>
+            </TextBlock.Text>
+          </TextBlock>
+        </Panel>
+      </StackPanel>
+      
+      <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
+              BorderThickness="1" Padding="15">
+        <TimePicker Header="Pick a time">
+          <DataValidationErrors.Error>
+            <sys:Exception /> 
+          </DataValidationErrors.Error>
+        </TimePicker>
+      </Border>
+
+      <TextBlock FontSize="18">A TimePicker with a header and minute increments specified.</TextBlock>
+      <StackPanel Orientation="Vertical">
+        <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
+                BorderThickness="1" Padding="15">
+          <TimePicker Header="Arrival time" MinuteIncrement="15" />
+        </Border>
+        <Panel Background="{DynamicResource SystemControlBackgroundBaseLowBrush}">
+          <TextBlock Padding="15">
+            <TextBlock.Text>
+              <x:String>
+                &lt;TimePicker Header="Arrival time" MinuteIncrement="15" /&gt;
+              </x:String>
+            </TextBlock.Text>
+          </TextBlock>
+        </Panel>
+      </StackPanel>
+
+      <TextBlock FontSize="18">A TimePicker using a 12-hour clock.</TextBlock>
+      <StackPanel Orientation="Vertical">
+        <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
+                BorderThickness="1" Padding="15">
+          <TimePicker ClockIdentifier="12HourClock" Header="12 hour clock" />
+        </Border>
+        <Panel Background="{DynamicResource SystemControlBackgroundBaseLowBrush}">
+          <TextBlock Padding="15">
+            <TextBlock.Text>
+              <x:String>
+                &lt;TimePicker ClockIdentifier="12HourClock" Header="12 hour clock" /&gt;
+              </x:String>
+            </TextBlock.Text>
+          </TextBlock>
+        </Panel>
+      </StackPanel>
+
+      <TextBlock FontSize="18">A TimePicker using a 24-hour clock.</TextBlock>
+      <StackPanel Orientation="Vertical">
+        <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
+                BorderThickness="1" Padding="15">
+          <TimePicker ClockIdentifier="24HourClock" Header="24 hour clock" />
+        </Border>
+        <Panel Background="{DynamicResource SystemControlBackgroundBaseLowBrush}">
+          <TextBlock Padding="15">
+            <TextBlock.Text>
+              <x:String>
+                &lt;TimePicker ClockIdentifier="24HourClock" Header="24 hour clock" /&gt;
+              </x:String>
+            </TextBlock.Text>
+          </TextBlock>
+        </Panel>
+      </StackPanel>
+      
+    </StackPanel>
+  </StackPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/DateTimePickerPage.xaml.cs b/samples/ControlCatalog/Pages/DateTimePickerPage.xaml.cs
new file mode 100644
index 0000000000..6c7ae3437e
--- /dev/null
+++ b/samples/ControlCatalog/Pages/DateTimePickerPage.xaml.cs
@@ -0,0 +1,30 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public class DateTimePickerPage : UserControl
+    {
+        public DateTimePickerPage()
+        {
+            this.InitializeComponent();
+            this.FindControl<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 " +
+                "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.";
+
+
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml b/samples/ControlCatalog/Pages/DialogsPage.xaml
index 60f8e3656e..a0e82663bf 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml
@@ -6,8 +6,12 @@
       <Button Name="OpenFile">Open File</Button>
       <Button Name="SaveFile">Save File</Button>
       <Button Name="SelectFolder">Select Folder</Button>
+      <Button Name="OpenBoth">Select Both</Button>
       <Button Name="DecoratedWindow">Decorated window</Button>
       <Button Name="DecoratedWindowDialog">Decorated window (dialog)</Button>
       <Button Name="Dialog">Dialog</Button>
+      <Button Name="DialogNoTaskbar">Dialog (No taskbar icon)</Button>
+      <Button Name="OwnedWindow">Owned window</Button>
+      <Button Name="OwnedWindowNoTaskbar">Owned window (No taskbar icon)</Button>
   </StackPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
index d207689223..49921fb7f6 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
@@ -1,5 +1,10 @@
+using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
 using Avalonia.Controls;
+using Avalonia.Dialogs;
+using Avalonia.Layout;
 using Avalonia.Markup.Xaml;
 #pragma warning disable 4014
 
@@ -34,7 +39,9 @@ namespace ControlCatalog.Pages
                 new OpenFileDialog()
                 {
                     Title = "Open file",
-                    Filters = GetFilters()
+                    Filters = GetFilters(),
+                    // Almost guaranteed to exist
+                    InitialFileName = Assembly.GetEntryAssembly()?.GetModules().FirstOrDefault()?.FullyQualifiedName
                 }.ShowAsync(GetWindow());
             };
             this.FindControl<Button>("SaveFile").Click += delegate
@@ -42,16 +49,30 @@ namespace ControlCatalog.Pages
                 new SaveFileDialog()
                 {
                     Title = "Save file",
-                    Filters = GetFilters()
+                    Filters = GetFilters(),
+                    InitialFileName = "test.txt"
                 }.ShowAsync(GetWindow());
             };
             this.FindControl<Button>("SelectFolder").Click += delegate
             {
                 new OpenFolderDialog()
                 {
-                    Title = "Select folder"
+                    Title = "Select folder",
                 }.ShowAsync(GetWindow());
             };
+            this.FindControl<Button>("OpenBoth").Click += async delegate
+            {
+                var res = await new OpenFileDialog()
+                {
+                    Title = "Select both",
+                    AllowMultiple = true
+                }.ShowManagedAsync(GetWindow(), new ManagedFileDialogOptions
+                {
+                    AllowDirectorySelection = true
+                });
+                if (res != null)
+                    Console.WriteLine("Selected: \n" + string.Join("\n", res));
+            };
             this.FindControl<Button>("DecoratedWindow").Click += delegate
             {
                 new DecoratedWindow().Show();
@@ -61,14 +82,62 @@ namespace ControlCatalog.Pages
                 new DecoratedWindow().ShowDialog(GetWindow());
             };
             this.FindControl<Button>("Dialog").Click += delegate
+            {
+                var window = CreateSampleWindow();
+                window.Height = 200;
+                window.ShowDialog(GetWindow());
+            };
+            this.FindControl<Button>("DialogNoTaskbar").Click += delegate
+            {
+                var window = CreateSampleWindow();
+                window.Height = 200;
+                window.ShowInTaskbar = false;
+                window.ShowDialog(GetWindow());
+            };
+            this.FindControl<Button>("OwnedWindow").Click += delegate
+            {
+                var window = CreateSampleWindow();
+
+                window.Show(GetWindow());
+            };
+
+            this.FindControl<Button>("OwnedWindowNoTaskbar").Click += delegate
+            {
+                var window = CreateSampleWindow();
+
+                window.ShowInTaskbar = false;
+
+                window.Show(GetWindow());
+            };
+        }
+
+        private Window CreateSampleWindow()
+        {
+            Button button;
+            
+            var window = new Window
+            {
+                Height = 200,
+                Width = 200,
+                Content = new StackPanel
                 {
-                    var window = new Window();
-                    window.Height = 200;
-                    window.Width = 200;
-                    window.Content = new TextBlock { Text = "Hello world!" };
-                    window.WindowStartupLocation = WindowStartupLocation.CenterOwner;
-                    window.ShowDialog(GetWindow());
-                };
+                    Spacing = 4,
+                    Children =
+                    {
+                        new TextBlock { Text = "Hello world!" },
+                        (button = new Button
+                        {
+                            HorizontalAlignment = HorizontalAlignment.Center,
+                            Content = "Click to close"
+                        })
+                    }
+                },
+                WindowStartupLocation = WindowStartupLocation.CenterOwner
+            };
+
+            button.Click += (_, __) => window.Close();
+
+            return window;
         }
 
         Window GetWindow() => (Window)this.VisualRoot;
diff --git a/samples/ControlCatalog/Pages/DragAndDropPage.xaml b/samples/ControlCatalog/Pages/DragAndDropPage.xaml
index 9bfcd90149..c22cf68b68 100644
--- a/samples/ControlCatalog/Pages/DragAndDropPage.xaml
+++ b/samples/ControlCatalog/Pages/DragAndDropPage.xaml
@@ -9,10 +9,16 @@
                 Margin="0,16,0,0"
                 HorizontalAlignment="Center"
                 Spacing="16">
-            <Border BorderBrush="{DynamicResource ThemeAccentBrush}" BorderThickness="2" Padding="16" Name="DragMe">
-                <TextBlock Name="DragState">Drag Me</TextBlock>
-            </Border>
-            <Border Background="{DynamicResource ThemeAccentBrush2}" Padding="16" 
+            <StackPanel>
+                <Border BorderBrush="{DynamicResource SystemAccentColor}" BorderThickness="2" Padding="16" Name="DragMeText">
+                  <TextBlock Name="DragStateText">Drag Me</TextBlock>
+                </Border>
+                <Border BorderBrush="{DynamicResource SystemAccentColor}" BorderThickness="2" Padding="16" Name="DragMeCustom">
+                  <TextBlock Name="DragStateCustom">Drag Me (custom)</TextBlock>
+                </Border>
+            </StackPanel>
+
+            <Border Background="{DynamicResource SystemAccentColorDark1}" Padding="16" 
                     DragDrop.AllowDrop="True">
                 <TextBlock Name="DropState">Drop some text or files here</TextBlock>
             </Border>
diff --git a/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs b/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs
index 0bf21c2820..5a52dbe12b 100644
--- a/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs
@@ -3,69 +3,85 @@ using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
 using System.Text;
 
 namespace ControlCatalog.Pages
 {
     public class DragAndDropPage : UserControl
     {
-        private TextBlock _DropState;
-        private TextBlock _DragState;
-        private Border _DragMe;
-        private int DragCount = 0;
-
+        TextBlock _DropState;
+        private const string CustomFormat = "application/xxx-avalonia-controlcatalog-custom";
         public DragAndDropPage()
         {
             this.InitializeComponent();
+            _DropState = this.Find<TextBlock>("DropState");
 
-            _DragMe.PointerPressed += DoDrag;
+            int textCount = 0;
+            SetupDnd("Text", d => d.Set(DataFormats.Text,
+                $"Text was dragged {++textCount} times"));
 
-            AddHandler(DragDrop.DropEvent, Drop);
-            AddHandler(DragDrop.DragOverEvent, DragOver);
+            SetupDnd("Custom", d => d.Set(CustomFormat, "Test123"));
         }
 
-        private async void DoDrag(object sender, Avalonia.Input.PointerPressedEventArgs e)
+        void SetupDnd(string suffix, Action<DataObject> factory, DragDropEffects effects = DragDropEffects.Copy)
         {
-            DataObject dragData = new DataObject();
-            dragData.Set(DataFormats.Text, $"You have dragged text {++DragCount} times");
+            var dragMe = this.Find<Border>("DragMe" + suffix);
+            var dragState = this.Find<TextBlock>("DragState"+suffix);
 
-            var result = await DragDrop.DoDragDrop(e, dragData, DragDropEffects.Copy);
-            switch(result)
+            async void DoDrag(object sender, Avalonia.Input.PointerPressedEventArgs e)
             {
-                case DragDropEffects.Copy:
-                    _DragState.Text = "The text was copied"; break;
-                case DragDropEffects.Link:
-                    _DragState.Text = "The text was linked"; break;
-                case DragDropEffects.None:
-                    _DragState.Text = "The drag operation was canceled"; break;
+                var dragData = new DataObject();
+                factory(dragData);
+
+                var result = await DragDrop.DoDragDrop(e, dragData, DragDropEffects.Copy);
+                switch (result)
+                {
+                    case DragDropEffects.Copy:
+                        dragState.Text = "Data was copied";
+                        break;
+                    case DragDropEffects.Link:
+                        dragState.Text = "Data was linked";
+                        break;
+                    case DragDropEffects.None:
+                        dragState.Text = "The drag operation was canceled";
+                        break;
+                }
             }
-        }
 
-        private void DragOver(object sender, DragEventArgs e)
-        {
-            // Only allow Copy or Link as Drop Operations.
-            e.DragEffects = e.DragEffects & (DragDropEffects.Copy | DragDropEffects.Link);
+            void DragOver(object sender, DragEventArgs e)
+            {
+                // Only allow Copy or Link as Drop Operations.
+                e.DragEffects = e.DragEffects & (DragDropEffects.Copy | DragDropEffects.Link);
 
-            // Only allow if the dragged data contains text or filenames.
-            if (!e.Data.Contains(DataFormats.Text) && !e.Data.Contains(DataFormats.FileNames))
-                e.DragEffects = DragDropEffects.None; 
-        }
+                // Only allow if the dragged data contains text or filenames.
+                if (!e.Data.Contains(DataFormats.Text)
+                    && !e.Data.Contains(DataFormats.FileNames)
+                    && !e.Data.Contains(CustomFormat))
+                    e.DragEffects = DragDropEffects.None;
+            }
 
-        private void Drop(object sender, DragEventArgs e)
-        {
-            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());
+            void Drop(object sender, DragEventArgs e)
+            {
+                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());
+                else if (e.Data.Contains(CustomFormat))
+                    _DropState.Text = "Custom: " + e.Data.Get(CustomFormat);
+            }
+
+            dragMe.PointerPressed += DoDrag;
+
+            AddHandler(DragDrop.DropEvent, Drop);
+            AddHandler(DragDrop.DragOverEvent, DragOver);
         }
 
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
-
-            _DropState = this.Find<TextBlock>("DropState");
-            _DragState = this.Find<TextBlock>("DragState");
-            _DragMe = this.Find<Border>("DragMe");
         }
     }
 }
diff --git a/samples/ControlCatalog/Pages/ImagePage.xaml b/samples/ControlCatalog/Pages/ImagePage.xaml
index b44fac27cb..f61931ed72 100644
--- a/samples/ControlCatalog/Pages/ImagePage.xaml
+++ b/samples/ControlCatalog/Pages/ImagePage.xaml
@@ -1,45 +1,69 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.Pages.ImagePage">
-  <StackPanel Orientation="Vertical" Spacing="4">
-    <TextBlock Classes="h1">Image</TextBlock>
-    <TextBlock Classes="h2">Displays an image</TextBlock>
-
-    <StackPanel Orientation="Horizontal"
-                Margin="0,16,0,0"
-                HorizontalAlignment="Center"
-                Spacing="16">
-      <StackPanel Orientation="Vertical">
-        <TextBlock>No Stretch</TextBlock>
-        <Image Source="/Assets/delicate-arch-896885_640.jpg"
-               Width="100" Height="200"
-               Stretch="None"/>
-      </StackPanel>
+  <DockPanel>
+    <StackPanel DockPanel.Dock="Top" Orientation="Vertical" Spacing="4">
+      <TextBlock Classes="h1">Image</TextBlock>
+      <TextBlock Classes="h2">Displays an image</TextBlock>
+    </StackPanel>
 
-      <StackPanel Orientation="Vertical">
-        <TextBlock>Fill</TextBlock>
-        <Image Source="/Assets/delicate-arch-896885_640.jpg"
-               Width="100" Height="200"
-               Stretch="Fill"/>
-      </StackPanel>
+    <Grid ColumnDefinitions="*,*,*" RowDefinitions="Auto,*" Margin="64">
+      
+      <DockPanel Grid.Column="0" Grid.Row="1" Margin="16">
+        <TextBlock DockPanel.Dock="Top" Classes="h3" Margin="0 8">Bitmap</TextBlock>
+        <ComboBox Name="bitmapStretch" DockPanel.Dock="Top" SelectedIndex="2" SelectionChanged="BitmapStretchChanged">
+          <ComboBoxItem>None</ComboBoxItem>
+          <ComboBoxItem>Fill</ComboBoxItem>
+          <ComboBoxItem>Uniform</ComboBoxItem>
+          <ComboBoxItem>UniformToFill</ComboBoxItem>
+        </ComboBox>
+        <Image Name="bitmapImage"
+               Source="/Assets/delicate-arch-896885_640.jpg"/>
+      </DockPanel>
 
-      <StackPanel Orientation="Vertical">
-        <TextBlock>Uniform</TextBlock>
-        <Image Source="/Assets/delicate-arch-896885_640.jpg"
-                Width="100" Height="200"
-                Stretch="Uniform"/>
-      </StackPanel>
+      <DockPanel Grid.Column="1" Grid.Row="1" Margin="16">
+        <TextBlock DockPanel.Dock="Top" Classes="h3" Margin="0 8">Crop</TextBlock>
+        <ComboBox Name="bitmapCrop" DockPanel.Dock="Top" SelectedIndex="2" SelectionChanged="BitmapCropChanged">
+          <ComboBoxItem>None</ComboBoxItem>
+          <ComboBoxItem>Center</ComboBoxItem>
+          <ComboBoxItem>TopLeft</ComboBoxItem>
+          <ComboBoxItem>TopRight</ComboBoxItem>
+          <ComboBoxItem>BottomLeft</ComboBoxItem>
+          <ComboBoxItem>BottomRight</ComboBoxItem>
+        </ComboBox>
+        <Image Name="croppedImage">
+          <Image.Source>
+            <CroppedBitmap  Source="/Assets/delicate-arch-896885_640.jpg" SourceRect="0 0 320 240"/>  
+          </Image.Source>
+        </Image>
+      </DockPanel>
 
-      <StackPanel Orientation="Vertical">
-        <TextBlock>UniformToFill</TextBlock>
-        <Image Source="/Assets/delicate-arch-896885_640.jpg"
-               Width="100" Height="200"
-               Stretch="UniformToFill"/>
-      </StackPanel>
-    </StackPanel>
-    <StackPanel Orientation="Vertical">
-      <TextBlock>Window Icon as an Image</TextBlock>
-      <Image Name="Icon" Width="100" Height="200" Stretch="None" />
-    </StackPanel>
-  </StackPanel>
+      <DockPanel Grid.Column="2" Grid.Row="1" Margin="16">
+        <TextBlock DockPanel.Dock="Top" Classes="h3" Margin="0 8">Drawing</TextBlock>
+        <ComboBox Name="drawingStretch" DockPanel.Dock="Top" SelectedIndex="2" SelectionChanged="DrawingStretchChanged">
+          <ComboBoxItem>None</ComboBoxItem>
+          <ComboBoxItem>Fill</ComboBoxItem>
+          <ComboBoxItem>Uniform</ComboBoxItem>
+          <ComboBoxItem>UniformToFill</ComboBoxItem>
+        </ComboBox>
+        <Image Name="drawingImage">
+          <Image.Source>
+            <DrawingImage>
+              <GeometryDrawing Brush="Red">
+                <PathGeometry>
+                  <PathFigure StartPoint="0,0" IsClosed="True">
+                    <QuadraticBezierSegment Point1="50,0" Point2="50,-50" />
+                    <QuadraticBezierSegment Point1="100,-50" Point2="100,0" />
+                    <LineSegment Point="50,0" />
+                    <LineSegment Point="50,50" />
+                  </PathFigure>
+                </PathGeometry>
+              </GeometryDrawing>
+            </DrawingImage>
+          </Image.Source>
+        </Image>
+      </DockPanel>
+    </Grid>
+    
+  </DockPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/ImagePage.xaml.cs b/samples/ControlCatalog/Pages/ImagePage.xaml.cs
index 792b25963e..d8f4d6d5a2 100644
--- a/samples/ControlCatalog/Pages/ImagePage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ImagePage.xaml.cs
@@ -1,41 +1,75 @@
-using System.IO;
+using System;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using Avalonia.Media;
 using Avalonia.Media.Imaging;
+using Avalonia.Platform;
 
 namespace ControlCatalog.Pages
 {
     public class ImagePage : UserControl
     {
-        private Image iconImage;
+        private readonly Image _bitmapImage;
+        private readonly Image _drawingImage;
+        private readonly Image _croppedImage;
+
         public ImagePage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
+            _bitmapImage = this.FindControl<Image>("bitmapImage");
+            _drawingImage = this.FindControl<Image>("drawingImage");
+            _croppedImage = this.FindControl<Image>("croppedImage");
         }
 
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
-            iconImage = this.Get<Image>("Icon");
         }
 
-        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        public void BitmapStretchChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (_bitmapImage != null)
+            {
+                var comboxBox = (ComboBox)sender;
+                _bitmapImage.Stretch = (Stretch)comboxBox.SelectedIndex;
+            }
+        }
+
+        public void DrawingStretchChanged(object sender, SelectionChangedEventArgs e)
         {
-            base.OnAttachedToVisualTree(e);
-            if (iconImage.Source == null)
+            if (_drawingImage != null)
             {
-                var windowRoot = e.Root as Window;
-                if (windowRoot != null)
-                {
-                    using (var stream = new MemoryStream())
-                    {
-                        windowRoot.Icon.Save(stream);
-                        stream.Seek(0, SeekOrigin.Begin);
-                        iconImage.Source = new Bitmap(stream);
-                    }
-                }
+                var comboxBox = (ComboBox)sender;
+                _drawingImage.Stretch = (Stretch)comboxBox.SelectedIndex;
             }
         }
+
+        public void BitmapCropChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (_croppedImage != null)
+            {
+                var comboxBox = (ComboBox)sender;
+                var croppedBitmap = _croppedImage.Source as CroppedBitmap;
+                croppedBitmap.SourceRect = GetCropRect(comboxBox.SelectedIndex);
+            }
+        }
+
+        private PixelRect GetCropRect(int index)
+        {
+            var bitmapWidth = 640;
+            var bitmapHeight = 426;
+            var cropSize = new PixelSize(320, 240);
+            return index switch
+            {
+                1 => new PixelRect(new PixelPoint((bitmapWidth - cropSize.Width) / 2, (bitmapHeight - cropSize.Width) / 2), cropSize),
+                2 => new PixelRect(new PixelPoint(0, 0), cropSize),
+                3 => new PixelRect(new PixelPoint(bitmapWidth - cropSize.Width, 0), cropSize),
+                4 => new PixelRect(new PixelPoint(0, bitmapHeight - cropSize.Height), cropSize),
+                5 => new PixelRect(new PixelPoint(bitmapWidth - cropSize.Width, bitmapHeight - cropSize.Height), cropSize),
+                _ => PixelRect.Empty
+            };
+            
+        }
     }
 }
diff --git a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml
index 103c016298..392ccb57c3 100644
--- a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml
+++ b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml
@@ -1,6 +1,30 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.Pages.ItemsRepeaterPage">
+  <UserControl.Resources>
+    <RecyclePool x:Key="RecyclePool" />
+    <DataTemplate x:Key="odd">
+      <TextBlock Background="Yellow"
+                 Foreground="Black"
+                 Height="{Binding Height}"
+                 Text="{Binding Text}"/>
+    </DataTemplate>
+    <DataTemplate x:Key="even">
+      <TextBlock Background="Wheat"
+                 Foreground="Black"
+                 Height="{Binding Height}"
+                 Text="{Binding Text}"/>
+    </DataTemplate>
+    <RecyclingElementFactory x:Key="elementFactory"
+                             RecyclePool="{StaticResource RecyclePool}"
+                             SelectTemplateKey="OnSelectTemplateKey">
+      <RecyclingElementFactory.Templates>
+        <StaticResource x:Key="odd" ResourceKey="odd" />
+        <StaticResource x:Key="even" ResourceKey="even" />
+      </RecyclingElementFactory.Templates>
+    </RecyclingElementFactory>
+  </UserControl.Resources>
+  
   <DockPanel>
     <StackPanel DockPanel.Dock="Top" Spacing="4" Margin="0 0 0 16">
       <TextBlock Classes="h1">ItemsRepeater</TextBlock>
@@ -15,18 +39,16 @@
       </ComboBox>
       <Button Command="{Binding AddItem}">Add 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>
     </StackPanel>
-    <Border BorderThickness="1" BorderBrush="{DynamicResource ThemeBorderMidBrush}" Margin="0 0 0 16">
+    <Border BorderThickness="1" BorderBrush="{DynamicResource SystemControlHighlightBaseMediumLowBrush}" Margin="0 0 0 16">
       <ScrollViewer Name="scroller"
                     HorizontalScrollBarVisibility="Auto"
                     VerticalScrollBarVisibility="Auto">
-        <ItemsRepeater Name="repeater" Background="Transparent" Items="{Binding Items}">
-          <ItemsRepeater.ItemTemplate>
-            <DataTemplate>
-              <TextBlock Height="{Binding Height}" Text="{Binding Text}"/>
-            </DataTemplate>
-          </ItemsRepeater.ItemTemplate>
-        </ItemsRepeater>
+        <ItemsRepeater Name="repeater" Background="Transparent" Items="{Binding Items}"
+                       ItemTemplate="{StaticResource elementFactory}"/>
       </ScrollViewer>
     </Border>
   </DockPanel>
diff --git a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs
index decd849adc..9e898c4536 100644
--- a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs
@@ -5,22 +5,32 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Layout;
 using Avalonia.Markup.Xaml;
+using Avalonia.VisualTree;
 using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
     public class ItemsRepeaterPage : UserControl
     {
+        private readonly ItemsRepeaterPageViewModel _viewModel;
         private ItemsRepeater _repeater;
         private ScrollViewer _scroller;
+        private Button _scrollToLast;
+        private Button _scrollToRandom;
+        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.PointerPressed += RepeaterClick;
-            DataContext = new ItemsRepeaterPageViewModel();
+            _repeater.KeyDown += RepeaterOnKeyDown;
+            _scrollToLast.Click += scrollToLast_Click;
+            _scrollToRandom.Click += scrollToRandom_Click;
+            DataContext = _viewModel = new ItemsRepeaterPageViewModel();
         }
 
         private void InitializeComponent()
@@ -28,6 +38,12 @@ namespace ControlCatalog.Pages
             AvaloniaXamlLoader.Load(this);
         }
 
+        public void OnSelectTemplateKey(object sender, SelectTemplateEventArgs e)
+        {
+            var item = (ItemsRepeaterPageViewModel.Item)e.DataContext;
+            e.TemplateKey = (item.Index % 2 == 0) ? "even" : "odd";
+        }
+
         private void LayoutChanged(object sender, SelectionChangedEventArgs e)
         {
             if (_repeater == null)
@@ -69,13 +85,60 @@ namespace ControlCatalog.Pages
                         MinItemHeight = 200,
                     };
                     break;
+                case 4:
+                    _scroller.HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
+                    _scroller.VerticalScrollBarVisibility = ScrollBarVisibility.Disabled;
+                    _repeater.Layout = new WrapLayout
+                    {
+                        Orientation = Orientation.Vertical,
+                        HorizontalSpacing = 20,
+                        VerticalSpacing = 20
+                    };
+                    break;
+                case 5:
+                    _scroller.HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled;
+                    _scroller.VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
+                    _repeater.Layout = new WrapLayout
+                    {
+                        Orientation = Orientation.Horizontal,
+                        HorizontalSpacing = 20,
+                        VerticalSpacing = 20
+                    };
+                    break;
             }
         }
 
+        private void ScrollTo(int index)
+        {
+            System.Diagnostics.Debug.WriteLine("Scroll to " + index);
+            var layoutManager = ((Window)this.GetVisualRoot()).LayoutManager;
+            var element = _repeater.GetOrCreateElement(index);
+            layoutManager.ExecuteLayoutPass();
+            element.BringIntoView();
+        }
+
         private void RepeaterClick(object sender, PointerPressedEventArgs e)
         {
             var item = (e.Source as TextBlock)?.DataContext as ItemsRepeaterPageViewModel.Item;
-            ((ItemsRepeaterPageViewModel)DataContext).SelectedItem = item;
+            _viewModel.SelectedItem = item;
+        }
+
+        private void RepeaterOnKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.F5)
+            {
+                _viewModel.ResetItems();
+            }
+        }
+
+        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)
+        {
+            ScrollTo(_random.Next(_viewModel.Items.Count - 1));
         }
     }
 }
diff --git a/samples/ControlCatalog/Pages/LabelsPage.axaml b/samples/ControlCatalog/Pages/LabelsPage.axaml
new file mode 100644
index 0000000000..961e7ba7e6
--- /dev/null
+++ b/samples/ControlCatalog/Pages/LabelsPage.axaml
@@ -0,0 +1,42 @@
+<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="400" d:DesignHeight="250"
+             x:Class="ControlCatalog.Pages.LabelsPage"
+             x:Name="_labelsPage">
+    <UserControl.Styles>
+        <Style Selector="Label">
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="Margin" Value="6,3,0,3"/>
+        </Style>
+        <Style Selector="TextBox">
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="Margin" Value="0,3,6,3"/>
+        </Style>
+        <Style Selector="CheckBox">
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="Margin" Value="0,3,6,3"/>
+        </Style>
+        <Style Selector="Button[IsDefault=true]">
+            <Setter Property="Background" Value="{DynamicResource HighlightBrush}"/>
+        </Style>
+    </UserControl.Styles>
+    <ScrollViewer VerticalScrollBarVisibility="Auto" 
+                  HorizontalScrollBarVisibility="Hidden">
+        <Grid HorizontalAlignment="Left" VerticalAlignment="Top" RowDefinitions="Auto,Auto,Auto,Auto,Auto,*" ColumnDefinitions="Auto,6,*" Width="246">
+            <Label Target="firstNameEdit" Grid.Row="0" Grid.Column="0">_First name</Label>
+            <TextBox Name="firstNameEdit" Grid.Column="2" Grid.Row="0" Text="{Binding FirstName}"></TextBox>
+            <Label Target="lastNameEdit" Grid.Row="1" Grid.Column="0">_Last name</Label>
+            <TextBox Name="lastNameEdit" Grid.Column="2" Grid.Row="1" Text="{Binding LastName}"></TextBox>
+            <Label Target="bannedCheck" Grid.Row="2" Grid.Column="0">_Banned</Label>
+            <CheckBox Name="bannedCheck" Grid.Column="2" Grid.Row="2" IsChecked="{Binding IsBanned}"></CheckBox>
+            <GridSplitter Grid.Column="1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Grid.RowSpan="3" >
+            </GridSplitter>
+            <StackPanel Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="3" Orientation="Horizontal" HorizontalAlignment="Right">
+                <Button IsCancel="True" Command="{Binding #_labelsPage.DoCancel}">Cancel</Button>
+                <Button IsDefault="True" Command="{Binding #_labelsPage.DoSave}">Save</Button>
+            </StackPanel>
+        </Grid>
+    </ScrollViewer>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/LabelsPage.axaml.cs b/samples/ControlCatalog/Pages/LabelsPage.axaml.cs
new file mode 100644
index 0000000000..a14978fd2c
--- /dev/null
+++ b/samples/ControlCatalog/Pages/LabelsPage.axaml.cs
@@ -0,0 +1,42 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using ControlCatalog.Models;
+
+namespace ControlCatalog.Pages
+{
+    public class LabelsPage : UserControl
+    {
+        private Person _person;
+
+        public LabelsPage()
+        {
+            CreateDefaultPerson();
+            this.InitializeComponent();
+        }
+
+        private void CreateDefaultPerson()
+        {
+            DataContext = _person = new Person
+            {
+                FirstName = "John",
+                LastName = "Doe",
+                IsBanned = true,
+            };
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        public void DoSave()
+        {
+            
+        }
+        public void DoCancel()
+        {
+            CreateDefaultPerson();
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/LayoutTransformControlPage.xaml b/samples/ControlCatalog/Pages/LayoutTransformControlPage.xaml
index 446dfd7ce1..8cf3610b47 100644
--- a/samples/ControlCatalog/Pages/LayoutTransformControlPage.xaml
+++ b/samples/ControlCatalog/Pages/LayoutTransformControlPage.xaml
@@ -11,10 +11,10 @@
           RowDefinitions="24,Auto,24"
           HorizontalAlignment="Center"
           VerticalAlignment="Center">
-      <Border Background="{DynamicResource ThemeAccentBrush}" Grid.Column="1" Grid.Row="0"/>
-      <Border Background="{DynamicResource ThemeAccentBrush}" Grid.Column="0" Grid.Row="1"/>
-      <Border Background="{DynamicResource ThemeAccentBrush}" Grid.Column="2" Grid.Row="1"/>
-      <Border Background="{DynamicResource ThemeAccentBrush}" Grid.Column="1" Grid.Row="2"/>
+      <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>
diff --git a/samples/ControlCatalog/Pages/ListBoxPage.xaml b/samples/ControlCatalog/Pages/ListBoxPage.xaml
index b1b3112e60..f515db84d4 100644
--- a/samples/ControlCatalog/Pages/ListBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/ListBoxPage.xaml
@@ -1,30 +1,25 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.Pages.ListBoxPage">
-  <StackPanel Orientation="Vertical" Spacing="4">
-    <TextBlock Classes="h1">ListBox</TextBlock>
-    <TextBlock Classes="h2">Hosts a collection of ListBoxItem.</TextBlock>
-
-    <StackPanel Orientation="Horizontal"
-              Margin="0,16,0,0"
-              HorizontalAlignment="Center"
-              Spacing="16">
-      <StackPanel Orientation="Vertical" Spacing="8">
-        <ListBox Items="{Binding Items}" SelectedItem="{Binding SelectedItem}" AutoScrollToSelectedItem="True"  SelectedItems="{Binding SelectedItems}" SelectionMode="{Binding SelectionMode}" Width="250" Height="350"></ListBox>
-
-        <Button Command="{Binding AddItemCommand}">Add</Button>
-
-        <Button Command="{Binding RemoveItemCommand}">Remove</Button>
-
-        <Button Command="{Binding SelectRandomItemCommand}">Select Random Item</Button>
-
-        <ComboBox SelectedIndex="{Binding SelectionMode, Mode=TwoWay}">
-          <ComboBoxItem>Single</ComboBoxItem>
-          <ComboBoxItem>Multiple</ComboBoxItem>
-          <ComboBoxItem>Toggle</ComboBoxItem>
-          <ComboBoxItem>AlwaysSelected</ComboBoxItem>
-        </ComboBox>
-      </StackPanel>
+  <DockPanel>
+    <StackPanel DockPanel.Dock="Top" Margin="4">
+      <TextBlock Classes="h1">ListBox</TextBlock>
+      <TextBlock Classes="h2">Hosts a collection of ListBoxItem.</TextBlock>
     </StackPanel>
-  </StackPanel>
+    <StackPanel DockPanel.Dock="Right" Margin="4">
+      <CheckBox IsChecked="{Binding Multiple}">Multiple</CheckBox>
+      <CheckBox IsChecked="{Binding Toggle}">Toggle</CheckBox>
+      <CheckBox IsChecked="{Binding AlwaysSelected}">AlwaysSelected</CheckBox>
+      <CheckBox IsChecked="{Binding AutoScrollToSelectedItem}">AutoScrollToSelectedItem</CheckBox>
+    </StackPanel>
+    <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" Margin="4">
+      <Button Command="{Binding AddItemCommand}">Add</Button>
+      <Button Command="{Binding RemoveItemCommand}">Remove</Button>
+      <Button Command="{Binding SelectRandomItemCommand}">Select Random Item</Button>
+    </StackPanel>
+    <ListBox Items="{Binding Items}"
+             Selection="{Binding Selection}"
+             AutoScrollToSelectedItem="{Binding AutoScrollToSelectedItem}"
+             SelectionMode="{Binding SelectionMode^}"/>
+  </DockPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/ListBoxPage.xaml.cs b/samples/ControlCatalog/Pages/ListBoxPage.xaml.cs
index 0f2d4461bf..59c8fc0cbe 100644
--- a/samples/ControlCatalog/Pages/ListBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ListBoxPage.xaml.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reactive;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using ReactiveUI;
+using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
@@ -13,72 +9,12 @@ namespace ControlCatalog.Pages
         public ListBoxPage()
         {
             InitializeComponent();
-            DataContext = new PageViewModel();
+            DataContext = new ListBoxPageViewModel();
         }
 
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
         }
-
-        private class PageViewModel : ReactiveObject
-        {
-            private int _counter;
-            private SelectionMode _selectionMode;
-
-            public PageViewModel()
-            {
-                Items = new ObservableCollection<string>(Enumerable.Range(1, 10000).Select(i => GenerateItem()));
-                SelectedItems = new ObservableCollection<string>();
-
-                AddItemCommand = ReactiveCommand.Create(() => Items.Add(GenerateItem()));
-
-                RemoveItemCommand = ReactiveCommand.Create(() =>
-                {
-                    while (SelectedItems.Count > 0)
-                    {
-                        Items.Remove(SelectedItems[0]);
-                    }
-                });
-
-                SelectRandomItemCommand = ReactiveCommand.Create(() =>
-                {
-                    var random = new Random();
-
-                    SelectedItem = Items[random.Next(Items.Count - 1)];
-                });
-            }
-
-            public ObservableCollection<string> Items { get; }
-
-            private string _selectedItem;
-
-            public string SelectedItem
-            {
-                get { return _selectedItem; }
-                set { this.RaiseAndSetIfChanged(ref _selectedItem, value); }
-            }
-
-
-            public ObservableCollection<string> SelectedItems { get; }
-
-            public ReactiveCommand<Unit, Unit> AddItemCommand { get; }
-
-            public ReactiveCommand<Unit, Unit> RemoveItemCommand { get; }
-
-            public ReactiveCommand<Unit, Unit> SelectRandomItemCommand { get; }
-
-            public SelectionMode SelectionMode
-            {
-                get => _selectionMode;
-                set
-                {
-                    SelectedItems.Clear();
-                    this.RaiseAndSetIfChanged(ref _selectionMode, value);
-                }
-            }
-
-            private string GenerateItem() => $"Item {_counter++.ToString()}";
-        }
     }
 }
diff --git a/samples/ControlCatalog/Pages/MenuPage.xaml b/samples/ControlCatalog/Pages/MenuPage.xaml
index 868f0df6ad..2c09cb9b4d 100644
--- a/samples/ControlCatalog/Pages/MenuPage.xaml
+++ b/samples/ControlCatalog/Pages/MenuPage.xaml
@@ -16,13 +16,19 @@
                 <TextBlock Classes="h3" Margin="4 8">Defined in XAML</TextBlock>
                 <Menu>
                     <MenuItem Header="_First">
-                        <MenuItem Header="Standard _Menu Item"/>
+                        <MenuItem Header="Standard _Menu Item" InputGesture="Ctrl+A" />
+                        <MenuItem Header="_Disabled Menu Item" IsEnabled="False" InputGesture="Ctrl+D" />
                         <Separator/>
                         <MenuItem Header="Menu with _Submenu">
                             <MenuItem Header="Submenu _1"/>
-                            <MenuItem Header="Submenu _2"/>
+                            <MenuItem Header="Submenu _2 with Submenu">
+                                <MenuItem Header="Submenu Level 2" />
+                            </MenuItem>
+                            <MenuItem Header="Submenu _3 with Submenu Disabled" IsEnabled="False">
+                                <MenuItem Header="Submenu Level 2" />
+                            </MenuItem>                          
                         </MenuItem>
-                        <MenuItem Header="Menu Item with _Icon">
+                        <MenuItem Header="Menu Item with _Icon" InputGesture="Ctrl+Shift+B">
                             <MenuItem.Icon>
                                 <Image Source="/Assets/github_icon.png"/>
                             </MenuItem.Icon>
@@ -52,6 +58,33 @@
                     </Menu.Styles>
                 </Menu>
             </StackPanel>
+        
+
+            <StackPanel>
+                <TextBlock Classes="h3" Margin="4 8">Mixed</TextBlock>
+                <Menu>
+                    <MenuItem Header="_File">
+                        <MenuItem Header="_New" CommandParameter="{Binding}" InputGesture="Ctrl+N"/>
+                        <Separator/>
+                        <MenuItem Header="_Open..." InputGesture="Ctrl+O"/>
+                        <Separator/>
+                        <MenuItem Header="Execu_te Script..." />
+                        <Separator/>
+                        <MenuItem Header="_Recent" Items="{Binding RecentItems}">
+                            <MenuItem.Styles>
+                                <Style Selector="MenuItem">
+                                    <Setter Property="Header" Value="{Binding Header}"/>
+                                </Style>
+                            </MenuItem.Styles>
+                        </MenuItem>
+                        <Separator/>
+                        <MenuItem Header="E_xit" InputGesture="Alt+F4"/>
+                    </MenuItem>
+                    <MenuItem Header="_Help">
+                        <MenuItem Header="_About"/>
+                    </MenuItem>
+                </Menu>
+            </StackPanel>
         </StackPanel>
     </StackPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/MenuPage.xaml.cs b/samples/ControlCatalog/Pages/MenuPage.xaml.cs
index 46dbe3dcad..5999510b6c 100644
--- a/samples/ControlCatalog/Pages/MenuPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/MenuPage.xaml.cs
@@ -6,7 +6,6 @@ using System.Windows.Input;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using ControlCatalog.ViewModels;
-using ReactiveUI;
 
 namespace ControlCatalog.Pages
 {
diff --git a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
index e605a92da0..d75622f1fb 100644
--- a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
+++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
@@ -1,5 +1,6 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=netstandard"
              x:Class="ControlCatalog.Pages.NumericUpDownPage">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Margin="2" Classes="h1">Numeric up-down control</TextBlock>
@@ -50,22 +51,22 @@
         <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="2">Text:</TextBlock>
         <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding #upDown.Text}" VerticalAlignment="Center" Margin="2" />
       </Grid>
-      <Grid Grid.Row="0" Grid.Column="2" Margin="10,2,2,2" RowDefinitions="Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="Auto, 120">
+      <Grid Grid.Row="0" Grid.Column="2" Margin="10,2,2,2" 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" Width="70" HorizontalAlignment="Center"/>
+                       CultureInfo="{Binding #upDown.CultureInfo}" 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" Width="70" HorizontalAlignment="Center"/>
+                       CultureInfo="{Binding #upDown.CultureInfo}" 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" Width="70" HorizontalAlignment="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"
-                       Margin="2" Width="70" HorizontalAlignment="Center"/>
+                       Margin="2" HorizontalAlignment="Center"/>
 
       </Grid>
     </Grid>
@@ -73,8 +74,17 @@
     <StackPanel Margin="2,10,2,2" Orientation="Horizontal" Spacing="10">
       <TextBlock FontSize="14" FontWeight="Bold" VerticalAlignment="Center">Usage of NumericUpDown:</TextBlock>
       <NumericUpDown Name="upDown" Minimum="0" Maximum="10" Increment="0.5"
-                     CultureInfo="en-US" VerticalAlignment="Center" Width="100"
+                     CultureInfo="en-US" VerticalAlignment="Center"
                      Watermark="Enter text" FormatString="{Binding SelectedFormat.Value}"/>
+      
+      <TextBlock FontSize="14" FontWeight="Bold" VerticalAlignment="Center">NumericUpDown with Validation Errors:</TextBlock>
+      <NumericUpDown Minimum="0" Maximum="10" Increment="0.5"
+                     CultureInfo="en-US" VerticalAlignment="Center"
+                     Watermark="Enter text" FormatString="{Binding SelectedFormat.Value}">
+        <DataValidationErrors.Error>
+          <sys:Exception /> 
+        </DataValidationErrors.Error>
+      </NumericUpDown>
     </StackPanel>
 
   </StackPanel>
diff --git a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
index 92da64d87e..31749edf08 100644
--- a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
@@ -6,7 +6,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Markup.Xaml;
-using ReactiveUI;
+using MiniMvvm;
 
 namespace ControlCatalog.Pages
 {
@@ -26,7 +26,7 @@ namespace ControlCatalog.Pages
 
     }
 
-    public class NumbersPageViewModel : ReactiveObject
+    public class NumbersPageViewModel : ViewModelBase
     {
         private IList<FormatObject> _formats;
         private FormatObject _selectedFormat;
diff --git a/samples/ControlCatalog/Pages/OpenGlPage.xaml b/samples/ControlCatalog/Pages/OpenGlPage.xaml
new file mode 100644
index 0000000000..0eb09004ba
--- /dev/null
+++ b/samples/ControlCatalog/Pages/OpenGlPage.xaml
@@ -0,0 +1,29 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.OpenGlPage"
+             xmlns:pages="clr-namespace:ControlCatalog.Pages">
+  <Grid>
+    <pages:OpenGlPageControl x:Name="GL"/>
+    <StackPanel>
+      <TextBlock Text="{Binding #GL.Info}"/>
+    </StackPanel>
+    <Grid ColumnDefinitions="*,Auto" Margin="20">
+      <StackPanel Grid.Column="1" MinWidth="300">
+        <TextBlock>Yaw</TextBlock>
+        <Slider Value="{Binding Yaw, Mode=TwoWay, ElementName=GL}" Maximum="10"/>
+        <TextBlock>Pitch</TextBlock>
+        <Slider Value="{Binding Pitch, Mode=TwoWay, ElementName=GL}" Maximum="10"/>
+        <TextBlock>Roll</TextBlock>
+        <Slider Value="{Binding Roll, Mode=TwoWay, ElementName=GL}" Maximum="10"/>
+        <StackPanel Orientation="Horizontal">
+          <TextBlock FontWeight="Bold" Foreground="#C000C0">D</TextBlock>
+          <TextBlock FontWeight="Bold" Foreground="#00C090">I</TextBlock>
+          <TextBlock FontWeight="Bold" Foreground="#90C000">S</TextBlock>
+          <TextBlock FontWeight="Bold" Foreground="#C09000">C</TextBlock>
+          <TextBlock FontWeight="Bold" Foreground="#00C090">O</TextBlock>
+        </StackPanel>
+        <Slider Value="{Binding Disco, Mode=TwoWay, ElementName=GL}" Maximum="1"/>
+      </StackPanel>
+    </Grid>
+  </Grid>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs b/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
new file mode 100644
index 0000000000..cb79bf219a
--- /dev/null
+++ b/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
@@ -0,0 +1,402 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.OpenGL;
+using Avalonia.OpenGL.Controls;
+using Avalonia.Platform.Interop;
+using Avalonia.Threading;
+using static Avalonia.OpenGL.GlConsts;
+// ReSharper disable StringLiteralTypo
+
+namespace ControlCatalog.Pages
+{
+    public class OpenGlPage : UserControl
+    {
+
+    }
+
+    public class OpenGlPageControl : OpenGlControlBase
+    {
+        private float _yaw;
+
+        public static readonly DirectProperty<OpenGlPageControl, float> YawProperty =
+            AvaloniaProperty.RegisterDirect<OpenGlPageControl, float>("Yaw", o => o.Yaw, (o, v) => o.Yaw = v);
+
+        public float Yaw
+        {
+            get => _yaw;
+            set => SetAndRaise(YawProperty, ref _yaw, value);
+        }
+
+        private float _pitch;
+
+        public static readonly DirectProperty<OpenGlPageControl, float> PitchProperty =
+            AvaloniaProperty.RegisterDirect<OpenGlPageControl, float>("Pitch", o => o.Pitch, (o, v) => o.Pitch = v);
+
+        public float Pitch
+        {
+            get => _pitch;
+            set => SetAndRaise(PitchProperty, ref _pitch, value);
+        }
+
+
+        private float _roll;
+
+        public static readonly DirectProperty<OpenGlPageControl, float> RollProperty =
+            AvaloniaProperty.RegisterDirect<OpenGlPageControl, float>("Roll", o => o.Roll, (o, v) => o.Roll = v);
+
+        public float Roll
+        {
+            get => _roll;
+            set => SetAndRaise(RollProperty, ref _roll, value);
+        }
+
+
+        private float _disco;
+
+        public static readonly DirectProperty<OpenGlPageControl, float> DiscoProperty =
+            AvaloniaProperty.RegisterDirect<OpenGlPageControl, float>("Disco", o => o.Disco, (o, v) => o.Disco = v);
+
+        public float Disco
+        {
+            get => _disco;
+            set => SetAndRaise(DiscoProperty, ref _disco, value);
+        }
+
+        private string _info;
+
+        public static readonly DirectProperty<OpenGlPageControl, string> InfoProperty =
+            AvaloniaProperty.RegisterDirect<OpenGlPageControl, string>("Info", o => o.Info, (o, v) => o.Info = v);
+
+        public string Info
+        {
+            get => _info;
+            private set => SetAndRaise(InfoProperty, ref _info, value);
+        }
+
+        static OpenGlPageControl()
+        {
+            AffectsRender<OpenGlPageControl>(YawProperty, PitchProperty, RollProperty, DiscoProperty);
+        }
+
+        private int _vertexShader;
+        private int _fragmentShader;
+        private int _shaderProgram;
+        private int _vertexBufferObject;
+        private int _indexBufferObject;
+        private int _vertexArrayObject;
+        private GlExtrasInterface _glExt;
+
+        private string GetShader(bool fragment, string shader)
+        {
+            var version = (GlVersion.Type == GlProfileType.OpenGL ?
+                RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? 150 : 120 :
+                100);
+            var data = "#version " + version + "\n";
+            if (GlVersion.Type == GlProfileType.OpenGLES)
+                data += "precision mediump float;\n";
+            if (version >= 150)
+            {
+                shader = shader.Replace("attribute", "in");
+                if (fragment)
+                    shader = shader
+                        .Replace("varying", "in")
+                        .Replace("//DECLAREGLFRAG", "out vec4 outFragColor;")
+                        .Replace("gl_FragColor", "outFragColor");
+                else
+                    shader = shader.Replace("varying", "out");
+            }
+
+            data += shader;
+
+            return data;
+        }
+
+
+        private string VertexShaderSource => GetShader(false, @"
+        attribute vec3 aPos;
+        attribute vec3 aNormal;
+        uniform mat4 uModel;
+        uniform mat4 uProjection;
+        uniform mat4 uView;
+
+        varying vec3 FragPos;
+        varying vec3 VecPos;  
+        varying vec3 Normal;
+        uniform float uTime;
+        uniform float uDisco;
+        void main()
+        {
+            float discoScale = sin(uTime * 10.0) / 10.0;
+            float distortionX = 1.0 + uDisco * cos(uTime * 20.0) / 10.0;
+            
+            float scale = 1.0 + uDisco * discoScale;
+            
+            vec3 scaledPos = aPos;
+            scaledPos.x = scaledPos.x * distortionX;
+            
+            scaledPos *= scale;
+            gl_Position = uProjection * uView * uModel * vec4(scaledPos, 1.0);
+            FragPos = vec3(uModel * vec4(aPos, 1.0));
+            VecPos = aPos;
+            Normal = normalize(vec3(uModel * vec4(aNormal, 1.0)));
+        }
+");
+
+        private string FragmentShaderSource => GetShader(true, @"
+        varying vec3 FragPos; 
+        varying vec3 VecPos; 
+        varying vec3 Normal;
+        uniform float uMaxY;
+        uniform float uMinY;
+        uniform float uTime;
+        uniform float uDisco;
+        //DECLAREGLFRAG
+
+        void main()
+        {
+            float y = (VecPos.y - uMinY) / (uMaxY - uMinY);
+            float c = cos(atan(VecPos.x, VecPos.z) * 20.0 + uTime * 40.0 + y * 50.0);
+            float s = sin(-atan(VecPos.z, VecPos.x) * 20.0 - uTime * 20.0 - y * 30.0);
+
+            vec3 discoColor = vec3(
+                0.5 + abs(0.5 - y) * cos(uTime * 10.0),
+                0.25 + (smoothstep(0.3, 0.8, y) * (0.5 - c / 4.0)),
+                0.25 + abs((smoothstep(0.1, 0.4, y) * (0.5 - s / 4.0))));
+
+            vec3 objectColor = vec3((1.0 - y), 0.40 +  y / 4.0, y * 0.75 + 0.25);
+            objectColor = objectColor * (1.0 - uDisco) + discoColor * uDisco;
+
+            float ambientStrength = 0.3;
+            vec3 lightColor = vec3(1.0, 1.0, 1.0);
+            vec3 lightPos = vec3(uMaxY * 2.0, uMaxY * 2.0, uMaxY * 2.0);
+            vec3 ambient = ambientStrength * lightColor;
+
+
+            vec3 norm = normalize(Normal);
+            vec3 lightDir = normalize(lightPos - FragPos);  
+
+            float diff = max(dot(norm, lightDir), 0.0);
+            vec3 diffuse = diff * lightColor;
+
+            vec3 result = (ambient + diffuse) * objectColor;
+            gl_FragColor = vec4(result, 1.0);
+
+        }
+");
+
+        [StructLayout(LayoutKind.Sequential, Pack = 4)]
+        private struct Vertex
+        {
+            public Vector3 Position;
+            public Vector3 Normal;
+        }
+
+        private readonly Vertex[] _points;
+        private readonly ushort[] _indices;
+        private readonly float _minY;
+        private readonly float _maxY;
+
+
+        public OpenGlPageControl()
+        {
+            var name = typeof(OpenGlPage).Assembly.GetManifestResourceNames().First(x => x.Contains("teapot.bin"));
+            using (var sr = new BinaryReader(typeof(OpenGlPage).Assembly.GetManifestResourceStream(name)))
+            {
+                var buf = new byte[sr.ReadInt32()];
+                sr.Read(buf, 0, buf.Length);
+                var points = new float[buf.Length / 4];
+                Buffer.BlockCopy(buf, 0, points, 0, buf.Length);
+                buf = new byte[sr.ReadInt32()];
+                sr.Read(buf, 0, buf.Length);
+                _indices = new ushort[buf.Length / 2];
+                Buffer.BlockCopy(buf, 0, _indices, 0, buf.Length);
+                _points = new Vertex[points.Length / 3];
+                for (var primitive = 0; primitive < points.Length / 3; primitive++)
+                {
+                    var srci = primitive * 3;
+                    _points[primitive] = new Vertex
+                    {
+                        Position = new Vector3(points[srci], points[srci + 1], points[srci + 2])
+                    };
+                }
+
+                for (int i = 0; i < _indices.Length; i += 3)
+                {
+                    Vector3 a = _points[_indices[i]].Position;
+                    Vector3 b = _points[_indices[i + 1]].Position;
+                    Vector3 c = _points[_indices[i + 2]].Position;
+                    var normal = Vector3.Normalize(Vector3.Cross(c - b, a - b));
+
+                    _points[_indices[i]].Normal += normal;
+                    _points[_indices[i + 1]].Normal += normal;
+                    _points[_indices[i + 2]].Normal += normal;
+                }
+
+                for (int i = 0; i < _points.Length; i++)
+                {
+                    _points[i].Normal = Vector3.Normalize(_points[i].Normal);
+                    _maxY = Math.Max(_maxY, _points[i].Position.Y);
+                    _minY = Math.Min(_minY, _points[i].Position.Y);
+                }
+            }
+
+        }
+
+        private void CheckError(GlInterface gl)
+        {
+            int err;
+            while ((err = gl.GetError()) != GL_NO_ERROR)
+                Console.WriteLine(err);
+        }
+
+        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)}";
+            
+            // Load the source of the vertex shader and compile it.
+            _vertexShader = GL.CreateShader(GL_VERTEX_SHADER);
+            Console.WriteLine(GL.CompileShaderAndGetError(_vertexShader, VertexShaderSource));
+
+            // Load the source of the fragment shader and compile it.
+            _fragmentShader = GL.CreateShader(GL_FRAGMENT_SHADER);
+            Console.WriteLine(GL.CompileShaderAndGetError(_fragmentShader, FragmentShaderSource));
+
+            // Create the shader program, attach the vertex and fragment shaders and link the program.
+            _shaderProgram = GL.CreateProgram();
+            GL.AttachShader(_shaderProgram, _vertexShader);
+            GL.AttachShader(_shaderProgram, _fragmentShader);
+            const int positionLocation = 0;
+            const int normalLocation = 1;
+            GL.BindAttribLocationString(_shaderProgram, positionLocation, "aPos");
+            GL.BindAttribLocationString(_shaderProgram, normalLocation, "aNormal");
+            Console.WriteLine(GL.LinkProgramAndGetError(_shaderProgram));
+            CheckError(GL);
+
+            // Create the vertex buffer object (VBO) for the vertex data.
+            _vertexBufferObject = GL.GenBuffer();
+            // Bind the VBO and copy the vertex data into it.
+            GL.BindBuffer(GL_ARRAY_BUFFER, _vertexBufferObject);
+            CheckError(GL);
+            var vertexSize = Marshal.SizeOf<Vertex>();
+            fixed (void* pdata = _points)
+                GL.BufferData(GL_ARRAY_BUFFER, new IntPtr(_points.Length * vertexSize),
+                    new IntPtr(pdata), GL_STATIC_DRAW);
+
+            _indexBufferObject = GL.GenBuffer();
+            GL.BindBuffer(GL_ELEMENT_ARRAY_BUFFER, _indexBufferObject);
+            CheckError(GL);
+            fixed (void* pdata = _indices)
+                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);
+            CheckError(GL);
+            GL.VertexAttribPointer(positionLocation, 3, GL_FLOAT,
+                0, vertexSize, IntPtr.Zero);
+            GL.VertexAttribPointer(normalLocation, 3, GL_FLOAT,
+                0, vertexSize, new IntPtr(12));
+            GL.EnableVertexAttribArray(positionLocation);
+            GL.EnableVertexAttribArray(normalLocation);
+            CheckError(GL);
+
+        }
+
+        protected override void OnOpenGlDeinit(GlInterface GL, int fb)
+        {
+            // Unbind everything
+            GL.BindBuffer(GL_ARRAY_BUFFER, 0);
+            GL.BindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+            _glExt.BindVertexArray(0);
+            GL.UseProgram(0);
+
+            // Delete all resources.
+            GL.DeleteBuffers(2, new[] { _vertexBufferObject, _indexBufferObject });
+            _glExt.DeleteVertexArrays(1, new[] { _vertexArrayObject });
+            GL.DeleteProgram(_shaderProgram);
+            GL.DeleteShader(_fragmentShader);
+            GL.DeleteShader(_vertexShader);
+        }
+
+        static Stopwatch St = Stopwatch.StartNew();
+        protected override unsafe void OnOpenGlRender(GlInterface gl, int fb)
+        {
+            gl.ClearColor(0, 0, 0, 0);
+            gl.Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+            gl.Enable(GL_DEPTH_TEST);
+            gl.Viewport(0, 0, (int)Bounds.Width, (int)Bounds.Height);
+            var GL = gl;
+
+            GL.BindBuffer(GL_ARRAY_BUFFER, _vertexBufferObject);
+            GL.BindBuffer(GL_ELEMENT_ARRAY_BUFFER, _indexBufferObject);
+            _glExt.BindVertexArray(_vertexArrayObject);
+            GL.UseProgram(_shaderProgram);
+            CheckError(GL);
+            var projection =
+                Matrix4x4.CreatePerspectiveFieldOfView((float)(Math.PI / 4), (float)(Bounds.Width / Bounds.Height),
+                    0.01f, 1000);
+
+
+            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");
+            var projectionLoc = GL.GetUniformLocationString(_shaderProgram, "uProjection");
+            var maxYLoc = GL.GetUniformLocationString(_shaderProgram, "uMaxY");
+            var minYLoc = GL.GetUniformLocationString(_shaderProgram, "uMinY");
+            var timeLoc = GL.GetUniformLocationString(_shaderProgram, "uTime");
+            var discoLoc = GL.GetUniformLocationString(_shaderProgram, "uDisco");
+            GL.UniformMatrix4fv(modelLoc, 1, false, &model);
+            GL.UniformMatrix4fv(viewLoc, 1, false, &view);
+            GL.UniformMatrix4fv(projectionLoc, 1, false, &projection);
+            GL.Uniform1f(maxYLoc, _maxY);
+            GL.Uniform1f(minYLoc, _minY);
+            GL.Uniform1f(timeLoc, (float)St.Elapsed.TotalSeconds);
+            GL.Uniform1f(discoLoc, _disco);
+            CheckError(GL);
+            GL.DrawElements(GL_TRIANGLES, _indices.Length, GL_UNSIGNED_SHORT, IntPtr.Zero);
+
+            CheckError(GL);
+            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/ProgressBarPage.xaml b/samples/ControlCatalog/Pages/ProgressBarPage.xaml
index 39bbf391bb..2ec0b48c76 100644
--- a/samples/ControlCatalog/Pages/ProgressBarPage.xaml
+++ b/samples/ControlCatalog/Pages/ProgressBarPage.xaml
@@ -1,25 +1,19 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.ProgressBarPage">
+<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="h1">ProgressBar</TextBlock>
     <TextBlock Classes="h2">A progress bar control</TextBlock>
-
     <StackPanel>
-      <StackPanel Orientation="Horizontal"
-                  Margin="0,16,0,0"
-                  HorizontalAlignment="Center"
-                  Spacing="16">
+      <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 Value="{Binding #hprogress.Value}" />
-          <ProgressBar IsIndeterminate="True"/>
+          <ProgressBar IsIndeterminate="{Binding #isIndeterminate.IsChecked}" ShowProgressText="{Binding #showProgress.IsChecked}" Value="{Binding #hprogress.Value}" />
         </StackPanel>
-        <ProgressBar Value="{Binding #vprogress.Value}" Orientation="Vertical" />
-        <ProgressBar Orientation="Vertical" IsIndeterminate="True" />
+        <ProgressBar IsIndeterminate="{Binding #isIndeterminate.IsChecked}" ShowProgressText="{Binding #showProgress.IsChecked}" Value="{Binding #vprogress.Value}" Orientation="Vertical" />
       </StackPanel>
       <StackPanel Margin="16">
-        <Slider Name="hprogress" Maximum="100" Value="40"/>
-        <Slider Name="vprogress" Maximum="100" Value="60"/>
+        <Slider Name="hprogress" Maximum="100" Value="40" />
+        <Slider Name="vprogress" Maximum="100" Value="60" />
       </StackPanel>
     </StackPanel>
   </StackPanel>
diff --git a/samples/ControlCatalog/Pages/RelativePanelPage.axaml b/samples/ControlCatalog/Pages/RelativePanelPage.axaml
new file mode 100644
index 0000000000..4dcdcc195f
--- /dev/null
+++ b/samples/ControlCatalog/Pages/RelativePanelPage.axaml
@@ -0,0 +1,60 @@
+<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="ControlCatalog.Pages.RelativePanelPage">
+    <RelativePanel Width="620" Height="700" Margin="32">
+        <Border Name="Rect1" Background="Red" Height="50" Width="50">
+            <TextBlock Text="Rect1" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </Border>
+        <Border Name="Rect2" Background="Blue" Height="50" Width="50" RelativePanel.AlignHorizontalCenterWithPanel="True">
+            <TextBlock Text="Rect2" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </Border>
+        <Border Name="Rect3" Background="Green" Height="50" Width="50" RelativePanel.AlignRightWithPanel="True">
+            <TextBlock Text="Rect3" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </Border>
+        <Border Name="Rect4" Background="Red" Height="50" Width="50" RelativePanel.AlignBottomWithPanel="True">
+            <TextBlock Text="Rect4" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </Border>
+        <Border Name="Rect5" Background="Blue" Height="50" Width="50" RelativePanel.AlignBottomWithPanel="True" RelativePanel.AlignHorizontalCenterWithPanel="True">
+            <TextBlock Text="Rect5" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </Border>
+        <Border Name="Rect6" Background="Green" Height="50" Width="50" RelativePanel.AlignBottomWithPanel="True" RelativePanel.AlignRightWithPanel="True">
+            <TextBlock Text="Rect6" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </Border>
+        <Border Name="Rect7" Background="Blue" Height="50" RelativePanel.RightOf="Rect1">
+            <TextBlock Text="Rect7 (RightOf Rect1)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </Border>
+        <Border Name="Rect8" Background="Green" Height="50" RelativePanel.Below="Rect7">
+            <TextBlock Text="Rect8 (Below Rect7)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </Border>
+        <Border Name="Rect9" Background="Blue" Height="140" Width="460" RelativePanel.AlignHorizontalCenterWithPanel="True" RelativePanel.AlignVerticalCenterWithPanel="True">
+            <TextBlock Text="Rect9" Padding="10" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+        </Border>
+        <Border Name="Rect10" Background="Red" Width="50" RelativePanel.RightOf="Rect9" RelativePanel.AlignVerticalCenterWith="Rect9">
+            <TextBlock Text="Rect14 (RightOf Rect9, AlignVerticalCenterWith Rect9)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <TextBlock.RenderTransform>
+                    <TransformGroup>
+                        <RotateTransform Angle="-90"/>
+                    </TransformGroup>
+                </TextBlock.RenderTransform>
+            </TextBlock>
+        </Border>
+        <Border Name="Rect11" Background="Red" Height="50" RelativePanel.AlignBottomWith="Rect9" RelativePanel.AlignHorizontalCenterWith="Rect9">
+            <TextBlock Text="Rect11 (AlignBottomWith Rect9, AlignHorizontalCenterWith Rect9)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </Border>
+        <Border Name="Rect12" Background="Red" Height="50" RelativePanel.Below="Rect8" RelativePanel.AlignLeftWith="Rect7">
+            <TextBlock Text="Rect12 (Below Rect8, AlignLeftWith Rect7)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </Border>
+        <Border Name="Rect13" Background="Blue" Height="50" RelativePanel.Below="Rect12" RelativePanel.AlignRightWith="Rect12">
+            <TextBlock Text="Rect13 (Below Rect12, AlignRightWith Rect12)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </Border>
+        <Border Name="Rect14" Background="Green" Height="50" RelativePanel.Above="Rect9" RelativePanel.AlignRightWith="Rect9">
+            <TextBlock Text="Rect14 (Above Rect9, AlignRightWith Rect9)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </Border>
+        <Border Name="Rect15" Background="Red" Height="50" RelativePanel.LeftOf="Rect2" RelativePanel.AlignTopWith="Rect9">
+            <TextBlock Text="Rect15 (LeftOf Rect2, AlignTopWith Rect9)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </Border>
+    </RelativePanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/RelativePanelPage.axaml.cs b/samples/ControlCatalog/Pages/RelativePanelPage.axaml.cs
new file mode 100644
index 0000000000..11d0a5152e
--- /dev/null
+++ b/samples/ControlCatalog/Pages/RelativePanelPage.axaml.cs
@@ -0,0 +1,19 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public class RelativePanelPage : UserControl
+    {
+        public RelativePanelPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/ScreenPage.cs b/samples/ControlCatalog/Pages/ScreenPage.cs
index d775eb9635..c39f414b44 100644
--- a/samples/ControlCatalog/Pages/ScreenPage.cs
+++ b/samples/ControlCatalog/Pages/ScreenPage.cs
@@ -29,7 +29,8 @@ namespace ControlCatalog.Pages
             var screens = w.Screens.All;
             var scaling = ((IRenderRoot)w).RenderScaling;
 
-            Pen p = new Pen(Brushes.Black);
+            var drawBrush = Brushes.Green;
+            Pen p = new Pen(drawBrush);
             if (screens != null)
                 foreach (Screen screen in screens)
                 {
@@ -53,19 +54,19 @@ namespace ControlCatalog.Pages
                     };
 
                     text.Text = $"Bounds: {screen.Bounds.Width}:{screen.Bounds.Height}";
-                    context.DrawText(Brushes.Black, boundsRect.Position.WithY(boundsRect.Size.Height), text);
+                    context.DrawText(drawBrush, boundsRect.Position.WithY(boundsRect.Size.Height), text);
                     
                     text.Text = $"WorkArea: {screen.WorkingArea.Width}:{screen.WorkingArea.Height}";
-                    context.DrawText(Brushes.Black, boundsRect.Position.WithY(boundsRect.Size.Height + 20), text);
+                    context.DrawText(drawBrush, boundsRect.Position.WithY(boundsRect.Size.Height + 20), text);
 
                     text.Text = $"Scaling: {screen.PixelDensity * 100}%";
-                    context.DrawText(Brushes.Black, boundsRect.Position.WithY(boundsRect.Size.Height + 40), text);
+                    context.DrawText(drawBrush, boundsRect.Position.WithY(boundsRect.Size.Height + 40), text);
                     
                     text.Text = $"Primary: {screen.Primary}";
-                    context.DrawText(Brushes.Black, boundsRect.Position.WithY(boundsRect.Size.Height + 60), text);
+                    context.DrawText(drawBrush, boundsRect.Position.WithY(boundsRect.Size.Height + 60), text);
                     
                     text.Text = $"Current: {screen.Equals(w.Screens.ScreenFromBounds(new PixelRect(w.Position, PixelSize.FromSize(w.Bounds.Size, scaling))))}";
-                    context.DrawText(Brushes.Black, boundsRect.Position.WithY(boundsRect.Size.Height + 80), text);
+                    context.DrawText(drawBrush, boundsRect.Position.WithY(boundsRect.Size.Height + 80), text);
                 }
 
             context.DrawRectangle(p, new Rect(w.Position.X / 10f + Math.Abs(_leftMost), w.Position.Y / 10, w.Bounds.Width / 10, w.Bounds.Height / 10));
diff --git a/samples/ControlCatalog/Pages/ScrollViewerPage.xaml b/samples/ControlCatalog/Pages/ScrollViewerPage.xaml
new file mode 100644
index 0000000000..bbefcab9ca
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ScrollViewerPage.xaml
@@ -0,0 +1,35 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.ScrollViewerPage">
+  <StackPanel Orientation="Vertical" Spacing="4">
+    <TextBlock Classes="h1">ScrollViewer</TextBlock>
+    <TextBlock Classes="h2">Allows for horizontal and vertical content scrolling.</TextBlock>
+
+    <Grid ColumnDefinitions="Auto, *">
+      <StackPanel Orientation="Vertical" Spacing="4">
+        <ToggleSwitch IsChecked="{Binding AllowAutoHide}" Content="Allow auto hide" />
+
+        <StackPanel Orientation="Vertical" Spacing="4">
+          <TextBlock Text="Horizontal Scroll" />
+          <ComboBox Items="{Binding AvailableVisibility}" SelectedItem="{Binding HorizontalScrollVisibility}" />
+        </StackPanel>
+
+        <StackPanel Orientation="Vertical" Spacing="4">
+          <TextBlock Text="Vertical Scroll" />
+          <ComboBox Items="{Binding AvailableVisibility}" SelectedItem="{Binding VerticalScrollVisibility}" />
+        </StackPanel>
+      </StackPanel>
+
+      <ScrollViewer x:Name="ScrollViewer"
+                    Grid.Column="1"
+                    Width="400" Height="400"
+                    AllowAutoHide="{Binding AllowAutoHide}"
+                    HorizontalScrollBarVisibility="{Binding HorizontalScrollVisibility}"
+                    VerticalScrollBarVisibility="{Binding VerticalScrollVisibility}">
+        <Image Width="800" Height="800" Stretch="UniformToFill"
+               Source="/Assets/delicate-arch-896885_640.jpg" />
+      </ScrollViewer>
+    </Grid>
+
+  </StackPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/ScrollViewerPage.xaml.cs b/samples/ControlCatalog/Pages/ScrollViewerPage.xaml.cs
new file mode 100644
index 0000000000..dcd7a88a56
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ScrollViewerPage.xaml.cs
@@ -0,0 +1,65 @@
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Markup.Xaml;
+using MiniMvvm;
+
+namespace ControlCatalog.Pages
+{
+    public class ScrollViewerPageViewModel : ViewModelBase
+    {
+        private bool _allowAutoHide;
+        private ScrollBarVisibility _horizontalScrollVisibility;
+        private ScrollBarVisibility _verticalScrollVisibility;
+
+        public ScrollViewerPageViewModel()
+        {
+            AvailableVisibility = new List<ScrollBarVisibility>
+            {
+                ScrollBarVisibility.Auto,
+                ScrollBarVisibility.Visible,
+                ScrollBarVisibility.Hidden,
+                ScrollBarVisibility.Disabled,
+            };
+
+            HorizontalScrollVisibility = ScrollBarVisibility.Auto;
+            VerticalScrollVisibility = ScrollBarVisibility.Auto;
+            AllowAutoHide = true;
+        }
+
+        public bool AllowAutoHide
+        {
+            get => _allowAutoHide;
+            set => this.RaiseAndSetIfChanged(ref _allowAutoHide, value);
+        }
+
+        public ScrollBarVisibility HorizontalScrollVisibility
+        {
+            get => _horizontalScrollVisibility;
+            set => this.RaiseAndSetIfChanged(ref _horizontalScrollVisibility, value);
+        }
+
+        public ScrollBarVisibility VerticalScrollVisibility
+        {
+            get => _verticalScrollVisibility;
+            set => this.RaiseAndSetIfChanged(ref _verticalScrollVisibility, value);
+        }
+
+        public List<ScrollBarVisibility> AvailableVisibility { get; }
+    }
+
+    public class ScrollViewerPage : UserControl
+    {
+        public ScrollViewerPage()
+        {
+            InitializeComponent();
+
+            DataContext = new ScrollViewerPageViewModel();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/SliderPage.xaml b/samples/ControlCatalog/Pages/SliderPage.xaml
index 58f7b881fe..b3f32ed421 100644
--- a/samples/ControlCatalog/Pages/SliderPage.xaml
+++ b/samples/ControlCatalog/Pages/SliderPage.xaml
@@ -1,20 +1,43 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=netstandard"
              x:Class="ControlCatalog.Pages.SliderPage">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h1">Slider</TextBlock>
     <TextBlock Classes="h2">A control that lets the user select from a range of values by moving a Thumb control along a Track.</TextBlock>
 
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 16 0 0" Spacing="16">
-      <Slider Value="0"
-              Minimum="0"
-              Maximum="100"
-              Width="300"/>
+      <StackPanel Orientation="Vertical"
+                  HorizontalAlignment="Center">
+        <Slider Value="0"
+                Minimum="0"
+                Maximum="100"
+                TickFrequency="10"
+                Width="300" />
+        <Slider Name="CustomTickedSlider"
+                Value="0"
+                Minimum="0"
+                Maximum="100"
+                TickPlacement="BottomRight"
+                IsSnapToTickEnabled="True"
+                Ticks="0,20,25,40,75,100"
+                Width="300" />
+        <Slider Value="0"
+                Minimum="0"
+                Maximum="100"
+                TickFrequency="10"
+                Width="300">
+          <DataValidationErrors.Error>
+            <sys:Exception /> 
+          </DataValidationErrors.Error>
+        </Slider>
+      </StackPanel>
       <Slider Value="0"
               Minimum="0"
               Maximum="100"
               Orientation="Vertical"
               IsSnapToTickEnabled="True"
+              TickPlacement="Outside"
               TickFrequency="10"
               Height="300"/>
     </StackPanel>
diff --git a/samples/ControlCatalog/Pages/SplitViewPage.xaml b/samples/ControlCatalog/Pages/SplitViewPage.xaml
new file mode 100644
index 0000000000..6902b27715
--- /dev/null
+++ b/samples/ControlCatalog/Pages/SplitViewPage.xaml
@@ -0,0 +1,103 @@
+<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="ControlCatalog.Pages.SplitViewPage">
+
+  <Border>
+
+    <Grid ColumnDefinitions="*,225">
+
+      <StackPanel Grid.Column="1" Orientation="Vertical" Spacing="4" Margin="5">
+        <ToggleButton Name="PaneOpenButton"
+                      Content="IsPaneOpen"
+                      IsChecked="{Binding IsPaneOpen, ElementName=SplitView}" />
+
+        <ToggleButton Name="UseLightDismissOverlayModeButton"
+                      Content="UseLightDismissOverlayMode"
+                      IsChecked="{Binding UseLightDismissOverlayMode, ElementName=SplitView}" />
+
+        <ToggleSwitch OffContent="Left" OnContent="Right" Content="Placement" IsChecked="{Binding !IsLeft}" />
+
+        <TextBlock Text="DisplayMode" />
+        <ComboBox Name="DisplayModeSelector" Width="170" Margin="10" SelectedIndex="{Binding DisplayMode}">
+          <ComboBoxItem>Inline</ComboBoxItem>
+          <ComboBoxItem>CompactInline</ComboBoxItem>
+          <ComboBoxItem>Overlay</ComboBoxItem>
+          <ComboBoxItem>CompactOverlay</ComboBoxItem>
+        </ComboBox>
+
+        <TextBlock Text="PaneBackground" />
+        <ComboBox Name="PaneBackgroundSelector" SelectedIndex="0" Width="170" Margin="10">
+          <ComboBoxItem Tag="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}">SystemControlBackgroundChromeMediumLowBrush</ComboBoxItem>
+          <ComboBoxItem Tag="Red">Red</ComboBoxItem>
+          <ComboBoxItem Tag="Blue">Blue</ComboBoxItem>
+          <ComboBoxItem Tag="Green">Green</ComboBoxItem>
+        </ComboBox>
+
+        <TextBlock Text="{Binding Value, ElementName=OpenPaneLengthSlider, StringFormat='{}OpenPaneLength: {0}'}" />
+        <Slider Name="OpenPaneLengthSlider" Value="256" Minimum="128" Maximum="500"
+                Width="150" />
+
+        <TextBlock Text="{Binding Value, ElementName=CompactPaneLengthSlider, StringFormat='{}CompactPaneLength: {0}'}" />
+        <Slider Name="CompactPaneLengthSlider" Value="48" Minimum="24" Maximum="128"
+                Width="150" />
+
+      </StackPanel>
+
+      <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
+            BorderThickness="1">
+        <!--{Binding SelectedItem.Tag, ElementName=PaneBackgroundSelector}-->
+        <SplitView Name="SplitView"
+                      PanePlacement="{Binding PanePlacement}"
+                      PaneBackground="{Binding SelectedItem.Tag, ElementName=PaneBackgroundSelector}"
+                      OpenPaneLength="{Binding Value, ElementName=OpenPaneLengthSlider}"
+                      CompactPaneLength="{Binding Value, ElementName=CompactPaneLengthSlider}"
+                      DisplayMode="{Binding CurrentDisplayMode}">
+          <SplitView.Pane>
+            <Grid>
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+              </Grid.RowDefinitions>
+              <TextBlock Text="PANE CONTENT" FontWeight="Bold" Name="PaneHeader" Margin="5,12,0,0" />
+              <ComboBox Width="150" Grid.Row="1">
+                <ComboBoxItem Content="Item1"/>
+                <ComboBoxItem Content="Item2"/>
+                <ComboBoxItem Content="Item3"/>
+              </ComboBox>
+              <ListBoxItem Grid.Row="2" VerticalAlignment="Top" Margin="0 10">
+                <StackPanel Orientation="Horizontal">
+                  <!--Path glyph from materialdesignicons.com-->
+                  <Border Width="48">
+                    <Viewbox Width="24" Height="24" HorizontalAlignment="Left">
+                      <Canvas Width="24" Height="24">
+                        <Path Fill="{DynamicResource SystemControlForegroundBaseHighBrush}" Data="M16 17V19H2V17S2 13 9 13 16 17 16 17M12.5 7.5A3.5 3.5 0 1 0 9 11A3.5 3.5 0 0 0 12.5 7.5M15.94 13A5.32 5.32 0 0 1 18 17V19H22V17S22 13.37 15.94 13M15 4A3.39 3.39 0 0 0 13.07 4.59A5 5 0 0 1 13.07 10.41A3.39 3.39 0 0 0 15 11A3.5 3.5 0 0 0 15 4Z" />
+                      </Canvas>
+                    </Viewbox>
+                  </Border>
+                  <TextBlock Text="People" VerticalAlignment="Center" />
+                </StackPanel>
+              </ListBoxItem>
+              <TextBlock Grid.Row="3" Text="Item at bottom" Margin="60,12" />
+            </Grid>
+          </SplitView.Pane>
+
+          <Grid>
+            <TextBlock FontSize="14" FontWeight="700" Text="SplitViewContent" HorizontalAlignment="Center" VerticalAlignment="Center"  Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+            <TextBlock FontSize="14" FontWeight="700" Text="SplitViewContent" TextAlignment="Left"  Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+            <TextBlock FontSize="14" FontWeight="700" Text="SplitViewContent" HorizontalAlignment="Right" TextAlignment="Left"  Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+            <TextBlock FontSize="14" FontWeight="700" Text="SplitViewContent" VerticalAlignment="Bottom" TextAlignment="Left"  Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+            <TextBlock FontSize="14" FontWeight="700" Text="SplitViewContent" VerticalAlignment="Bottom" HorizontalAlignment="Right" TextAlignment="Left"  Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+          </Grid>
+
+        </SplitView>
+      </Border>
+      
+    </Grid>
+  </Border>
+
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/SplitViewPage.xaml.cs b/samples/ControlCatalog/Pages/SplitViewPage.xaml.cs
new file mode 100644
index 0000000000..cbf217c94a
--- /dev/null
+++ b/samples/ControlCatalog/Pages/SplitViewPage.xaml.cs
@@ -0,0 +1,21 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using ControlCatalog.ViewModels;
+
+namespace ControlCatalog.Pages
+{
+    public class SplitViewPage : UserControl
+    {
+        public SplitViewPage()
+        {
+            this.InitializeComponent();
+            DataContext = new SplitViewPageViewModel();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/TabControlPage.xaml.cs b/samples/ControlCatalog/Pages/TabControlPage.xaml.cs
index a38a3ab4cb..f49b13091b 100644
--- a/samples/ControlCatalog/Pages/TabControlPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TabControlPage.xaml.cs
@@ -6,7 +6,7 @@ using Avalonia.Markup.Xaml;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
 
-using ReactiveUI;
+using MiniMvvm;
 
 namespace ControlCatalog.Pages
 {
@@ -56,7 +56,7 @@ namespace ControlCatalog.Pages
             return new Bitmap(assets.Open(new Uri(uri)));
         }
 
-        private class PageViewModel : ReactiveObject
+        private class PageViewModel : ViewModelBase
         {
             private Dock _tabPlacement;
 
diff --git a/samples/ControlCatalog/Pages/TextBlockPage.xaml b/samples/ControlCatalog/Pages/TextBlockPage.xaml
new file mode 100644
index 0000000000..d4f72f161a
--- /dev/null
+++ b/samples/ControlCatalog/Pages/TextBlockPage.xaml
@@ -0,0 +1,125 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.TextBlockPage">
+  <StackPanel>
+    <TextBlock Classes="h1">TextBlock</TextBlock>
+    <TextBlock Classes="h2">A control that can display text</TextBlock>
+    <StackPanel
+      Orientation="Horizontal"
+      Spacing="16"
+      HorizontalAlignment="Center"
+      Margin="0,16,0,0">
+      <StackPanel.Styles>
+        <Style Selector="Border">
+          <Setter Property="BorderThickness" Value="1"/>
+          <Setter Property="BorderBrush" Value="{DynamicResource SystemControlHighlightBaseMediumLowBrush}"/>
+          <Setter Property="Padding" Value="2"/>
+        </Style>
+      </StackPanel.Styles>
+      <Border>
+        <StackPanel Width="200" Spacing="8">
+          <TextBlock Margin="0 0 10 0" TextTrimming="CharacterEllipsis" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit."/>
+          <TextBlock Margin="0 0 10 0" TextTrimming="WordEllipsis" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit."/>
+          <TextBlock Text="Left aligned text" TextAlignment="Left" />
+          <TextBlock Text="Center aligned text" TextAlignment="Center" />
+          <TextBlock Text="Right aligned text" TextAlignment="Right" />
+        </StackPanel>
+      </Border>
+      <Border>
+        <StackPanel Width="200" Spacing="8">
+          <TextBlock
+            TextWrapping="Wrap"
+            Text="Multiline TextBlock with TextWrapping.&#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>
+      </Border>
+      <Border>
+        <StackPanel Width="200" Spacing="8">
+          <TextBlock Text="Custom font regular" FontWeight="Normal" FontStyle="Normal" FontFamily="avares://ControlCatalog/Assets/Fonts#Source Sans Pro"/>
+          <TextBlock Text="Custom font bold" FontWeight="Bold" FontStyle="Normal" FontFamily="avares://ControlCatalog/Assets/Fonts#Source Sans Pro"/>
+          <TextBlock Text="Custom font italic" FontWeight="Normal" FontStyle="Italic" FontFamily="/Assets/Fonts/SourceSansPro-Italic.ttf#Source Sans Pro"/>
+          <TextBlock Text="Custom font italic bold" FontWeight="Bold" FontStyle="Italic" FontFamily="/Assets/Fonts/SourceSansPro-*.ttf#Source Sans Pro"/>
+        </StackPanel>
+      </Border>
+    </StackPanel>
+    <StackPanel
+      Orientation="Horizontal"
+      Spacing="16"
+      HorizontalAlignment="Center"
+      Margin="0,16,0,0">
+      <StackPanel.Styles>
+        <Style Selector="Border">
+          <Setter Property="BorderThickness" Value="1"/>
+          <Setter Property="BorderBrush" Value="{DynamicResource SystemControlHighlightBaseMediumLowBrush}"/>
+          <Setter Property="Padding" Value="2"/>
+        </Style>
+      </StackPanel.Styles>
+      <Border>
+        <StackPanel Width="200" Spacing="8">
+          <TextBlock TextDecorations="Underline" Text="Underline"/>
+          <TextBlock TextDecorations="Strikethrough" Text="Strikethrough"/>
+          <TextBlock TextDecorations="Overline" Text="Overline" />
+          <TextBlock TextDecorations="Baseline" Text="Baseline"/>
+          <TextBlock Text="Custom TextDecorations">
+            <TextBlock.TextDecorations>
+              <TextDecorationCollection>
+                <TextDecoration
+                  Location="Overline"
+                  StrokeThicknessUnit="Pixel"
+                  StrokeThickness="2">
+                  <TextDecoration.Stroke>
+                    <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+                      <LinearGradientBrush.GradientStops>
+                        <GradientStop Offset="0" Color="Red"/>
+                        <GradientStop Offset="1" Color="Green"/>
+                      </LinearGradientBrush.GradientStops>
+                    </LinearGradientBrush>
+                  </TextDecoration.Stroke>
+                </TextDecoration>
+                <TextDecoration
+                  Location="Strikethrough"
+                  StrokeThicknessUnit="Pixel"
+                  StrokeThickness="1">
+                  <TextDecoration.Stroke>
+                    <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+                      <LinearGradientBrush.GradientStops>
+                        <GradientStop Offset="0" Color="Green"/>
+                        <GradientStop Offset="1" Color="Blue"/>
+                      </LinearGradientBrush.GradientStops>
+                    </LinearGradientBrush>
+                  </TextDecoration.Stroke>
+                </TextDecoration>
+                <TextDecoration
+                  Location="Underline"
+                  StrokeThicknessUnit="Pixel"
+                  StrokeThickness="2">
+                  <TextDecoration.Stroke>
+                    <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+                      <LinearGradientBrush.GradientStops>
+                        <GradientStop Offset="0" Color="Blue"/>
+                        <GradientStop Offset="1" Color="Red"/>
+                      </LinearGradientBrush.GradientStops>
+                    </LinearGradientBrush>
+                  </TextDecoration.Stroke>
+                </TextDecoration>
+              </TextDecorationCollection>
+            </TextBlock.TextDecorations>
+          </TextBlock>
+        </StackPanel>
+      </Border>
+      <Border>
+        <StackPanel Width="200" Spacing="8">
+          <TextBlock Text="🏻 👌🏻"/>
+          <TextBlock Text="🏼 👌🏼" />
+          <TextBlock Text="🏽 👌🏽"/>
+          <TextBlock Text="🏾 👌🏾"/>
+          <TextBlock Text="🏿 👌🏿"/>
+        </StackPanel>
+      </Border>
+      <Border>
+        <StackPanel Width="200" Spacing="8">
+          <TextBlock Text="👪 👨‍👩‍👧 👨‍👩‍👧‍👦"/>
+        </StackPanel>
+      </Border>
+    </StackPanel>
+  </StackPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/TextBlockPage.xaml.cs b/samples/ControlCatalog/Pages/TextBlockPage.xaml.cs
new file mode 100644
index 0000000000..49fecbe7c5
--- /dev/null
+++ b/samples/ControlCatalog/Pages/TextBlockPage.xaml.cs
@@ -0,0 +1,18 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public class TextBlockPage : UserControl
+    {
+        public TextBlockPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml b/samples/ControlCatalog/Pages/TextBoxPage.xaml
index 64118a00b4..4958174f40 100644
--- a/samples/ControlCatalog/Pages/TextBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml
@@ -1,9 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.TextBoxPage">
+             x:Class="ControlCatalog.Pages.TextBoxPage"
+             xmlns:sys="clr-namespace:System;assembly=netstandard">
   <StackPanel Orientation="Vertical" Spacing="4">
-    <TextBlock Classes="h1">TextBox</TextBlock>
-    <TextBlock Classes="h2">A control into which the user can input text</TextBlock>
+    <Label Classes="h1">TextBox</Label>
+    <Label Classes="h2">A control into which the user can input text</Label>
 
     <StackPanel Orientation="Horizontal"
               Margin="0,16,0,0"
@@ -11,15 +12,22 @@
               Spacing="16">
       <StackPanel Orientation="Vertical" Spacing="8">
         <TextBox Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit." Width="200" />
-        <TextBox Watermark="ReadOnly" IsReadOnly="True" Text="This is read only"/>
+        <TextBox Width="200" Watermark="ReadOnly" IsReadOnly="True" Text="This is read only"/>
         <TextBox Width="200" Watermark="Watermark" />
         <TextBox Width="200"
                  Watermark="Floating Watermark"
                  UseFloatingWatermark="True"
                  Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit."/>
+        
+        <TextBox Width="200" Text="Validation Error">
+          <DataValidationErrors.Error>
+            <sys:Exception /> 
+          </DataValidationErrors.Error>
+        </TextBox>
 
         <TextBox Width="200"
                  Watermark="Password Box"
+                 Classes="revealPasswordButton"
                  UseFloatingWatermark="True"
                  PasswordChar="*"
                  Text="Password" />
@@ -37,22 +45,24 @@
                  Text="Multiline TextBox with TextWrapping.&#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." />
         <TextBox AcceptsReturn="True" Width="200" Height="125"
                  Text="Multiline TextBox with no TextWrapping.&#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." />
+
+        <TextBox Classes="clearButton" Text="Clear Content" Width="200" FontWeight="Normal" FontStyle="Normal" Watermark="Watermark" FontFamily="avares://ControlCatalog/Assets/Fonts#Source Sans Pro"/>
       </StackPanel>
-        <StackPanel Orientation="Vertical" Spacing="8">
-            <TextBlock Classes="h2">resm fonts</TextBlock>
-            <TextBox Width="200" Text="Custom font regular" FontWeight="Normal" FontStyle="Normal" FontFamily="resm:ControlCatalog.Assets.Fonts?assembly=ControlCatalog#Source Sans Pro"/>
-                <TextBox Width="200" Text="Custom font bold" FontWeight="Bold" FontStyle="Normal" FontFamily="resm:ControlCatalog.Assets.Fonts?assembly=ControlCatalog#Source Sans Pro"/>
-                <TextBox Width="200" Text="Custom font italic" FontWeight="Normal" FontStyle="Italic" FontFamily="resm:ControlCatalog.Assets.Fonts.SourceSansPro-Italic.ttf?assembly=ControlCatalog#Source Sans Pro"/>
-                <TextBox Width="200" Text="Custom font italic bold" FontWeight="Bold" FontStyle="Italic" FontFamily="resm:ControlCatalog.Assets.Fonts.SourceSansPro-*.ttf?assembly=ControlCatalog#Source Sans Pro"/>
-        </StackPanel>
-        
-        <StackPanel Orientation="Vertical" Spacing="8">
-            <TextBlock Classes="h2">res fonts</TextBlock>
-            <TextBox Width="200" Text="Custom font regular" FontWeight="Normal" FontStyle="Normal" FontFamily="avares://ControlCatalog/Assets/Fonts#Source Sans Pro"/>
-            <TextBox Width="200" Text="Custom font bold" FontWeight="Bold" FontStyle="Normal" FontFamily="avares://ControlCatalog/Assets/Fonts#Source Sans Pro"/>
-            <TextBox Width="200" Text="Custom font italic" FontWeight="Normal" FontStyle="Italic" FontFamily="/Assets/Fonts/SourceSansPro-Italic.ttf#Source Sans Pro"/>
-            <TextBox Width="200" Text="Custom font italic bold" FontWeight="Bold" FontStyle="Italic" FontFamily="/Assets/Fonts/SourceSansPro-*.ttf#Source Sans Pro"/>
-        </StackPanel>
+      <StackPanel Orientation="Vertical" Spacing="8">
+        <Label Classes="h2" Target="{Binding #firstResMFont}">res_m fonts</Label>
+        <TextBox Width="200" x:Name="firstResMFont" Text="Custom font regular" FontWeight="Normal" FontStyle="Normal" FontFamily="resm:ControlCatalog.Assets.Fonts?assembly=ControlCatalog#Source Sans Pro"/>
+        <TextBox Width="200" Text="Custom font bold" FontWeight="Bold" FontStyle="Normal" FontFamily="resm:ControlCatalog.Assets.Fonts?assembly=ControlCatalog#Source Sans Pro"/>
+        <TextBox Width="200" Text="Custom font italic" FontWeight="Normal" FontStyle="Italic" FontFamily="resm:ControlCatalog.Assets.Fonts.SourceSansPro-Italic.ttf?assembly=ControlCatalog#Source Sans Pro"/>
+        <TextBox Width="200" Text="Custom font italic bold" FontWeight="Bold" FontStyle="Italic" FontFamily="resm:ControlCatalog.Assets.Fonts.SourceSansPro-*.ttf?assembly=ControlCatalog#Source Sans Pro"/>
+      </StackPanel>
+
+      <StackPanel Orientation="Vertical" Spacing="8">
+        <Label Classes="h2" Target="{Binding #firstResFont}">_res fonts</Label>
+        <TextBox Width="200" x:Name="firstResFont" Text="Custom font regular" FontWeight="Normal" FontStyle="Normal" FontFamily="avares://ControlCatalog/Assets/Fonts#Source Sans Pro"/>
+        <TextBox Width="200" Text="Custom font bold" FontWeight="Bold" FontStyle="Normal" FontFamily="avares://ControlCatalog/Assets/Fonts#Source Sans Pro"/>
+        <TextBox Width="200" Text="Custom font italic" FontWeight="Normal" FontStyle="Italic" FontFamily="/Assets/Fonts/SourceSansPro-Italic.ttf#Source Sans Pro"/>
+        <TextBox Width="200" Text="Custom font italic bold" FontWeight="Bold" FontStyle="Italic" FontFamily="/Assets/Fonts/SourceSansPro-*.ttf#Source Sans Pro"/>
       </StackPanel>
+    </StackPanel>
   </StackPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/ToggleSwitchPage.xaml b/samples/ControlCatalog/Pages/ToggleSwitchPage.xaml
new file mode 100644
index 0000000000..161ee2ee16
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ToggleSwitchPage.xaml
@@ -0,0 +1,79 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.ToggleSwitchPage" Margin="5">
+  <StackPanel Width="500" HorizontalAlignment="Center">
+    <TextBlock Text="Simple ToggleSwitch" Classes="header"/>
+    <Border Classes="Thin">
+      <StackPanel>
+        <ToggleSwitch Margin="10"/>
+        <TextBox Text="&lt;ToggleSwitch/&gt;" Classes="CodeBox"/>
+      </StackPanel>
+    </Border>
+
+    <TextBlock Text="headered ToggleSwitch" Classes="header"/>
+
+    <Border Classes="Thin">
+      <StackPanel>
+        <ToggleSwitch Content="headered" IsChecked="true" Margin="10"/>
+        <TextBox Classes="CodeBox"
+          Text="&lt;ToggleSwitch&gt;headered&lt;/ToggleSwitch&gt;"/>
+      </StackPanel>
+    </Border>
+
+    <TextBlock Text="Custom content ToggleSwitch" Classes="header"/>
+
+    <Border Classes="Thin">
+      <StackPanel>
+        <ToggleSwitch Content="Custom"
+          OnContent="On"
+          OffContent="Off"
+          Margin="10"/>
+
+        <TextBox Text="&lt;ToggleSwitch Content=&quot;Custom&quot; 
+ContentOn=&quot;On&quot; 
+ContentOff=&quot;Off&quot; /&gt;"
+          Classes="CodeBox"/>
+      </StackPanel>
+    </Border>
+
+    <TextBlock Text="Image content ToggleSwitch" Classes="header"/>
+
+    <Border Classes="Thin">
+      <StackPanel>
+        <ToggleSwitch Content="Just Click!" Margin="10">
+          <ToggleSwitch.OnContent>
+            <Image Source="/Assets/hirsch-899118_640.jpg" Height="32"/>
+          </ToggleSwitch.OnContent>
+
+          <ToggleSwitch.OffContent>
+            <Image Source="/Assets/delicate-arch-896885_640.jpg" Height="32"/>
+          </ToggleSwitch.OffContent>
+
+        </ToggleSwitch>
+      </StackPanel>
+    </Border>
+  </StackPanel>
+
+  <UserControl.Styles >
+    <Style Selector="TextBox.CodeBox" >
+      <Setter Property="Padding" Value="10"/>
+      <Setter Property="IsReadOnly" Value="True"/>
+      <Setter Property="BorderBrush" Value="Transparent"/>
+      <Setter Property="FontSize" Value="14"/>
+      <Setter Property="IsEnabled" Value="true"/>
+    </Style>
+
+    <Style Selector="TextBlock.header">
+      <Setter Property="FontSize" Value="18"/>
+      <Setter Property="Margin" Value="0 20 0 20"/>
+    </Style>
+
+    <Style Selector="Border.Thin">
+      <Setter Property="BorderBrush" Value="Gray"/>
+      <Setter Property="BorderThickness" Value="0.5"/>
+      <Setter Property="CornerRadius" Value="2"/>
+    </Style>
+
+  </UserControl.Styles>
+</UserControl>
+
diff --git a/samples/ControlCatalog/Pages/ToggleSwitchPage.xaml.cs b/samples/ControlCatalog/Pages/ToggleSwitchPage.xaml.cs
new file mode 100644
index 0000000000..66f7d14c7f
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ToggleSwitchPage.xaml.cs
@@ -0,0 +1,19 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public class ToggleSwitchPage : UserControl
+    {
+        public ToggleSwitchPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/ToolTipPage.xaml b/samples/ControlCatalog/Pages/ToolTipPage.xaml
index cbe1e3059c..ec073d48a9 100644
--- a/samples/ControlCatalog/Pages/ToolTipPage.xaml
+++ b/samples/ControlCatalog/Pages/ToolTipPage.xaml
@@ -12,13 +12,13 @@
               HorizontalAlignment="Center">
             <Border Grid.Column="0"
                     Grid.Row="1"
-                    Background="{DynamicResource ThemeAccentBrush}"
+                    Background="{DynamicResource SystemAccentColor}"
                     Margin="5"
                     Padding="50"
                     ToolTip.Tip="This is a ToolTip">
                 <TextBlock>Hover Here</TextBlock>
             </Border>
-            <CheckBox Grid.Column="1"
+            <ToggleSwitch Grid.Column="1"
                       Margin="5"
                       Grid.Row="0"
                       IsChecked="{Binding ElementName=Border, Path=(ToolTip.IsOpen)}"
@@ -26,7 +26,7 @@
             <Border Name="Border"
                     Grid.Column="1"
                     Grid.Row="1"
-                    Background="{DynamicResource ThemeAccentBrush}"
+                    Background="{DynamicResource SystemAccentColor}"
                     Margin="5"
                     Padding="50"
                     ToolTip.Placement="Bottom">
diff --git a/samples/ControlCatalog/Pages/TreeViewPage.xaml b/samples/ControlCatalog/Pages/TreeViewPage.xaml
index 3a81e2ed02..6d99132680 100644
--- a/samples/ControlCatalog/Pages/TreeViewPage.xaml
+++ b/samples/ControlCatalog/Pages/TreeViewPage.xaml
@@ -19,8 +19,8 @@
         </TreeView>
 
         <Button Command="{Binding AddItemCommand}">Add</Button>
-
         <Button Command="{Binding RemoveItemCommand}">Remove</Button>
+        <Button Command="{Binding SelectRandomItemCommand}">Select Random</Button>
 
         <ComboBox SelectedIndex="{Binding SelectionMode, Mode=TwoWay}">
           <ComboBoxItem>Single</ComboBoxItem>
diff --git a/samples/ControlCatalog/Pages/TreeViewPage.xaml.cs b/samples/ControlCatalog/Pages/TreeViewPage.xaml.cs
index 1f35f05f1d..3fb990459f 100644
--- a/samples/ControlCatalog/Pages/TreeViewPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TreeViewPage.xaml.cs
@@ -1,9 +1,6 @@
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reactive;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using ReactiveUI;
+using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
@@ -12,104 +9,12 @@ namespace ControlCatalog.Pages
         public TreeViewPage()
         {
             InitializeComponent();
-            DataContext = new PageViewModel();
+            DataContext = new TreeViewPageViewModel();
         }
 
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
         }
-
-        private class PageViewModel : ReactiveObject
-        {
-            private SelectionMode _selectionMode;
-
-            public PageViewModel()
-            {
-                Node root = new Node();
-                Items = root.Children;
-                SelectedItems = new ObservableCollection<Node>();
-
-                AddItemCommand = ReactiveCommand.Create(() =>
-                {
-                    Node parentItem = SelectedItems.Count > 0 ? SelectedItems[0] : root;
-                    parentItem.AddNewItem();
-                });
-
-                RemoveItemCommand = ReactiveCommand.Create(() =>
-                {
-                    while (SelectedItems.Count > 0)
-                    {
-                        Node lastItem = SelectedItems[0];
-                        RecursiveRemove(Items, lastItem);
-                        SelectedItems.Remove(lastItem);
-                    }
-
-                    bool RecursiveRemove(ObservableCollection<Node> items, Node selectedItem)
-                    {
-                        if (items.Remove(selectedItem))
-                        {
-                            return true;
-                        }
-
-                        foreach (Node item in items)
-                        {
-                            if (item.AreChildrenInitialized && RecursiveRemove(item.Children, selectedItem))
-                            {
-                                return true;
-                            }
-                        }
-
-                        return false;
-                    }
-                });
-            }
-
-            public ObservableCollection<Node> Items { get; }
-
-            public ObservableCollection<Node> SelectedItems { get; }
-
-            public ReactiveCommand<Unit, Unit> AddItemCommand { get; }
-
-            public ReactiveCommand<Unit, Unit> RemoveItemCommand { get; }
-
-            public SelectionMode SelectionMode
-            {
-                get => _selectionMode;
-                set
-                {
-                    SelectedItems.Clear();
-                    this.RaiseAndSetIfChanged(ref _selectionMode, value);
-                }
-            }
-        }
-
-        private class Node
-        {
-            private int _counter;
-            private ObservableCollection<Node> _children;
-
-            public string Header { get; private set; }
-
-            public bool AreChildrenInitialized => _children != null;
-
-            public ObservableCollection<Node> Children
-            {
-                get
-                {
-                    if (_children == null)
-                    {
-                        _children = new ObservableCollection<Node>(Enumerable.Range(1, 10).Select(i => CreateNewNode()));
-                    }
-                    return _children;
-                }
-            }
-
-            public void AddNewItem() => Children.Add(CreateNewNode());
-
-            public override string ToString() => Header;
-
-            private Node CreateNewNode() => new Node {Header = $"Item {_counter++}"};
-        }
     }
 }
diff --git a/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml b/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml
new file mode 100644
index 0000000000..b90f43c3b6
--- /dev/null
+++ b/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml
@@ -0,0 +1,19 @@
+<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="ControlCatalog.Pages.WindowCustomizationsPage">
+  <StackPanel Spacing="10"  Margin="25">
+    <CheckBox Content="Extend Client Area to Decorations" IsChecked="{Binding ExtendClientAreaEnabled}" />
+    <CheckBox Content="Title Bar" IsChecked="{Binding SystemTitleBarEnabled}" />    
+    <CheckBox Content="Prefer System Chrome" IsChecked="{Binding PreferSystemChromeEnabled}" />
+    <Slider Minimum="-1" Maximum="200" Value="{Binding TitleBarHeight}" />
+    <ComboBox x:Name="TransparencyLevels" SelectedIndex="{Binding TransparencyLevel}">
+      <ComboBoxItem>None</ComboBoxItem>
+      <ComboBoxItem>Transparent</ComboBoxItem>
+      <ComboBoxItem>Blur</ComboBoxItem>
+      <ComboBoxItem>AcrylicBlur</ComboBoxItem>
+    </ComboBox>
+  </StackPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml.cs b/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml.cs
new file mode 100644
index 0000000000..d8d4f3f371
--- /dev/null
+++ b/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml.cs
@@ -0,0 +1,19 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public class WindowCustomizationsPage : UserControl
+    {
+        public WindowCustomizationsPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/teapot.bin b/samples/ControlCatalog/Pages/teapot.bin
new file mode 100644
index 0000000000..589eeb912d
Binary files /dev/null and b/samples/ControlCatalog/Pages/teapot.bin differ
diff --git a/samples/ControlCatalog/SideBar.xaml b/samples/ControlCatalog/SideBar.xaml
index 26d25a6266..7c911e91e9 100644
--- a/samples/ControlCatalog/SideBar.xaml
+++ b/samples/ControlCatalog/SideBar.xaml
@@ -12,7 +12,7 @@
     <Style Selector="TabControl.sidebar">
         <Setter Property="TabStripPlacement" Value="Left"/>
         <Setter Property="Padding" Value="8 0 0 0"/>
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource SystemAccentColor}"/>
         <Setter Property="Template">
             <ControlTemplate>
                 <Border 
@@ -67,16 +67,19 @@
         <Setter Property="(ScrollViewer.HorizontalScrollBarVisibility)" Value="Auto"/>
         <Setter Property="(ScrollViewer.VerticalScrollBarVisibility)" Value="Auto"/>
     </Style>
+    <Style Selector="TabControl.sidebar > TabItem:selected /template/ Border#PART_SelectedPipe">
+        <Setter Property="IsVisible" Value="False" />
+    </Style>
     <Style Selector="TabControl.sidebar > TabItem:pointerover">
         <Setter Property="Opacity" Value="1"/>
     </Style>
     <Style Selector="TabControl.sidebar > TabItem:pointerover">
-        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Background" Value="{DynamicResource SystemAccentColorLight2}"/>
     </Style>
     <Style Selector="TabControl.sidebar > TabItem:selected">
         <Setter Property="Opacity" Value="1"/>
     </Style>
     <Style Selector="TabControl.sidebar > TabItem:selected">
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/>
+        <Setter Property="Background" Value="{DynamicResource SystemAccentColorLight1}"/>
     </Style>
 </Styles>
diff --git a/samples/ControlCatalog/ViewModels/ContextMenuPageViewModel.cs b/samples/ControlCatalog/ViewModels/ContextMenuPageViewModel.cs
index 5c2f74d2d5..3f5d0cd93c 100644
--- a/samples/ControlCatalog/ViewModels/ContextMenuPageViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/ContextMenuPageViewModel.cs
@@ -3,7 +3,7 @@ using System.Reactive;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.VisualTree;
-using ReactiveUI;
+using MiniMvvm;
 
 namespace ControlCatalog.ViewModels
 {
@@ -12,9 +12,9 @@ namespace ControlCatalog.ViewModels
         public Control View { get; set; }
         public ContextMenuPageViewModel()
         {
-            OpenCommand = ReactiveCommand.CreateFromTask(Open);
-            SaveCommand = ReactiveCommand.Create(Save);
-            OpenRecentCommand = ReactiveCommand.Create<string>(OpenRecent);
+            OpenCommand = MiniCommand.CreateFromTask(Open);
+            SaveCommand = MiniCommand.Create(Save);
+            OpenRecentCommand = MiniCommand.Create<string>(OpenRecent);
 
             MenuItems = new[]
             {
@@ -44,9 +44,9 @@ namespace ControlCatalog.ViewModels
         }
 
         public IReadOnlyList<MenuItemViewModel> MenuItems { get; set; }
-        public ReactiveCommand<Unit, Unit> OpenCommand { get; }
-        public ReactiveCommand<Unit, Unit> SaveCommand { get; }
-        public ReactiveCommand<string, Unit> OpenRecentCommand { get; }
+        public MiniCommand OpenCommand { get; }
+        public MiniCommand SaveCommand { get; }
+        public MiniCommand OpenRecentCommand { get; }
 
         public async Task Open()
         {
diff --git a/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs b/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs
index bc2ce80714..ee1fa6ae77 100644
--- a/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs
@@ -1,31 +1,34 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
-using ReactiveUI;
+using Avalonia.Media;
+using MiniMvvm;
 
 namespace ControlCatalog.ViewModels
 {
-    public class ItemsRepeaterPageViewModel : ReactiveObject
+    public class ItemsRepeaterPageViewModel : ViewModelBase
     {
-        private int newItemIndex = 1;
+        private int _newItemIndex = 1;
+        private int _newGenerationIndex = 0;
+        private ObservableCollection<Item> _items;
 
         public ItemsRepeaterPageViewModel()
         {
-            Items = new ObservableCollection<Item>(
-                Enumerable.Range(1, 100000).Select(i => new Item
-                {
-                    Text = $"Item {i.ToString()}",
-                }));
+            Items = CreateItems();
         }
 
-        public ObservableCollection<Item> Items { get; }
+        public ObservableCollection<Item> Items
+        {
+            get => _items;
+            set => this.RaiseAndSetIfChanged(ref _items, value);
+        }
 
         public Item SelectedItem { get; set; }
 
         public void AddItem()
         {
             var index = SelectedItem != null ? Items.IndexOf(SelectedItem) : -1;
-            Items.Insert(index + 1, new Item { Text = $"New Item {newItemIndex++}" });
+            Items.Insert(index + 1, new Item(index + 1) { Text = $"New Item {_newItemIndex++}" });
         }
 
         public void RandomizeHeights()
@@ -38,10 +41,30 @@ namespace ControlCatalog.ViewModels
             }
         }
 
-        public class Item : ReactiveObject
+        public void ResetItems()
+        {
+            Items = CreateItems();
+        }
+
+        private ObservableCollection<Item> CreateItems()
+        {
+            var suffix = _newGenerationIndex == 0 ? string.Empty : $"[{_newGenerationIndex.ToString()}]";
+
+            _newGenerationIndex++;
+
+            return new ObservableCollection<Item>(
+                Enumerable.Range(1, 100000).Select(i => new Item(i)
+                {
+                    Text = $"Item {i.ToString()} {suffix}"
+                }));
+        }
+
+        public class Item : ViewModelBase
         {
             private double _height = double.NaN;
 
+            public Item(int index) => Index = index;
+            public int Index { get; }
             public string Text { get; set; }
             
             public double Height 
diff --git a/samples/ControlCatalog/ViewModels/ListBoxPageViewModel.cs b/samples/ControlCatalog/ViewModels/ListBoxPageViewModel.cs
new file mode 100644
index 0000000000..7f2d6e9572
--- /dev/null
+++ b/samples/ControlCatalog/ViewModels/ListBoxPageViewModel.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reactive;
+using Avalonia.Controls;
+using Avalonia.Controls.Selection;
+using MiniMvvm;
+
+namespace ControlCatalog.ViewModels
+{
+    public class ListBoxPageViewModel : ViewModelBase
+    {
+        private bool _multiple;
+        private bool _toggle;
+        private bool _alwaysSelected;
+        private bool _autoScrollToSelectedItem = true;
+        private int _counter;
+        private IObservable<SelectionMode> _selectionMode;
+
+        public ListBoxPageViewModel()
+        {
+            Items = new ObservableCollection<string>(Enumerable.Range(1, 10000).Select(i => GenerateItem()));
+            
+            Selection = new SelectionModel<string>();
+            Selection.Select(1);
+
+            _selectionMode = this.WhenAnyValue(
+                x => x.Multiple,
+                x => x.Toggle,
+                x => x.AlwaysSelected,
+                (m, t, a) =>
+                    (m ? Avalonia.Controls.SelectionMode.Multiple : 0) |
+                    (t ? Avalonia.Controls.SelectionMode.Toggle : 0) |
+                    (a ? Avalonia.Controls.SelectionMode.AlwaysSelected : 0));
+
+            AddItemCommand = MiniCommand.Create(() => Items.Add(GenerateItem()));
+
+            RemoveItemCommand = MiniCommand.Create(() =>
+            {
+                var items = Selection.SelectedItems.ToList();
+
+                foreach (var item in items)
+                {
+                    Items.Remove(item);
+                }
+            });
+
+            SelectRandomItemCommand = MiniCommand.Create(() =>
+            {
+                var random = new Random();
+
+                using (Selection.BatchUpdate())
+                {
+                    Selection.Clear();
+                    Selection.Select(random.Next(Items.Count - 1));
+                }
+            });
+        }
+
+        public ObservableCollection<string> Items { get; }
+        public SelectionModel<string> Selection { get; }
+        public IObservable<SelectionMode> SelectionMode => _selectionMode;
+
+        public bool Multiple
+        {
+            get => _multiple;
+            set => this.RaiseAndSetIfChanged(ref _multiple, value);
+        }
+
+        public bool Toggle
+        {
+            get => _toggle;
+            set => this.RaiseAndSetIfChanged(ref _toggle, value);
+        }
+
+        public bool AlwaysSelected
+        {
+            get => _alwaysSelected;
+            set => this.RaiseAndSetIfChanged(ref _alwaysSelected, value);
+        }
+
+        public bool AutoScrollToSelectedItem
+        {
+            get => _autoScrollToSelectedItem;
+            set => this.RaiseAndSetIfChanged(ref _autoScrollToSelectedItem, value);
+        }
+
+        public MiniCommand AddItemCommand { get; }
+        public MiniCommand RemoveItemCommand { get; }
+        public MiniCommand SelectRandomItemCommand { get; }
+
+        private string GenerateItem() => $"Item {_counter++.ToString()}";
+    }
+}
diff --git a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
index 89e7653618..4b3cfa9c9d 100644
--- a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@@ -1,35 +1,48 @@
 using System.Reactive;
+using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Notifications;
 using Avalonia.Dialogs;
-using ReactiveUI;
+using Avalonia.Platform;
+using System;
+using MiniMvvm;
 
 namespace ControlCatalog.ViewModels
 {
-    class MainWindowViewModel : ReactiveObject
+    class MainWindowViewModel : ViewModelBase
     {
         private IManagedNotificationManager _notificationManager;
 
+        private bool _isMenuItemChecked = true;
+        private WindowState _windowState;
+        private WindowState[] _windowStates;
+        private int _transparencyLevel;
+        private ExtendClientAreaChromeHints _chromeHints;
+        private bool _extendClientAreaEnabled;
+        private bool _systemTitleBarEnabled;        
+        private bool _preferSystemChromeEnabled;
+        private double _titleBarHeight;
+
         public MainWindowViewModel(IManagedNotificationManager notificationManager)
         {
             _notificationManager = notificationManager;
 
-            ShowCustomManagedNotificationCommand = ReactiveCommand.Create(() =>
+            ShowCustomManagedNotificationCommand = MiniCommand.Create(() =>
             {
                 NotificationManager.Show(new NotificationViewModel(NotificationManager) { Title = "Hey There!", Message = "Did you know that Avalonia now supports Custom In-Window Notifications?" });
             });
 
-            ShowManagedNotificationCommand = ReactiveCommand.Create(() =>
+            ShowManagedNotificationCommand = MiniCommand.Create(() =>
             {
                 NotificationManager.Show(new Avalonia.Controls.Notifications.Notification("Welcome", "Avalonia now supports Notifications.", NotificationType.Information));
             });
 
-            ShowNativeNotificationCommand = ReactiveCommand.Create(() =>
+            ShowNativeNotificationCommand = MiniCommand.Create(() =>
             {
                 NotificationManager.Show(new Avalonia.Controls.Notifications.Notification("Error", "Native Notifications are not quite ready. Coming soon.", NotificationType.Error));
             });
 
-            AboutCommand = ReactiveCommand.CreateFromTask(async () =>
+            AboutCommand = MiniCommand.CreateFromTask(async () =>
             {
                 var dialog = new AboutAvaloniaDialog();
 
@@ -38,10 +51,94 @@ namespace ControlCatalog.ViewModels
                 await dialog.ShowDialog(mainWindow);
             });
 
-            ExitCommand = ReactiveCommand.Create(() =>
+            ExitCommand = MiniCommand.Create(() =>
             {
                 (App.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime).Shutdown();
             });
+
+            ToggleMenuItemCheckedCommand = MiniCommand.Create(() =>
+            {
+                IsMenuItemChecked = !IsMenuItemChecked;
+            });
+
+            WindowState = WindowState.Normal;
+
+            WindowStates = new WindowState[]
+            {
+                WindowState.Minimized,
+                WindowState.Normal,
+                WindowState.Maximized,
+                WindowState.FullScreen,
+            };
+
+            this.WhenAnyValue(x => x.SystemTitleBarEnabled, x=>x.PreferSystemChromeEnabled)
+                .Subscribe(x =>
+                {
+                    var hints = ExtendClientAreaChromeHints.NoChrome | ExtendClientAreaChromeHints.OSXThickTitleBar;
+
+                    if(x.Item1)
+                    {
+                        hints |= ExtendClientAreaChromeHints.SystemChrome;
+                    }
+
+                    if(x.Item2)
+                    {
+                        hints |= ExtendClientAreaChromeHints.PreferSystemChrome;
+                    }
+
+                    ChromeHints = hints;
+                });
+
+            SystemTitleBarEnabled = true;            
+            TitleBarHeight = -1;
+        }        
+
+        public int TransparencyLevel
+        {
+            get { return _transparencyLevel; }
+            set { this.RaiseAndSetIfChanged(ref _transparencyLevel, value); }
+        }        
+
+        public ExtendClientAreaChromeHints ChromeHints
+        {
+            get { return _chromeHints; }
+            set { this.RaiseAndSetIfChanged(ref _chromeHints, value); }
+        }        
+
+        public bool ExtendClientAreaEnabled
+        {
+            get { return _extendClientAreaEnabled; }
+            set { this.RaiseAndSetIfChanged(ref _extendClientAreaEnabled, value); }
+        }        
+
+        public bool SystemTitleBarEnabled
+        {
+            get { return _systemTitleBarEnabled; }
+            set { this.RaiseAndSetIfChanged(ref _systemTitleBarEnabled, value); }
+        }        
+
+        public bool PreferSystemChromeEnabled
+        {
+            get { return _preferSystemChromeEnabled; }
+            set { this.RaiseAndSetIfChanged(ref _preferSystemChromeEnabled, value); }
+        }        
+
+        public double TitleBarHeight
+        {
+            get { return _titleBarHeight; }
+            set { this.RaiseAndSetIfChanged(ref _titleBarHeight, value); }
+        }
+
+        public WindowState WindowState
+        {
+            get { return _windowState; }
+            set { this.RaiseAndSetIfChanged(ref _windowState, value); }
+        }
+
+        public WindowState[] WindowStates
+        {
+            get { return _windowStates; }
+            set { this.RaiseAndSetIfChanged(ref _windowStates, value); }
         }
 
         public IManagedNotificationManager NotificationManager
@@ -50,14 +147,22 @@ namespace ControlCatalog.ViewModels
             set { this.RaiseAndSetIfChanged(ref _notificationManager, value); }
         }
 
-        public ReactiveCommand<Unit, Unit> ShowCustomManagedNotificationCommand { get; }
+        public bool IsMenuItemChecked
+        {
+            get { return _isMenuItemChecked; }
+            set { this.RaiseAndSetIfChanged(ref _isMenuItemChecked, value); }
+        }
+
+        public MiniCommand ShowCustomManagedNotificationCommand { get; }
+
+        public MiniCommand ShowManagedNotificationCommand { get; }
 
-        public ReactiveCommand<Unit, Unit> ShowManagedNotificationCommand { get; }
+        public MiniCommand ShowNativeNotificationCommand { get; }
 
-        public ReactiveCommand<Unit, Unit> ShowNativeNotificationCommand { get; }
+        public MiniCommand AboutCommand { get; }
 
-        public ReactiveCommand<Unit, Unit> AboutCommand { get; }
+        public MiniCommand ExitCommand { get; }
 
-        public ReactiveCommand<Unit, Unit> ExitCommand { get; }
+        public MiniCommand ToggleMenuItemCheckedCommand { get; }
     }
 }
diff --git a/samples/ControlCatalog/ViewModels/MenuPageViewModel.cs b/samples/ControlCatalog/ViewModels/MenuPageViewModel.cs
index dc9c4a8f49..ecbd59c5d7 100644
--- a/samples/ControlCatalog/ViewModels/MenuPageViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MenuPageViewModel.cs
@@ -4,7 +4,7 @@ using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.VisualTree;
-using ReactiveUI;
+using MiniMvvm;
 
 namespace ControlCatalog.ViewModels
 {
@@ -13,10 +13,27 @@ namespace ControlCatalog.ViewModels
         public Control View { get; set; }
         public MenuPageViewModel()
         {
-            OpenCommand = ReactiveCommand.CreateFromTask(Open);
-            SaveCommand = ReactiveCommand.Create(Save, Observable.Return(false));
-            OpenRecentCommand = ReactiveCommand.Create<string>(OpenRecent);
+            OpenCommand = MiniCommand.CreateFromTask(Open);
+            SaveCommand = MiniCommand.Create(Save);
+            OpenRecentCommand = MiniCommand.Create<string>(OpenRecent);
 
+            var recentItems = new[]
+            {
+                new MenuItemViewModel
+                {
+                    Header = "File1.txt",
+                    Command = OpenRecentCommand,
+                    CommandParameter = @"c:\foo\File1.txt"
+                },
+                new MenuItemViewModel
+                {
+                    Header = "File2.txt",
+                    Command = OpenRecentCommand,
+                    CommandParameter = @"c:\foo\File2.txt"
+                },
+            };
+
+            RecentItems = recentItems;
             MenuItems = new[]
             {
                 new MenuItemViewModel
@@ -24,27 +41,13 @@ namespace ControlCatalog.ViewModels
                     Header = "_File",
                     Items = new[]
                     {
-                        new MenuItemViewModel { Header = "_Open...", Command = OpenCommand },
+                        new MenuItemViewModel { Header = "O_pen...", Command = OpenCommand },
                         new MenuItemViewModel { Header = "Save", Command = SaveCommand },
                         new MenuItemViewModel { Header = "-" },
                         new MenuItemViewModel
                         {
                             Header = "Recent",
-                            Items = new[]
-                            {
-                                new MenuItemViewModel
-                                {
-                                    Header = "File1.txt",
-                                    Command = OpenRecentCommand,
-                                    CommandParameter = @"c:\foo\File1.txt"
-                                },
-                                new MenuItemViewModel
-                                {
-                                    Header = "File2.txt",
-                                    Command = OpenRecentCommand,
-                                    CommandParameter = @"c:\foo\File2.txt"
-                                },
-                            }
+                            Items = recentItems
                         },
                     }
                 },
@@ -61,9 +64,10 @@ namespace ControlCatalog.ViewModels
         }
 
         public IReadOnlyList<MenuItemViewModel> MenuItems { get; set; }
-        public ReactiveCommand<Unit, Unit> OpenCommand { get; }
-        public ReactiveCommand<Unit, Unit> SaveCommand { get; }
-        public ReactiveCommand<string, Unit> OpenRecentCommand { get; }
+        public IReadOnlyList<MenuItemViewModel> RecentItems { get; set; }
+        public MiniCommand OpenCommand { get; }
+        public MiniCommand SaveCommand { get; }
+        public MiniCommand OpenRecentCommand { get; }
 
         public async Task Open()
         {
diff --git a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
index 8724ba344b..2052481015 100644
--- a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
@@ -1,6 +1,6 @@
 using System.Reactive;
 using Avalonia.Controls.Notifications;
-using ReactiveUI;
+using MiniMvvm;
 
 namespace ControlCatalog.ViewModels
 {
@@ -8,12 +8,12 @@ namespace ControlCatalog.ViewModels
     {
         public NotificationViewModel(INotificationManager manager)
         {
-            YesCommand = ReactiveCommand.Create(() =>
+            YesCommand = MiniCommand.Create(() =>
             {
                 manager.Show(new Avalonia.Controls.Notifications.Notification("Avalonia Notifications", "Start adding notifications to your app today."));
             });
 
-            NoCommand = ReactiveCommand.Create(() =>
+            NoCommand = MiniCommand.Create(() =>
             {
                 manager.Show(new Avalonia.Controls.Notifications.Notification("Avalonia Notifications", "Start adding notifications to your app today. To find out more visit..."));
             });
@@ -22,9 +22,9 @@ namespace ControlCatalog.ViewModels
         public string Title { get; set; }
         public string Message { get; set; }
 
-        public ReactiveCommand<Unit, Unit> YesCommand { get; }
+        public MiniCommand YesCommand { get; }
 
-        public ReactiveCommand<Unit, Unit> NoCommand { get; }
+        public MiniCommand NoCommand { get; }
 
     }
 }
diff --git a/samples/ControlCatalog/ViewModels/SplitViewPageViewModel.cs b/samples/ControlCatalog/ViewModels/SplitViewPageViewModel.cs
new file mode 100644
index 0000000000..9e6932bb76
--- /dev/null
+++ b/samples/ControlCatalog/ViewModels/SplitViewPageViewModel.cs
@@ -0,0 +1,46 @@
+using System;
+using Avalonia.Controls;
+using MiniMvvm;
+
+namespace ControlCatalog.ViewModels
+{
+    public class SplitViewPageViewModel : ViewModelBase
+    {
+        private bool _isLeft = true;
+        private int _displayMode = 3; //CompactOverlay
+
+        public bool IsLeft
+        {
+            get => _isLeft;
+            set
+            {
+                this.RaiseAndSetIfChanged(ref _isLeft, value);
+                this.RaisePropertyChanged(nameof(PanePlacement));
+            }
+        }
+        
+        public int DisplayMode
+        {
+            get => _displayMode;
+            set
+            {
+                this.RaiseAndSetIfChanged(ref _displayMode, value);
+                this.RaisePropertyChanged(nameof(CurrentDisplayMode));
+            }
+        }
+
+        public SplitViewPanePlacement PanePlacement => _isLeft ? SplitViewPanePlacement.Left : SplitViewPanePlacement.Right;
+        
+        public SplitViewDisplayMode CurrentDisplayMode
+        {
+            get
+            {
+                if (Enum.IsDefined(typeof(SplitViewDisplayMode), _displayMode))
+                {
+                    return (SplitViewDisplayMode)_displayMode;
+                }
+                return SplitViewDisplayMode.CompactOverlay;
+            }
+        }
+    }
+}
diff --git a/samples/ControlCatalog/ViewModels/TreeViewPageViewModel.cs b/samples/ControlCatalog/ViewModels/TreeViewPageViewModel.cs
new file mode 100644
index 0000000000..c03379330f
--- /dev/null
+++ b/samples/ControlCatalog/ViewModels/TreeViewPageViewModel.cs
@@ -0,0 +1,124 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reactive;
+using Avalonia.Controls;
+using MiniMvvm;
+
+namespace ControlCatalog.ViewModels
+{
+    public class TreeViewPageViewModel : ViewModelBase
+    {
+        private readonly Node _root;
+        private SelectionMode _selectionMode;
+
+        public TreeViewPageViewModel()
+        {
+            _root = new Node();
+
+            Items = _root.Children;
+            SelectedItems = new ObservableCollection<Node>();
+
+            AddItemCommand = MiniCommand.Create(AddItem);
+            RemoveItemCommand = MiniCommand.Create(RemoveItem);
+            SelectRandomItemCommand = MiniCommand.Create(SelectRandomItem);
+        }
+
+        public ObservableCollection<Node> Items { get; }
+        public ObservableCollection<Node> SelectedItems { get; }
+        public MiniCommand AddItemCommand { get; }
+        public MiniCommand RemoveItemCommand { get; }
+        public MiniCommand SelectRandomItemCommand { get; }
+
+        public SelectionMode SelectionMode
+        {
+            get => _selectionMode;
+            set
+            {
+                SelectedItems.Clear();
+                this.RaiseAndSetIfChanged(ref _selectionMode, value);
+            }
+        }
+
+        private void AddItem()
+        {
+            var parentItem = SelectedItems.Count > 0 ? (Node)SelectedItems[0] : _root;
+            parentItem.AddItem();
+        }
+
+        private void RemoveItem()
+        {
+            while (SelectedItems.Count > 0)
+            {
+                Node lastItem = (Node)SelectedItems[0];
+                RecursiveRemove(Items, lastItem);
+                SelectedItems.RemoveAt(0);
+            }
+
+            bool RecursiveRemove(ObservableCollection<Node> items, Node selectedItem)
+            {
+                if (items.Remove(selectedItem))
+                {
+                    return true;
+                }
+
+                foreach (Node item in items)
+                {
+                    if (item.AreChildrenInitialized && RecursiveRemove(item.Children, selectedItem))
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+        }
+
+        private void SelectRandomItem()
+        {
+            var random = new Random();
+            var depth = random.Next(4);
+            var indexes = Enumerable.Range(0, depth).Select(x => random.Next(10));
+            var node = _root;
+
+            foreach (var i in indexes)
+            {
+                node = node.Children[i];
+            }
+
+            SelectedItems.Clear();
+            SelectedItems.Add(node);
+        }
+
+        public class Node
+        {
+            private ObservableCollection<Node> _children;
+            private int _childIndex = 10;
+
+            public Node()
+            {
+                Header = "Item";
+            }
+
+            public Node(Node parent, int index)
+            {
+                Parent = parent;
+                Header = parent.Header + ' ' + index;
+            }
+
+            public Node Parent { get; }
+            public string Header { get; }
+            public bool AreChildrenInitialized => _children != null;
+            public ObservableCollection<Node> Children => _children ??= CreateChildren();
+            public void AddItem() => Children.Add(new Node(this, _childIndex++));
+            public void RemoveItem(Node child) => Children.Remove(child);
+            public override string ToString() => Header;
+
+            private ObservableCollection<Node> CreateChildren()
+            {
+                return new ObservableCollection<Node>(
+                    Enumerable.Range(0, 10).Select(i => new Node(this, i)));
+            }
+        }
+    }
+}
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
index b9075b957b..8fc91aca14 100644
--- a/samples/Directory.Build.props
+++ b/samples/Directory.Build.props
@@ -1,6 +1,7 @@
 <Project>
   <PropertyGroup>
       <IsPackable>false</IsPackable>
+      <AvaloniaPreviewerNetCoreToolPath>$(MSBuildThisFileDirectory)..\src\tools\Avalonia.Designer.HostApp\bin\Debug\netcoreapp2.0\Avalonia.Designer.HostApp.dll</AvaloniaPreviewerNetCoreToolPath>
   </PropertyGroup>
   <Import Project="..\build\SharedVersion.props" />
 </Project>
diff --git a/samples/MiniMvvm/MiniCommand.cs b/samples/MiniMvvm/MiniCommand.cs
new file mode 100644
index 0000000000..c6a9273c20
--- /dev/null
+++ b/samples/MiniMvvm/MiniCommand.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace MiniMvvm
+{
+    public sealed class MiniCommand<T> : MiniCommand, ICommand
+    {
+        private readonly Action<T> _cb;
+        private bool _busy;
+        private Func<T, Task> _acb;
+        
+        public MiniCommand(Action<T> cb)
+        {
+            _cb = cb;
+        }
+
+        public MiniCommand(Func<T, Task> cb)
+        {
+            _acb = cb;
+        }
+
+        private bool Busy
+        {
+            get => _busy;
+            set
+            {
+                _busy = value;
+                CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        
+        public override event EventHandler CanExecuteChanged;
+        public override bool CanExecute(object parameter) => !_busy;
+
+        public override async void Execute(object parameter)
+        {
+            if(Busy)
+                return;
+            try
+            {
+                Busy = true;
+                if (_cb != null)
+                    _cb((T)parameter);
+                else
+                    await _acb((T)parameter);
+            }
+            finally
+            {
+                Busy = false;
+            }
+        }
+    }
+    
+    public abstract class MiniCommand : ICommand
+    {
+        public static MiniCommand Create(Action cb) => new MiniCommand<object>(_ => cb());
+        public static MiniCommand Create<TArg>(Action<TArg> cb) => new MiniCommand<TArg>(cb);
+        public static MiniCommand CreateFromTask(Func<Task> cb) => new MiniCommand<object>(_ => cb());
+        
+        public abstract bool CanExecute(object parameter);
+        public abstract void Execute(object parameter);
+        public abstract event EventHandler CanExecuteChanged;
+    }
+}
diff --git a/samples/MiniMvvm/MiniMvvm.csproj b/samples/MiniMvvm/MiniMvvm.csproj
new file mode 100644
index 0000000000..6535b2bdbd
--- /dev/null
+++ b/samples/MiniMvvm/MiniMvvm.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+  <Import Project="..\..\build\Rx.props" />
+</Project>
diff --git a/samples/MiniMvvm/PropertyChangedExtensions.cs b/samples/MiniMvvm/PropertyChangedExtensions.cs
new file mode 100644
index 0000000000..f1065c7530
--- /dev/null
+++ b/samples/MiniMvvm/PropertyChangedExtensions.cs
@@ -0,0 +1,108 @@
+using System;
+using System.ComponentModel;
+using System.Linq.Expressions;
+using System.Reactive.Linq;
+using System.Reflection;
+
+namespace MiniMvvm
+{
+    public static class PropertyChangedExtensions
+    {
+        class PropertyObservable<T> : IObservable<T>
+        {
+            private readonly INotifyPropertyChanged _target;
+            private readonly PropertyInfo _info;
+
+            public PropertyObservable(INotifyPropertyChanged target, PropertyInfo info)
+            {
+                _target = target;
+                _info = info;
+            }
+
+            class Subscription : IDisposable
+            {
+                private readonly INotifyPropertyChanged _target;
+                private readonly PropertyInfo _info;
+                private readonly IObserver<T> _observer;
+
+                public Subscription(INotifyPropertyChanged target, PropertyInfo info, IObserver<T> observer)
+                {
+                    _target = target;
+                    _info = info;
+                    _observer = observer;
+                    _target.PropertyChanged += OnPropertyChanged;
+                    _observer.OnNext((T)_info.GetValue(_target));
+                }
+
+                private void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
+                {
+                    if (e.PropertyName == _info.Name)
+                        _observer.OnNext((T)_info.GetValue(_target));
+                }
+
+                public void Dispose()
+                {
+                    _target.PropertyChanged -= OnPropertyChanged;
+                    _observer.OnCompleted();
+                }
+            }
+
+            public IDisposable Subscribe(IObserver<T> observer)
+            {
+                return new Subscription(_target, _info, observer);
+            }
+        }
+
+        public static IObservable<TRes> WhenAnyValue<TModel, TRes>(this TModel model,
+            Expression<Func<TModel, TRes>> expr) where TModel : INotifyPropertyChanged
+        {
+            var l = (LambdaExpression)expr;
+            var ma = (MemberExpression)l.Body;
+            var prop = (PropertyInfo)ma.Member;
+            return new PropertyObservable<TRes>(model, prop);
+        }
+        
+        public static IObservable<TRes> WhenAnyValue<TModel, T1, TRes>(this TModel model,
+            Expression<Func<TModel, T1>> v1,
+            Func<T1,  TRes> cb
+        ) where TModel : INotifyPropertyChanged
+        {
+            return model.WhenAnyValue(v1).Select(cb);
+        }
+        
+        public static IObservable<TRes> WhenAnyValue<TModel, T1, T2, TRes>(this TModel model,
+            Expression<Func<TModel, T1>> v1,
+            Expression<Func<TModel, T2>> v2,
+            Func<T1, T2, TRes> cb
+        ) where TModel : INotifyPropertyChanged =>
+            Observable.CombineLatest(
+                model.WhenAnyValue(v1),
+                model.WhenAnyValue(v2),
+                cb);
+
+        public static IObservable<ValueTuple<T1, T2>> WhenAnyValue<TModel, T1, T2>(this TModel model,
+            Expression<Func<TModel, T1>> v1,
+            Expression<Func<TModel, T2>> v2
+        ) where TModel : INotifyPropertyChanged =>
+            model.WhenAnyValue(v1, v2, (a1, a2) => (a1, a2));
+
+        public static IObservable<TRes> WhenAnyValue<TModel, T1, T2, T3, TRes>(this TModel model,
+            Expression<Func<TModel, T1>> v1,
+            Expression<Func<TModel, T2>> v2,
+            Expression<Func<TModel, T3>> v3,
+            Func<T1, T2, T3, TRes> cb
+        ) where TModel : INotifyPropertyChanged =>
+            Observable.CombineLatest(
+                model.WhenAnyValue(v1),
+                model.WhenAnyValue(v2),
+                model.WhenAnyValue(v3),
+                cb);
+
+        public static IObservable<ValueTuple<T1, T2, T3>> WhenAnyValue<TModel, T1, T2, T3>(this TModel model,
+            Expression<Func<TModel, T1>> v1,
+            Expression<Func<TModel, T2>> v2,
+            Expression<Func<TModel, T3>> v3
+        ) where TModel : INotifyPropertyChanged =>
+            model.WhenAnyValue(v1, v2, v3, (a1, a2, a3) => (a1, a2, a3));
+    }
+}
diff --git a/samples/MiniMvvm/ViewModelBase.cs b/samples/MiniMvvm/ViewModelBase.cs
new file mode 100644
index 0000000000..7256b05cef
--- /dev/null
+++ b/samples/MiniMvvm/ViewModelBase.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Reactive.Joins;
+using System.Runtime.CompilerServices;
+
+namespace MiniMvvm
+{
+    public class ViewModelBase : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+        protected bool RaiseAndSetIfChanged<T>(ref T field, T value, [CallerMemberName] string propertyName = null)
+        {
+            if (!EqualityComparer<T>.Default.Equals(field, value))
+            {
+                field = value;
+                RaisePropertyChanged(propertyName);
+                return true;
+            }
+            return false;
+        }
+        
+        
+        protected void RaisePropertyChanged([CallerMemberName] string propertyName = null)
+            => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+}
diff --git a/samples/PlatformSanityChecks/PlatformSanityChecks.csproj b/samples/PlatformSanityChecks/PlatformSanityChecks.csproj
index 2adef5f64e..86d762a5bc 100644
--- a/samples/PlatformSanityChecks/PlatformSanityChecks.csproj
+++ b/samples/PlatformSanityChecks/PlatformSanityChecks.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/Previewer/App.xaml.cs b/samples/Previewer/App.xaml.cs
index fffa987a27..ab83d45cd3 100644
--- a/samples/Previewer/App.xaml.cs
+++ b/samples/Previewer/App.xaml.cs
@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 
 namespace Previewer
@@ -9,6 +10,13 @@ namespace Previewer
         {
             AvaloniaXamlLoader.Load(this);
         }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                desktop.MainWindow = new MainWindow();
+            base.OnFrameworkInitializationCompleted();
+        }
     }
 
-}
\ No newline at end of file
+}
diff --git a/samples/Previewer/Previewer.csproj b/samples/Previewer/Previewer.csproj
index 2cdde0c945..cfedb7ad9e 100644
--- a/samples/Previewer/Previewer.csproj
+++ b/samples/Previewer/Previewer.csproj
@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Update="**\*.xaml.cs">
       <DependentUpon>%(Filename)</DependentUpon>
     </Compile>
     <EmbeddedResource Include="**\*.xaml" />
-    <ProjectReference Include="..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj" />
   </ItemGroup>
   
   <Import Project="..\..\build\SampleApp.props" />
diff --git a/samples/Previewer/Program.cs b/samples/Previewer/Program.cs
index 48363e27f2..b12b93974a 100644
--- a/samples/Previewer/Program.cs
+++ b/samples/Previewer/Program.cs
@@ -1,13 +1,14 @@
-using System;
-using Avalonia;
+using Avalonia;
 
 namespace Previewer
 {
     class Program
     {
-        static void Main(string[] args)
-        {
-            AppBuilder.Configure<App>().UsePlatformDetect().Start<MainWindow>();
-        }
+        public static AppBuilder BuildAvaloniaApp()
+          => AppBuilder.Configure<App>()
+                .UsePlatformDetect();
+
+        public static int Main(string[] args)
+          => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
     }
-}
\ No newline at end of file
+}
diff --git a/samples/RemoteDemo/RemoteDemo.csproj b/samples/RemoteDemo/RemoteDemo.csproj
index 2d7699561a..530cad805f 100644
--- a/samples/RemoteDemo/RemoteDemo.csproj
+++ b/samples/RemoteDemo/RemoteDemo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
diff --git a/samples/RenderDemo/App.xaml b/samples/RenderDemo/App.xaml
index b3d6d4d13f..751d0fc60f 100644
--- a/samples/RenderDemo/App.xaml
+++ b/samples/RenderDemo/App.xaml
@@ -3,8 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:Class="RenderDemo.App">
     <Application.Styles>
-        <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
-        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
+        <FluentTheme/>
         <StyleInclude Source="avares://RenderDemo/SideBar.xaml"/>
         <StyleInclude Source="avares://RenderDemo/Pages/DataRepeater.xaml"/>
     </Application.Styles>
diff --git a/samples/RenderDemo/App.xaml.cs b/samples/RenderDemo/App.xaml.cs
index d95018520a..8054b06964 100644
--- a/samples/RenderDemo/App.xaml.cs
+++ b/samples/RenderDemo/App.xaml.cs
@@ -1,10 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia;
-using Avalonia.Logging.Serilog;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using Avalonia.ReactiveUI;
 
 namespace RenderDemo
 {
@@ -15,16 +11,26 @@ namespace RenderDemo
             AvaloniaXamlLoader.Load(this);
         }
 
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                desktop.MainWindow = new MainWindow();
+            base.OnFrameworkInitializationCompleted();
+        }
+
         // TODO: Make this work with GTK/Skia/Cairo depending on command-line args
         // again.
-        static void Main(string[] args) => BuildAvaloniaApp().Start<MainWindow>();
+        static void Main(string[] args) 
+            => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
 
         // App configuration, used by the entry point and previewer
         static AppBuilder BuildAvaloniaApp()
            => AppBuilder.Configure<App>()
+               .With(new Win32PlatformOptions
+               {
+                   OverlayPopups = true,
+               })
                 .UsePlatformDetect()
-                .UseReactiveUI()
-                .LogToDebug();
-
+                .LogToTrace();
     }
 }
diff --git a/samples/RenderDemo/Controls/LineBoundsDemoControl.cs b/samples/RenderDemo/Controls/LineBoundsDemoControl.cs
new file mode 100644
index 0000000000..cc847a594d
--- /dev/null
+++ b/samples/RenderDemo/Controls/LineBoundsDemoControl.cs
@@ -0,0 +1,53 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avalonia.Rendering.SceneGraph;
+using Avalonia.Threading;
+
+namespace RenderDemo.Controls
+{
+    public class LineBoundsDemoControl : Control
+    {
+        static LineBoundsDemoControl()
+        {
+            AffectsRender<LineBoundsDemoControl>(AngleProperty);
+        }
+
+        public LineBoundsDemoControl()
+        {
+            var timer = new DispatcherTimer();
+            timer.Interval = TimeSpan.FromSeconds(1 / 60.0);
+            timer.Tick += (sender, e) => Angle += Math.PI / 360;
+            timer.Start();
+        }
+
+        public static readonly StyledProperty<double> AngleProperty =
+            AvaloniaProperty.Register<LineBoundsDemoControl, double>(nameof(Angle));        
+
+        public double Angle
+        {
+            get => GetValue(AngleProperty);
+            set => SetValue(AngleProperty, value);
+        }
+
+        public override void Render(DrawingContext drawingContext)
+        {
+            var lineLength = Math.Sqrt((100 * 100) + (100 * 100));
+
+            var diffX = LineBoundsHelper.CalculateAdjSide(Angle, lineLength);
+            var diffY = LineBoundsHelper.CalculateOppSide(Angle, lineLength);
+
+
+            var p1 = new Point(200, 200);
+            var p2 = new Point(p1.X + diffX, p1.Y + diffY);
+
+            var pen = new Pen(Brushes.Green, 20, lineCap: PenLineCap.Square);
+            var boundPen = new Pen(Brushes.Black);
+
+            drawingContext.DrawLine(pen, p1, p2);
+
+            drawingContext.DrawRectangle(boundPen, LineBoundsHelper.CalculateBounds(p1, p2, pen));
+        }
+    }
+}
diff --git a/samples/RenderDemo/MainWindow.xaml b/samples/RenderDemo/MainWindow.xaml
index 7f63e7725f..93fbe5e412 100644
--- a/samples/RenderDemo/MainWindow.xaml
+++ b/samples/RenderDemo/MainWindow.xaml
@@ -3,8 +3,8 @@
         x:Class="RenderDemo.MainWindow"
         Title="AvaloniaUI Rendering Test"
         xmlns:pages="clr-namespace:RenderDemo.Pages"
-        Width="800"
-        Height="600">
+        Width="{Binding Width, Mode=TwoWay}"
+        Height="{Binding Height, Mode=TwoWay}">
   <DockPanel>
     <Menu DockPanel.Dock="Top">
       <MenuItem Header="Rendering">
@@ -24,11 +24,18 @@
           </MenuItem.Icon>
         </MenuItem>
       </MenuItem>
+      <MenuItem Header="Tests">
+        <MenuItem Header="Resize window"
+                  Command="{Binding ResizeWindow}"/>
+      </MenuItem>
     </Menu>
     <TabControl Classes="sidebar">
       <TabItem Header="Animations">
         <pages:AnimationsPage/>
       </TabItem>
+      <TabItem Header="Transitions">
+        <pages:TransitionsPage/>
+      </TabItem>
       <TabItem Header="Clipping">
         <pages:ClippingPage/>
       </TabItem>
@@ -41,6 +48,15 @@
       <TabItem Header="RenderTargetBitmap">
         <pages:RenderTargetBitmapPage/>
       </TabItem>
+      <TabItem Header="WriteableBitmap">
+        <pages:WriteableBitmapPage/>
+      </TabItem>
+      <TabItem Header="GlyphRun">
+        <pages:GlyphRunPage/>
+      </TabItem>
+      <TabItem Header="LineBounds">
+        <pages:LineBoundsPage />
+      </TabItem>
     </TabControl>
   </DockPanel>
 </Window>
diff --git a/samples/RenderDemo/MainWindow.xaml.cs b/samples/RenderDemo/MainWindow.xaml.cs
index f1f974f7a1..877eb8016a 100644
--- a/samples/RenderDemo/MainWindow.xaml.cs
+++ b/samples/RenderDemo/MainWindow.xaml.cs
@@ -1,12 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using RenderDemo.ViewModels;
-using ReactiveUI;
+using MiniMvvm;
 
 namespace RenderDemo
 {
diff --git a/samples/RenderDemo/Pages/ClippingPage.xaml b/samples/RenderDemo/Pages/ClippingPage.xaml
index 8920b8a123..10225f7c49 100644
--- a/samples/RenderDemo/Pages/ClippingPage.xaml
+++ b/samples/RenderDemo/Pages/ClippingPage.xaml
@@ -43,7 +43,7 @@
                   C 72.078834 28.113269 74.047517 25.960974 74.931641 23.777344 
                   C 78.93827 14.586564 73.049722 2.8815081 63.248047 0.67382812
                   C 61.721916 0.22817968 60.165597 0.038541919 58.625 0.07421875 z ">
-      <Border Name="clipChild" Background="{DynamicResource ThemeAccentBrush}" Margin="4">
+      <Border Name="clipChild" Background="Red" Margin="4">
         <!-- Setting opacity puts the TextBox on a new layer -->
         <TextBox Text="Avalonia" Opacity="0.9" VerticalAlignment="Center"/>
         <Border.RenderTransform>
@@ -53,4 +53,4 @@
     </Border>
     <CheckBox Name="useMask" IsChecked="True" Grid.Row="1">Apply Geometry Clip</CheckBox>
   </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/samples/RenderDemo/Pages/GlyphRunPage.xaml b/samples/RenderDemo/Pages/GlyphRunPage.xaml
new file mode 100644
index 0000000000..c2914e8847
--- /dev/null
+++ b/samples/RenderDemo/Pages/GlyphRunPage.xaml
@@ -0,0 +1,14 @@
+<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.GlyphRunPage">
+  <Border
+    Background="White">
+    <Image
+      x:Name="imageControl"
+      Stretch="None">
+    </Image>
+  </Border>
+</UserControl>
diff --git a/samples/RenderDemo/Pages/GlyphRunPage.xaml.cs b/samples/RenderDemo/Pages/GlyphRunPage.xaml.cs
new file mode 100644
index 0000000000..857358f6b2
--- /dev/null
+++ b/samples/RenderDemo/Pages/GlyphRunPage.xaml.cs
@@ -0,0 +1,80 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+using Avalonia.Threading;
+
+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 float _fontSize = 20;
+        private int _direction = 10;
+
+        public GlyphRunPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+
+            _imageControl = this.FindControl<Image>("imageControl");
+            _imageControl.Source = new DrawingImage();
+
+            DispatcherTimer.Run(() =>
+            {
+                UpdateGlyphRun();
+
+                return true;
+            }, TimeSpan.FromSeconds(1));
+        }
+
+        private void UpdateGlyphRun()
+        {
+            var c = (uint)_rand.Next(65, 90);
+
+            if (_fontSize + _direction > 200)
+            {
+                _direction = -10;
+            }
+
+            if (_fontSize + _direction < 20)
+            {
+                _direction = 10;
+            }
+
+            _fontSize += _direction;
+
+            _glyphIndices[0] = _glyphTypeface.GetGlyph(c);
+
+            var scale = (double)_fontSize / _glyphTypeface.DesignEmHeight;
+
+            var drawingGroup = new DrawingGroup();
+
+            var glyphRunDrawing = new GlyphRunDrawing
+            {
+                Foreground = Brushes.Black,
+                GlyphRun = new GlyphRun(_glyphTypeface, _fontSize, _glyphIndices),
+            };
+
+            drawingGroup.Children.Add(glyphRunDrawing);
+
+            var geometryDrawing = new GeometryDrawing
+            {
+                Pen = new Pen(Brushes.Black),
+                Geometry = new RectangleGeometry { Rect = new Rect(glyphRunDrawing.GlyphRun.Size) }
+            };
+
+            drawingGroup.Children.Add(geometryDrawing);
+
+            (_imageControl.Source as DrawingImage).Drawing = drawingGroup;
+        }
+    }
+}
diff --git a/samples/RenderDemo/Pages/LineBoundsPage.xaml b/samples/RenderDemo/Pages/LineBoundsPage.xaml
new file mode 100644
index 0000000000..07d658630a
--- /dev/null
+++ b/samples/RenderDemo/Pages/LineBoundsPage.xaml
@@ -0,0 +1,9 @@
+<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"
+             xmlns:controls="clr-namespace:RenderDemo.Controls"
+             x:Class="RenderDemo.Pages.LineBoundsPage">
+  <controls:LineBoundsDemoControl />
+</UserControl>
diff --git a/samples/RenderDemo/Pages/LineBoundsPage.xaml.cs b/samples/RenderDemo/Pages/LineBoundsPage.xaml.cs
new file mode 100644
index 0000000000..28ddedd4bc
--- /dev/null
+++ b/samples/RenderDemo/Pages/LineBoundsPage.xaml.cs
@@ -0,0 +1,19 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace RenderDemo.Pages
+{
+    public class LineBoundsPage : UserControl
+    {
+        public LineBoundsPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/RenderDemo/Pages/RenderTargetBitmapPage.cs b/samples/RenderDemo/Pages/RenderTargetBitmapPage.cs
index 3eb2276c48..f263786ab7 100644
--- a/samples/RenderDemo/Pages/RenderTargetBitmapPage.cs
+++ b/samples/RenderDemo/Pages/RenderTargetBitmapPage.cs
@@ -39,7 +39,7 @@ namespace RenderDemo.Pages
                 ctx.FillRectangle(Brushes.Fuchsia, new Rect(50, 50, 100, 100));
             }
 
-            context.DrawImage(_bitmap, 1, 
+            context.DrawImage(_bitmap,
                 new Rect(0, 0, 200, 200), 
                 new Rect(0, 0, 200, 200));
             Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
diff --git a/samples/RenderDemo/Pages/TransitionsPage.xaml b/samples/RenderDemo/Pages/TransitionsPage.xaml
new file mode 100644
index 0000000000..d6da293ff3
--- /dev/null
+++ b/samples/RenderDemo/Pages/TransitionsPage.xaml
@@ -0,0 +1,115 @@
+<UserControl 
+  xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+  x:Class="RenderDemo.Pages.TransitionsPage">
+  <UserControl.Styles>
+    <Styles>
+      <Styles.Resources>
+        <Template x:Key="Acorn">
+          <Path Fill="White" Stretch="Uniform"
+                Data="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.9062C 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"/>
+        </Template>
+        <Template x:Key="Heart">
+          <Path Fill="Red" Stretch="Uniform" Data="
+          M 272.70141,238.71731 
+          C 206.46141,238.71731 152.70146,292.4773 152.70146,358.71731 
+          C 152.70146,493.47282 288.63461,528.80461 381.26391,662.02535 
+          C 468.83815,529.62199 609.82641,489.17075 609.82641,358.71731 
+          C 609.82641,292.47731 556.06651,238.7173 489.82641,238.71731 
+          C 441.77851,238.71731 400.42481,267.08774 381.26391,307.90481 
+          C 362.10311,267.08773 320.74941,238.7173 272.70141,238.71731 z "/>
+        </Template>
+      </Styles.Resources>
+
+      <Style Selector="Border.Test">
+        <Setter Property="Margin" Value="15"/>
+        <Setter Property="Width" Value="100"/>
+        <Setter Property="Height" Value="100"/>
+        <Setter Property="Child" Value="{StaticResource Acorn}"/>
+        <Setter Property="Transitions">
+          <Transitions>
+            <TransformOperationsTransition Property="RenderTransform"  Duration="0:0:1" />
+          </Transitions>
+        </Setter>
+        <Setter Property="RenderTransform" Value="none" />
+      </Style>
+
+      <Style Selector="Border.Rect1:pointerover">
+        <Setter Property="RenderTransform" Value="rotate(120deg) scale(1.5)" />
+      </Style>
+
+      <Style Selector="Border.Rect2:pointerover">
+        <Setter Property="RenderTransform" Value="scale(0.8)" />
+      </Style>
+
+      <Style Selector="Border.Rect3">
+        <Setter Property="Child" Value="{StaticResource Heart}"/>
+      </Style>
+
+      <Style Selector="Border.Rect3:pointerover">
+        <Setter Property="RenderTransform" Value="rotate(1turn)" />
+      </Style>
+
+      <Style Selector="Border.Rect4:pointerover">
+        <Setter Property="RenderTransform" Value="translateY(-100px)" />
+      </Style>
+
+      <Style Selector="Border.Rect5:pointerover">
+        <Setter Property="RenderTransform" Value="skewX(-20deg)" />
+      </Style>
+
+      <Style Selector="Border.Rect5:pointerover">
+        <Setter Property="RenderTransform" Value="skewX(-20deg)" />
+      </Style>
+
+      <Style Selector="Border.Rect6">
+        <Setter Property="Transitions">
+          <Transitions>
+            <TransformOperationsTransition Property="RenderTransform"  Duration="0:0:0.5" Delay="0:0:1"/>
+          </Transitions>
+        </Setter>
+        <Setter Property="RenderTransform" Value="scale(0.8)" />
+      </Style>
+
+      <Style Selector="Border.Rect6:pointerover">
+        <Setter Property="RenderTransform" Value="none" />
+      </Style>
+
+    </Styles>
+  </UserControl.Styles>
+
+  <Grid>
+    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" ClipToBounds="False">
+      <StackPanel.Clock>
+        <Clock />
+      </StackPanel.Clock>
+      <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+        <TextBlock VerticalAlignment="Center">Hover to activate Transform Keyframe Animations.</TextBlock>
+        <Button Content="{Binding PlayStateText}" Command="{Binding TogglePlayState}" Click="ToggleClock" />
+      </StackPanel>
+      <WrapPanel ClipToBounds="False">
+        <Border Classes="Test Rect1" Background="DarkRed"/>
+        <Border Classes="Test Rect2" Background="Magenta"/>
+        <Border Classes="Test Rect3"/>
+        <Border Classes="Test Rect4" Background="Navy"/>
+        <Border Classes="Test Rect5" Background="SeaGreen"/>
+        <Border Classes="Test Rect6" Background="Orange"/>
+      </WrapPanel>
+    </StackPanel>
+  </Grid>
+</UserControl>
diff --git a/samples/RenderDemo/Pages/TransitionsPage.xaml.cs b/samples/RenderDemo/Pages/TransitionsPage.xaml.cs
new file mode 100644
index 0000000000..5f446c9e99
--- /dev/null
+++ b/samples/RenderDemo/Pages/TransitionsPage.xaml.cs
@@ -0,0 +1,37 @@
+using Avalonia.Animation;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using RenderDemo.ViewModels;
+
+namespace RenderDemo.Pages
+{
+    public class TransitionsPage : UserControl
+    {
+        public TransitionsPage()
+        {
+            InitializeComponent();
+            this.DataContext = new AnimationsPageViewModel();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        private void ToggleClock(object sender, RoutedEventArgs args)
+        {
+            var button = sender as Button;
+            var clock = button.Clock;
+
+            if (clock.PlayState == PlayState.Run)
+            {
+                clock.PlayState = PlayState.Pause;
+            }
+            else if (clock.PlayState == PlayState.Pause)
+            {
+                clock.PlayState = PlayState.Run;
+            }
+        }
+    }
+}
diff --git a/samples/RenderDemo/Pages/WriteableBitmapPage.cs b/samples/RenderDemo/Pages/WriteableBitmapPage.cs
new file mode 100644
index 0000000000..850e398a93
--- /dev/null
+++ b/samples/RenderDemo/Pages/WriteableBitmapPage.cs
@@ -0,0 +1,92 @@
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.LogicalTree;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Media.Immutable;
+using Avalonia.Platform;
+using Avalonia.Threading;
+
+namespace RenderDemo.Pages
+{
+    public class WriteableBitmapPage : Control
+    {
+        private WriteableBitmap _unpremulBitmap;
+        private WriteableBitmap _premulBitmap;
+        private readonly Stopwatch _st = Stopwatch.StartNew();
+
+        protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
+        {
+            _unpremulBitmap = new WriteableBitmap(new PixelSize(256, 256), new Vector(96, 96), PixelFormat.Bgra8888, AlphaFormat.Unpremul);
+            _premulBitmap = new WriteableBitmap(new PixelSize(256, 256), new Vector(96, 96), PixelFormat.Bgra8888, AlphaFormat.Premul);
+
+            base.OnAttachedToLogicalTree(e);
+        }
+
+        protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
+        {
+            base.OnDetachedFromLogicalTree(e);
+
+            _unpremulBitmap?.Dispose();
+            _unpremulBitmap = null;
+
+            _premulBitmap?.Dispose();
+            _unpremulBitmap = null;
+        }
+
+        public override void Render(DrawingContext context)
+        {
+            void FillPixels(WriteableBitmap bitmap, byte fillAlpha, bool premul)
+            {
+                using (var fb = bitmap.Lock())
+                {
+                    var data = new int[fb.Size.Width * fb.Size.Height];
+
+                    for (int y = 0; y < fb.Size.Height; y++)
+                    {
+                        for (int x = 0; x < fb.Size.Width; x++)
+                        {
+                            var color = new Color(fillAlpha, 0, 255, 0);
+
+                            if (premul)
+                            {
+                                byte r = (byte) (color.R * color.A / 255);
+                                byte g = (byte) (color.G * color.A / 255);
+                                byte b = (byte) (color.B * color.A / 255);
+
+                                color = new Color(fillAlpha, r, g, b);
+                            }
+
+                            data[y * fb.Size.Width + x] = (int) color.ToUint32();
+                        }
+                    }
+
+                    Marshal.Copy(data, 0, fb.Address, fb.Size.Width * fb.Size.Height);
+                }
+            }
+
+            base.Render(context);
+
+            byte alpha = (byte)((_st.ElapsedMilliseconds / 10) % 256);
+
+            FillPixels(_unpremulBitmap, alpha, false);
+            FillPixels(_premulBitmap, alpha, true);
+
+            context.FillRectangle(Brushes.Red, new Rect(0, 0, 256 * 3, 256));
+
+            context.DrawImage(_unpremulBitmap,
+                new Rect(0, 0, 256, 256),
+                new Rect(0, 0, 256, 256));
+
+            context.DrawImage(_premulBitmap,
+                new Rect(0, 0, 256, 256),
+                new Rect(256, 0, 256, 256));
+
+            context.FillRectangle(new ImmutableSolidColorBrush(Colors.Lime, alpha / 255d), new Rect(512, 0, 256, 256));
+
+            Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
+        }
+    }
+}
diff --git a/samples/RenderDemo/RenderDemo.csproj b/samples/RenderDemo/RenderDemo.csproj
index bbd8666456..bba1d23e0a 100644
--- a/samples/RenderDemo/RenderDemo.csproj
+++ b/samples/RenderDemo/RenderDemo.csproj
@@ -1,17 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="..\..\src\Avalonia.Visuals\Rendering\SceneGraph\LineBoundsHelper.cs" Link="LineBoundsHelper.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
     <ProjectReference Include="..\..\src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj" />
   </ItemGroup> 
+    <ProjectReference Include="..\MiniMvvm\MiniMvvm.csproj" />
+  </ItemGroup>
   <Import Project="..\..\build\SampleApp.props" />
   <Import Project="..\..\build\EmbedXaml.props" />
-  <Import Project="..\..\build\Serilog.props" />
   <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\ReactiveUI.props" />
   <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" />
   <Import Project="..\..\build\ReferenceCoreLibraries.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
diff --git a/samples/RenderDemo/SideBar.xaml b/samples/RenderDemo/SideBar.xaml
index d6bde0b146..fd23067f61 100644
--- a/samples/RenderDemo/SideBar.xaml
+++ b/samples/RenderDemo/SideBar.xaml
@@ -1,65 +1,68 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Style Selector="TabControl.sidebar">
-        <Setter Property="TabStripPlacement" Value="Left"/>
-        <Setter Property="Padding" Value="8 0 0 0"/>
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush}"/>
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border 
-                    Margin="{TemplateBinding Margin}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}">
-                    <DockPanel>
-                        <ScrollViewer
-                            Name="PART_ScrollViewer"
-                            HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
-                            VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
-                            Background="{TemplateBinding Background}">
-                            <ItemsPresenter
-                                Name="PART_ItemsPresenter"                          
-                                Items="{TemplateBinding Items}"
-                                ItemsPanel="{TemplateBinding ItemsPanel}"
-                                ItemTemplate="{TemplateBinding ItemTemplate}">
-                            </ItemsPresenter>
-                        </ScrollViewer>
-                        <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.sidebar">
+    <Setter Property="TabStripPlacement" Value="Left"/>
+    <Setter Property="Padding" Value="8 0 0 0"/>
+    <Setter Property="Background" Value="{DynamicResource SystemAccentColor}"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border
+            Margin="{TemplateBinding Margin}"
+            BorderBrush="{TemplateBinding BorderBrush}"
+            BorderThickness="{TemplateBinding BorderThickness}">
+          <DockPanel>
+            <ScrollViewer
+                Name="PART_ScrollViewer"
+                HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
+                Background="{TemplateBinding Background}">
+              <ItemsPresenter
+                  Name="PART_ItemsPresenter"
+                  Items="{TemplateBinding Items}"
+                  ItemsPanel="{TemplateBinding ItemsPanel}"
+                  ItemTemplate="{TemplateBinding ItemTemplate}">
+              </ItemsPresenter>
+            </ScrollViewer>
+            <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.sidebar > TabItem">       
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="Foreground" Value="White"/>
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="Margin" Value="0"/>
-        <Setter Property="Padding" Value="16"/>
-        <Setter Property="Opacity" Value="0.5"/>
-        <Setter Property="Transitions">
-            <Transitions>
-                <DoubleTransition Property="Opacity" Duration="0:0:0.150"/>
-            </Transitions>
-        </Setter>
-    </Style>
-    <Style Selector="TabControl.sidebar > TabItem:pointerover">
-        <Setter Property="Opacity" Value="1"/>
-    </Style>
-    <Style Selector="TabControl.sidebar > TabItem:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="Transparent"/>
-    </Style>
-    <Style Selector="TabControl.sidebar > TabItem:selected">
-        <Setter Property="Opacity" Value="1"/>
-    </Style>
-    <Style Selector="TabControl.sidebar > TabItem:selected /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/>
-    </Style>
+  <Style Selector="TabControl.sidebar > TabItem">
+    <Setter Property="BorderThickness" Value="0"/>
+    <Setter Property="Foreground" Value="White"/>
+    <Setter Property="FontSize" Value="14"/>
+    <Setter Property="Margin" Value="0"/>
+    <Setter Property="Padding" Value="16"/>
+    <Setter Property="Opacity" Value="0.5"/>
+    <Setter Property="Transitions">
+      <Transitions>
+        <DoubleTransition Property="Opacity" Duration="0:0:0.150"/>
+      </Transitions>
+    </Setter>
+  </Style>
+  <Style Selector="TabControl.sidebar > TabItem:selected /template/ Border#PART_SelectedPipe">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="TabControl.sidebar > TabItem:pointerover">
+    <Setter Property="Opacity" Value="1"/>
+  </Style>
+  <Style Selector="TabControl.sidebar > TabItem:pointerover /template/ Border#PART_LayoutRoot">
+    <Setter Property="Background" Value="{DynamicResource SystemAccentColorLight2}"/>
+  </Style>
+  <Style Selector="TabControl.sidebar > TabItem:selected">
+    <Setter Property="Opacity" Value="1"/>
+  </Style>
+  <Style Selector="TabControl.sidebar > TabItem:selected /template/ Border#PART_LayoutRoot">
+    <Setter Property="Background" Value="{DynamicResource SystemAccentColorLight1}"/>
+  </Style>
 </Styles>
diff --git a/samples/RenderDemo/ViewModels/MainWindowViewModel.cs b/samples/RenderDemo/ViewModels/MainWindowViewModel.cs
index d2d789a687..19917c20df 100644
--- a/samples/RenderDemo/ViewModels/MainWindowViewModel.cs
+++ b/samples/RenderDemo/ViewModels/MainWindowViewModel.cs
@@ -1,33 +1,68 @@
-using System;
-using System.Reactive;
-using ReactiveUI;
+using System.Reactive;
+using System.Threading.Tasks;
+using MiniMvvm;
 
 namespace RenderDemo.ViewModels
 {
-    public class MainWindowViewModel : ReactiveObject
+    public class MainWindowViewModel : ViewModelBase
     {
         private bool drawDirtyRects = false;
         private bool drawFps = true;
+        private double width = 800;
+        private double height = 600;
 
         public MainWindowViewModel()
         {
-            ToggleDrawDirtyRects = ReactiveCommand.Create(() => DrawDirtyRects = !DrawDirtyRects);
-            ToggleDrawFps = ReactiveCommand.Create(() => DrawFps = !DrawFps);
+            ToggleDrawDirtyRects = MiniCommand.Create(() => DrawDirtyRects = !DrawDirtyRects);
+            ToggleDrawFps = MiniCommand.Create(() => DrawFps = !DrawFps);
+            ResizeWindow = MiniCommand.CreateFromTask(ResizeWindowAsync);
         }
 
         public bool DrawDirtyRects
         {
-            get { return drawDirtyRects; }
-            set { this.RaiseAndSetIfChanged(ref drawDirtyRects, value); }
+            get => drawDirtyRects;
+            set => this.RaiseAndSetIfChanged(ref drawDirtyRects, value);
         }
 
         public bool DrawFps
         {
-            get { return drawFps; }
-            set { this.RaiseAndSetIfChanged(ref drawFps, value); }
+            get => drawFps;
+            set => this.RaiseAndSetIfChanged(ref drawFps, value);
         }
 
-        public ReactiveCommand<Unit, bool> ToggleDrawDirtyRects { get; }
-        public ReactiveCommand<Unit, bool> ToggleDrawFps { get; }
+        public double Width
+        {
+            get => width;
+            set => this.RaiseAndSetIfChanged(ref width, value);
+        }
+
+        public double Height
+        {
+            get => height;
+            set => this.RaiseAndSetIfChanged(ref height, value);
+        }
+
+        public MiniCommand ToggleDrawDirtyRects { get; }
+        public MiniCommand ToggleDrawFps { get; }
+        public MiniCommand ResizeWindow { get; }
+
+        private async Task ResizeWindowAsync()
+        {
+            for (int i = 0; i < 30; i++)
+            {
+                Width += 10;
+                Height += 5;
+                await Task.Delay(10);
+            }
+
+            await Task.Delay(10);
+
+            for (int i = 0; i < 30; i++)
+            {
+                Width -= 10;
+                Height -= 5;
+                await Task.Delay(10);
+            }
+        }
     }
 }
diff --git a/samples/Sandbox/App.axaml b/samples/Sandbox/App.axaml
new file mode 100644
index 0000000000..f601f9f78f
--- /dev/null
+++ b/samples/Sandbox/App.axaml
@@ -0,0 +1,8 @@
+<Application
+    xmlns="https://github.com/avaloniaui" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:Class="Sandbox.App">
+    <Application.Styles>
+        <FluentTheme Mode="Dark"/>
+    </Application.Styles>
+</Application>
diff --git a/samples/Sandbox/App.axaml.cs b/samples/Sandbox/App.axaml.cs
new file mode 100644
index 0000000000..7eb8345784
--- /dev/null
+++ b/samples/Sandbox/App.axaml.cs
@@ -0,0 +1,22 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+
+namespace Sandbox
+{
+    public class App : Application
+    {
+        public override void Initialize()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktopLifetime)
+            {
+                desktopLifetime.MainWindow = new MainWindow();
+            }
+        }
+    }
+}
diff --git a/samples/Sandbox/MainWindow.axaml b/samples/Sandbox/MainWindow.axaml
new file mode 100644
index 0000000000..6929f192c7
--- /dev/null
+++ b/samples/Sandbox/MainWindow.axaml
@@ -0,0 +1,4 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        x:Class="Sandbox.MainWindow">
+</Window>
diff --git a/samples/Sandbox/MainWindow.axaml.cs b/samples/Sandbox/MainWindow.axaml.cs
new file mode 100644
index 0000000000..3d54036d29
--- /dev/null
+++ b/samples/Sandbox/MainWindow.axaml.cs
@@ -0,0 +1,21 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Win32.WinRT.Composition;
+
+namespace Sandbox
+{
+    public class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            this.InitializeComponent();
+            this.AttachDevTools();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/samples/Sandbox/Program.cs b/samples/Sandbox/Program.cs
new file mode 100644
index 0000000000..1e74105196
--- /dev/null
+++ b/samples/Sandbox/Program.cs
@@ -0,0 +1,15 @@
+using Avalonia;
+
+namespace Sandbox
+{
+    public class Program
+    {
+        static void Main(string[] args)
+        {
+            AppBuilder.Configure<App>()
+                .UsePlatformDetect()
+                .LogToTrace()
+                .StartWithClassicDesktopLifetime(args);
+        }
+    }
+}
diff --git a/samples/Sandbox/Sandbox.csproj b/samples/Sandbox/Sandbox.csproj
new file mode 100644
index 0000000000..0c19440a1e
--- /dev/null
+++ b/samples/Sandbox/Sandbox.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
+  </ItemGroup>
+  
+  <Import Project="..\..\build\SampleApp.props" />
+  <Import Project="..\..\build\ReferenceCoreLibraries.props" />
+  <Import Project="..\..\build\BuildTargets.targets" />
+</Project>
diff --git a/samples/VirtualizationDemo/App.xaml.cs b/samples/VirtualizationDemo/App.xaml.cs
index b220807443..81b80c1f40 100644
--- a/samples/VirtualizationDemo/App.xaml.cs
+++ b/samples/VirtualizationDemo/App.xaml.cs
@@ -1,7 +1,5 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 
 namespace VirtualizationDemo
@@ -12,5 +10,12 @@ namespace VirtualizationDemo
         {
             AvaloniaXamlLoader.Load(this);
         }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                desktop.MainWindow = new MainWindow();
+            base.OnFrameworkInitializationCompleted();
+        }
     }
 }
diff --git a/samples/VirtualizationDemo/MainWindow.xaml b/samples/VirtualizationDemo/MainWindow.xaml
index 12137cd03d..4bd657bf93 100644
--- a/samples/VirtualizationDemo/MainWindow.xaml
+++ b/samples/VirtualizationDemo/MainWindow.xaml
@@ -45,7 +45,7 @@
 
         <ListBox Name="listBox" 
                  Items="{Binding Items}" 
-                 SelectedItems="{Binding SelectedItems}"
+                 Selection="{Binding Selection}"
                  SelectionMode="Multiple"
                  VirtualizationMode="{Binding VirtualizationMode}"
                  ScrollViewer.HorizontalScrollBarVisibility="{Binding HorizontalScrollBarVisibility, Mode=TwoWay}"
diff --git a/samples/VirtualizationDemo/MainWindow.xaml.cs b/samples/VirtualizationDemo/MainWindow.xaml.cs
index 271519b10b..cea200dcec 100644
--- a/samples/VirtualizationDemo/MainWindow.xaml.cs
+++ b/samples/VirtualizationDemo/MainWindow.xaml.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
diff --git a/samples/VirtualizationDemo/Program.cs b/samples/VirtualizationDemo/Program.cs
index 9d8f7c1a3d..febda46450 100644
--- a/samples/VirtualizationDemo/Program.cs
+++ b/samples/VirtualizationDemo/Program.cs
@@ -1,24 +1,15 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Logging.Serilog;
-using Avalonia.ReactiveUI;
-using Serilog;
+using Avalonia;
 
 namespace VirtualizationDemo
 {
     class Program
     {
-        static void Main(string[] args)
-        {
-            AppBuilder.Configure<App>()
-               .UsePlatformDetect()
-               .UseReactiveUI()
-               .LogToDebug()
-               .Start<MainWindow>();
-        }
+        public static AppBuilder BuildAvaloniaApp()
+            => AppBuilder.Configure<App>()
+                .UsePlatformDetect()
+                .LogToTrace();
+
+        public static int Main(string[] args)
+            => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
     }
 }
diff --git a/samples/VirtualizationDemo/ViewModels/ItemViewModel.cs b/samples/VirtualizationDemo/ViewModels/ItemViewModel.cs
index 4401a2dfeb..9ba505ffe5 100644
--- a/samples/VirtualizationDemo/ViewModels/ItemViewModel.cs
+++ b/samples/VirtualizationDemo/ViewModels/ItemViewModel.cs
@@ -1,12 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using ReactiveUI;
+using System;
+using MiniMvvm;
 
 namespace VirtualizationDemo.ViewModels
 {
-    internal class ItemViewModel : ReactiveObject
+    internal class ItemViewModel : ViewModelBase
     {
         private string _prefix;
         private int _index;
diff --git a/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs b/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs
index 649c64ab1d..514df691ae 100644
--- a/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs
+++ b/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs
@@ -1,19 +1,17 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
-using ReactiveUI;
 using Avalonia.Layout;
+using Avalonia.Controls.Selection;
+using MiniMvvm;
 
 namespace VirtualizationDemo.ViewModels
 {
-    internal class MainWindowViewModel : ReactiveObject
+    internal class MainWindowViewModel : ViewModelBase
     {
         private int _itemCount = 200;
         private string _newItemString = "New Item";
@@ -28,15 +26,15 @@ namespace VirtualizationDemo.ViewModels
         public MainWindowViewModel()
         {
             this.WhenAnyValue(x => x.ItemCount).Subscribe(ResizeItems);
-            RecreateCommand = ReactiveCommand.Create(() => Recreate());
+            RecreateCommand = MiniCommand.Create(() => Recreate());
 
-            AddItemCommand = ReactiveCommand.Create(() => AddItem());
+            AddItemCommand = MiniCommand.Create(() => AddItem());
 
-            RemoveItemCommand = ReactiveCommand.Create(() => Remove());
+            RemoveItemCommand = MiniCommand.Create(() => Remove());
 
-            SelectFirstCommand = ReactiveCommand.Create(() => SelectItem(0));
+            SelectFirstCommand = MiniCommand.Create(() => SelectItem(0));
 
-            SelectLastCommand = ReactiveCommand.Create(() => SelectItem(Items.Count - 1));
+            SelectLastCommand = MiniCommand.Create(() => SelectItem(Items.Count - 1));
         }
 
         public string NewItemString
@@ -51,8 +49,7 @@ namespace VirtualizationDemo.ViewModels
             set { this.RaiseAndSetIfChanged(ref _itemCount, value); }
         }
 
-        public AvaloniaList<ItemViewModel> SelectedItems { get; } 
-            = new AvaloniaList<ItemViewModel>();
+        public SelectionModel<ItemViewModel> Selection { get; } = new SelectionModel<ItemViewModel>();
 
         public AvaloniaList<ItemViewModel> Items
         {
@@ -93,11 +90,11 @@ namespace VirtualizationDemo.ViewModels
         public IEnumerable<ItemVirtualizationMode> VirtualizationModes => 
             Enum.GetValues(typeof(ItemVirtualizationMode)).Cast<ItemVirtualizationMode>();
 
-        public ReactiveCommand<Unit, Unit> AddItemCommand { get; private set; }
-        public ReactiveCommand<Unit, Unit> RecreateCommand { get; private set; }
-        public ReactiveCommand<Unit, Unit> RemoveItemCommand { get; private set; }
-        public ReactiveCommand<Unit, Unit> SelectFirstCommand { get; private set; }
-        public ReactiveCommand<Unit, Unit> SelectLastCommand { get; private set; }
+        public MiniCommand AddItemCommand { get; private set; }
+        public MiniCommand RecreateCommand { get; private set; }
+        public MiniCommand RemoveItemCommand { get; private set; }
+        public MiniCommand SelectFirstCommand { get; private set; }
+        public MiniCommand SelectLastCommand { get; private set; }
 
         public void RandomizeSize()
         {
@@ -141,9 +138,9 @@ namespace VirtualizationDemo.ViewModels
         {
             var index = Items.Count;
 
-            if (SelectedItems.Count > 0)
+            if (Selection.SelectedItems.Count > 0)
             {
-                index = Items.IndexOf(SelectedItems[0]);
+                index = Selection.SelectedIndex;
             }
 
             Items.Insert(index, new ItemViewModel(_newItemIndex++, NewItemString));
@@ -151,9 +148,9 @@ namespace VirtualizationDemo.ViewModels
 
         private void Remove()
         {
-            if (SelectedItems.Count > 0)
+            if (Selection.SelectedItems.Count > 0)
             {
-                Items.RemoveAll(SelectedItems);
+                Items.RemoveAll(Selection.SelectedItems.ToList());
             }
         }
 
@@ -167,8 +164,7 @@ namespace VirtualizationDemo.ViewModels
 
         private void SelectItem(int index)
         {
-            SelectedItems.Clear();
-            SelectedItems.Add(Items[index]);
+            Selection.SelectedIndex = index;
         }
     }
 }
diff --git a/samples/VirtualizationDemo/VirtualizationDemo.csproj b/samples/VirtualizationDemo/VirtualizationDemo.csproj
index 3005fdbc51..d898b737a9 100644
--- a/samples/VirtualizationDemo/VirtualizationDemo.csproj
+++ b/samples/VirtualizationDemo/VirtualizationDemo.csproj
@@ -1,17 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
     <ProjectReference Include="..\..\src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj" />
+    <ProjectReference Include="..\MiniMvvm\MiniMvvm.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\SampleApp.props" />
   <Import Project="..\..\build\EmbedXaml.props" />
-  <Import Project="..\..\build\Serilog.props" />
   <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\ReactiveUI.props" />
   <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" />
   <Import Project="..\..\build\ReferenceCoreLibraries.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
diff --git a/samples/interop/Direct3DInteropSample/App.paml.cs b/samples/interop/Direct3DInteropSample/App.paml.cs
index 1b6d5fd39c..29365decfe 100644
--- a/samples/interop/Direct3DInteropSample/App.paml.cs
+++ b/samples/interop/Direct3DInteropSample/App.paml.cs
@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 
 namespace Direct3DInteropSample
@@ -9,5 +10,12 @@ namespace Direct3DInteropSample
         {
             AvaloniaXamlLoader.Load(this);
         }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                desktop.MainWindow = new MainWindow();
+            base.OnFrameworkInitializationCompleted();
+        }
     }
 }
diff --git a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
index 3e318278c1..cd9963a2e5 100644
--- a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
+++ b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
@@ -22,11 +22,10 @@
       </EmbeddedResource>
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj" />
         <ProjectReference Include="..\..\..\src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj" />
         <ProjectReference Include="..\..\..\src\Windows\Avalonia.Win32\Avalonia.Win32.csproj" />
+        <ProjectReference Include="..\..\MiniMvvm\MiniMvvm.csproj" />
     </ItemGroup>
-    <Import Project="..\..\..\build\Serilog.props" />
     <Import Project="..\..\..\build\Rx.props" />
     <Import Project="..\..\..\build\ReferenceCoreLibraries.props" />
 </Project>
diff --git a/samples/interop/Direct3DInteropSample/MainWindow.cs b/samples/interop/Direct3DInteropSample/MainWindow.cs
index 1ac4b44a74..6cc3cb9116 100644
--- a/samples/interop/Direct3DInteropSample/MainWindow.cs
+++ b/samples/interop/Direct3DInteropSample/MainWindow.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 using Avalonia;
 using Avalonia.Controls;
diff --git a/samples/interop/Direct3DInteropSample/MainWindowViewModel.cs b/samples/interop/Direct3DInteropSample/MainWindowViewModel.cs
index d39a21cd07..21679a99c5 100644
--- a/samples/interop/Direct3DInteropSample/MainWindowViewModel.cs
+++ b/samples/interop/Direct3DInteropSample/MainWindowViewModel.cs
@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using ReactiveUI;
+using MiniMvvm;
 
 namespace Direct3DInteropSample
 {
-    public class MainWindowViewModel : ReactiveObject
+    public class MainWindowViewModel : ViewModelBase
     {
         private double _rotationX;
 
diff --git a/samples/interop/Direct3DInteropSample/Program.cs b/samples/interop/Direct3DInteropSample/Program.cs
index 21302fa68a..bf8e76d7e4 100644
--- a/samples/interop/Direct3DInteropSample/Program.cs
+++ b/samples/interop/Direct3DInteropSample/Program.cs
@@ -1,19 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia;
+using Avalonia;
 
 namespace Direct3DInteropSample
 {
     class Program
     {
-        static void Main(string[] args)
-        {
-            AppBuilder.Configure<App>()
-                .With(new Win32PlatformOptions {UseDeferredRendering = false})
-                .UseWin32().UseDirect2D1().Start<MainWindow>();
-        }
+        public static AppBuilder BuildAvaloniaApp()
+            => AppBuilder.Configure<App>()
+                .With(new Win32PlatformOptions { UseDeferredRendering = false })
+                .UseWin32()
+                .UseDirect2D1();
+
+        public static int Main(string[] args)
+            => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
     }
 }
diff --git a/samples/interop/NativeEmbedSample/App.xaml b/samples/interop/NativeEmbedSample/App.xaml
new file mode 100644
index 0000000000..e35ade4087
--- /dev/null
+++ b/samples/interop/NativeEmbedSample/App.xaml
@@ -0,0 +1,8 @@
+<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
new file mode 100644
index 0000000000..cb17cfc35d
--- /dev/null
+++ b/samples/interop/NativeEmbedSample/App.xaml.cs
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 0000000000..ab9df11e19
--- /dev/null
+++ b/samples/interop/NativeEmbedSample/EmbedSample.cs
@@ -0,0 +1,121 @@
+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
new file mode 100644
index 0000000000..e389a51ef5
--- /dev/null
+++ b/samples/interop/NativeEmbedSample/GtkHelper.cs
@@ -0,0 +1,58 @@
+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
new file mode 100644
index 0000000000..74a06a0a0c
--- /dev/null
+++ b/samples/interop/NativeEmbedSample/MacHelper.cs
@@ -0,0 +1,39 @@
+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
new file mode 100644
index 0000000000..f2161a1bea
--- /dev/null
+++ b/samples/interop/NativeEmbedSample/MainWindow.xaml
@@ -0,0 +1,52 @@
+<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
new file mode 100644
index 0000000000..4324aa2762
--- /dev/null
+++ b/samples/interop/NativeEmbedSample/MainWindow.xaml.cs
@@ -0,0 +1,36 @@
+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
new file mode 100644
index 0000000000..c25442b52c
--- /dev/null
+++ b/samples/interop/NativeEmbedSample/NativeEmbedSample.csproj
@@ -0,0 +1,30 @@
+<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
new file mode 100644
index 0000000000..baa7837667
--- /dev/null
+++ b/samples/interop/NativeEmbedSample/Program.cs
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000..8e5bcdf49e
--- /dev/null
+++ b/samples/interop/NativeEmbedSample/WinApi.cs
@@ -0,0 +1,74 @@
+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/NativeEmbedSample/nodes-license.md b/samples/interop/NativeEmbedSample/nodes-license.md
new file mode 100644
index 0000000000..ab165bb9b6
--- /dev/null
+++ b/samples/interop/NativeEmbedSample/nodes-license.md
@@ -0,0 +1 @@
+nodes.mp4 by beeple is licensed under the creative commons license, downloaded from https://vimeo.com/9936271
diff --git a/samples/interop/NativeEmbedSample/nodes.mp4 b/samples/interop/NativeEmbedSample/nodes.mp4
new file mode 100644
index 0000000000..5afe23488a
Binary files /dev/null and b/samples/interop/NativeEmbedSample/nodes.mp4 differ
diff --git a/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj b/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
index c067d38595..8394d7cb13 100644
--- a/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
+++ b/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
@@ -136,10 +136,6 @@
       <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
       <Name>Avalonia.Layout</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj">
-      <Project>{6417b24e-49c2-4985-8db2-3ab9d898ec91}</Project>
-      <Name>Avalonia.ReactiveUI</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj">
       <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
       <Name>Avalonia.Visuals</Name>
@@ -190,4 +186,4 @@
   <Import Project="..\..\..\build\Rx.props" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\..\build\LegacyProject.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/scripts/ReplaceNugetCache.ps1 b/scripts/ReplaceNugetCache.ps1
index 70f5eaa40b..2543e58249 100644
--- a/scripts/ReplaceNugetCache.ps1
+++ b/scripts/ReplaceNugetCache.ps1
@@ -1,5 +1,5 @@
-copy ..\samples\ControlCatalog.NetCore\bin\Debug\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netcoreapp2.0\
-copy ..\samples\ControlCatalog.NetCore\bin\Debug\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netstandard2.0\
-copy ..\samples\ControlCatalog.NetCore\bin\Debug\netcoreapp2.0\Avalonia.Win32.dll ~\.nuget\packages\avalonia.win32\$args\lib\netstandard2.0\
-copy ..\samples\ControlCatalog.NetCore\bin\Debug\netcoreapp2.0\Avalonia.Skia.dll ~\.nuget\packages\avalonia.skia\$args\lib\netstandard2.0\
-copy ..\samples\ControlCatalog.NetCore\bin\Debug\netcoreapp2.0\Avalonia.Skia.dll ~\.nuget\packages\avalonia.direct2d1\$args\lib\netstandard2.0\
+copy ..\samples\ControlCatalog.NetCore\bin\Debug\netcoreapp3.1\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netcoreapp2.0\
+copy ..\samples\ControlCatalog.NetCore\bin\Debug\netcoreapp3.1\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netstandard2.0\
+copy ..\samples\ControlCatalog.NetCore\bin\Debug\netcoreapp3.1\Avalonia.Win32.dll ~\.nuget\packages\avalonia.win32\$args\lib\netstandard2.0\
+copy ..\samples\ControlCatalog.NetCore\bin\Debug\netcoreapp3.1\Avalonia.Skia.dll ~\.nuget\packages\avalonia.skia\$args\lib\netstandard2.0\
+copy ..\samples\ControlCatalog.NetCore\bin\Debug\netcoreapp3.1\Avalonia.Skia.dll ~\.nuget\packages\avalonia.direct2d1\$args\lib\netstandard2.0\
diff --git a/scripts/ReplaceNugetCache.sh b/scripts/ReplaceNugetCache.sh
index e1c0487d60..7ac601571d 100755
--- a/scripts/ReplaceNugetCache.sh
+++ b/scripts/ReplaceNugetCache.sh
@@ -1,8 +1,8 @@
  #!/usr/bin/env bash
  
- cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp2.0/Avalonia**.dll ~/.nuget/packages/avalonia/$1/lib/netcoreapp2.0/
- cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp2.0/Avalonia**.dll ~/.nuget/packages/avalonia/$1/lib/netstandard2.0/
- cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp2.0/Avalonia**.dll ~/.nuget/packages/avalonia.skia/$1/lib/netstandard2.0/
- cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp2.0/Avalonia**.dll ~/.nuget/packages/avalonia.native/$1/lib/netstandard2.0/
+ cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp3.1/Avalonia**.dll ~/.nuget/packages/avalonia/$1/lib/netcoreapp3.1/
+ cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp3.1/Avalonia**.dll ~/.nuget/packages/avalonia/$1/lib/netstandard2.0/
+ cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp3.1/Avalonia**.dll ~/.nuget/packages/avalonia.skia/$1/lib/netstandard2.0/
+ cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp3.1/Avalonia**.dll ~/.nuget/packages/avalonia.native/$1/lib/netstandard2.0/
  
  
diff --git a/scripts/ReplaceNugetCacheRelease.ps1 b/scripts/ReplaceNugetCacheRelease.ps1
index 1c19e00400..96678819a4 100644
--- a/scripts/ReplaceNugetCacheRelease.ps1
+++ b/scripts/ReplaceNugetCacheRelease.ps1
@@ -1,5 +1,5 @@
-copy ..\samples\ControlCatalog.NetCore\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netcoreapp2.0\
-copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netstandard2.0\
-copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.gtk3\$args\lib\netstandard2.0\
-copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.win32\$args\lib\netstandard2.0\
-copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.skia\$args\lib\netstandard2.0\
\ No newline at end of file
+copy ..\samples\ControlCatalog.NetCore\bin\Release\netcoreapp3.1\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netcoreapp2.0\
+copy ..\samples\ControlCatalog.NetCore\bin\Release\netcoreapp3.1\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netstandard2.0\
+copy ..\samples\ControlCatalog.NetCore\bin\Release\netcoreapp3.1\Avalonia.Win32.dll ~\.nuget\packages\avalonia.win32\$args\lib\netstandard2.0\
+copy ..\samples\ControlCatalog.NetCore\bin\Release\netcoreapp3.1\Avalonia.Skia.dll ~\.nuget\packages\avalonia.skia\$args\lib\netstandard2.0\
+copy ..\samples\ControlCatalog.NetCore\bin\Release\netcoreapp3.1\Avalonia.Skia.dll ~\.nuget\packages\avalonia.direct2d1\$args\lib\netstandard2.0\
\ No newline at end of file
diff --git a/scripts/avalonia-rename.ps1 b/scripts/avalonia-rename.ps1
deleted file mode 100644
index c77dffb55d..0000000000
--- a/scripts/avalonia-rename.ps1
+++ /dev/null
@@ -1,64 +0,0 @@
-function Get-NewDirectoryName {
-    param ([System.IO.DirectoryInfo]$item)
-
-    $name = $item.Name.Replace("perspex", "avalonia")
-    $name = $name.Replace("Perspex", "Avalonia")
-    Join-Path $item.Parent.FullName $name
-}
-
-function Get-NewFileName {
-    param ([System.IO.FileInfo]$item)
-
-    $name = $item.Name.Replace("perspex", "avalonia")
-    $name = $name.Replace("Perspex", "Avalonia")
-    Join-Path $item.DirectoryName $name
-}
-
-function Rename-Contents {
-    param ([System.IO.FileInfo] $file)
-
-    $extensions = @(".cs",".xaml",".csproj",".sln",".md",".json",".yml",".partial",".ps1",".nuspec",".htm",".html",".gitmodules".".xml",".plist",".targets",".projitems",".shproj",".xib")
-
-    if ($extensions.Contains($file.Extension)) {
-        $text = [IO.File]::ReadAllText($file.FullName)
-        $text = $text.Replace("github.com/perspex", "github.com/avaloniaui")
-        $text = $text.Replace("github.com/Perspex", "github.com/AvaloniaUI")
-        $text = $text.Replace("perspex", "avalonia")
-        $text = $text.Replace("Perspex", "Avalonia")
-        $text = $text.Replace("PERSPEX", "AVALONIA")
-        [IO.File]::WriteAllText($file.FullName, $text)
-    }
-}
-
-function Process-Files {
-    param ([System.IO.DirectoryInfo] $item)
-
-    $dirs = Get-ChildItem -Path $item.FullName -Directory
-    $files = Get-ChildItem -Path $item.FullName -File
-
-    foreach ($dir in $dirs) {
-        Process-Files $dir.FullName
-    }
-
-    foreach ($file in $files) {
-        Rename-Contents $file
-
-        $renamed = Get-NewFileName $file
-
-        if ($file.FullName -ne $renamed) {
-            Write-Host git mv $file.FullName $renamed
-            & git mv $file.FullName $renamed
-        }
-    }
-
-    $renamed = Get-NewDirectoryName $item
-
-    if ($item.FullName -ne $renamed) {
-        Write-Host git mv $item.FullName $renamed
-        & git mv $item.FullName $renamed
-    }
-}
-
-& git submodule deinit .
-& git clean -xdf
-Process-Files .
diff --git a/src/Android/Avalonia.Android/AndroidPlatform.cs b/src/Android/Avalonia.Android/AndroidPlatform.cs
index c11cadfbac..2e6f4a67c3 100644
--- a/src/Android/Avalonia.Android/AndroidPlatform.cs
+++ b/src/Android/Avalonia.Android/AndroidPlatform.cs
@@ -67,7 +67,7 @@ namespace Avalonia.Android
             throw new NotSupportedException();
         }
 
-        public IEmbeddableWindowImpl CreateEmbeddableWindow()
+        public IWindowImpl CreateEmbeddableWindow()
         {
             throw new NotSupportedException();
         }
diff --git a/src/Android/Avalonia.Android/AvaloniaView.cs b/src/Android/Avalonia.Android/AvaloniaView.cs
index fbe027db00..72732a1f95 100644
--- a/src/Android/Avalonia.Android/AvaloniaView.cs
+++ b/src/Android/Avalonia.Android/AvaloniaView.cs
@@ -33,10 +33,8 @@ namespace Avalonia.Android
             return _view.View.DispatchKeyEvent(e);
         }
 
-        class ViewImpl : TopLevelImpl, IEmbeddableWindowImpl
+        class ViewImpl : TopLevelImpl
         {
-            public event Action LostFocus;
-
             public ViewImpl(Context context) : base(context)
             {
                 View.Focusable = true;
diff --git a/src/Android/Avalonia.Android/Platform/ClipboardImpl.cs b/src/Android/Avalonia.Android/Platform/ClipboardImpl.cs
index 51e0a1e799..7802f336fb 100644
--- a/src/Android/Avalonia.Android/Platform/ClipboardImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/ClipboardImpl.cs
@@ -43,5 +43,11 @@ namespace Avalonia.Android.Platform
 
             return Task.FromResult<object>(null);
         }
+
+        public Task SetDataObjectAsync(IDataObject data) => throw new PlatformNotSupportedException();
+
+        public Task<string[]> GetFormatsAsync() => throw new PlatformNotSupportedException();
+
+        public Task<object> GetDataAsync(string format) => throw new PlatformNotSupportedException();
     }
 }
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
index 71706676d6..71dce93ce7 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
@@ -126,7 +126,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
             _view.Visibility = ViewStates.Visible;
         }
 
-        public double Scaling => 1;
+        public double RenderScaling => 1;
 
         void Draw()
         {
@@ -194,6 +194,8 @@ namespace Avalonia.Android.Platform.SkiaPlatform
         }
 
         public IPopupImpl CreatePopup() => null;
+        
+        public Action LostFocus { get; set; }
 
         ILockedFramebuffer IFramebufferPlatformSurface.Lock()=>new AndroidFramebuffer(_view.Holder.Surface);
     }
diff --git a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
index 2f95a6e4bd..f880e48282 100644
--- a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
+++ b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
@@ -127,10 +127,6 @@
       <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
       <Name>Avalonia.Layout</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj">
-      <Project>{6417b24e-49c2-4985-8db2-3ab9d898ec91}</Project>
-      <Name>Avalonia.ReactiveUI</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj">
       <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
       <Name>Avalonia.Visuals</Name>
@@ -149,7 +145,6 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <Import Project="..\..\..\build\Serilog.props" />
   <Import Project="..\..\..\build\Base.props" />
   <Import Project="..\..\..\build\Rx.props" />
   <Import Project="..\..\..\build\System.Memory.props" />
diff --git a/src/Avalonia.Animation/Animatable.cs b/src/Avalonia.Animation/Animatable.cs
index ca45fb8c4d..067d9f462f 100644
--- a/src/Avalonia.Animation/Animatable.cs
+++ b/src/Avalonia.Animation/Animatable.cs
@@ -1,13 +1,10 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Linq;
-using Avalonia.Collections;
+using System.Collections.Specialized;
 using Avalonia.Data;
-using Avalonia.Animation.Animators;
+
+#nullable enable
 
 namespace Avalonia.Animation
 {
@@ -16,9 +13,24 @@ namespace Avalonia.Animation
     /// </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);
@@ -26,68 +38,196 @@ namespace Avalonia.Animation
         }
 
         /// <summary>
-        /// Defines the <see cref="Transitions"/> property.
+        /// Gets or sets the property transitions for the control.
         /// </summary>
-        public static readonly DirectProperty<Animatable, Transitions> TransitionsProperty =
-            AvaloniaProperty.RegisterDirect<Animatable, Transitions>(
-                nameof(Transitions),
-                o => o.Transitions,
-                (o, v) => o.Transitions = v);
+        public Transitions? Transitions
+        {
+            get => GetValue(TransitionsProperty);
+            set => SetValue(TransitionsProperty, value);
+        }
 
-        private Transitions _transitions;
+        /// <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;
 
-        private Dictionary<AvaloniaProperty, IDisposable> _previousTransitions;
+                if (Transitions is object)
+                {
+                    AddTransitions(Transitions);
+                }
+            }
+        }
 
         /// <summary>
-        /// Gets or sets the property transitions for the control.
+        /// Disables transitions for the control.
         /// </summary>
-        public Transitions Transitions
+        /// <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)
         {
-            get
+            if (change.Property == TransitionsProperty && change.IsEffectiveValueChange)
             {
-                if (_transitions is null)
-                    _transitions = new Transitions();
+                var oldTransitions = change.OldValue.GetValueOrDefault<Transitions>();
+                var newTransitions = change.NewValue.GetValueOrDefault<Transitions>();
 
-                if (_previousTransitions is null)
-                    _previousTransitions = new Dictionary<AvaloniaProperty, IDisposable>();
+                if (newTransitions is object)
+                {
+                    newTransitions.CollectionChanged += TransitionsCollectionChanged;
+                    AddTransitions(newTransitions);
+                }
 
-                return _transitions;
+                if (oldTransitions is object)
+                {
+                    oldTransitions.CollectionChanged -= TransitionsCollectionChanged;
+                    RemoveTransitions(oldTransitions);
+                }
             }
-            set
+            else if (_transitionsEnabled &&
+                     Transitions is object &&
+                     _transitionState is object &&
+                     !change.Property.IsDirect &&
+                     change.Priority > BindingPriority.Animation)
             {
-                if (value is null)
-                    return;
+                for (var i = Transitions.Count -1; i >= 0; --i)
+                {
+                    var transition = Transitions[i];
 
-                if (_previousTransitions is null)
-                    _previousTransitions = new Dictionary<AvaloniaProperty, IDisposable>();
+                    if (transition.Property == change.Property)
+                    {
+                        var state = _transitionState[transition];
+                        var oldValue = state.BaseValue;
+                        var newValue = GetAnimationBaseValue(transition.Property);
 
-                SetAndRaise(TransitionsProperty, ref _transitions, value);
+                        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.GetService<IGlobalClock>(),
+                                oldValue,
+                                newValue);
+                            return;
+                        }
+                    }
+                }
             }
+
+            base.OnPropertyChangedCore(change);
         }
 
-        /// <summary>
-        /// Reacts to a change in a <see cref="AvaloniaProperty"/> value in 
-        /// order to animate the change if a <see cref="ITransition"/> is set for the property.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        private void TransitionsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            if (_transitions is null || _previousTransitions is null || e.Priority == BindingPriority.Animation) return;
+            if (!_transitionsEnabled)
+            {
+                return;
+            }
 
-            // PERF-SENSITIVE: Called on every property change. Don't use LINQ here (too many allocations).
-            foreach (var transition in _transitions)
+            switch (e.Action)
             {
-                if (transition.Property == e.Property)
+                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
                 {
-                    if (_previousTransitions.TryGetValue(e.Property, out var dispose))
-                        dispose.Dispose();
+                    BaseValue = GetAnimationBaseValue(t.Property),
+                });
+            }
+        }
 
-                    var instance = transition.Apply(this, Clock ?? Avalonia.Animation.Clock.GlobalClock, e.OldValue, e.NewValue);
+        private void RemoveTransitions(IList items)
+        {
+            if (_transitionState is null)
+            {
+                return;
+            }
 
-                    _previousTransitions[e.Property] = instance;
-                    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
index ae6deb585c..ca1d97290e 100644
--- a/src/Avalonia.Animation/Animation.cs
+++ b/src/Avalonia.Animation/Animation.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -254,10 +251,10 @@ namespace Avalonia.Animation
 
                     if (keyframe.TimingMode == KeyFrameTimingMode.TimeSpan)
                     {
-                        cue = new Cue(keyframe.KeyTime.Ticks / Duration.Ticks);
+                        cue = new Cue(keyframe.KeyTime.TotalSeconds / Duration.TotalSeconds);
                     }
 
-                    var newKF = new AnimatorKeyFrame(handler, cue);
+                    var newKF = new AnimatorKeyFrame(handler, cue, keyframe.KeySpline);
 
                     subscriptions.Add(newKF.BindSetter(setter, control));
 
diff --git a/src/Avalonia.Animation/AnimatorKeyFrame.cs b/src/Avalonia.Animation/AnimatorKeyFrame.cs
index 36d15e518e..f6a0c12be4 100644
--- a/src/Avalonia.Animation/AnimatorKeyFrame.cs
+++ b/src/Avalonia.Animation/AnimatorKeyFrame.cs
@@ -24,11 +24,20 @@ namespace Avalonia.Animation
         {
             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;
diff --git a/src/Avalonia.Animation/Animators/Animator`1.cs b/src/Avalonia.Animation/Animators/Animator`1.cs
index e42489d6a6..0660440e30 100644
--- a/src/Avalonia.Animation/Animators/Animator`1.cs
+++ b/src/Avalonia.Animation/Animators/Animator`1.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
@@ -92,6 +89,9 @@ namespace Avalonia.Animation.Animators
             else
                 newValue = (T)lastKeyframe.Value;
 
+            if (lastKeyframe.KeySpline != null)
+                progress = lastKeyframe.KeySpline.GetSplineProgress(progress);
+
             return Interpolate(progress, oldValue, newValue);
         }
 
diff --git a/src/Avalonia.Animation/Animators/BoolAnimator.cs b/src/Avalonia.Animation/Animators/BoolAnimator.cs
index 63ff4933d6..f02fd8dfaa 100644
--- a/src/Avalonia.Animation/Animators/BoolAnimator.cs
+++ b/src/Avalonia.Animation/Animators/BoolAnimator.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Animation.Animators
+namespace Avalonia.Animation.Animators
 {
     /// <summary>
     /// Animator that handles <see cref="bool"/> properties.
diff --git a/src/Avalonia.Animation/Animators/ByteAnimator.cs b/src/Avalonia.Animation/Animators/ByteAnimator.cs
index 0fb8f7fdc1..9fce07895c 100644
--- a/src/Avalonia.Animation/Animators/ByteAnimator.cs
+++ b/src/Avalonia.Animation/Animators/ByteAnimator.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Animation.Animators
 {
diff --git a/src/Avalonia.Animation/Animators/DecimalAnimator.cs b/src/Avalonia.Animation/Animators/DecimalAnimator.cs
index b5fae7990c..5aed5e5f3d 100644
--- a/src/Avalonia.Animation/Animators/DecimalAnimator.cs
+++ b/src/Avalonia.Animation/Animators/DecimalAnimator.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Animation.Animators
+namespace Avalonia.Animation.Animators
 {
     /// <summary>
     /// Animator that handles <see cref="decimal"/> properties.
diff --git a/src/Avalonia.Animation/Animators/DoubleAnimator.cs b/src/Avalonia.Animation/Animators/DoubleAnimator.cs
index 68975be9d0..1ca3fabc47 100644
--- a/src/Avalonia.Animation/Animators/DoubleAnimator.cs
+++ b/src/Avalonia.Animation/Animators/DoubleAnimator.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Animation.Animators
+namespace Avalonia.Animation.Animators
 {
     /// <summary>
     /// Animator that handles <see cref="double"/> properties.
diff --git a/src/Avalonia.Animation/Animators/FloatAnimator.cs b/src/Avalonia.Animation/Animators/FloatAnimator.cs
index 0fd3bf8729..62f48a15a3 100644
--- a/src/Avalonia.Animation/Animators/FloatAnimator.cs
+++ b/src/Avalonia.Animation/Animators/FloatAnimator.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Animation.Animators
+namespace Avalonia.Animation.Animators
 {
     /// <summary>
     /// Animator that handles <see cref="float"/> properties.
diff --git a/src/Avalonia.Animation/Animators/Int16Animator.cs b/src/Avalonia.Animation/Animators/Int16Animator.cs
index d7e7da5d38..5235082fc4 100644
--- a/src/Avalonia.Animation/Animators/Int16Animator.cs
+++ b/src/Avalonia.Animation/Animators/Int16Animator.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Animation.Animators
 {
diff --git a/src/Avalonia.Animation/Animators/Int32Animator.cs b/src/Avalonia.Animation/Animators/Int32Animator.cs
index 792b810652..2596f13e84 100644
--- a/src/Avalonia.Animation/Animators/Int32Animator.cs
+++ b/src/Avalonia.Animation/Animators/Int32Animator.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Animation.Animators
 {
diff --git a/src/Avalonia.Animation/Animators/Int64Animator.cs b/src/Avalonia.Animation/Animators/Int64Animator.cs
index ca5817924e..d05750d35c 100644
--- a/src/Avalonia.Animation/Animators/Int64Animator.cs
+++ b/src/Avalonia.Animation/Animators/Int64Animator.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Animation.Animators
 {
diff --git a/src/Avalonia.Animation/Animators/UInt16Animator.cs b/src/Avalonia.Animation/Animators/UInt16Animator.cs
index 4b5463dade..6c9588a966 100644
--- a/src/Avalonia.Animation/Animators/UInt16Animator.cs
+++ b/src/Avalonia.Animation/Animators/UInt16Animator.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Animation.Animators
 {
diff --git a/src/Avalonia.Animation/Animators/UInt32Animator.cs b/src/Avalonia.Animation/Animators/UInt32Animator.cs
index c1f09e3518..e2af533566 100644
--- a/src/Avalonia.Animation/Animators/UInt32Animator.cs
+++ b/src/Avalonia.Animation/Animators/UInt32Animator.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Animation.Animators
 {
diff --git a/src/Avalonia.Animation/Animators/UInt64Animator.cs b/src/Avalonia.Animation/Animators/UInt64Animator.cs
index 0fd9fcb30a..a709a77100 100644
--- a/src/Avalonia.Animation/Animators/UInt64Animator.cs
+++ b/src/Avalonia.Animation/Animators/UInt64Animator.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Animation.Animators
 {
diff --git a/src/Avalonia.Animation/Avalonia.Animation.csproj b/src/Avalonia.Animation/Avalonia.Animation.csproj
index 73c619942e..ee91acf45e 100644
--- a/src/Avalonia.Animation/Avalonia.Animation.csproj
+++ b/src/Avalonia.Animation/Avalonia.Animation.csproj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>    
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>
diff --git a/src/Avalonia.Animation/DisposeAnimationInstanceSubject.cs b/src/Avalonia.Animation/DisposeAnimationInstanceSubject.cs
index 0c15524362..696f43d006 100644
--- a/src/Avalonia.Animation/DisposeAnimationInstanceSubject.cs
+++ b/src/Avalonia.Animation/DisposeAnimationInstanceSubject.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Animation.Animators;
 
diff --git a/src/Avalonia.Animation/Easing/BackEaseIn.cs b/src/Avalonia.Animation/Easing/BackEaseIn.cs
index a8d723d433..aab0b27294 100644
--- a/src/Avalonia.Animation/Easing/BackEaseIn.cs
+++ b/src/Avalonia.Animation/Easing/BackEaseIn.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Animation.Easings
diff --git a/src/Avalonia.Animation/Easing/BackEaseInOut.cs b/src/Avalonia.Animation/Easing/BackEaseInOut.cs
index 4844c2a0d1..aba0524209 100644
--- a/src/Avalonia.Animation/Easing/BackEaseInOut.cs
+++ b/src/Avalonia.Animation/Easing/BackEaseInOut.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Animation.Easings
diff --git a/src/Avalonia.Animation/Easing/BackEaseOut.cs b/src/Avalonia.Animation/Easing/BackEaseOut.cs
index 291c7c2541..c6a059cf66 100644
--- a/src/Avalonia.Animation/Easing/BackEaseOut.cs
+++ b/src/Avalonia.Animation/Easing/BackEaseOut.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Animation.Easings
diff --git a/src/Avalonia.Animation/Easing/BounceEaseIn.cs b/src/Avalonia.Animation/Easing/BounceEaseIn.cs
index 3fc879b3cf..343609a89a 100644
--- a/src/Avalonia.Animation/Easing/BounceEaseIn.cs
+++ b/src/Avalonia.Animation/Easing/BounceEaseIn.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Animation.Utils;
 
 namespace Avalonia.Animation.Easings
diff --git a/src/Avalonia.Animation/Easing/BounceEaseInOut.cs b/src/Avalonia.Animation/Easing/BounceEaseInOut.cs
index b393a4e7c7..b0c0391177 100644
--- a/src/Avalonia.Animation/Easing/BounceEaseInOut.cs
+++ b/src/Avalonia.Animation/Easing/BounceEaseInOut.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Animation.Utils;
 
 namespace Avalonia.Animation.Easings
diff --git a/src/Avalonia.Animation/Easing/BounceEaseOut.cs b/src/Avalonia.Animation/Easing/BounceEaseOut.cs
index 555c8d9c79..f2759c4568 100644
--- a/src/Avalonia.Animation/Easing/BounceEaseOut.cs
+++ b/src/Avalonia.Animation/Easing/BounceEaseOut.cs
@@ -1,5 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
 using Avalonia.Animation.Utils;
 
 namespace Avalonia.Animation.Easings
diff --git a/src/Avalonia.Animation/Easing/CircularEaseIn.cs b/src/Avalonia.Animation/Easing/CircularEaseIn.cs
index 1b22258099..cf6f0f84a8 100644
--- a/src/Avalonia.Animation/Easing/CircularEaseIn.cs
+++ b/src/Avalonia.Animation/Easing/CircularEaseIn.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Animation.Easings
diff --git a/src/Avalonia.Animation/Easing/CircularEaseInOut.cs b/src/Avalonia.Animation/Easing/CircularEaseInOut.cs
index 156b634d3e..d01c7ea76b 100644
--- a/src/Avalonia.Animation/Easing/CircularEaseInOut.cs
+++ b/src/Avalonia.Animation/Easing/CircularEaseInOut.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Animation.Easings
diff --git a/src/Avalonia.Animation/Easing/CircularEaseOut.cs b/src/Avalonia.Animation/Easing/CircularEaseOut.cs
index 2aa6161783..b5fcaa300c 100644
--- a/src/Avalonia.Animation/Easing/CircularEaseOut.cs
+++ b/src/Avalonia.Animation/Easing/CircularEaseOut.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Animation.Easings
diff --git a/src/Avalonia.Animation/Easing/CubicEaseIn.cs b/src/Avalonia.Animation/Easing/CubicEaseIn.cs
index 1997493fc0..294443c0b7 100644
--- a/src/Avalonia.Animation/Easing/CubicEaseIn.cs
+++ b/src/Avalonia.Animation/Easing/CubicEaseIn.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Animation.Easings
 {
     /// <summary>
diff --git a/src/Avalonia.Animation/Easing/CubicEaseInOut.cs b/src/Avalonia.Animation/Easing/CubicEaseInOut.cs
index be4d46d180..5ff816e38d 100644
--- a/src/Avalonia.Animation/Easing/CubicEaseInOut.cs
+++ b/src/Avalonia.Animation/Easing/CubicEaseInOut.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Animation.Easings
 {
     /// <summary>
diff --git a/src/Avalonia.Animation/Easing/CubicEaseOut.cs b/src/Avalonia.Animation/Easing/CubicEaseOut.cs
index cfa42afeb9..d51fb633a1 100644
--- a/src/Avalonia.Animation/Easing/CubicEaseOut.cs
+++ b/src/Avalonia.Animation/Easing/CubicEaseOut.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Animation.Easings
 {
     /// <summary>
diff --git a/src/Avalonia.Animation/Easing/Easing.cs b/src/Avalonia.Animation/Easing/Easing.cs
index 5b0dea6c60..e006459652 100644
--- a/src/Avalonia.Animation/Easing/Easing.cs
+++ b/src/Avalonia.Animation/Easing/Easing.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Globalization;
 using System.Linq;
 
 namespace Avalonia.Animation.Easings
@@ -25,6 +26,11 @@ namespace Avalonia.Animation.Easings
         /// <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>();
diff --git a/src/Avalonia.Animation/Easing/EasingTypeConverter.cs b/src/Avalonia.Animation/Easing/EasingTypeConverter.cs
index ee15761eff..6613f6d393 100644
--- a/src/Avalonia.Animation/Easing/EasingTypeConverter.cs
+++ b/src/Avalonia.Animation/Easing/EasingTypeConverter.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.ComponentModel;
 using System.Globalization;
diff --git a/src/Avalonia.Animation/Easing/ElasticEaseIn.cs b/src/Avalonia.Animation/Easing/ElasticEaseIn.cs
index 654ac6991b..d678bebd0c 100644
--- a/src/Avalonia.Animation/Easing/ElasticEaseIn.cs
+++ b/src/Avalonia.Animation/Easing/ElasticEaseIn.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Animation.Utils;
 
diff --git a/src/Avalonia.Animation/Easing/ElasticEaseInOut.cs b/src/Avalonia.Animation/Easing/ElasticEaseInOut.cs
index b170cb2d6a..92331d49b6 100644
--- a/src/Avalonia.Animation/Easing/ElasticEaseInOut.cs
+++ b/src/Avalonia.Animation/Easing/ElasticEaseInOut.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Animation.Utils;
 
diff --git a/src/Avalonia.Animation/Easing/ElasticEaseOut.cs b/src/Avalonia.Animation/Easing/ElasticEaseOut.cs
index 1cc38a9dea..fdda568699 100644
--- a/src/Avalonia.Animation/Easing/ElasticEaseOut.cs
+++ b/src/Avalonia.Animation/Easing/ElasticEaseOut.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Animation.Utils;
 
diff --git a/src/Avalonia.Animation/Easing/ExponentialEaseIn.cs b/src/Avalonia.Animation/Easing/ExponentialEaseIn.cs
index 14977f6783..546e255348 100644
--- a/src/Avalonia.Animation/Easing/ExponentialEaseIn.cs
+++ b/src/Avalonia.Animation/Easing/ExponentialEaseIn.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Animation.Easings
diff --git a/src/Avalonia.Animation/Easing/ExponentialEaseInOut.cs b/src/Avalonia.Animation/Easing/ExponentialEaseInOut.cs
index 64eb51e116..de3cbf0202 100644
--- a/src/Avalonia.Animation/Easing/ExponentialEaseInOut.cs
+++ b/src/Avalonia.Animation/Easing/ExponentialEaseInOut.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Animation.Easings
diff --git a/src/Avalonia.Animation/Easing/ExponentialEaseOut.cs b/src/Avalonia.Animation/Easing/ExponentialEaseOut.cs
index b89f8e9fa2..7f91388e08 100644
--- a/src/Avalonia.Animation/Easing/ExponentialEaseOut.cs
+++ b/src/Avalonia.Animation/Easing/ExponentialEaseOut.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Animation.Easings
diff --git a/src/Avalonia.Animation/Easing/IEasing.cs b/src/Avalonia.Animation/Easing/IEasing.cs
index 3c954a8cab..9c9c7b3a99 100644
--- a/src/Avalonia.Animation/Easing/IEasing.cs
+++ b/src/Avalonia.Animation/Easing/IEasing.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Animation.Easings
 {
     /// <summary>
diff --git a/src/Avalonia.Animation/Easing/LinearEasing.cs b/src/Avalonia.Animation/Easing/LinearEasing.cs
index f7a90c0eef..78a56005f6 100644
--- a/src/Avalonia.Animation/Easing/LinearEasing.cs
+++ b/src/Avalonia.Animation/Easing/LinearEasing.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Animation.Easings
 {
     /// <summary>
diff --git a/src/Avalonia.Animation/Easing/QuadraticEaseIn.cs b/src/Avalonia.Animation/Easing/QuadraticEaseIn.cs
index 6c29b31516..49faec6187 100644
--- a/src/Avalonia.Animation/Easing/QuadraticEaseIn.cs
+++ b/src/Avalonia.Animation/Easing/QuadraticEaseIn.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Animation.Easings
 {
     /// <summary>
diff --git a/src/Avalonia.Animation/Easing/QuadraticEaseInOut.cs b/src/Avalonia.Animation/Easing/QuadraticEaseInOut.cs
index 16ba02cc20..4d95bdc393 100644
--- a/src/Avalonia.Animation/Easing/QuadraticEaseInOut.cs
+++ b/src/Avalonia.Animation/Easing/QuadraticEaseInOut.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Animation.Easings
 {
     /// <summary>
diff --git a/src/Avalonia.Animation/Easing/QuadraticEaseOut.cs b/src/Avalonia.Animation/Easing/QuadraticEaseOut.cs
index 5252b88cf3..8ec7265841 100644
--- a/src/Avalonia.Animation/Easing/QuadraticEaseOut.cs
+++ b/src/Avalonia.Animation/Easing/QuadraticEaseOut.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Animation.Easings
 {
     /// <summary>
diff --git a/src/Avalonia.Animation/Easing/QuarticEaseIn.cs b/src/Avalonia.Animation/Easing/QuarticEaseIn.cs
index 988fd1f7fb..69785aec3c 100644
--- a/src/Avalonia.Animation/Easing/QuarticEaseIn.cs
+++ b/src/Avalonia.Animation/Easing/QuarticEaseIn.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Animation.Easings
 {
     /// <summary>
diff --git a/src/Avalonia.Animation/Easing/QuarticEaseInOut.cs b/src/Avalonia.Animation/Easing/QuarticEaseInOut.cs
index 0ad908f6bb..5a7205087d 100644
--- a/src/Avalonia.Animation/Easing/QuarticEaseInOut.cs
+++ b/src/Avalonia.Animation/Easing/QuarticEaseInOut.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Animation.Easings
 {
     /// <summary>
diff --git a/src/Avalonia.Animation/Easing/QuarticEaseOut.cs b/src/Avalonia.Animation/Easing/QuarticEaseOut.cs
index 8499575653..764a1a6ce6 100644
--- a/src/Avalonia.Animation/Easing/QuarticEaseOut.cs
+++ b/src/Avalonia.Animation/Easing/QuarticEaseOut.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Animation.Easings
 {
     /// <summary>
diff --git a/src/Avalonia.Animation/Easing/QuinticEaseIn.cs b/src/Avalonia.Animation/Easing/QuinticEaseIn.cs
index 4b0c598c69..688f5b789d 100644
--- a/src/Avalonia.Animation/Easing/QuinticEaseIn.cs
+++ b/src/Avalonia.Animation/Easing/QuinticEaseIn.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Animation.Easings
 {
     /// <summary>
diff --git a/src/Avalonia.Animation/Easing/QuinticEaseInOut.cs b/src/Avalonia.Animation/Easing/QuinticEaseInOut.cs
index 53c29f75dc..5b6c0c1162 100644
--- a/src/Avalonia.Animation/Easing/QuinticEaseInOut.cs
+++ b/src/Avalonia.Animation/Easing/QuinticEaseInOut.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Animation.Easings
 {
     /// <summary>
diff --git a/src/Avalonia.Animation/Easing/QuinticEaseOut.cs b/src/Avalonia.Animation/Easing/QuinticEaseOut.cs
index 1ad31a9623..5cb5663dff 100644
--- a/src/Avalonia.Animation/Easing/QuinticEaseOut.cs
+++ b/src/Avalonia.Animation/Easing/QuinticEaseOut.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Animation.Easings
 {
     /// <summary>
diff --git a/src/Avalonia.Animation/Easing/SineEaseIn.cs b/src/Avalonia.Animation/Easing/SineEaseIn.cs
index a4b496e4b6..01ae7bca04 100644
--- a/src/Avalonia.Animation/Easing/SineEaseIn.cs
+++ b/src/Avalonia.Animation/Easing/SineEaseIn.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Animation.Utils;
 
diff --git a/src/Avalonia.Animation/Easing/SineEaseInOut.cs b/src/Avalonia.Animation/Easing/SineEaseInOut.cs
index 51052575e2..6b8419f2a1 100644
--- a/src/Avalonia.Animation/Easing/SineEaseInOut.cs
+++ b/src/Avalonia.Animation/Easing/SineEaseInOut.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Animation.Easings
diff --git a/src/Avalonia.Animation/Easing/SineEaseOut.cs b/src/Avalonia.Animation/Easing/SineEaseOut.cs
index 267b4b3809..f7ead3feac 100644
--- a/src/Avalonia.Animation/Easing/SineEaseOut.cs
+++ b/src/Avalonia.Animation/Easing/SineEaseOut.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Animation.Utils;
 
diff --git a/src/Avalonia.Animation/Easing/SplineEasing.cs b/src/Avalonia.Animation/Easing/SplineEasing.cs
new file mode 100644
index 0000000000..975fcc4746
--- /dev/null
+++ b/src/Avalonia.Animation/Easing/SplineEasing.cs
@@ -0,0 +1,85 @@
+namespace Avalonia.Animation.Easings
+{
+    /// <summary>
+    /// Eases a <see cref="double"/> value
+    /// using a user-defined cubic bezier curve.
+    /// Good for custom easing functions that doesn't quite
+    /// fit with the built-in ones. 
+    /// </summary>
+    public class SplineEasing : Easing
+    {
+        /// <summary>
+        /// X coordinate of the first control point
+        /// </summary>
+        public double X1
+        {
+            get => _internalKeySpline.ControlPointX1;
+            set
+            {
+                _internalKeySpline.ControlPointX1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Y coordinate of the first control point
+        /// </summary>
+        public double Y1
+        {
+            get => _internalKeySpline.ControlPointY1;
+            set
+            {
+                _internalKeySpline.ControlPointY1 = value;
+            }
+        }
+
+        /// <summary>
+        /// X coordinate of the second control point
+        /// </summary> 
+        public double X2
+        {
+            get => _internalKeySpline.ControlPointX2;
+            set
+            {
+                _internalKeySpline.ControlPointX2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Y coordinate of the second control point
+        /// </summary>
+        public double Y2
+        {
+            get => _internalKeySpline.ControlPointY2;
+            set
+            {
+                _internalKeySpline.ControlPointY2 = value;
+            }
+        }
+
+        private readonly KeySpline _internalKeySpline;
+
+        public SplineEasing(double x1 = 0d, double y1 = 0d, double x2 = 1d, double y2 = 1d)
+        {
+            _internalKeySpline = new KeySpline();
+
+            this.X1 = x1;
+            this.Y1 = y1;
+            this.X2 = x2;
+            this.Y1 = y2;
+        }
+
+        public SplineEasing(KeySpline keySpline)
+        {
+            _internalKeySpline = keySpline;
+        }
+        
+        public SplineEasing()
+        {
+            _internalKeySpline = new KeySpline();
+        }
+
+        /// <inheritdoc/>
+        public override double Ease(double progress) =>
+            _internalKeySpline.GetSplineProgress(progress);
+    }
+}
diff --git a/src/Avalonia.Animation/FillMode.cs b/src/Avalonia.Animation/FillMode.cs
index 39beecf455..001e1cdeb4 100644
--- a/src/Avalonia.Animation/FillMode.cs
+++ b/src/Avalonia.Animation/FillMode.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Animation
+namespace Avalonia.Animation
 {
     public enum FillMode
     {
diff --git a/src/Avalonia.Animation/IAnimation.cs b/src/Avalonia.Animation/IAnimation.cs
index 26cf4a6fd1..ff85535d8a 100644
--- a/src/Avalonia.Animation/IAnimation.cs
+++ b/src/Avalonia.Animation/IAnimation.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Threading.Tasks;
 
diff --git a/src/Avalonia.Animation/IAnimationSetter.cs b/src/Avalonia.Animation/IAnimationSetter.cs
index 9c8365ea37..2d22377286 100644
--- a/src/Avalonia.Animation/IAnimationSetter.cs
+++ b/src/Avalonia.Animation/IAnimationSetter.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Animation
 {
     public interface IAnimationSetter
diff --git a/src/Avalonia.Animation/IAnimator.cs b/src/Avalonia.Animation/IAnimator.cs
index d09f396d70..d0fb173c54 100644
--- a/src/Avalonia.Animation/IAnimator.cs
+++ b/src/Avalonia.Animation/IAnimator.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace Avalonia.Animation
diff --git a/src/Avalonia.Animation/ITransition.cs b/src/Avalonia.Animation/ITransition.cs
index e5d8466f04..ade2ec8b9e 100644
--- a/src/Avalonia.Animation/ITransition.cs
+++ b/src/Avalonia.Animation/ITransition.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Animation
 {
diff --git a/src/Avalonia.Animation/IterationCount.cs b/src/Avalonia.Animation/IterationCount.cs
index e9cd0686d8..9463718608 100644
--- a/src/Avalonia.Animation/IterationCount.cs
+++ b/src/Avalonia.Animation/IterationCount.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.ComponentModel;
 using System.Globalization;
@@ -63,7 +60,7 @@ namespace Avalonia.Animation
         public IterationType RepeatType => _type;
 
         /// <summary>
-        /// Gets a value that indicates whether the <see cref="IterationCount"/> is set to loop.
+        /// Gets a value that indicates whether the <see cref="IterationCount"/> is set to Infinite.
         /// </summary>
         public bool IsInfinite => _type == IterationType.Infinite;
 
diff --git a/src/Avalonia.Animation/IterationCountTypeConverter.cs b/src/Avalonia.Animation/IterationCountTypeConverter.cs
index a2bb9a20f1..1c63f8cdf1 100644
--- a/src/Avalonia.Animation/IterationCountTypeConverter.cs
+++ b/src/Avalonia.Animation/IterationCountTypeConverter.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.ComponentModel;
 using System.Globalization;
diff --git a/src/Avalonia.Animation/KeyFrame.cs b/src/Avalonia.Animation/KeyFrame.cs
index a6577505ee..c2cc1aa051 100644
--- a/src/Avalonia.Animation/KeyFrame.cs
+++ b/src/Avalonia.Animation/KeyFrame.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
 using Avalonia.Collections;
 using Avalonia.Metadata;
@@ -22,6 +19,7 @@ namespace Avalonia.Animation
     {
         private TimeSpan _ktimeSpan;
         private Cue _kCue;
+        private KeySpline _kKeySpline;
 
         public KeyFrame()
         {
@@ -77,6 +75,25 @@ namespace Avalonia.Animation
             }
         }
 
+        /// <summary>
+        /// Gets or sets the KeySpline of this <see cref="KeyFrame"/>.
+        /// </summary>
+        /// <value>The key spline.</value>
+        public KeySpline KeySpline
+        {
+            get
+            {
+                return _kKeySpline;
+            }
+            set
+            {
+                _kKeySpline = value;
+                if (value != null && !value.IsValid())
+                {
+                    throw new ArgumentException($"{nameof(KeySpline)} must have X coordinates >= 0.0 and <= 1.0.");
+                }
+            }
+        }
 
     }
 
diff --git a/src/Avalonia.Animation/KeyFrames.cs b/src/Avalonia.Animation/KeyFrames.cs
index 9e3b1d9f51..2e9efa8691 100644
--- a/src/Avalonia.Animation/KeyFrames.cs
+++ b/src/Avalonia.Animation/KeyFrames.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
 using Avalonia.Collections;
 
diff --git a/src/Avalonia.Animation/KeySpline.cs b/src/Avalonia.Animation/KeySpline.cs
new file mode 100644
index 0000000000..a6e9769186
--- /dev/null
+++ b/src/Avalonia.Animation/KeySpline.cs
@@ -0,0 +1,346 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using Avalonia;
+using Avalonia.Utilities;
+
+// Ported from WPF open-source code.
+// https://github.com/dotnet/wpf/blob/ae1790531c3b993b56eba8b1f0dd395a3ed7de75/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/KeySpline.cs
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Determines how an animation is used based on a cubic bezier curve.
+    /// X1 and X2 must be between 0.0 and 1.0, inclusive.
+    /// See https://docs.microsoft.com/en-us/dotnet/api/system.windows.media.animation.keyspline
+    /// </summary>
+    [TypeConverter(typeof(KeySplineTypeConverter))]
+    public class KeySpline : AvaloniaObject
+    {
+        // Control points
+        private double _controlPointX1;
+        private double _controlPointY1;
+        private double _controlPointX2;
+        private double _controlPointY2;
+        private bool _isSpecified;
+        private bool _isDirty;
+
+        // The parameter that corresponds to the most recent time
+        private double _parameter;
+
+        // Cached coefficients
+        private double _Bx;        // 3*points[0].X
+        private double _Cx;        // 3*points[1].X
+        private double _Cx_Bx;     // 2*(Cx - Bx)
+        private double _three_Cx;  // 3 - Cx
+
+        private double _By;        // 3*points[0].Y
+        private double _Cy;        // 3*points[1].Y
+
+        // constants
+        private const double _accuracy = .001;   // 1/3 the desired accuracy in X
+        private const double _fuzz = .000001;    // computational zero
+
+        /// <summary>
+        /// Create a <see cref="KeySpline"/> with X1 = Y1 = 0 and X2 = Y2 = 1.
+        /// </summary>
+        public KeySpline()
+        {
+            _controlPointX1 = 0.0;
+            _controlPointY1 = 0.0;
+            _controlPointX2 = 1.0;
+            _controlPointY2 = 1.0;
+            _isDirty = true;
+        }
+
+        /// <summary>
+        /// Create a <see cref="KeySpline"/> with the given parameters
+        /// </summary>
+        /// <param name="x1">X coordinate for the first control point</param>
+        /// <param name="y1">Y coordinate for the first control point</param>
+        /// <param name="x2">X coordinate for the second control point</param>
+        /// <param name="y2">Y coordinate for the second control point</param>
+        public KeySpline(double x1, double y1, double x2, double y2)
+        {
+            _controlPointX1 = x1;
+            _controlPointY1 = y1;
+            _controlPointX2 = x2;
+            _controlPointY2 = y2;
+            _isDirty = true;
+        }
+
+        /// <summary>
+        /// Parse a <see cref="KeySpline"/> from a string. The string
+        /// needs to contain 4 values in it for the 2 control points.
+        /// </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="KeySpline"/> with the appropriate values set</returns>
+        public static KeySpline Parse(string value, CultureInfo culture)
+        {
+            if (culture is null)
+                culture = CultureInfo.InvariantCulture;
+
+            using (var tokenizer = new StringTokenizer((string)value, culture, exceptionMessage: $"Invalid KeySpline string: \"{value}\"."))
+            {
+                return new KeySpline(tokenizer.ReadDouble(), tokenizer.ReadDouble(), tokenizer.ReadDouble(), tokenizer.ReadDouble());
+            }
+        }
+
+        /// <summary>
+        /// X coordinate of the first control point
+        /// </summary>
+        public double ControlPointX1
+        {
+            get => _controlPointX1;
+            set
+            {
+                if (IsValidXValue(value))
+                {
+                    _controlPointX1 = value;
+                    _isDirty = true;
+                }
+                else
+                {
+                    throw new ArgumentException("Invalid KeySpline X1 value. Must be >= 0.0 and <= 1.0.");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Y coordinate of the first control point
+        /// </summary>
+        public double ControlPointY1
+        {
+            get => _controlPointY1;
+            set
+            {
+                _controlPointY1 = value;
+                _isDirty = true;
+            }
+        }
+
+        /// <summary>
+        /// X coordinate of the second control point
+        /// </summary>
+        public double ControlPointX2
+        {
+            get => _controlPointX2;
+            set
+            {
+                if (IsValidXValue(value))
+                {
+                    _controlPointX2 = value;
+                    _isDirty = true;
+                }
+                else
+                {
+                    throw new ArgumentException("Invalid KeySpline X2 value. Must be >= 0.0 and <= 1.0.");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Y coordinate of the second control point
+        /// </summary>
+        public double ControlPointY2
+        {
+            get => _controlPointY2;
+            set
+            {
+                _controlPointY2 = value;
+                _isDirty = true;
+            }
+        }
+
+        /// <summary>
+        /// Calculates spline progress from a linear progress.
+        /// </summary>
+        /// <param name="linearProgress">the linear progress</param>
+        /// <returns>the spline progress</returns>
+        public double GetSplineProgress(double linearProgress)
+        {
+            if (_isDirty)
+            {
+                Build();
+            }
+
+            if (!_isSpecified)
+            {
+                return linearProgress;
+            }
+            else
+            {
+                SetParameterFromX(linearProgress);
+
+                return GetBezierValue(_By, _Cy, _parameter);
+            }
+        }
+
+        /// <summary>
+        /// Check to see whether the <see cref="KeySpline"/> is valid by looking
+        /// at its X values.
+        /// </summary>
+        /// <returns>true if the X values for this <see cref="KeySpline"/> fall in 
+        /// acceptable range; false otherwise.</returns>
+        public bool IsValid()
+        {
+            return IsValidXValue(_controlPointX1) && IsValidXValue(_controlPointX2);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        private bool IsValidXValue(double value)
+        {
+            return value >= 0.0 && value <= 1.0;
+        }
+
+        /// <summary>
+        /// Compute cached coefficients.
+        /// </summary>
+        private void Build()
+        {
+            if (_controlPointX1 == 0 && _controlPointY1 == 0 && _controlPointX2 == 1 && _controlPointY2 == 1)
+            {
+                // This KeySpline would have no effect on the progress.
+                _isSpecified = false;
+            }
+            else
+            {
+                _isSpecified = true;
+
+                _parameter = 0;
+
+                // X coefficients
+                _Bx = 3 * _controlPointX1;
+                _Cx = 3 * _controlPointX2;
+                _Cx_Bx = 2 * (_Cx - _Bx);
+                _three_Cx = 3 - _Cx;
+
+                // Y coefficients
+                _By = 3 * _controlPointY1;
+                _Cy = 3 * _controlPointY2;
+            }
+
+            _isDirty = false;
+        }
+
+        /// <summary>
+        /// Get an X or Y value with the Bezier formula.
+        /// </summary>
+        /// <param name="b">the second Bezier coefficient</param>
+        /// <param name="c">the third Bezier coefficient</param>
+        /// <param name="t">the parameter value to evaluate at</param>
+        /// <returns>the value of the Bezier function at the given parameter</returns>
+        static private double GetBezierValue(double b, double c, double t)
+        {
+            double s = 1.0 - t;
+            double t2 = t * t;
+
+            return b * t * s * s + c * t2 * s + t2 * t;
+        }
+
+        /// <summary>
+        /// Get X and dX/dt at a given parameter
+        /// </summary>
+        /// <param name="t">the parameter value to evaluate at</param>
+        /// <param name="x">the value of x there</param>
+        /// <param name="dx">the value of dx/dt there</param>
+        private void GetXAndDx(double t, out double x, out double dx)
+        {
+            double s = 1.0 - t;
+            double t2 = t * t;
+            double s2 = s * s;
+
+            x = _Bx * t * s2 + _Cx * t2 * s + t2 * t;
+            dx = _Bx * s2 + _Cx_Bx * s * t + _three_Cx * t2;
+        }
+
+        /// <summary>
+        /// Compute the parameter value that corresponds to a given X value, using a modified
+        /// clamped Newton-Raphson algorithm to solve the equation X(t) - time = 0. We make 
+        /// use of some known properties of this particular function:
+        /// * We are only interested in solutions in the interval [0,1]
+        /// * X(t) is increasing, so we can assume that if X(t) > time t > solution.  We use
+        ///   that to clamp down the search interval with every probe.
+        /// * The derivative of X and Y are between 0 and 3.
+        /// </summary>
+        /// <param name="time">the time, scaled to fit in [0,1]</param>
+        private void SetParameterFromX(double time)
+        {
+            // Dynamic search interval to clamp with
+            double bottom = 0;
+            double top = 1;
+
+            if (time == 0)
+            {
+                _parameter = 0;
+            }
+            else if (time == 1)
+            {
+                _parameter = 1;
+            }
+            else
+            {
+                // Loop while improving the guess
+                while (top - bottom > _fuzz)
+                {
+                    double x, dx, absdx;
+
+                    // Get x and dx/dt at the current parameter
+                    GetXAndDx(_parameter, out x, out dx);
+                    absdx = Math.Abs(dx);
+
+                    // Clamp down the search interval, relying on the monotonicity of X(t)
+                    if (x > time)
+                    {
+                        top = _parameter;      // because parameter > solution
+                    }
+                    else
+                    {
+                        bottom = _parameter;  // because parameter < solution
+                    }
+
+                    // The desired accuracy is in ultimately in y, not in x, so the
+                    // accuracy needs to be multiplied by dx/dy = (dx/dt) / (dy/dt).
+                    // But dy/dt <=3, so we omit that
+                    if (Math.Abs(x - time) < _accuracy * absdx)
+                    {
+                        break; // We're there
+                    }
+
+                    if (absdx > _fuzz)
+                    {
+                        // Nonzero derivative, use Newton-Raphson to obtain the next guess
+                        double next = _parameter - (x - time) / dx;
+
+                        // If next guess is out of the search interval then clamp it in
+                        if (next >= top)
+                        {
+                            _parameter = (_parameter + top) / 2;
+                        }
+                        else if (next <= bottom)
+                        {
+                            _parameter = (_parameter + bottom) / 2;
+                        }
+                        else
+                        {
+                            // Next guess is inside the search interval, accept it
+                            _parameter = next;
+                        }
+                    }
+                    else    // Zero derivative, halve the search interval
+                    {
+                        _parameter = (bottom + top) / 2;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Animation/KeySplineTypeConverter.cs b/src/Avalonia.Animation/KeySplineTypeConverter.cs
new file mode 100644
index 0000000000..b026206e5f
--- /dev/null
+++ b/src/Avalonia.Animation/KeySplineTypeConverter.cs
@@ -0,0 +1,25 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+// Ported from WPF open-source code.
+// https://github.com/dotnet/wpf/blob/ae1790531c3b993b56eba8b1f0dd395a3ed7de75/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/KeySpline.cs
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Converts string values to <see cref="KeySpline"/> values
+    /// </summary>
+    public class KeySplineTypeConverter : TypeConverter
+    {
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            return sourceType == typeof(string);
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            return KeySpline.Parse((string)value, CultureInfo.InvariantCulture);
+        }
+    }
+}
diff --git a/src/Avalonia.Animation/PlayState.cs b/src/Avalonia.Animation/PlayState.cs
index 8d28f06eb1..313d33d586 100644
--- a/src/Avalonia.Animation/PlayState.cs
+++ b/src/Avalonia.Animation/PlayState.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Animation
+namespace Avalonia.Animation
 {
     /// <summary>
     /// Determines the playback state of an animation.
diff --git a/src/Avalonia.Animation/PlaybackDirection.cs b/src/Avalonia.Animation/PlaybackDirection.cs
index a44dd388ae..bbce6106e1 100644
--- a/src/Avalonia.Animation/PlaybackDirection.cs
+++ b/src/Avalonia.Animation/PlaybackDirection.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Animation
+namespace Avalonia.Animation
 {
     /// <summary>
     /// Determines the playback direction of an animation.
diff --git a/src/Avalonia.Animation/Properties/AssemblyInfo.cs b/src/Avalonia.Animation/Properties/AssemblyInfo.cs
index 8523b9537d..221b51e95a 100644
--- a/src/Avalonia.Animation/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Animation/Properties/AssemblyInfo.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Metadata;
 using System.Reflection;
 using System.Runtime.CompilerServices;
@@ -9,5 +6,10 @@ using System.Runtime.CompilerServices;
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation.Easings")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation.Animators")]
 
+#if SIGNED_BUILD
+[assembly: InternalsVisibleTo("Avalonia.LeakTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.Animation.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+#else
 [assembly: InternalsVisibleTo("Avalonia.LeakTests")]
 [assembly: InternalsVisibleTo("Avalonia.Animation.UnitTests")]
+#endif
diff --git a/src/Avalonia.Animation/TransitionInstance.cs b/src/Avalonia.Animation/TransitionInstance.cs
index a69ad50a4b..5184341324 100644
--- a/src/Avalonia.Animation/TransitionInstance.cs
+++ b/src/Avalonia.Animation/TransitionInstance.cs
@@ -1,12 +1,10 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Metadata;
 using System;
 using System.Reactive.Linq;
 using Avalonia.Animation.Easings;
 using Avalonia.Animation.Utils;
 using Avalonia.Reactive;
+using Avalonia.Utilities;
 
 namespace Avalonia.Animation
 {
@@ -16,29 +14,56 @@ namespace Avalonia.Animation
     internal class TransitionInstance : SingleSubscriberObservableBase<double>
     {
         private IDisposable _timerSubscription;
+        private TimeSpan _delay;
         private TimeSpan _duration;
         private readonly IClock _baseClock;
         private IClock _clock;
 
-        public TransitionInstance(IClock clock, TimeSpan Duration)
+        public TransitionInstance(IClock clock, TimeSpan delay, TimeSpan duration)
         {
-            _duration = Duration;
+            clock = clock ?? throw new ArgumentNullException(nameof(clock));
+
+            _delay = delay;
+            _duration = duration;
             _baseClock = clock;
         }
 
         private void TimerTick(TimeSpan t)
         {
-            var interpVal = _duration.Ticks == 0 ? 1d : (double)t.Ticks / _duration.Ticks;
+
+            // [<------------- normalizedTotalDur ------------------>]
+            // [<---- Delay ---->][<---------- Duration ------------>]
+            //                   ^- normalizedDelayEnd
+            //                    [<----   normalizedInterpVal   --->]
+
+            var normalizedInterpVal = 1d;
+
+            if (!MathUtilities.AreClose(_duration.TotalSeconds, 0d))
+            {
+                var normalizedTotalDur = _delay + _duration;
+                var normalizedDelayEnd = _delay.TotalSeconds / normalizedTotalDur.TotalSeconds;
+                var normalizedPresentationTime = t.TotalSeconds / normalizedTotalDur.TotalSeconds;
+
+                if (normalizedPresentationTime < normalizedDelayEnd
+                    || MathUtilities.AreClose(normalizedPresentationTime, normalizedDelayEnd))
+                {
+                    normalizedInterpVal = 0d;
+                }
+                else
+                {
+                    normalizedInterpVal = (t.TotalSeconds - _delay.TotalSeconds) / _duration.TotalSeconds;
+                }
+            }
 
             // Clamp interpolation value.
-            if (interpVal >= 1d | interpVal < 0d)
+            if (normalizedInterpVal >= 1d || normalizedInterpVal < 0d)
             {
                 PublishNext(1d);
                 PublishCompleted();
             }
             else
             {
-                PublishNext(interpVal);
+                PublishNext(normalizedInterpVal);
             }
         }
 
diff --git a/src/Avalonia.Animation/Transition`1.cs b/src/Avalonia.Animation/Transition`1.cs
index cd0d5d9ce9..4542a137e5 100644
--- a/src/Avalonia.Animation/Transition`1.cs
+++ b/src/Avalonia.Animation/Transition`1.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
 using Avalonia.Animation.Easings;
@@ -16,10 +13,15 @@ namespace Avalonia.Animation
         private AvaloniaProperty _prop;
 
         /// <summary>
-        /// Gets the duration of the animation.
+        /// Gets or sets the duration of the transition.
         /// </summary> 
         public TimeSpan Duration { get; set; }
 
+        /// <summary>
+        /// Gets or sets delay before starting the transition.
+        /// </summary> 
+        public TimeSpan Delay { get; set; } = TimeSpan.Zero;
+
         /// <summary>
         /// Gets the easing class to be used.
         /// </summary>
@@ -50,7 +52,7 @@ namespace Avalonia.Animation
         /// <inheritdocs/>
         public virtual IDisposable Apply(Animatable control, IClock clock, object oldValue, object newValue)
         {
-            var transition = DoTransition(new TransitionInstance(clock, Duration), (T)oldValue, (T)newValue);
+            var transition = DoTransition(new TransitionInstance(clock, Delay, Duration), (T)oldValue, (T)newValue);
             return control.Bind<T>((AvaloniaProperty<T>)Property, transition, Data.BindingPriority.Animation);
         }
     }
diff --git a/src/Avalonia.Animation/Transitions.cs b/src/Avalonia.Animation/Transitions.cs
index 7e742fc0b4..6687a2902d 100644
--- a/src/Avalonia.Animation/Transitions.cs
+++ b/src/Avalonia.Animation/Transitions.cs
@@ -1,7 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using System;
 using Avalonia.Collections;
+using Avalonia.Threading;
 
 namespace Avalonia.Animation
 {
@@ -16,6 +15,17 @@ namespace Avalonia.Animation
         public Transitions()
         {
             ResetBehavior = ResetBehavior.Remove;
+            Validate = ValidateTransition;
+        }
+
+        private void ValidateTransition(ITransition obj)
+        {
+            Dispatcher.UIThread.VerifyAccess();
+
+            if (obj.Property.IsDirect)
+            {
+                throw new InvalidOperationException("Cannot animate a direct property.");
+            }
         }
     }
 }
diff --git a/src/Avalonia.Animation/Transitions/DoubleTransition.cs b/src/Avalonia.Animation/Transitions/DoubleTransition.cs
index d7dd93c743..8cae1e1f81 100644
--- a/src/Avalonia.Animation/Transitions/DoubleTransition.cs
+++ b/src/Avalonia.Animation/Transitions/DoubleTransition.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
 
diff --git a/src/Avalonia.Animation/Transitions/FloatTransition.cs b/src/Avalonia.Animation/Transitions/FloatTransition.cs
index 825a3f958f..427563e559 100644
--- a/src/Avalonia.Animation/Transitions/FloatTransition.cs
+++ b/src/Avalonia.Animation/Transitions/FloatTransition.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
 
diff --git a/src/Avalonia.Animation/Transitions/IntegerTransition.cs b/src/Avalonia.Animation/Transitions/IntegerTransition.cs
index e3dca5b26d..7a85bd75dc 100644
--- a/src/Avalonia.Animation/Transitions/IntegerTransition.cs
+++ b/src/Avalonia.Animation/Transitions/IntegerTransition.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
 
diff --git a/src/Avalonia.Animation/Utils/BounceEaseUtils.cs b/src/Avalonia.Animation/Utils/BounceEaseUtils.cs
index 71b4ec4d94..0fc9f923f6 100644
--- a/src/Avalonia.Animation/Utils/BounceEaseUtils.cs
+++ b/src/Avalonia.Animation/Utils/BounceEaseUtils.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Animation.Utils
 {
     /// <summary>
diff --git a/src/Avalonia.Animation/Utils/EasingUtils.cs b/src/Avalonia.Animation/Utils/EasingUtils.cs
index 1a7688cace..1179ff6919 100644
--- a/src/Avalonia.Animation/Utils/EasingUtils.cs
+++ b/src/Avalonia.Animation/Utils/EasingUtils.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Animation.Utils
 {
diff --git a/src/Avalonia.Base/AttachedProperty.cs b/src/Avalonia.Base/AttachedProperty.cs
index fdb04b6dfc..b8ab4d6bf5 100644
--- a/src/Avalonia.Base/AttachedProperty.cs
+++ b/src/Avalonia.Base/AttachedProperty.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia
@@ -18,12 +15,14 @@ namespace Avalonia
         /// <param name="ownerType">The class that is registering the property.</param>
         /// <param name="metadata">The property metadata.</param>
         /// <param name="inherits">Whether the property inherits its value.</param>
+        /// <param name="validate">A value validation callback.</param>
         public AttachedProperty(
             string name,
-            Type ownerType,            
+            Type ownerType,
             StyledPropertyMetadata<TValue> metadata,
-            bool inherits = false)
-            : base(name, ownerType, metadata, inherits)
+            bool inherits = false,
+            Func<TValue, bool> validate = null)
+            : base(name, ownerType, metadata, inherits, validate)
         {
         }
 
diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj
index cbcf7a7386..9bfd387ca9 100644
--- a/src/Avalonia.Base/Avalonia.Base.csproj
+++ b/src/Avalonia.Base/Avalonia.Base.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Avalonia.Base</AssemblyName>
     <RootNamespace>Avalonia</RootNamespace>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>    
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj"/>
@@ -13,4 +13,5 @@
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\JetBrains.Annotations.props" />
   <Import Project="..\..\build\System.Memory.props" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>
diff --git a/src/Avalonia.Base/AvaloniaInternalException.cs b/src/Avalonia.Base/AvaloniaInternalException.cs
index 205dc29a97..a536073174 100644
--- a/src/Avalonia.Base/AvaloniaInternalException.cs
+++ b/src/Avalonia.Base/AvaloniaInternalException.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia
diff --git a/src/Avalonia.Base/AvaloniaLocator.cs b/src/Avalonia.Base/AvaloniaLocator.cs
index f9bbe38bec..3163d15c1b 100644
--- a/src/Avalonia.Base/AvaloniaLocator.cs
+++ b/src/Avalonia.Base/AvaloniaLocator.cs
@@ -54,6 +54,23 @@ namespace Avalonia
                 return _locator;
             }
 
+            public AvaloniaLocator ToLazy<TImlp>(Func<TImlp> func) where TImlp : TService
+            {
+                var constructed = false;
+                TImlp instance = default;
+                _locator._registry[typeof (TService)] = () =>
+                {
+                    if (!constructed)
+                    {
+                        instance = func();
+                        constructed = true;
+                    }
+
+                    return instance;
+                };
+                return _locator;
+            }
+            
             public AvaloniaLocator ToSingleton<TImpl>() where TImpl : class, TService, new()
             {
                 TImpl instance = null;
diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 0499907ab8..6645d25b5d 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -1,16 +1,11 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Reactive.Linq;
 using Avalonia.Data;
 using Avalonia.Diagnostics;
 using Avalonia.Logging;
+using Avalonia.PropertyStore;
 using Avalonia.Threading;
-using Avalonia.Utilities;
 
 namespace Avalonia
 {
@@ -20,13 +15,13 @@ namespace Avalonia
     /// <remarks>
     /// This class is analogous to DependencyObject in WPF.
     /// </remarks>
-    public class AvaloniaObject : IAvaloniaObject, IAvaloniaObjectDebug, INotifyPropertyChanged
+    public class AvaloniaObject : IAvaloniaObject, IAvaloniaObjectDebug, INotifyPropertyChanged, IValueSink
     {
         private IAvaloniaObject _inheritanceParent;
-        private List<DirectBindingSubscription> _directBindings;
+        private List<IDisposable> _directBindings;
         private PropertyChangedEventHandler _inpcChanged;
         private EventHandler<AvaloniaPropertyChangedEventArgs> _propertyChanged;
-        private EventHandler<AvaloniaPropertyChangedEventArgs> _inheritablePropertyChanged;
+        private List<IAvaloniaObject> _inheritanceChildren;
         private ValueStore _values;
         private ValueStore Values => _values ?? (_values = new ValueStore(this));
 
@@ -36,7 +31,6 @@ namespace Avalonia
         public AvaloniaObject()
         {
             VerifyAccess();
-            AvaloniaPropertyRegistry.Instance.NotifyInitialized(this);
         }
 
         /// <summary>
@@ -57,15 +51,6 @@ namespace Avalonia
             remove { _inpcChanged -= value; }
         }
 
-        /// <summary>
-        /// Raised when an inheritable <see cref="AvaloniaProperty"/> value changes on this object.
-        /// </summary>
-        event EventHandler<AvaloniaPropertyChangedEventArgs> IAvaloniaObject.InheritablePropertyChanged
-        {
-            add { _inheritablePropertyChanged += value; }
-            remove { _inheritablePropertyChanged -= value; }
-        }
-
         /// <summary>
         /// Gets or sets the parent object that inherited <see cref="AvaloniaProperty"/> values
         /// are inherited from.
@@ -83,47 +68,31 @@ namespace Avalonia
             set
             {
                 VerifyAccess();
+
                 if (_inheritanceParent != value)
                 {
-                    if (_inheritanceParent != null)
-                    {
-                        _inheritanceParent.InheritablePropertyChanged -= ParentPropertyChanged;
-                    }
+                    var oldParent = _inheritanceParent;
+                    var valuestore = _values;
 
-                    var oldInheritanceParent = _inheritanceParent;
+                    _inheritanceParent?.RemoveInheritanceChild(this);
                     _inheritanceParent = value;
-                    var valuestore = _values;
 
-                    foreach (var property in AvaloniaPropertyRegistry.Instance.GetRegisteredInherited(GetType()))
+                    var properties = AvaloniaPropertyRegistry.Instance.GetRegisteredInherited(GetType());
+                    var propertiesCount = properties.Count;
+
+                    for (var i = 0; i < propertiesCount; i++)
                     {
-                        if (valuestore != null && valuestore.GetValue(property) != AvaloniaProperty.UnsetValue)
+                        var property = properties[i];
+                        if (valuestore?.IsSet(property) == true)
                         {
-                            // if local value set there can be no change
+                            // If local value set there can be no change.
                             continue;
                         }
-                        // get the value as it would have been with the previous InheritanceParent
-                        object oldValue;
-                        if (oldInheritanceParent is AvaloniaObject aobj)
-                        {
-                            oldValue = aobj.GetValueOrDefaultUnchecked(property);
-                        }
-                        else
-                        {
-                            oldValue = ((IStyledPropertyAccessor)property).GetDefaultValue(GetType());
-                        }
-
-                        object newValue = GetDefaultValue(property);
 
-                        if (!Equals(oldValue, newValue))
-                        {
-                            RaisePropertyChanged(property, oldValue, newValue, BindingPriority.LocalValue);
-                        }
+                        property.RouteInheritanceParentChanged(this, oldParent);
                     }
 
-                    if (_inheritanceParent != null)
-                    {
-                        _inheritanceParent.InheritablePropertyChanged += ParentPropertyChanged;
-                    }
+                    _inheritanceParent?.AddInheritanceChild(this);
                 }
             }
         }
@@ -144,16 +113,8 @@ namespace Avalonia
         /// <param name="binding">The binding information.</param>
         public IBinding this[IndexerDescriptor binding]
         {
-            get
-            {
-                return new IndexerBinding(this, binding.Property, binding.Mode);
-            }
-
-            set
-            {
-                var sourceBinding = value as IBinding;
-                this.Bind(binding.Property, sourceBinding);
-            }
+            get { return new IndexerBinding(this, binding.Property, binding.Mode); }
+            set { this.Bind(binding.Property, value); }
         }
 
         public bool CheckAccess() => Dispatcher.UIThread.CheckAccess();
@@ -166,10 +127,56 @@ namespace Avalonia
         /// <param name="property">The property.</param>
         public void ClearValue(AvaloniaProperty property)
         {
-            Contract.Requires<ArgumentNullException>(property != null);
+            property = property ?? throw new ArgumentNullException(nameof(property));
+
+            property.RouteClearValue(this);
+        }
+
+        /// <summary>
+        /// Clears a <see cref="AvaloniaProperty"/>'s local value.
+        /// </summary>
+        /// <param name="property">The property.</param>
+        public void ClearValue<T>(AvaloniaProperty<T> property)
+        {
+            property = property ?? throw new ArgumentNullException(nameof(property));
+            VerifyAccess();
+
+            switch (property)
+            {
+                case StyledPropertyBase<T> styled:
+                    ClearValue(styled);
+                    break;
+                case DirectPropertyBase<T> direct:
+                    ClearValue(direct);
+                    break;
+                default:
+                    throw new NotSupportedException("Unsupported AvaloniaProperty type.");
+            }
+        }
+
+        /// <summary>
+        /// Clears a <see cref="AvaloniaProperty"/>'s local value.
+        /// </summary>
+        /// <param name="property">The property.</param>
+        public void ClearValue<T>(StyledPropertyBase<T> property)
+        {
+            property = property ?? throw new ArgumentNullException(nameof(property));
+            VerifyAccess();
+
+            _values?.ClearLocalValue(property);
+        }
+
+        /// <summary>
+        /// Clears a <see cref="AvaloniaProperty"/>'s local value.
+        /// </summary>
+        /// <param name="property">The property.</param>
+        public void ClearValue<T>(DirectPropertyBase<T> property)
+        {
+            property = property ?? throw new ArgumentNullException(nameof(property));
             VerifyAccess();
 
-            SetValue(property, AvaloniaProperty.UnsetValue);
+            var p = AvaloniaPropertyRegistry.Instance.GetRegisteredDirect(this, property);
+            p.InvokeSetter(this, p.GetUnsetValue(GetType()));
         }
 
         /// <summary>
@@ -210,21 +217,23 @@ namespace Avalonia
         /// <returns>The value.</returns>
         public object GetValue(AvaloniaProperty property)
         {
-            if (property is null)
-            {
-                throw new ArgumentNullException(nameof(property));
-            }
+            property = property ?? throw new ArgumentNullException(nameof(property));
+
+            return property.RouteGetValue(this);
+        }
 
+        /// <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>
+        public T GetValue<T>(StyledPropertyBase<T> property)
+        {
+            property = property ?? throw new ArgumentNullException(nameof(property));
             VerifyAccess();
 
-            if (property.IsDirect)
-            {
-                return ((IDirectPropertyAccessor)GetRegistered(property)).GetValue(this);
-            }
-            else
-            {
-                return GetValueOrDefaultUnchecked(property);
-            }
+            return GetValueOrInheritedOrDefault(property);
         }
 
         /// <summary>
@@ -233,14 +242,28 @@ namespace Avalonia
         /// <typeparam name="T">The type of the property.</typeparam>
         /// <param name="property">The property.</param>
         /// <returns>The value.</returns>
-        public T GetValue<T>(AvaloniaProperty<T> property)
+        public T GetValue<T>(DirectPropertyBase<T> property)
+        {
+            property = property ?? throw new ArgumentNullException(nameof(property));
+            VerifyAccess();
+
+            var registered = AvaloniaPropertyRegistry.Instance.GetRegisteredDirect(this, property);
+            return registered.InvokeGetter(this);
+        }
+
+        /// <inheritdoc/>
+        public Optional<T> GetBaseValue<T>(StyledPropertyBase<T> property, BindingPriority maxPriority)
         {
-            if (property is null)
+            property = property ?? throw new ArgumentNullException(nameof(property));
+            VerifyAccess();
+
+            if (_values is object &&
+                _values.TryGetValue(property, maxPriority, out var value))
             {
-                throw new ArgumentNullException(nameof(property));
+                return value;
             }
 
-            return (T)GetValue((AvaloniaProperty)property);
+            return default;
         }
 
         /// <summary>
@@ -284,17 +307,49 @@ namespace Avalonia
             object value,
             BindingPriority priority = BindingPriority.LocalValue)
         {
-            Contract.Requires<ArgumentNullException>(property != null);
+            property = property ?? throw new ArgumentNullException(nameof(property));
+
+            property.RouteSetValue(this, value, priority);
+        }
+
+        /// <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>
+        public IDisposable SetValue<T>(
+            StyledPropertyBase<T> property,
+            T value,
+            BindingPriority priority = BindingPriority.LocalValue)
+        {
+            property = property ?? throw new ArgumentNullException(nameof(property));
             VerifyAccess();
 
-            if (property.IsDirect)
+            LogPropertySet(property, value, priority);
+
+            if (value is UnsetValueType)
             {
-                SetDirectValue(property, value);
+                if (priority == BindingPriority.LocalValue)
+                {
+                    Values.ClearLocalValue(property);
+                }
+                else
+                {
+                    throw new NotSupportedException(
+                        "Cannot set property to Unset at non-local value priority.");
+                }
             }
-            else
+            else if (!(value is DoNothingType))
             {
-                SetStyledValue(property, value, priority);
+                return Values.SetValue(property, value, priority);
             }
+
+            return null;
         }
 
         /// <summary>
@@ -303,69 +358,35 @@ namespace Avalonia
         /// <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>
-        public void SetValue<T>(
-            AvaloniaProperty<T> property,
-            T value,
-            BindingPriority priority = BindingPriority.LocalValue)
+        public void SetValue<T>(DirectPropertyBase<T> property, T value)
         {
-            Contract.Requires<ArgumentNullException>(property != null);
+            property = property ?? throw new ArgumentNullException(nameof(property));
+            VerifyAccess();
 
-            SetValue((AvaloniaProperty)property, value, priority);
+            LogPropertySet(property, value, BindingPriority.LocalValue);
+            SetDirectValueUnchecked(property, 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>
-        public IDisposable Bind(
-            AvaloniaProperty property,
-            IObservable<object> source,
+        public IDisposable Bind<T>(
+            StyledPropertyBase<T> property,
+            IObservable<BindingValue<T>> source,
             BindingPriority priority = BindingPriority.LocalValue)
         {
-            Contract.Requires<ArgumentNullException>(property != null);
-            Contract.Requires<ArgumentNullException>(source != null);
-
+            property = property ?? throw new ArgumentNullException(nameof(property));
+            source = source ?? throw new ArgumentNullException(nameof(source));
             VerifyAccess();
 
-            if (property.IsDirect)
-            {
-                if (property.IsReadOnly)
-                {
-                    throw new ArgumentException($"The property {property.Name} is readonly.");
-                }
-
-                Logger.TryGet(LogEventLevel.Verbose)?.Log(
-                    LogArea.Property,
-                    this,
-                    "Bound {Property} to {Binding} with priority LocalValue",
-                    property,
-                    GetDescription(source));
-
-                if (_directBindings == null)
-                {
-                    _directBindings = new List<DirectBindingSubscription>();
-                }
-
-                return new DirectBindingSubscription(this, property, source);
-            }
-            else
-            {
-                Logger.TryGet(LogEventLevel.Verbose)?.Log(
-                    LogArea.Property,
-                    this,
-                    "Bound {Property} to {Binding} with priority {Priority}",
-                    property,
-                    GetDescription(source),
-                    priority);
-
-                return Values.AddBinding(property, source, priority);
-            }
+            return Values.AddBinding(property, source, priority);
         }
 
         /// <summary>
@@ -374,59 +395,68 @@ namespace Avalonia
         /// <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>
         public IDisposable Bind<T>(
-            AvaloniaProperty<T> property,
-            IObservable<T> source,
-            BindingPriority priority = BindingPriority.LocalValue)
+            DirectPropertyBase<T> property,
+            IObservable<BindingValue<T>> source)
         {
-            Contract.Requires<ArgumentNullException>(property != null);
+            property = property ?? throw new ArgumentNullException(nameof(property));
+            source = source ?? throw new ArgumentNullException(nameof(source));
+            VerifyAccess();
+
+            property = AvaloniaPropertyRegistry.Instance.GetRegisteredDirect(this, property);
+
+            if (property.IsReadOnly)
+            {
+                throw new ArgumentException($"The property {property.Name} is readonly.");
+            }
+
+            Logger.TryGet(LogEventLevel.Verbose, LogArea.Property)?.Log(
+                this,
+                "Bound {Property} to {Binding} with priority LocalValue",
+                property,
+                GetDescription(source));
+
+            _directBindings ??= new List<IDisposable>();
 
-            return Bind(property, source.Select(x => (object)x), priority);
+            return new DirectBindingSubscription<T>(this, property, source);
         }
 
         /// <summary>
-        /// Forces the specified property to be revalidated.
+        /// Coerces the specified <see cref="AvaloniaProperty"/>.
         /// </summary>
+        /// <typeparam name="T">The type of the property.</typeparam>
         /// <param name="property">The property.</param>
-        public void Revalidate(AvaloniaProperty property)
+        public void CoerceValue<T>(StyledPropertyBase<T> property)
         {
-            VerifyAccess();
-            _values?.Revalidate(property);
+            _values?.CoerceValue(property);
+        }
+
+        /// <inheritdoc/>
+        void IAvaloniaObject.AddInheritanceChild(IAvaloniaObject child)
+        {
+            _inheritanceChildren ??= new List<IAvaloniaObject>();
+            _inheritanceChildren.Add(child);
         }
         
-        internal void PriorityValueChanged(AvaloniaProperty property, int priority, object oldValue, object newValue)
+        /// <inheritdoc/>
+        void IAvaloniaObject.RemoveInheritanceChild(IAvaloniaObject child)
         {
-            oldValue = (oldValue == AvaloniaProperty.UnsetValue) ?
-                GetDefaultValue(property) :
-                oldValue;
-            newValue = (newValue == AvaloniaProperty.UnsetValue) ?
-                GetDefaultValue(property) :
-                newValue;
+            _inheritanceChildren?.Remove(child);
+        }
 
-            if (!Equals(oldValue, newValue))
+        void IAvaloniaObject.InheritedPropertyChanged<T>(
+            AvaloniaProperty<T> property,
+            Optional<T> oldValue,
+            Optional<T> newValue)
+        {
+            if (property.Inherits && (_values == null || !_values.IsSet(property)))
             {
-                RaisePropertyChanged(property, oldValue, newValue, (BindingPriority)priority);
-
-                Logger.TryGet(LogEventLevel.Verbose)?.Log(
-                    LogArea.Property,
-                    this,
-                    "{Property} changed from {$Old} to {$Value} with priority {Priority}",
-                    property,
-                    oldValue,
-                    newValue,
-                    (BindingPriority)priority);
+                RaisePropertyChanged(property, oldValue, newValue, BindingPriority.LocalValue);
             }
         }
-        
-        internal void BindingNotificationReceived(AvaloniaProperty property, BindingNotification notification)
-        {
-            LogIfError(property, notification);
-            UpdateDataValidation(property, notification);
-        }
 
         /// <inheritdoc/>
         Delegate[] IAvaloniaObjectDebug.GetPropertyChangedSubscribers()
@@ -434,26 +464,109 @@ namespace Avalonia
             return _propertyChanged?.GetInvocationList();
         }
 
-        /// <summary>
-        /// Gets all priority values set on the object.
-        /// </summary>
-        /// <returns>A collection of property/value tuples.</returns>
-        internal IDictionary<AvaloniaProperty, object> GetSetValues() => Values?.GetSetValues();
+        void IValueSink.ValueChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        {
+            var property = (StyledPropertyBase<T>)change.Property;
+
+            LogIfError(property, change.NewValue);
+
+            // If the change is to the effective value of the property and no old/new value is set
+            // then fill in the old/new value from property inheritance/default value. We don't do
+            // this for non-effective value changes because these are only needed for property
+            // transitions, where knowing e.g. that an inherited value is active at an arbitrary
+            // priority isn't of any use and would introduce overhead.
+            if (change.IsEffectiveValueChange && !change.OldValue.HasValue)
+            {
+                change.SetOldValue(GetInheritedOrDefault<T>(property));
+            }
+
+            if (change.IsEffectiveValueChange && !change.NewValue.HasValue)
+            {
+                change.SetNewValue(GetInheritedOrDefault(property));
+            }
+
+            if (!change.IsEffectiveValueChange ||
+                !EqualityComparer<T>.Default.Equals(change.OldValue.Value, change.NewValue.Value))
+            {
+                RaisePropertyChanged(change);
+
+                if (change.IsEffectiveValueChange)
+                {
+                    Logger.TryGet(LogEventLevel.Verbose, LogArea.Property)?.Log(
+                        this,
+                        "{Property} changed from {$Old} to {$Value} with priority {Priority}",
+                        property,
+                        change.OldValue,
+                        change.NewValue,
+                        change.Priority);
+                }
+            }
+        }
+
+        void IValueSink.Completed<T>(
+            StyledPropertyBase<T> property,
+            IPriorityValueEntry entry,
+            Optional<T> oldValue) 
+        {
+            var change = new AvaloniaPropertyChangedEventArgs<T>(
+                this,
+                property,
+                oldValue,
+                default,
+                BindingPriority.Unset);
+            ((IValueSink)this).ValueChanged(change);
+        }
 
         /// <summary>
-        /// Forces revalidation of properties when a property value changes.
+        /// Called for each inherited property when the <see cref="InheritanceParent"/> changes.
         /// </summary>
-        /// <param name="property">The property to that affects validation.</param>
-        /// <param name="affected">The affected properties.</param>
-        protected static void AffectsValidation(AvaloniaProperty property, params AvaloniaProperty[] affected)
+        /// <typeparam name="T">The type of the property value.</typeparam>
+        /// <param name="property">The property.</param>
+        /// <param name="oldParent">The old inheritance parent.</param>
+        internal void InheritanceParentChanged<T>(
+            StyledPropertyBase<T> property,
+            IAvaloniaObject oldParent)
+        {
+            var oldValue = oldParent switch
+            {
+                AvaloniaObject o => o.GetValueOrInheritedOrDefault(property),
+                null => property.GetDefaultValue(GetType()),
+                _ => oldParent.GetValue(property)
+            };
+
+            var newValue = GetInheritedOrDefault(property);
+
+            if (!EqualityComparer<T>.Default.Equals(oldValue, newValue))
+            {
+                RaisePropertyChanged(property, oldValue, newValue);
+            }
+        }
+
+        internal AvaloniaPropertyValue GetDiagnosticInternal(AvaloniaProperty property)
         {
-            property.Changed.Subscribe(e =>
+            if (property.IsDirect)
+            {
+                return new AvaloniaPropertyValue(
+                    property,
+                    GetValue(property),
+                    BindingPriority.Unset,
+                    "Local Value");
+            }
+            else if (_values != null)
             {
-                foreach (var p in affected)
+                var result = _values.GetDiagnostic(property);
+
+                if (result != null)
                 {
-                    e.Sender.Revalidate(p);
+                    return result;
                 }
-            });
+            }
+
+            return new AvaloniaPropertyValue(
+                property,
+                GetValue(property),
+                BindingPriority.Unset,
+                "Unset");
         }
 
         /// <summary>
@@ -463,8 +576,7 @@ namespace Avalonia
         /// <param name="e">The binding error.</param>
         protected internal virtual void LogBindingError(AvaloniaProperty property, Exception e)
         {
-            Logger.TryGet(LogEventLevel.Warning)?.Log(
-                LogArea.Binding,
+            Logger.TryGet(LogEventLevel.Warning, LogArea.Binding)?.Log(
                 this,
                 "Error in binding to {Target}.{Property}: {Message}",
                 this,
@@ -477,18 +589,30 @@ namespace Avalonia
         /// enabled.
         /// </summary>
         /// <param name="property">The property.</param>
-        /// <param name="status">The new validation status.</param>
-        protected virtual void UpdateDataValidation(
-            AvaloniaProperty property,
-            BindingNotification status)
+        /// <param name="value">The new binding value for the property.</param>
+        protected virtual void UpdateDataValidation<T>(
+            AvaloniaProperty<T> property,
+            BindingValue<T> value)
+        {
+        }
+
+        /// <summary>
+        /// 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)
         {
+            if (change.IsEffectiveValueChange)
+            {
+                OnPropertyChanged(change);
+            }
         }
 
         /// <summary>
         /// Called when a avalonia property changes on the object.
         /// </summary>
-        /// <param name="e">The event arguments.</param>
-        protected virtual void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        /// <param name="change">The property change details.</param>
+        protected virtual void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
         {
         }
 
@@ -499,46 +623,18 @@ namespace Avalonia
         /// <param name="oldValue">The old property value.</param>
         /// <param name="newValue">The new property value.</param>
         /// <param name="priority">The priority of the binding that produced the value.</param>
-        protected internal void RaisePropertyChanged(
-            AvaloniaProperty property,
-            object oldValue,
-            object newValue,
+        protected internal void RaisePropertyChanged<T>(
+            AvaloniaProperty<T> property,
+            Optional<T> oldValue,
+            BindingValue<T> newValue,
             BindingPriority priority = BindingPriority.LocalValue)
         {
-            Contract.Requires<ArgumentNullException>(property != null);
-            VerifyAccess();
-
-            AvaloniaPropertyChangedEventArgs e = new AvaloniaPropertyChangedEventArgs(
+            RaisePropertyChanged(new AvaloniaPropertyChangedEventArgs<T>(
                 this,
                 property,
                 oldValue,
                 newValue,
-                priority);
-
-            property.Notifying?.Invoke(this, true);
-
-            try
-            {
-                OnPropertyChanged(e);
-                property.NotifyChanged(e);
-
-                _propertyChanged?.Invoke(this, e);
-
-                if (_inpcChanged != null)
-                {
-                    PropertyChangedEventArgs e2 = new PropertyChangedEventArgs(property.Name);
-                    _inpcChanged(this, e2);
-                }
-
-                if (property.Inherits)
-                {
-                    _inheritablePropertyChanged?.Invoke(this, e);
-                }
-            }
-            finally
-            {
-                property.Notifying?.Invoke(this, false);
-            }
+                priority));
         }
 
         /// <summary>
@@ -561,216 +657,152 @@ namespace Avalonia
                 return false;
             }
 
-            DeferredSetter<T> setter = Values.GetDirectDeferredSetter(property);
-
-            return setter.SetAndNotify(this, property, ref field, value);
+            var old = field;
+            field = value;
+            RaisePropertyChanged(property, old, value);
+            return true;
         }
 
-        /// <summary>
-        /// Tries to cast a value to a type, taking into account that the value may be a
-        /// <see cref="BindingNotification"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="type">The type.</param>
-        /// <returns>The cast value, or a <see cref="BindingNotification"/>.</returns>
-        private static object CastOrDefault(object value, Type type)
+        private T GetInheritedOrDefault<T>(StyledPropertyBase<T> property)
         {
-            var notification = value as BindingNotification;
-
-            if (notification == null)
+            if (property.Inherits && InheritanceParent is AvaloniaObject o)
             {
-                return TypeUtilities.ConvertImplicitOrDefault(value, type);
+                return o.GetValueOrInheritedOrDefault(property);
             }
-            else
-            {
-                if (notification.HasValue)
-                {
-                    notification.SetValue(TypeUtilities.ConvertImplicitOrDefault(notification.Value, type));
-                }
 
-                return notification;
-            }
+            return property.GetDefaultValue(GetType());
         }
 
-        /// <summary>
-        /// Gets the default value for a property.
-        /// </summary>
-        /// <param name="property">The property.</param>
-        /// <returns>The default value.</returns>
-        private object GetDefaultValue(AvaloniaProperty property)
+        private T GetValueOrInheritedOrDefault<T>(
+            StyledPropertyBase<T> property,
+            BindingPriority maxPriority = BindingPriority.Animation)
         {
-            if (property.Inherits && InheritanceParent is AvaloniaObject aobj)
-                return aobj.GetValueOrDefaultUnchecked(property);
-            return ((IStyledPropertyAccessor) property).GetDefaultValue(GetType());
-        }
+            var o = this;
+            var inherits = property.Inherits;
+            var value = default(T);
 
-        /// <summary>
-        /// Gets the value or default value for a property.
-        /// </summary>
-        /// <param name="property">The property.</param>
-        /// <returns>The default value.</returns>
-        private object GetValueOrDefaultUnchecked(AvaloniaProperty property)
-        {
-            var aobj = this;
-            var valuestore = aobj._values;
-            if (valuestore != null)
+            while (o != null)
             {
-                var result = valuestore.GetValue(property);
-                if (result != AvaloniaProperty.UnsetValue)
+                var values = o._values;
+
+                if (values?.TryGetValue(property, maxPriority, out value) == true)
                 {
-                    return result;
+                    return value;
                 }
-            }
-            if (property.Inherits)
-            {
-                while (aobj.InheritanceParent is AvaloniaObject parent)
+
+                if (!inherits)
                 {
-                    aobj = parent;
-                    valuestore = aobj._values;
-                    if (valuestore != null)
-                    {
-                        var result = valuestore.GetValue(property);
-                        if (result != AvaloniaProperty.UnsetValue)
-                        {
-                            return result;
-                        }
-                    }
+                    break;
                 }
+
+                o = o.InheritanceParent as AvaloniaObject;
             }
-            return ((IStyledPropertyAccessor)property).GetDefaultValue(GetType());
+
+            return property.GetDefaultValue(GetType());
         }
 
-        /// <summary>
-        /// Sets the value of a direct property.
-        /// </summary>
-        /// <param name="property">The property.</param>
-        /// <param name="value">The value.</param>
-        private void SetDirectValue(AvaloniaProperty property, object value)
+        protected internal void RaisePropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
         {
-            void Set()
+            VerifyAccess();
+
+            if (change.IsEffectiveValueChange)
             {
-                var notification = value as BindingNotification;
+                change.Property.Notifying?.Invoke(this, true);
+            }
 
-                if (notification != null)
-                {
-                    LogIfError(property, notification);
-                    value = notification.Value;
-                }
+            try
+            {
+                OnPropertyChangedCore(change);
 
-                if (notification == null || notification.ErrorType == BindingErrorType.Error || notification.HasValue)
+                if (change.IsEffectiveValueChange)
                 {
-                    var metadata = (IDirectPropertyMetadata)property.GetMetadata(GetType());
-                    var accessor = (IDirectPropertyAccessor)GetRegistered(property);
-                    var finalValue = value == AvaloniaProperty.UnsetValue ?
-                        metadata.UnsetValue : value;
-
-                    LogPropertySet(property, value, BindingPriority.LocalValue);
+                    change.Property.NotifyChanged(change);
+                    _propertyChanged?.Invoke(this, change);
 
-                    accessor.SetValue(this, finalValue);
-                }
+                    if (_inpcChanged != null)
+                    {
+                        var inpce = new PropertyChangedEventArgs(change.Property.Name);
+                        _inpcChanged(this, inpce);
+                    }
 
-                if (notification != null)
-                {
-                    UpdateDataValidation(property, notification);
+                    if (change.Property.Inherits && _inheritanceChildren != null)
+                    {
+                        foreach (var child in _inheritanceChildren)
+                        {
+                            child.InheritedPropertyChanged(
+                                change.Property,
+                                change.OldValue,
+                                change.NewValue.ToOptional());
+                        }
+                    }
                 }
             }
-
-            if (Dispatcher.UIThread.CheckAccess())
-            {
-                Set();
-            }
-            else
+            finally
             {
-                Dispatcher.UIThread.Post(Set);
+                if (change.IsEffectiveValueChange)
+                {
+                    change.Property.Notifying?.Invoke(this, false);
+                }
             }
         }
 
         /// <summary>
-        /// Sets the value of a styled property.
+        /// Sets the value of a direct property.
         /// </summary>
         /// <param name="property">The property.</param>
         /// <param name="value">The value.</param>
-        /// <param name="priority">The priority of the value.</param>
-        private void SetStyledValue(AvaloniaProperty property, object value, BindingPriority priority)
+        private void SetDirectValueUnchecked<T>(DirectPropertyBase<T> property, T value)
         {
-            var notification = value as BindingNotification;
+            var p = AvaloniaPropertyRegistry.Instance.GetRegisteredDirect(this, property);
 
-            // We currently accept BindingNotifications for non-direct properties but we just
-            // strip them to their underlying value.
-            if (notification != null)
+            if (value is UnsetValueType)
             {
-                if (!notification.HasValue)
-                {
-                    return;
-                }
-                else
-                {
-                    value = notification.Value;
-                }
+                p.InvokeSetter(this, p.GetUnsetValue(GetType()));
             }
-
-            var originalValue = value;
-
-            if (!TypeUtilities.TryConvertImplicit(property.PropertyType, value, out value))
+            else if (!(value is DoNothingType))
             {
-                throw new ArgumentException(string.Format(
-                    "Invalid value for Property '{0}': '{1}' ({2})",
-                    property.Name,
-                    originalValue,
-                    originalValue?.GetType().FullName ?? "(null)"));
+                p.InvokeSetter(this, value);
             }
-
-            LogPropertySet(property, value, priority);
-            Values.AddValue(property, value, (int)priority);
         }
 
         /// <summary>
-        /// Given a direct property, returns a registered avalonia property that is equivalent or
-        /// throws if not found.
+        /// Sets the value of a direct property.
         /// </summary>
         /// <param name="property">The property.</param>
-        /// <returns>The registered property.</returns>
-        private AvaloniaProperty GetRegistered(AvaloniaProperty property)
+        /// <param name="value">The value.</param>
+        private void SetDirectValueUnchecked<T>(DirectPropertyBase<T> property, BindingValue<T> value)
         {
-            var direct = property as IDirectPropertyAccessor;
+            var p = AvaloniaPropertyRegistry.Instance.FindRegisteredDirect(this, property);
 
-            if (direct == null)
+            if (p == null)
             {
-                throw new AvaloniaInternalException(
-                    "AvaloniaObject.GetRegistered should only be called for direct properties");
-            }
-
-            if (property.OwnerType.IsAssignableFrom(GetType()))
-            {
-                return property;
+                throw new ArgumentException($"Property '{property.Name} not registered on '{this.GetType()}");
             }
 
-            var result =  AvaloniaPropertyRegistry.Instance.GetRegistered(this)
-                .FirstOrDefault(x => x == property);
+            LogIfError(property, value);
 
-            if (result == null)
+            switch (value.Type)
             {
-                throw new ArgumentException($"Property '{property.Name} not registered on '{this.GetType()}");
+                case BindingValueType.UnsetValue:
+                case BindingValueType.BindingError:
+                    var fallback = value.HasValue ? value : value.WithValue(property.GetUnsetValue(GetType()));
+                    property.InvokeSetter(this, fallback);
+                    break;
+                case BindingValueType.DataValidationError:
+                    property.InvokeSetter(this, value);
+                    break;
+                case BindingValueType.Value:
+                case BindingValueType.BindingErrorWithFallback:
+                case BindingValueType.DataValidationErrorWithFallback:
+                    property.InvokeSetter(this, value);
+                    break;
             }
 
-            return result;
-        }
+            var metadata = p.GetMetadata(GetType());
 
-        /// <summary>
-        /// Called when a property is changed on the current <see cref="InheritanceParent"/>.
-        /// </summary>
-        /// <param name="sender">The event sender.</param>
-        /// <param name="e">The event args.</param>
-        /// <remarks>
-        /// Checks for changes in an inherited property value.
-        /// </remarks>
-        private void ParentPropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
-        {
-            Contract.Requires<ArgumentNullException>(e != null);
-
-            if (e.Property.Inherits && !IsSet(e.Property))
+            if (metadata.EnableDataValidation == true)
             {
-                RaisePropertyChanged(e.Property, e.OldValue, e.NewValue, BindingPriority.LocalValue);
+                UpdateDataValidation(property, value);
             }
         }
 
@@ -779,7 +811,7 @@ namespace Avalonia
         /// </summary>
         /// <param name="o">The observable.</param>
         /// <returns>The description.</returns>
-        private string GetDescription(IObservable<object> o)
+        private string GetDescription(object o)
         {
             var description = o as IDescription;
             return description?.Description ?? o.ToString();
@@ -789,12 +821,12 @@ namespace Avalonia
         /// Logs a mesage if the notification represents a binding error.
         /// </summary>
         /// <param name="property">The property being bound.</param>
-        /// <param name="notification">The binding notification.</param>
-        private void LogIfError(AvaloniaProperty property, BindingNotification notification)
+        /// <param name="value">The binding notification.</param>
+        private void LogIfError<T>(AvaloniaProperty property, BindingValue<T> value)
         {
-            if (notification.ErrorType == BindingErrorType.Error)
+            if (value.HasError)
             {
-                if (notification.Error is AggregateException aggregate)
+                if (value.Error is AggregateException aggregate)
                 {
                     foreach (var inner in aggregate.InnerExceptions)
                     {
@@ -803,7 +835,7 @@ namespace Avalonia
                 }
                 else
                 {
-                    LogBindingError(property, notification.Error);
+                    LogBindingError(property, value.Error);
                 }
             }
         }
@@ -814,10 +846,9 @@ namespace Avalonia
         /// <param name="property">The property.</param>
         /// <param name="value">The new value.</param>
         /// <param name="priority">The priority.</param>
-        private void LogPropertySet(AvaloniaProperty property, object value, BindingPriority priority)
+        private void LogPropertySet<T>(AvaloniaProperty<T> property, T value, BindingPriority priority)
         {
-            Logger.TryGet(LogEventLevel.Verbose)?.Log(
-                LogArea.Property,
+            Logger.TryGet(LogEventLevel.Verbose, LogArea.Property)?.Log(
                 this,
                 "Set {Property} to {$Value} with priority {Priority}",
                 property,
@@ -825,16 +856,16 @@ namespace Avalonia
                 priority);
         }
 
-        private class DirectBindingSubscription : IObserver<object>, IDisposable
+        private class DirectBindingSubscription<T> : IObserver<BindingValue<T>>, IDisposable
         {
-            readonly AvaloniaObject _owner;
-            readonly AvaloniaProperty _property;
-            IDisposable _subscription;
+            private readonly AvaloniaObject _owner;
+            private readonly DirectPropertyBase<T> _property;
+            private readonly IDisposable _subscription;
 
             public DirectBindingSubscription(
                 AvaloniaObject owner,
-                AvaloniaProperty property,
-                IObservable<object> source)
+                DirectPropertyBase<T> property,
+                IObservable<BindingValue<T>> source)
             {
                 _owner = owner;
                 _property = property;
@@ -850,11 +881,22 @@ namespace Avalonia
 
             public void OnCompleted() => Dispose();
             public void OnError(Exception error) => Dispose();
-
-            public void OnNext(object value)
+            public void OnNext(BindingValue<T> value)
             {
-                var castValue = CastOrDefault(value, _property.PropertyType);
-                _owner.SetDirectValue(_property, castValue);
+                if (Dispatcher.UIThread.CheckAccess())
+                {
+                    _owner.SetDirectValueUnchecked(_property, value);
+                }
+                else
+                {
+                    // To avoid allocating closure in the outer scope we need to capture variables
+                    // locally. This allows us to skip most of the allocations when on UI thread.
+                    var instance = _owner;
+                    var property = _property;
+                    var newValue = value;
+
+                    Dispatcher.UIThread.Post(() => instance.SetDirectValueUnchecked(property, newValue));
+                }
             }
         }
     }
diff --git a/src/Avalonia.Base/AvaloniaObjectExtensions.cs b/src/Avalonia.Base/AvaloniaObjectExtensions.cs
index ad1cefd4ea..173c5c1a94 100644
--- a/src/Avalonia.Base/AvaloniaObjectExtensions.cs
+++ b/src/Avalonia.Base/AvaloniaObjectExtensions.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive;
 using System.Reactive.Disposables;
@@ -68,6 +65,51 @@ namespace Avalonia
             return new AvaloniaPropertyObservable<T>(o, property);
         }
 
+        /// <summary>
+        /// Gets an observable for a <see cref="AvaloniaProperty"/>.
+        /// </summary>
+        /// <param name="o">The object.</param>
+        /// <param name="property">The property.</param>
+        /// <returns>
+        /// An observable which fires immediately with the current value of the property on the
+        /// object and subsequently each time the property value changes.
+        /// </returns>
+        /// <remarks>
+        /// The subscription to <paramref name="o"/> is created using a weak reference.
+        /// </remarks>
+        public static IObservable<BindingValue<object>> GetBindingObservable(
+            this IAvaloniaObject o,
+            AvaloniaProperty property)
+        {
+            Contract.Requires<ArgumentNullException>(o != null);
+            Contract.Requires<ArgumentNullException>(property != null);
+
+            return new AvaloniaPropertyBindingObservable<object>(o, property);
+        }
+
+        /// <summary>
+        /// Gets an observable for a <see cref="AvaloniaProperty"/>.
+        /// </summary>
+        /// <param name="o">The object.</param>
+        /// <typeparam name="T">The property type.</typeparam>
+        /// <param name="property">The property.</param>
+        /// <returns>
+        /// An observable which fires immediately with the current value of the property on the
+        /// object and subsequently each time the property value changes.
+        /// </returns>
+        /// <remarks>
+        /// The subscription to <paramref name="o"/> is created using a weak reference.
+        /// </remarks>
+        public static IObservable<BindingValue<T>> GetBindingObservable<T>(
+            this IAvaloniaObject o,
+            AvaloniaProperty<T> property)
+        {
+            Contract.Requires<ArgumentNullException>(o != null);
+            Contract.Requires<ArgumentNullException>(property != null);
+
+            return new AvaloniaPropertyBindingObservable<T>(o, property);
+        }
+
         /// <summary>
         /// Gets an observable that listens for property changed events for an
         /// <see cref="AvaloniaProperty"/>.
@@ -80,7 +122,7 @@ namespace Avalonia
         /// for the specified property.
         /// </returns>
         public static IObservable<AvaloniaPropertyChangedEventArgs> GetPropertyChangedObservable(
-            this IAvaloniaObject o, 
+            this IAvaloniaObject o,
             AvaloniaProperty property)
         {
             Contract.Requires<ArgumentNullException>(o != null);
@@ -134,6 +176,167 @@ namespace Avalonia
                 o.GetObservable(property));
         }
 
+        /// <summary>
+        /// Gets a subject for a <see cref="AvaloniaProperty"/>.
+        /// </summary>
+        /// <param name="o">The object.</param>
+        /// <param name="property">The property.</param>
+        /// <param name="priority">
+        /// The priority with which binding values are written to the object.
+        /// </param>
+        /// <returns>
+        /// An <see cref="ISubject{Object}"/> which can be used for two-way binding to/from the 
+        /// property.
+        /// </returns>
+        public static ISubject<BindingValue<object>> GetBindingSubject(
+            this IAvaloniaObject o,
+            AvaloniaProperty property,
+            BindingPriority priority = BindingPriority.LocalValue)
+        {
+            return Subject.Create<BindingValue<object>>(
+                Observer.Create<BindingValue<object>>(x =>
+                {
+                    if (x.HasValue)
+                    {
+                        o.SetValue(property, x.Value, priority);
+                    }
+                }),
+                o.GetBindingObservable(property));
+        }
+
+        /// <summary>
+        /// Gets a subject for a <see cref="AvaloniaProperty"/>.
+        /// </summary>
+        /// <typeparam name="T">The property type.</typeparam>
+        /// <param name="o">The object.</param>
+        /// <param name="property">The property.</param>
+        /// <param name="priority">
+        /// The priority with which binding values are written to the object.
+        /// </param>
+        /// <returns>
+        /// An <see cref="ISubject{T}"/> which can be used for two-way binding to/from the 
+        /// property.
+        /// </returns>
+        public static ISubject<BindingValue<T>> GetBindingSubject<T>(
+            this IAvaloniaObject o,
+            AvaloniaProperty<T> property,
+            BindingPriority priority = BindingPriority.LocalValue)
+        {
+            return Subject.Create<BindingValue<T>>(
+                Observer.Create<BindingValue<T>>(x =>
+                {
+                    if (x.HasValue)
+                    {
+                        o.SetValue(property, x.Value, priority);
+                    }
+                }),
+                o.GetBindingObservable(property));
+        }
+
+        /// <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.
+        /// </summary>
+        /// <typeparam name="T">The type of the property.</typeparam>
+        /// <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<T>(
+            this IAvaloniaObject target,
+            AvaloniaProperty<T> property,
+            IObservable<BindingValue<T>> 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 switch
+            {
+                StyledPropertyBase<T> styled => target.Bind(styled, source, priority),
+                DirectPropertyBase<T> direct => target.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));
+
+            return target.Bind(
+                property,
+                source.ToBindingValue(),
+                priority);
+        }
+
+        /// <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<T>(
+            this IAvaloniaObject target,
+            AvaloniaProperty<T> property,
+            IObservable<T> 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 target.Bind(
+                property,
+                source.ToBindingValue(),
+                priority);
+        }
+
         /// <summary>
         /// Binds a property on an <see cref="IAvaloniaObject"/> to an <see cref="IBinding"/>.
         /// </summary>
@@ -153,16 +356,16 @@ namespace Avalonia
             IBinding binding,
             object anchor = null)
         {
-            Contract.Requires<ArgumentNullException>(target != null);
-            Contract.Requires<ArgumentNullException>(property != null);
-            Contract.Requires<ArgumentNullException>(binding != null);
+            target = target ?? throw new ArgumentNullException(nameof(target));
+            property = property ?? throw new ArgumentNullException(nameof(property));
+            binding = binding ?? throw new ArgumentNullException(nameof(binding));
 
             var metadata = property.GetMetadata(target.GetType()) as IDirectPropertyMetadata;
 
             var result = binding.Initiate(
                 target,
                 property,
-                anchor, 
+                anchor,
                 metadata?.EnableDataValidation ?? false);
 
             if (result != null)
@@ -175,6 +378,189 @@ 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>
+        /// <typeparam name="T">The type of the property.</typeparam>
+        /// <param name="target">The object.</param>
+        /// <param name="property">The property.</param>
+        /// <returns>The value.</returns>
+        public static T GetValue<T>(this IAvaloniaObject target, AvaloniaProperty<T> property)
+        {
+            target = target ?? throw new ArgumentNullException(nameof(target));
+            property = property ?? throw new ArgumentNullException(nameof(property));
+
+            return property switch
+            {
+                StyledPropertyBase<T> styled => target.GetValue(styled),
+                DirectPropertyBase<T> direct => target.GetValue(direct),
+                _ => throw new NotSupportedException("Unsupported AvaloniaProperty type.")
+            };
+        }
+
+        /// <summary>
+        /// Gets an <see cref="AvaloniaProperty"/> base value.
+        /// </summary>
+        /// <param name="target">The object.</param>
+        /// <param name="property">The property.</param>
+        /// <param name="maxPriority">The maximum priority for the value.</param>
+        /// <remarks>
+        /// For styled properties, gets the value of the property if set on the object with a
+        /// priority equal or lower to <paramref name="maxPriority"/>, otherwise
+        /// <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)"/>.
+        /// </remarks>
+        public static object GetBaseValue(
+            this IAvaloniaObject target,
+            AvaloniaProperty property,
+            BindingPriority maxPriority)
+        {
+            target = target ?? throw new ArgumentNullException(nameof(target));
+            property = property ?? throw new ArgumentNullException(nameof(property));
+
+            return property.RouteGetBaseValue(target, maxPriority);
+        }
+
+        /// <summary>
+        /// Gets an <see cref="AvaloniaProperty"/> base value.
+        /// </summary>
+        /// <param name="target">The object.</param>
+        /// <param name="property">The property.</param>
+        /// <param name="maxPriority">The maximum priority for the value.</param>
+        /// <remarks>
+        /// For styled properties, gets the value of the property if set on the 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.
+        /// 
+        /// For direct properties returns
+        /// <see cref="IAvaloniaObject.GetValue{T}(DirectPropertyBase{T})"/>.
+        /// </remarks>
+        public static Optional<T> GetBaseValue<T>(
+            this IAvaloniaObject target,
+            AvaloniaProperty<T> property,
+            BindingPriority maxPriority)
+        {
+            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
+            {
+                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));
+
+            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.");
+            }
+        }
+
         /// <summary>
         /// Subscribes to a property changed notifications for changes that originate from a
         /// <typeparamref name="TTarget"/>.
diff --git a/src/Avalonia.Base/AvaloniaProperty.cs b/src/Avalonia.Base/AvaloniaProperty.cs
index ac7d2c60af..5117fdb170 100644
--- a/src/Avalonia.Base/AvaloniaProperty.cs
+++ b/src/Avalonia.Base/AvaloniaProperty.cs
@@ -1,12 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Reactive.Subjects;
-using System.Reflection;
 using Avalonia.Data;
+using Avalonia.Data.Core;
 using Avalonia.Utilities;
 
 namespace Avalonia
@@ -14,7 +9,7 @@ namespace Avalonia
     /// <summary>
     /// Base class for avalonia properties.
     /// </summary>
-    public class AvaloniaProperty : IEquatable<AvaloniaProperty>
+    public abstract class AvaloniaProperty : IEquatable<AvaloniaProperty>, IPropertyInfo
     {
         /// <summary>
         /// Represents an unset property value.
@@ -22,11 +17,9 @@ namespace Avalonia
         public static readonly object UnsetValue = new UnsetValueType();
 
         private static int s_nextId;
-        private readonly Subject<AvaloniaPropertyChangedEventArgs> _initialized;
-        private readonly Subject<AvaloniaPropertyChangedEventArgs> _changed;
-        private readonly PropertyMetadata _defaultMetadata;
-        private readonly Dictionary<Type, PropertyMetadata> _metadata;
-        private readonly Dictionary<Type, PropertyMetadata> _metadataCache = new Dictionary<Type, PropertyMetadata>();
+        private readonly AvaloniaPropertyMetadata _defaultMetadata;
+        private readonly Dictionary<Type, AvaloniaPropertyMetadata> _metadata;
+        private readonly Dictionary<Type, AvaloniaPropertyMetadata> _metadataCache = new Dictionary<Type, AvaloniaPropertyMetadata>();
 
         private bool _hasMetadataOverrides;
 
@@ -42,7 +35,7 @@ namespace Avalonia
             string name,
             Type valueType,
             Type ownerType,
-            PropertyMetadata metadata,
+            AvaloniaPropertyMetadata metadata,
             Action<IAvaloniaObject, bool> notifying = null)
         {
             Contract.Requires<ArgumentNullException>(name != null);
@@ -55,9 +48,7 @@ namespace Avalonia
                 throw new ArgumentException("'name' may not contain periods.");
             }
 
-            _initialized = new Subject<AvaloniaPropertyChangedEventArgs>();
-            _changed = new Subject<AvaloniaPropertyChangedEventArgs>();
-            _metadata = new Dictionary<Type, PropertyMetadata>();
+            _metadata = new Dictionary<Type, AvaloniaPropertyMetadata>();
 
             Name = name;
             PropertyType = valueType;
@@ -78,14 +69,12 @@ namespace Avalonia
         protected AvaloniaProperty(
             AvaloniaProperty source,
             Type ownerType,
-            PropertyMetadata metadata)
+            AvaloniaPropertyMetadata metadata)
         {
             Contract.Requires<ArgumentNullException>(source != null);
             Contract.Requires<ArgumentNullException>(ownerType != null);
 
-            _initialized = source._initialized;
-            _changed = source._changed;
-            _metadata = new Dictionary<Type, PropertyMetadata>();
+            _metadata = new Dictionary<Type, AvaloniaPropertyMetadata>();
 
             Name = source.Name;
             PropertyType = source.PropertyType;
@@ -138,22 +127,6 @@ namespace Avalonia
         /// </summary>
         public virtual bool IsReadOnly => false;
 
-        /// <summary>
-        /// Gets an observable that is fired when this property is initialized on a
-        /// new <see cref="AvaloniaObject"/> instance.
-        /// </summary>
-        /// <remarks>
-        /// This observable is fired each time a new <see cref="AvaloniaObject"/> is constructed
-        /// for all properties registered on the object's type. The default value of the property
-        /// for the object is passed in the args' NewValue (OldValue will always be
-        /// <see cref="UnsetValue"/>.
-        /// </remarks>
-        /// <value>
-        /// An observable that is fired when this property is initialized on a new
-        /// <see cref="AvaloniaObject"/> instance.
-        /// </value>
-        public IObservable<AvaloniaPropertyChangedEventArgs> Initialized => _initialized;
-
         /// <summary>
         /// Gets an observable that is fired when this property changes on any
         /// <see cref="AvaloniaObject"/> instance.
@@ -162,7 +135,7 @@ namespace Avalonia
         /// An observable that is fired when this property changes on any
         /// <see cref="AvaloniaObject"/> instance.
         /// </value>
-        public IObservable<AvaloniaPropertyChangedEventArgs> Changed => _changed;
+        public IObservable<AvaloniaPropertyChangedEventArgs> Changed => GetChanged();
 
         /// <summary>
         /// Gets a method that gets called before and after the property starts being notified on an
@@ -255,7 +228,8 @@ namespace Avalonia
         /// <param name="defaultValue">The default value of the property.</param>
         /// <param name="inherits">Whether the property inherits its value.</param>
         /// <param name="defaultBindingMode">The default binding mode for the property.</param>
-        /// <param name="validate">A validation function.</param>
+         /// <param name="validate">A value validation callback.</param>
+        /// <param name="coerce">A value coercion callback.</param>
         /// <param name="notifying">
         /// A method that gets called before and after the property starts being notified on an
         /// object; the bool argument will be true before and false afterwards. This callback is
@@ -267,7 +241,8 @@ namespace Avalonia
             TValue defaultValue = default(TValue),
             bool inherits = false,
             BindingMode defaultBindingMode = BindingMode.OneWay,
-            Func<TOwner, TValue, TValue> validate = null,
+            Func<TValue, bool> validate = null,
+            Func<IAvaloniaObject, TValue, TValue> coerce = null,
             Action<IAvaloniaObject, bool> notifying = null)
                 where TOwner : IAvaloniaObject
         {
@@ -275,14 +250,15 @@ namespace Avalonia
 
             var metadata = new StyledPropertyMetadata<TValue>(
                 defaultValue,
-                validate: Cast(validate),
-                defaultBindingMode: defaultBindingMode);
+                defaultBindingMode: defaultBindingMode,
+                coerce: coerce);
 
             var result = new StyledProperty<TValue>(
                 name,
                 typeof(TOwner),
                 metadata,
                 inherits,
+                validate,
                 notifying);
             AvaloniaPropertyRegistry.Instance.Register(typeof(TOwner), result);
             return result;
@@ -298,24 +274,26 @@ namespace Avalonia
         /// <param name="defaultValue">The default value of the property.</param>
         /// <param name="inherits">Whether the property inherits its value.</param>
         /// <param name="defaultBindingMode">The default binding mode for the property.</param>
-        /// <param name="validate">A validation function.</param>
+        /// <param name="validate">A value validation callback.</param>
+        /// <param name="coerce">A value coercion callback.</param>
         /// <returns>A <see cref="AvaloniaProperty{TValue}"/></returns>
         public static AttachedProperty<TValue> RegisterAttached<TOwner, THost, TValue>(
             string name,
             TValue defaultValue = default(TValue),
             bool inherits = false,
             BindingMode defaultBindingMode = BindingMode.OneWay,
-            Func<THost, TValue, TValue> validate = null)
+            Func<TValue, bool> validate = null,
+            Func<IAvaloniaObject, TValue, TValue> coerce = null)
                 where THost : IAvaloniaObject
         {
             Contract.Requires<ArgumentNullException>(name != null);
 
             var metadata = new StyledPropertyMetadata<TValue>(
                 defaultValue,
-                validate: Cast(validate),
-                defaultBindingMode: defaultBindingMode);
+                defaultBindingMode: defaultBindingMode,
+                coerce: coerce);
 
-            var result = new AttachedProperty<TValue>(name, typeof(TOwner), metadata, inherits);
+            var result = new AttachedProperty<TValue>(name, typeof(TOwner), metadata, inherits, validate);
             var registry = AvaloniaPropertyRegistry.Instance;
             registry.Register(typeof(TOwner), result);
             registry.RegisterAttached(typeof(THost), result);
@@ -332,7 +310,8 @@ namespace Avalonia
         /// <param name="defaultValue">The default value of the property.</param>
         /// <param name="inherits">Whether the property inherits its value.</param>
         /// <param name="defaultBindingMode">The default binding mode for the property.</param>
-        /// <param name="validate">A validation function.</param>
+        /// <param name="validate">A value validation callback.</param>
+        /// <param name="coerce">A value coercion callback.</param>
         /// <returns>A <see cref="AvaloniaProperty{TValue}"/></returns>
         public static AttachedProperty<TValue> RegisterAttached<THost, TValue>(
             string name,
@@ -340,17 +319,18 @@ namespace Avalonia
             TValue defaultValue = default(TValue),
             bool inherits = false,
             BindingMode defaultBindingMode = BindingMode.OneWay,
-            Func<THost, TValue, TValue> validate = null)
+            Func<TValue, bool> validate = null,
+            Func<IAvaloniaObject, TValue, TValue> coerce = null)
                 where THost : IAvaloniaObject
         {
             Contract.Requires<ArgumentNullException>(name != null);
 
             var metadata = new StyledPropertyMetadata<TValue>(
                 defaultValue,
-                validate: Cast(validate),
-                defaultBindingMode: defaultBindingMode);
+                defaultBindingMode: defaultBindingMode,
+                coerce: coerce);
 
-            var result = new AttachedProperty<TValue>(name, ownerType, metadata, inherits);
+            var result = new AttachedProperty<TValue>(name, ownerType, metadata, inherits, validate);
             var registry = AvaloniaPropertyRegistry.Instance;
             registry.Register(ownerType, result);
             registry.RegisterAttached(typeof(THost), result);
@@ -365,9 +345,7 @@ namespace Avalonia
         /// <param name="name">The name of the property.</param>
         /// <param name="getter">Gets the current value of the property.</param>
         /// <param name="setter">Sets the value of the property.</param>
-        /// <param name="unsetValue">
-        /// The value to use when the property is set to <see cref="AvaloniaProperty.UnsetValue"/>
-        /// </param>
+        /// <param name="unsetValue">The value to use when the property is cleared.</param>
         /// <param name="defaultBindingMode">The default binding mode for the property.</param>
         /// <param name="enableDataValidation">
         /// Whether the property is interested in data validation.
@@ -383,13 +361,18 @@ namespace Avalonia
                 where TOwner : IAvaloniaObject
         {
             Contract.Requires<ArgumentNullException>(name != null);
+            Contract.Requires<ArgumentNullException>(getter != null);
 
             var metadata = new DirectPropertyMetadata<TValue>(
                 unsetValue: unsetValue,
                 defaultBindingMode: defaultBindingMode,
                 enableDataValidation: enableDataValidation);
 
-            var result = new DirectProperty<TOwner, TValue>(name, getter, setter, metadata);
+            var result = new DirectProperty<TOwner, TValue>(
+                name,
+                getter,
+                setter,
+                metadata);
             AvaloniaPropertyRegistry.Instance.Register(typeof(TOwner), result);
             return result;
         }
@@ -436,7 +419,7 @@ namespace Avalonia
         /// <returns>
         /// The property metadata.
         /// </returns>
-        public PropertyMetadata GetMetadata<T>() where T : IAvaloniaObject
+        public AvaloniaPropertyMetadata GetMetadata<T>() where T : IAvaloniaObject
         {
             return GetMetadata(typeof(T));
         }
@@ -449,7 +432,7 @@ namespace Avalonia
         /// The property metadata.
         /// </returns>
         ///
-        public PropertyMetadata GetMetadata(Type type)
+        public AvaloniaPropertyMetadata GetMetadata(Type type)
         {
             if (!_hasMetadataOverrides)
             {
@@ -479,34 +462,66 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// True if <see cref="Initialized"/> has any observers.
+        /// Uses the visitor pattern to resolve an untyped property to a typed property.
         /// </summary>
-        internal bool HasNotifyInitializedObservers => _initialized.HasObservers;
+        /// <typeparam name="TData">The type of user data passed.</typeparam>
+        /// <param name="vistor">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> vistor, ref TData data)
+            where TData : struct;
 
         /// <summary>
-        /// Notifies the <see cref="Initialized"/> observable.
+        /// Routes an untyped ClearValue call to a typed call.
         /// </summary>
-        /// <param name="e">The observable arguments.</param>
-        internal void NotifyInitialized(AvaloniaPropertyChangedEventArgs e)
-        {
-            _initialized.OnNext(e);
-        }
+        /// <param name="o">The object instance.</param>
+        internal abstract void RouteClearValue(IAvaloniaObject o);
 
         /// <summary>
-        /// Notifies the <see cref="Changed"/> observable.
+        /// Routes an untyped GetValue call to a typed call.
         /// </summary>
-        /// <param name="e">The observable arguments.</param>
-        internal void NotifyChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            _changed.OnNext(e);
-        }
+        /// <param name="o">The object instance.</param>
+        internal abstract object RouteGetValue(IAvaloniaObject 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);
+
+        /// <summary>
+        /// Routes an untyped SetValue call to a typed call.
+        /// </summary>
+        /// <param name="o">The object instance.</param>
+        /// <param name="value">The value.</param>
+        /// <param name="priority">The priority.</param>
+        /// <returns>
+        /// An <see cref="IDisposable"/> if setting the property can be undone, otherwise null.
+        /// </returns>
+        internal abstract IDisposable RouteSetValue(
+            IAvaloniaObject o,
+            object value,
+            BindingPriority priority);
+
+        /// <summary>
+        /// Routes an untyped Bind call to a typed call.
+        /// </summary>
+        /// <param name="o">The object instance.</param>
+        /// <param name="source">The binding source.</param>
+        /// <param name="priority">The priority.</param>
+        internal abstract IDisposable RouteBind(
+            IAvaloniaObject o,
+            IObservable<BindingValue<object>> source,
+            BindingPriority priority);
+
+        internal abstract void RouteInheritanceParentChanged(AvaloniaObject o, IAvaloniaObject oldParent);
 
         /// <summary>
         /// Overrides the metadata for the property on the specified type.
         /// </summary>
         /// <param name="type">The type.</param>
         /// <param name="metadata">The metadata.</param>
-        protected void OverrideMetadata(Type type, PropertyMetadata metadata)
+        protected void OverrideMetadata(Type type, AvaloniaPropertyMetadata metadata)
         {
             Contract.Requires<ArgumentNullException>(type != null);
             Contract.Requires<ArgumentNullException>(metadata != null);
@@ -525,14 +540,16 @@ namespace Avalonia
             _hasMetadataOverrides = true;
         }
 
-        private PropertyMetadata GetMetadataWithOverrides(Type type)
+        protected abstract IObservable<AvaloniaPropertyChangedEventArgs> GetChanged();
+
+        private AvaloniaPropertyMetadata GetMetadataWithOverrides(Type type)
         {
             if (type is null)
             {
                 throw new ArgumentNullException(nameof(type));
             }
 
-            if (_metadataCache.TryGetValue(type, out PropertyMetadata result))
+            if (_metadataCache.TryGetValue(type, out AvaloniaPropertyMetadata result))
             {
                 return result;
             }
@@ -548,7 +565,7 @@ namespace Avalonia
                     return result;
                 }
 
-                currentType = currentType.GetTypeInfo().BaseType;
+                currentType = currentType.BaseType;
             }
 
             _metadataCache[type] = _defaultMetadata;
@@ -556,27 +573,19 @@ namespace Avalonia
             return _defaultMetadata;
         }
 
-        [DebuggerHidden]
-        private static Func<IAvaloniaObject, TValue, TValue> Cast<TOwner, TValue>(Func<TOwner, TValue, TValue> f)
-            where TOwner : IAvaloniaObject
-        {
-            if (f != null)
-            {
-                return (o, v) => (o is TOwner) ? f((TOwner)o, v) : v;
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        
+        bool IPropertyInfo.CanGet => true;
+        bool IPropertyInfo.CanSet => true;
+        object IPropertyInfo.Get(object target) => ((AvaloniaObject)target).GetValue(this);
+        void IPropertyInfo.Set(object target, object value) => ((AvaloniaObject)target).SetValue(this, value);
     }
+
     /// <summary>
     /// Class representing the <see cref="AvaloniaProperty.UnsetValue"/>.
     /// </summary>
-    public class UnsetValueType
+    public sealed class UnsetValueType
     {
+        internal UnsetValueType() { }
+
         /// <summary>
         /// Returns the string representation of the <see cref="AvaloniaProperty.UnsetValue"/>.
         /// </summary>
diff --git a/src/Avalonia.Base/AvaloniaPropertyChangedEventArgs.cs b/src/Avalonia.Base/AvaloniaPropertyChangedEventArgs.cs
index 6082367723..c1a2832fde 100644
--- a/src/Avalonia.Base/AvaloniaPropertyChangedEventArgs.cs
+++ b/src/Avalonia.Base/AvaloniaPropertyChangedEventArgs.cs
@@ -1,43 +1,29 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Data;
 
+#nullable enable
+
 namespace Avalonia
 {
     /// <summary>
     /// Provides information for a avalonia property change.
     /// </summary>
-    public class AvaloniaPropertyChangedEventArgs : EventArgs
+    public abstract class AvaloniaPropertyChangedEventArgs : EventArgs
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AvaloniaPropertyChangedEventArgs"/> class.
-        /// </summary>
-        /// <param name="sender">The object that the property changed on.</param>
-        /// <param name="property">The property that changed.</param>
-        /// <param name="oldValue">The old value of the property.</param>
-        /// <param name="newValue">The new value of the property.</param>
-        /// <param name="priority">The priority of the binding that produced the value.</param>
         public AvaloniaPropertyChangedEventArgs(
-            AvaloniaObject sender,
-            AvaloniaProperty property,
-            object oldValue,
-            object newValue,
+            IAvaloniaObject sender,
             BindingPriority priority)
         {
             Sender = sender;
-            Property = property;
-            OldValue = oldValue;
-            NewValue = newValue;
             Priority = priority;
+            IsEffectiveValueChange = true;
         }
 
         /// <summary>
         /// Gets the <see cref="AvaloniaObject"/> that the property changed on.
         /// </summary>
         /// <value>The sender object.</value>
-        public AvaloniaObject Sender { get; private set; }
+        public IAvaloniaObject Sender { get; }
 
         /// <summary>
         /// Gets the property that changed.
@@ -45,30 +31,42 @@ namespace Avalonia
         /// <value>
         /// The property that changed.
         /// </value>
-        public AvaloniaProperty Property { get; private set; }
+        public AvaloniaProperty Property => GetProperty();
 
         /// <summary>
         /// Gets the old value of the property.
         /// </summary>
-        /// <value>
-        /// The old value of the property.
-        /// </value>
-        public object OldValue { get; private set; }
+        public object? OldValue => GetOldValue();
 
         /// <summary>
         /// Gets the new value of the property.
         /// </summary>
-        /// <value>
-        /// The new value of the property.
-        /// </value>
-        public object NewValue { get; private set; }
+        public object? NewValue => GetNewValue();
 
         /// <summary>
         /// Gets the priority of the binding that produced the value.
         /// </summary>
         /// <value>
-        /// The priority of the binding that produced the value.
+        /// The priority of the new value.
         /// </value>
         public BindingPriority Priority { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether the change represents a change to the effective value of
+        /// the property.
+        /// </summary>
+        /// <remarks>
+        /// This will usually be true, except in
+        /// <see cref="AvaloniaObject.OnPropertyChangedCore{T}(AvaloniaPropertyChangedEventArgs{T})"/>
+        /// which recieves 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 signalled
+        /// has not resulted in a change to the property value on the object.
+        /// </remarks>
+        public bool IsEffectiveValueChange { get; private set; }
+
+        internal void MarkNonEffectiveValue() => IsEffectiveValueChange = false;
+        protected abstract AvaloniaProperty GetProperty();
+        protected abstract object? GetOldValue();
+        protected abstract object? GetNewValue();
     }
 }
diff --git a/src/Avalonia.Base/AvaloniaPropertyChangedEventArgs`1.cs b/src/Avalonia.Base/AvaloniaPropertyChangedEventArgs`1.cs
new file mode 100644
index 0000000000..054bf93b3a
--- /dev/null
+++ b/src/Avalonia.Base/AvaloniaPropertyChangedEventArgs`1.cs
@@ -0,0 +1,72 @@
+using Avalonia.Data;
+
+#nullable enable
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Provides information for an Avalonia property change.
+    /// </summary>
+    public class AvaloniaPropertyChangedEventArgs<T> : AvaloniaPropertyChangedEventArgs
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AvaloniaPropertyChangedEventArgs"/> class.
+        /// </summary>
+        /// <param name="sender">The object that the property changed on.</param>
+        /// <param name="property">The property that changed.</param>
+        /// <param name="oldValue">The old value of the property.</param>
+        /// <param name="newValue">The new value of the property.</param>
+        /// <param name="priority">The priority of the binding that produced the value.</param>
+        public AvaloniaPropertyChangedEventArgs(
+            IAvaloniaObject sender,
+            AvaloniaProperty<T> property,
+            Optional<T> oldValue,
+            BindingValue<T> newValue,
+            BindingPriority priority)
+            : base(sender, priority)
+        {
+            Property = property;
+            OldValue = oldValue;
+            NewValue = newValue;
+        }
+
+        /// <summary>
+        /// Gets the property that changed.
+        /// </summary>
+        /// <value>
+        /// The property that changed.
+        /// </value>
+        public new AvaloniaProperty<T> Property { get; }
+
+        /// <summary>
+        /// Gets the old value of the property.
+        /// </summary>
+        /// <remarks>
+        /// When <see cref="AvaloniaPropertyChangedEventArgs.IsEffectiveValueChange"/> is true, returns the
+        /// old value of the property on the object. 
+        /// When <see cref="AvaloniaPropertyChangedEventArgs.IsEffectiveValueChange"/> is false, returns
+        /// <see cref="Optional{T}.Empty"/>.
+        /// </remarks>
+        public new Optional<T> OldValue { get; private set; }
+
+        /// <summary>
+        /// Gets the new value of the property.
+        /// </summary>
+        /// <remarks>
+        /// When <see cref="AvaloniaPropertyChangedEventArgs.IsEffectiveValueChange"/> is true, returns the
+        /// value of the property on the object.
+        /// When <see cref="AvaloniaPropertyChangedEventArgs.IsEffectiveValueChange"/> is false returns the
+        /// changed value, or <see cref="Optional{T}.Empty"/> if the value was removed.
+        /// </remarks>
+        public new BindingValue<T> NewValue { get; private set; }
+
+        internal void SetOldValue(Optional<T> value) => OldValue = value;
+        internal void SetNewValue(BindingValue<T> value) => NewValue = value;
+
+        protected override AvaloniaProperty GetProperty() => Property;
+
+        protected override object? GetOldValue() => OldValue.GetValueOrDefault(AvaloniaProperty.UnsetValue);
+
+        protected override object? GetNewValue() => NewValue.GetValueOrDefault(AvaloniaProperty.UnsetValue);
+    }
+}
diff --git a/src/Avalonia.Base/PropertyMetadata.cs b/src/Avalonia.Base/AvaloniaPropertyMetadata.cs
similarity index 78%
rename from src/Avalonia.Base/PropertyMetadata.cs
rename to src/Avalonia.Base/AvaloniaPropertyMetadata.cs
index bec562354d..2963567b14 100644
--- a/src/Avalonia.Base/PropertyMetadata.cs
+++ b/src/Avalonia.Base/AvaloniaPropertyMetadata.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Data;
 
 namespace Avalonia
@@ -8,15 +5,15 @@ namespace Avalonia
     /// <summary>
     /// Base class for avalonia property metadata.
     /// </summary>
-    public class PropertyMetadata
+    public class AvaloniaPropertyMetadata
     {
         private BindingMode _defaultBindingMode;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PropertyMetadata"/> class.
+        /// Initializes a new instance of the <see cref="AvaloniaPropertyMetadata"/> class.
         /// </summary>
         /// <param name="defaultBindingMode">The default binding mode.</param>
-        public PropertyMetadata(
+        public AvaloniaPropertyMetadata(
             BindingMode defaultBindingMode = BindingMode.Default)
         {
             _defaultBindingMode = defaultBindingMode;
@@ -40,7 +37,7 @@ namespace Avalonia
         /// <param name="baseMetadata">The base metadata to merge.</param>
         /// <param name="property">The property to which the metadata is being applied.</param>
         public virtual void Merge(
-            PropertyMetadata baseMetadata, 
+            AvaloniaPropertyMetadata baseMetadata, 
             AvaloniaProperty property)
         {
             if (_defaultBindingMode == BindingMode.Default)
diff --git a/src/Avalonia.Base/AvaloniaPropertyRegistry.cs b/src/Avalonia.Base/AvaloniaPropertyRegistry.cs
index d718f5917c..4cde965400 100644
--- a/src/Avalonia.Base/AvaloniaPropertyRegistry.cs
+++ b/src/Avalonia.Base/AvaloniaPropertyRegistry.cs
@@ -1,11 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using Avalonia.Data;
 
 namespace Avalonia
 {
@@ -20,12 +15,14 @@ namespace Avalonia
             new Dictionary<Type, Dictionary<int, AvaloniaProperty>>();
         private readonly Dictionary<Type, Dictionary<int, AvaloniaProperty>> _attached =
             new Dictionary<Type, Dictionary<int, AvaloniaProperty>>();
+        private readonly Dictionary<Type, Dictionary<int, AvaloniaProperty>> _direct =
+            new Dictionary<Type, Dictionary<int, AvaloniaProperty>>();
         private readonly Dictionary<Type, List<AvaloniaProperty>> _registeredCache =
             new Dictionary<Type, List<AvaloniaProperty>>();
         private readonly Dictionary<Type, List<AvaloniaProperty>> _attachedCache =
             new Dictionary<Type, List<AvaloniaProperty>>();
-        private readonly Dictionary<Type, List<PropertyInitializationData>> _initializedCache =
-            new Dictionary<Type, List<PropertyInitializationData>>();
+        private readonly Dictionary<Type, List<AvaloniaProperty>> _directCache =
+            new Dictionary<Type, List<AvaloniaProperty>>();
         private readonly Dictionary<Type, List<AvaloniaProperty>> _inheritedCache =
             new Dictionary<Type, List<AvaloniaProperty>>();
 
@@ -45,7 +42,7 @@ namespace Avalonia
         /// </summary>
         /// <param name="type">The type.</param>
         /// <returns>A collection of <see cref="AvaloniaProperty"/> definitions.</returns>
-        public IEnumerable<AvaloniaProperty> GetRegistered(Type type)
+        public IReadOnlyList<AvaloniaProperty> GetRegistered(Type type)
         {
             Contract.Requires<ArgumentNullException>(type != null);
 
@@ -79,7 +76,7 @@ namespace Avalonia
         /// </summary>
         /// <param name="type">The type.</param>
         /// <returns>A collection of <see cref="AvaloniaProperty"/> definitions.</returns>
-        public IEnumerable<AvaloniaProperty> GetRegisteredAttached(Type type)
+        public IReadOnlyList<AvaloniaProperty> GetRegisteredAttached(Type type)
         {
             Contract.Requires<ArgumentNullException>(type != null);
 
@@ -105,12 +102,43 @@ namespace Avalonia
             return result;
         }
 
+        /// <summary>
+        /// Gets all direct <see cref="AvaloniaProperty"/>s registered on a type.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <returns>A collection of <see cref="AvaloniaProperty"/> definitions.</returns>
+        public IReadOnlyList<AvaloniaProperty> GetRegisteredDirect(Type type)
+        {
+            Contract.Requires<ArgumentNullException>(type != null);
+
+            if (_directCache.TryGetValue(type, out var result))
+            {
+                return result;
+            }
+
+            var t = type;
+            result = new List<AvaloniaProperty>();
+
+            while (t != null)
+            {
+                if (_direct.TryGetValue(t, out var direct))
+                {
+                    result.AddRange(direct.Values);
+                }
+
+                t = t.BaseType;
+            }
+
+            _directCache.Add(type, result);
+            return result;
+        }
+
         /// <summary>
         /// Gets all inherited <see cref="AvaloniaProperty"/>s registered on a type.
         /// </summary>
         /// <param name="type">The type.</param>
         /// <returns>A collection of <see cref="AvaloniaProperty"/> definitions.</returns>
-        public IEnumerable<AvaloniaProperty> GetRegisteredInherited(Type type)
+        public IReadOnlyList<AvaloniaProperty> GetRegisteredInherited(Type type)
         {
             Contract.Requires<ArgumentNullException>(type != null);
 
@@ -122,16 +150,27 @@ namespace Avalonia
             result = new List<AvaloniaProperty>();
             var visited = new HashSet<AvaloniaProperty>();
 
-            foreach (var property in GetRegistered(type))
+            var registered = GetRegistered(type);
+            var registeredCount = registered.Count;
+
+            for (var i = 0; i < registeredCount; i++)
             {
+                var property = registered[i];
+
                 if (property.Inherits)
                 {
                     result.Add(property);
                     visited.Add(property);
                 }
             }
-            foreach (var property in GetRegisteredAttached(type))
+
+            var registeredAttached = GetRegisteredAttached(type);
+            var registeredAttachedCount = registeredAttached.Count;
+
+            for (var i = 0; i < registeredAttachedCount; i++)
             {
+                var property = registeredAttached[i];
+
                 if (property.Inherits)
                 {
                     if (!visited.Contains(property))
@@ -150,13 +189,29 @@ namespace Avalonia
         /// </summary>
         /// <param name="o">The object.</param>
         /// <returns>A collection of <see cref="AvaloniaProperty"/> definitions.</returns>
-        public IEnumerable<AvaloniaProperty> GetRegistered(AvaloniaObject o)
+        public IReadOnlyList<AvaloniaProperty> GetRegistered(IAvaloniaObject o)
         {
             Contract.Requires<ArgumentNullException>(o != null);
 
             return GetRegistered(o.GetType());
         }
 
+        /// <summary>
+        /// Finds a direct property as registered on an object.
+        /// </summary>
+        /// <param name="o">The object.</param>
+        /// <param name="property">The direct property.</param>
+        /// <returns>
+        /// The registered property or null if no matching property found.
+        /// </returns>
+        public DirectPropertyBase<T> GetRegisteredDirect<T>(
+            IAvaloniaObject o,
+            DirectPropertyBase<T> property)
+        {
+            return FindRegisteredDirect(o, property) ??
+                throw new ArgumentException($"Property '{property.Name} not registered on '{o.GetType()}");
+        }
+
         /// <summary>
         /// Finds a registered property on a type by name.
         /// </summary>
@@ -173,12 +228,25 @@ namespace Avalonia
             Contract.Requires<ArgumentNullException>(type != null);
             Contract.Requires<ArgumentNullException>(name != null);
 
-            if (name.Contains('.'))
+            if (name.Contains("."))
             {
                 throw new InvalidOperationException("Attached properties not supported.");
             }
 
-            return GetRegistered(type).FirstOrDefault(x => x.Name == name);
+            var registered = GetRegistered(type);
+            var registeredCount = registered.Count;
+
+            for (var i = 0; i < registeredCount; i++)
+            {
+                AvaloniaProperty x = registered[i];
+
+                if (x.Name == name)
+                {
+                    return x;
+                }
+            }
+
+            return null;
         }
 
         /// <summary>
@@ -192,7 +260,7 @@ namespace Avalonia
         /// <exception cref="InvalidOperationException">
         /// The property name contains a '.'.
         /// </exception>
-        public AvaloniaProperty FindRegistered(AvaloniaObject o, string name)
+        public AvaloniaProperty FindRegistered(IAvaloniaObject o, string name)
         {
             Contract.Requires<ArgumentNullException>(o != null);
             Contract.Requires<ArgumentNullException>(name != null);
@@ -200,6 +268,39 @@ namespace Avalonia
             return FindRegistered(o.GetType(), name);
         }
 
+        /// <summary>
+        /// Finds a direct property as registered on an object.
+        /// </summary>
+        /// <param name="o">The object.</param>
+        /// <param name="property">The direct property.</param>
+        /// <returns>
+        /// The registered property or null if no matching property found.
+        /// </returns>
+        public DirectPropertyBase<T> FindRegisteredDirect<T>(
+            IAvaloniaObject o,
+            DirectPropertyBase<T> property)
+        {
+            if (property.Owner == o.GetType())
+            {
+                return property;
+            }
+
+            var registeredDirect = GetRegisteredDirect(o.GetType());
+            var registeredDirectCount = registeredDirect.Count;
+
+            for (var i = 0; i < registeredDirectCount; i++)
+            {
+                var p = registeredDirect[i];
+
+                if (p == property)
+                {
+                    return (DirectPropertyBase<T>)p;
+                }
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// Finds a registered property by Id.
         /// </summary>
@@ -221,8 +322,23 @@ namespace Avalonia
             Contract.Requires<ArgumentNullException>(type != null);
             Contract.Requires<ArgumentNullException>(property != null);
 
-            return Instance.GetRegistered(type).Any(x => x == property) ||
-                Instance.GetRegisteredAttached(type).Any(x => x == property);
+            static bool ContainsProperty(IReadOnlyList<AvaloniaProperty> properties, AvaloniaProperty property)
+            {
+                var propertiesCount = properties.Count;
+
+                for (var i = 0; i < propertiesCount; i++)
+                {
+                    if (properties[i] == property)
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+
+            return ContainsProperty(Instance.GetRegistered(type), property) ||
+                   ContainsProperty(Instance.GetRegisteredAttached(type), property);
         }
 
         /// <summary>
@@ -246,7 +362,7 @@ namespace Avalonia
         /// <param name="property">The property.</param>
         /// <remarks>
         /// You won't usually want to call this method directly, instead use the
-        /// <see cref="AvaloniaProperty.Register{TOwner, TValue}(string, TValue, bool, Data.BindingMode, Func{TOwner, TValue, TValue}, Action{IAvaloniaObject, bool})"/>
+        /// <see cref="AvaloniaProperty.Register{TOwner, TValue}(string, TValue, bool, Data.BindingMode, Func{TValue, bool}, Func{IAvaloniaObject, TValue, TValue}, Action{IAvaloniaObject, bool})"/>
         /// method.
         /// </remarks>
         public void Register(Type type, AvaloniaProperty property)
@@ -265,13 +381,28 @@ namespace Avalonia
                 inner.Add(property.Id, property);
             }
 
+            if (property.IsDirect)
+            {
+                if (!_direct.TryGetValue(type, out inner))
+                {
+                    inner = new Dictionary<int, AvaloniaProperty>();
+                    inner.Add(property.Id, property);
+                    _direct.Add(type, inner);
+                }
+                else if (!inner.ContainsKey(property.Id))
+                {
+                    inner.Add(property.Id, property);
+                }
+
+                _directCache.Clear();
+            }
+
             if (!_properties.ContainsKey(property.Id))
             {
                 _properties.Add(property.Id, property);
             }
             
             _registeredCache.Clear();
-            _initializedCache.Clear();
             _inheritedCache.Clear();
         }
 
@@ -282,7 +413,7 @@ namespace Avalonia
         /// <param name="property">The property.</param>
         /// <remarks>
         /// You won't usually want to call this method directly, instead use the
-        /// <see cref="AvaloniaProperty.RegisterAttached{THost, TValue}(string, Type, TValue, bool, Data.BindingMode, Func{THost, TValue, TValue})"/>
+        /// <see cref="AvaloniaProperty.RegisterAttached{THost, TValue}(string, Type, TValue, bool, Data.BindingMode, Func{TValue, bool}, Func{IAvaloniaObject, TValue, TValue})"/>
         /// method.
         /// </remarks>
         public void RegisterAttached(Type type, AvaloniaProperty property)
@@ -308,96 +439,7 @@ namespace Avalonia
             }
             
             _attachedCache.Clear();
-            _initializedCache.Clear();
             _inheritedCache.Clear();
         }
-
-        internal void NotifyInitialized(AvaloniaObject o)
-        {
-            Contract.Requires<ArgumentNullException>(o != null);
-
-            var type = o.GetType();
-
-            void Notify(AvaloniaProperty property, object value)
-            {
-                var e = new AvaloniaPropertyChangedEventArgs(
-                    o,
-                    property,
-                    AvaloniaProperty.UnsetValue,
-                    value,
-                    BindingPriority.Unset);
-
-                property.NotifyInitialized(e);
-            }
-
-            if (!_initializedCache.TryGetValue(type, out var initializationData))
-            {
-                var visited = new HashSet<AvaloniaProperty>();
-
-                initializationData = new List<PropertyInitializationData>();
-
-                foreach (AvaloniaProperty property in GetRegistered(type))
-                {
-                    if (property.IsDirect)
-                    {
-                        initializationData.Add(new PropertyInitializationData(property, (IDirectPropertyAccessor)property));
-                    }
-                    else
-                    {
-                        initializationData.Add(new PropertyInitializationData(property, (IStyledPropertyAccessor)property, type));
-                    }
-
-                    visited.Add(property);
-                }
-
-                foreach (AvaloniaProperty property in GetRegisteredAttached(type))
-                {
-                    if (!visited.Contains(property))
-                    {
-                        initializationData.Add(new PropertyInitializationData(property, (IStyledPropertyAccessor)property, type));
-
-                        visited.Add(property);
-                    }
-                }
-
-                _initializedCache.Add(type, initializationData);
-            }
-
-            foreach (PropertyInitializationData data in initializationData)
-            {
-                if (!data.Property.HasNotifyInitializedObservers)
-                {
-                    continue;
-                }
-
-                object value = data.IsDirect ? data.DirectAccessor.GetValue(o) : data.Value;
-
-                Notify(data.Property, value);
-            }
-        }
-
-        private readonly struct PropertyInitializationData
-        {
-            public AvaloniaProperty Property { get; }
-            public object Value { get; }
-            public bool IsDirect { get; }
-            public IDirectPropertyAccessor DirectAccessor { get; }
-
-            public PropertyInitializationData(AvaloniaProperty property, IDirectPropertyAccessor directAccessor)
-            {
-                Property = property;
-                Value = null;
-                IsDirect = true;
-                DirectAccessor = directAccessor;
-            }
-
-            public PropertyInitializationData(AvaloniaProperty property, IStyledPropertyAccessor styledAccessor, Type type)
-            {
-                Property = property;
-                Value = styledAccessor.GetDefaultValue(type);
-                IsDirect = false;
-                DirectAccessor = null;
-            }
-        }
     }
 }
diff --git a/src/Avalonia.Base/AvaloniaProperty`1.cs b/src/Avalonia.Base/AvaloniaProperty`1.cs
index 0a223cf7ee..247ea0a25a 100644
--- a/src/Avalonia.Base/AvaloniaProperty`1.cs
+++ b/src/Avalonia.Base/AvaloniaProperty`1.cs
@@ -1,7 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using System.Reactive.Subjects;
+using Avalonia.Data;
+using Avalonia.Utilities;
 
 namespace Avalonia
 {
@@ -9,8 +9,10 @@ namespace Avalonia
     /// A typed avalonia property.
     /// </summary>
     /// <typeparam name="TValue">The value type of the property.</typeparam>
-    public class AvaloniaProperty<TValue> : AvaloniaProperty
+    public abstract class AvaloniaProperty<TValue> : AvaloniaProperty
     {
+        private readonly Subject<AvaloniaPropertyChangedEventArgs<TValue>> _changed;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="AvaloniaProperty{TValue}"/> class.
         /// </summary>
@@ -21,24 +23,87 @@ namespace Avalonia
         protected AvaloniaProperty(
             string name,
             Type ownerType,
-            PropertyMetadata metadata,
+            AvaloniaPropertyMetadata metadata,
             Action<IAvaloniaObject, bool> notifying = null)
             : base(name, typeof(TValue), ownerType, metadata, notifying)
         {
+            _changed = new Subject<AvaloniaPropertyChangedEventArgs<TValue>>();
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="AvaloniaProperty"/> class.
+        /// 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, 
-            PropertyMetadata metadata)
+            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>
+        /// <param name="source">The property to copy.</param>
+        /// <param name="ownerType">The new owner type.</param>
+        /// <param name="metadata">Optional overridden metadata.</param>
+        protected AvaloniaProperty(
+            AvaloniaProperty<TValue> source,
+            Type ownerType,
+            AvaloniaPropertyMetadata metadata)
             : base(source, ownerType, metadata)
         {
+            _changed = source._changed;
+        }
+
+        /// <summary>
+        /// Gets an observable that is fired when this property changes on any
+        /// <see cref="AvaloniaObject"/> instance.
+        /// </summary>
+        /// <value>
+        /// An observable that is fired when this property changes on any
+        /// <see cref="AvaloniaObject"/> instance.
+        /// </value>
+
+        public new IObservable<AvaloniaPropertyChangedEventArgs<TValue>> Changed => _changed;
+
+        /// <summary>
+        /// Notifies the <see cref="Changed"/> observable.
+        /// </summary>
+        /// <param name="e">The observable arguments.</param>
+        internal void NotifyChanged(AvaloniaPropertyChangedEventArgs<TValue> e)
+        {
+            _changed.OnNext(e);
+        }
+
+        protected override IObservable<AvaloniaPropertyChangedEventArgs> GetChanged() => Changed;
+
+        protected BindingValue<object> TryConvert(object value)
+        {
+            if (value == UnsetValue)
+            {
+                return BindingValue<object>.Unset;
+            }
+            else if (value == BindingOperations.DoNothing)
+            {
+                return BindingValue<object>.DoNothing;
+            }
+
+            if (!TypeUtilities.TryConvertImplicit(PropertyType, value, out var converted))
+            {
+                var error = new ArgumentException(string.Format(
+                    "Invalid value for Property '{0}': '{1}' ({2})",
+                    Name,
+                    value,
+                    value?.GetType().FullName ?? "(null)"));
+                return BindingValue<object>.BindingError(error);
+            }
+
+            return converted;
         }
     }
 }
diff --git a/src/Avalonia.Base/BoxedValue.cs b/src/Avalonia.Base/BoxedValue.cs
deleted file mode 100644
index 5fc515f299..0000000000
--- a/src/Avalonia.Base/BoxedValue.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Represents boxed value of type <typeparamref name="T"/>.
-    /// </summary>
-    /// <typeparam name="T">Type of stored value.</typeparam>
-    internal readonly struct BoxedValue<T>
-    {
-        public BoxedValue(T value)
-        {
-            Boxed = value;
-            Typed = value;
-        }
-
-        /// <summary>
-        /// Boxed value.
-        /// </summary>
-        public object Boxed { get; }
-
-        /// <summary>
-        /// Typed value.
-        /// </summary>
-        public T Typed { get; }
-    }
-}
diff --git a/src/Avalonia.Base/Collections/AvaloniaDictionary.cs b/src/Avalonia.Base/Collections/AvaloniaDictionary.cs
index 4de4c540a0..a3c51dc965 100644
--- a/src/Avalonia.Base/Collections/AvaloniaDictionary.cs
+++ b/src/Avalonia.Base/Collections/AvaloniaDictionary.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/src/Avalonia.Base/Collections/AvaloniaList.cs b/src/Avalonia.Base/Collections/AvaloniaList.cs
index 3c8d4ca7e6..5681214222 100644
--- a/src/Avalonia.Base/Collections/AvaloniaList.cs
+++ b/src/Avalonia.Base/Collections/AvaloniaList.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -66,6 +63,15 @@ namespace Avalonia.Collections
             _inner = new List<T>();
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AvaloniaList{T}"/>.
+        /// </summary>
+        /// <param name="capacity">Initial list capacity.</param>
+        public AvaloniaList(int capacity)
+        {
+            _inner = new List<T>(capacity);
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="AvaloniaList{T}"/> class.
         /// </summary>
@@ -178,6 +184,15 @@ namespace Avalonia.Collections
             set { this[index] = (T)value; }
         }
 
+        /// <summary>
+        /// Gets or sets the total number of elements the internal data structure can hold without resizing.
+        /// </summary>
+        public int Capacity
+        {
+            get => _inner.Capacity;
+            set => _inner.Capacity = value;
+        }
+
         /// <summary>
         /// Adds an item to the collection.
         /// </summary>
@@ -327,6 +342,8 @@ namespace Avalonia.Collections
                     }
                     else
                     {
+                        EnsureCapacity(_inner.Count + list.Count);
+
                         using (IEnumerator<T> en = items.GetEnumerator())
                         {
                             int insertIndex = index;
@@ -544,12 +561,96 @@ namespace Avalonia.Collections
         /// <inheritdoc/>
         void ICollection.CopyTo(Array array, int index)
         {
-            _inner.CopyTo((T[])array, index);
+            if (array == null)
+            {
+                throw new ArgumentNullException(nameof(array));
+            }
+
+            if (array.Rank != 1)
+            {
+                throw new ArgumentException("Multi-dimensional arrays are not supported.");
+            }
+
+            if (array.GetLowerBound(0) != 0)
+            {
+                throw new ArgumentException("Non-zero lower bounds are not supported.");
+            }
+
+            if (index < 0)
+            {
+                throw new ArgumentException("Invalid index.");
+            }
+
+            if (array.Length - index < Count)
+            {
+                throw new ArgumentException("The target array is too small.");
+            }
+
+            if (array is T[] tArray)
+            {
+                _inner.CopyTo(tArray, index);
+            }
+            else
+            {
+                //
+                // Catch the obvious case assignment will fail.
+                // We can't find all possible problems by doing the check though.
+                // For example, if the element type of the Array is derived from T,
+                // we can't figure out if we can successfully copy the element beforehand.
+                //
+                Type targetType = array.GetType().GetElementType()!;
+                Type sourceType = typeof(T);
+                if (!(targetType.IsAssignableFrom(sourceType) || sourceType.IsAssignableFrom(targetType)))
+                {
+                    throw new ArgumentException("Invalid array type");
+                }
+
+                //
+                // We can't cast array of value type to object[], so we don't support
+                // widening of primitive types here.
+                //
+                object[] objects = array as object[];
+                if (objects == null)
+                {
+                    throw new ArgumentException("Invalid array type");
+                }
+
+                int count = _inner.Count;
+                try
+                {
+                    for (int i = 0; i < count; i++)
+                    {
+                        objects[index++] = _inner[i];
+                    }
+                }
+                catch (ArrayTypeMismatchException)
+                {
+                    throw new ArgumentException("Invalid array type");
+                }
+            }
         }
 
         /// <inheritdoc/>
         Delegate[] INotifyCollectionChangedDebug.GetCollectionChangedSubscribers() => _collectionChanged?.GetInvocationList();
 
+        private void EnsureCapacity(int capacity)
+        {
+            // Adapted from List<T> implementation.
+            var currentCapacity = _inner.Capacity;
+
+            if (currentCapacity < capacity)
+            {
+                var newCapacity = currentCapacity == 0 ? 4 : currentCapacity * 2;
+
+                if (newCapacity < capacity)
+                {
+                    newCapacity = capacity;
+                }
+
+                _inner.Capacity = newCapacity;
+            }
+        }
+
         /// <summary>
         /// Raises the <see cref="CollectionChanged"/> event with an add action.
         /// </summary>
diff --git a/src/Avalonia.Base/Collections/AvaloniaListConverter.cs b/src/Avalonia.Base/Collections/AvaloniaListConverter.cs
index 63c2e07ecf..f3e22bfe69 100644
--- a/src/Avalonia.Base/Collections/AvaloniaListConverter.cs
+++ b/src/Avalonia.Base/Collections/AvaloniaListConverter.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.ComponentModel;
 using System.Globalization;
diff --git a/src/Avalonia.Base/Collections/AvaloniaListExtensions.cs b/src/Avalonia.Base/Collections/AvaloniaListExtensions.cs
index 58f3413780..b52829a60f 100644
--- a/src/Avalonia.Base/Collections/AvaloniaListExtensions.cs
+++ b/src/Avalonia.Base/Collections/AvaloniaListExtensions.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -143,6 +140,7 @@ 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)
diff --git a/src/Avalonia.Base/Collections/IAvaloniaList.cs b/src/Avalonia.Base/Collections/IAvaloniaList.cs
index b7ed9b1ad6..250d4faeb9 100644
--- a/src/Avalonia.Base/Collections/IAvaloniaList.cs
+++ b/src/Avalonia.Base/Collections/IAvaloniaList.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Generic;
 
 namespace Avalonia.Collections
diff --git a/src/Avalonia.Base/Collections/IAvaloniaReadOnlyList.cs b/src/Avalonia.Base/Collections/IAvaloniaReadOnlyList.cs
index 755efa3eaf..a6a5953827 100644
--- a/src/Avalonia.Base/Collections/IAvaloniaReadOnlyList.cs
+++ b/src/Avalonia.Base/Collections/IAvaloniaReadOnlyList.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
diff --git a/src/Avalonia.Base/Collections/NotifyCollectionChangedExtensions.cs b/src/Avalonia.Base/Collections/NotifyCollectionChangedExtensions.cs
index ba84c37e4a..fe9ef667b0 100644
--- a/src/Avalonia.Base/Collections/NotifyCollectionChangedExtensions.cs
+++ b/src/Avalonia.Base/Collections/NotifyCollectionChangedExtensions.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Specialized;
 using System.Reactive.Linq;
 using Avalonia.Reactive;
diff --git a/src/Avalonia.Base/Collections/Pooled/ClearMode.cs b/src/Avalonia.Base/Collections/Pooled/ClearMode.cs
new file mode 100644
index 0000000000..d78ac8feab
--- /dev/null
+++ b/src/Avalonia.Base/Collections/Pooled/ClearMode.cs
@@ -0,0 +1,40 @@
+// This source file is adapted from the Collections.Pooled.
+// (https://github.com/jtmueller/Collections.Pooled/tree/master/Collections.Pooled/)
+
+namespace Avalonia.Collections.Pooled
+{
+    /// <summary>
+    /// This enum allows control over how data is treated when internal
+    /// arrays are returned to the ArrayPool. Be careful to understand 
+    /// what each option does before using anything other than the default
+    /// of Auto.
+    /// </summary>
+    public enum ClearMode
+    {
+        /// <summary>
+        /// <para><code>Auto</code> has different behavior depending on the host project's target framework.</para>
+        /// <para>.NET Core 2.1: Reference types and value types that contain reference types are cleared
+        /// when the internal arrays are returned to the pool. Value types that do not contain reference
+        /// types are not cleared when returned to the pool.</para>
+        /// <para>.NET Standard 2.0: All user types are cleared before returning to the pool, in case they
+        /// contain reference types.
+        /// For .NET Standard, Auto and Always have the same behavior.</para>
+        /// </summary>
+        Auto = 0,
+        /// <summary>
+        /// The <para><code>Always</code> setting has the effect of always clearing user types before returning to the pool.
+        /// This is the default behavior on .NET Standard.</para><para>You might want to turn this on in a .NET Core project
+        /// if you were concerned about sensitive data stored in value types leaking to other pars of your application.</para> 
+        /// </summary>
+        Always = 1,
+        /// <summary>
+        /// <para><code>Never</code> will cause pooled collections to never clear user types before returning them to the pool.</para>
+        /// <para>You might want to use this setting in a .NET Standard project when you know that a particular collection stores
+        /// only value types and you want the performance benefit of not taking time to reset array items to their default value.</para>
+        /// <para>Be careful with this setting: if used for a collection that contains reference types, or value types that contain
+        /// reference types, this setting could cause memory issues by making the garbage collector unable to clean up instances
+        /// that are still being referenced by arrays sitting in the ArrayPool.</para>
+        /// </summary>
+        Never = 2
+    }
+}
diff --git a/src/Avalonia.Base/Collections/Pooled/ICollectionDebugView.cs b/src/Avalonia.Base/Collections/Pooled/ICollectionDebugView.cs
new file mode 100644
index 0000000000..2b15388a13
--- /dev/null
+++ b/src/Avalonia.Base/Collections/Pooled/ICollectionDebugView.cs
@@ -0,0 +1,31 @@
+// 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 System;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Avalonia.Collections.Pooled
+{
+    internal sealed class ICollectionDebugView<T>
+    {
+        private readonly ICollection<T> _collection;
+
+        public ICollectionDebugView(ICollection<T> collection)
+        {
+            _collection = collection ?? throw new ArgumentNullException(nameof(collection));
+        }
+
+        [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
+        public T[] Items
+        {
+            get
+            {
+                T[] items = new T[_collection.Count];
+                _collection.CopyTo(items, 0);
+                return items;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Collections/Pooled/IReadOnlyPooledList.cs b/src/Avalonia.Base/Collections/Pooled/IReadOnlyPooledList.cs
new file mode 100644
index 0000000000..7a233a62ab
--- /dev/null
+++ b/src/Avalonia.Base/Collections/Pooled/IReadOnlyPooledList.cs
@@ -0,0 +1,23 @@
+// This source file is adapted from the Collections.Pooled.
+// (https://github.com/jtmueller/Collections.Pooled/tree/master/Collections.Pooled/)
+
+using System;
+using System.Collections.Generic;
+
+namespace Avalonia.Collections.Pooled
+{
+    /// <summary>
+    /// Represents a read-only collection of pooled elements that can be accessed by index
+    /// </summary>
+    /// <typeparam name="T">The type of elements in the read-only pooled list.</typeparam>
+
+    public interface IReadOnlyPooledList<T> : IReadOnlyList<T>
+    {
+#pragma warning disable CS0419
+        /// <summary>
+        /// Gets a <see cref="System.ReadOnlySpan{T}"/> for the items currently in the collection.
+        /// </summary>
+#pragma warning restore CS0419
+        ReadOnlySpan<T> Span { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Collections/Pooled/PooledList.cs b/src/Avalonia.Base/Collections/Pooled/PooledList.cs
new file mode 100644
index 0000000000..e50e100d32
--- /dev/null
+++ b/src/Avalonia.Base/Collections/Pooled/PooledList.cs
@@ -0,0 +1,1532 @@
+// 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 System;
+using System.Buffers;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Runtime.Serialization;
+using System.Threading;
+
+namespace Avalonia.Collections.Pooled
+{
+    /// <summary>
+    /// Implements a variable-size list that uses a pooled array to store the
+    /// elements. A PooledList has a capacity, which is the allocated length
+    /// of the internal array. As elements are added to a PooledList, the capacity
+    /// of the PooledList is automatically increased as required by reallocating the
+    /// internal array.
+    /// </summary>
+    /// <remarks>
+    /// This class is based on the code for <see cref="List{T}"/> but it supports <see cref="Span{T}"/>
+    /// and uses <see cref="ArrayPool{T}"/> when allocating internal arrays.
+    /// </remarks>
+    [DebuggerDisplay("Count = {Count}")]
+    [DebuggerTypeProxy(typeof(ICollectionDebugView<>))]
+    [Serializable]
+    public class PooledList<T> : IList<T>, IReadOnlyPooledList<T>, IList, IDisposable, IDeserializationCallback
+    {
+        // internal constant copied from Array.MaxArrayLength
+        private const int MaxArrayLength = 0x7FEFFFFF;
+        private const int DefaultCapacity = 4;
+        private static readonly T[] s_emptyArray = Array.Empty<T>();
+
+        [NonSerialized]
+        private ArrayPool<T> _pool;
+        [NonSerialized]
+        private object _syncRoot;
+
+        private T[] _items; // Do not rename (binary serialization)
+        private int _size; // Do not rename (binary serialization)
+        private int _version; // Do not rename (binary serialization)
+        private readonly bool _clearOnFree;
+
+        #region Constructors
+
+        /// <summary>
+        /// Constructs a PooledList. The list is initially empty and has a capacity
+        /// of zero. Upon adding the first element to the list the capacity is
+        /// increased to DefaultCapacity, and then increased in multiples of two
+        /// as required.
+        /// </summary>
+        public PooledList() : this(ClearMode.Auto, ArrayPool<T>.Shared) { }
+
+        /// <summary>
+        /// Constructs a PooledList. The list is initially empty and has a capacity
+        /// of zero. Upon adding the first element to the list the capacity is
+        /// increased to DefaultCapacity, and then increased in multiples of two
+        /// as required.
+        /// </summary>
+        public PooledList(ClearMode clearMode) : this(clearMode, ArrayPool<T>.Shared) { }
+
+        /// <summary>
+        /// Constructs a PooledList. The list is initially empty and has a capacity
+        /// of zero. Upon adding the first element to the list the capacity is
+        /// increased to DefaultCapacity, and then increased in multiples of two
+        /// as required.
+        /// </summary>
+        public PooledList(ArrayPool<T> customPool) : this(ClearMode.Auto, customPool) { }
+
+        /// <summary>
+        /// Constructs a PooledList. The list is initially empty and has a capacity
+        /// of zero. Upon adding the first element to the list the capacity is
+        /// increased to DefaultCapacity, and then increased in multiples of two
+        /// as required.
+        /// </summary>
+        public PooledList(ClearMode clearMode, ArrayPool<T> customPool)
+        {
+            _items = s_emptyArray;
+            _pool = customPool ?? ArrayPool<T>.Shared;
+            _clearOnFree = ShouldClear(clearMode);
+        }
+
+        /// <summary>
+        /// Constructs a List with a given initial capacity. The list is
+        /// initially empty, but will have room for the given number of elements
+        /// before any reallocations are required.
+        /// </summary>
+        public PooledList(int capacity) : this(capacity, ClearMode.Auto, ArrayPool<T>.Shared) { }
+
+        /// <summary>
+        /// Constructs a List with a given initial capacity. The list is
+        /// initially empty, but will have room for the given number of elements
+        /// before any reallocations are required.
+        /// </summary>
+        public PooledList(int capacity, bool sizeToCapacity) : this(capacity, ClearMode.Auto, ArrayPool<T>.Shared, sizeToCapacity) { }
+
+        /// <summary>
+        /// Constructs a List with a given initial capacity. The list is
+        /// initially empty, but will have room for the given number of elements
+        /// before any reallocations are required.
+        /// </summary>
+        public PooledList(int capacity, ClearMode clearMode) : this(capacity, clearMode, ArrayPool<T>.Shared) { }
+
+        /// <summary>
+        /// Constructs a List with a given initial capacity. The list is
+        /// initially empty, but will have room for the given number of elements
+        /// before any reallocations are required.
+        /// </summary>
+        public PooledList(int capacity, ClearMode clearMode, bool sizeToCapacity) : this(capacity, clearMode, ArrayPool<T>.Shared, sizeToCapacity) { }
+
+        /// <summary>
+        /// Constructs a List with a given initial capacity. The list is
+        /// initially empty, but will have room for the given number of elements
+        /// before any reallocations are required.
+        /// </summary>
+        public PooledList(int capacity, ArrayPool<T> customPool) : this(capacity, ClearMode.Auto, customPool) { }
+
+        /// <summary>
+        /// Constructs a List with a given initial capacity. The list is
+        /// initially empty, but will have room for the given number of elements
+        /// before any reallocations are required.
+        /// </summary>
+        public PooledList(int capacity, ArrayPool<T> customPool, bool sizeToCapacity) : this(capacity, ClearMode.Auto, customPool, sizeToCapacity) { }
+
+        /// <summary>
+        /// Constructs a List with a given initial capacity. The list is
+        /// initially empty, but will have room for the given number of elements
+        /// before any reallocations are required.
+        /// </summary>
+        public PooledList(int capacity, ClearMode clearMode, ArrayPool<T> customPool) : this(capacity, clearMode, customPool, false) { }
+
+        /// <summary>
+        /// Constructs a List with a given initial capacity. The list is
+        /// initially empty, but will have room for the given number of elements
+        /// before any reallocations are required.
+        /// </summary>
+        public PooledList(int capacity, ClearMode clearMode, ArrayPool<T> customPool, bool sizeToCapacity)
+        {
+            if (capacity < 0)
+                ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.capacity, ExceptionResource.ArgumentOutOfRange_NeedNonNegNum);
+
+            _pool = customPool ?? ArrayPool<T>.Shared;
+            _clearOnFree = ShouldClear(clearMode);
+
+            if (capacity == 0)
+            {
+                _items = s_emptyArray;
+            }
+            else
+            {
+                _items = _pool.Rent(capacity);
+            }
+
+            if (sizeToCapacity)
+            {
+                _size = capacity;
+                if (clearMode != ClearMode.Never)
+                {
+                    Array.Clear(_items, 0, _size);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Constructs a PooledList, copying the contents of the given collection. The
+        /// size and capacity of the new list will both be equal to the size of the
+        /// given collection.
+        /// </summary>
+        public PooledList(T[] array) : this(array.AsSpan(), ClearMode.Auto, ArrayPool<T>.Shared) { }
+
+        /// <summary>
+        /// Constructs a PooledList, copying the contents of the given collection. The
+        /// size and capacity of the new list will both be equal to the size of the
+        /// given collection.
+        /// </summary>
+        public PooledList(T[] array, ClearMode clearMode) : this(array.AsSpan(), clearMode, ArrayPool<T>.Shared) { }
+
+        /// <summary>
+        /// Constructs a PooledList, copying the contents of the given collection. The
+        /// size and capacity of the new list will both be equal to the size of the
+        /// given collection.
+        /// </summary>
+        public PooledList(T[] array, ArrayPool<T> customPool) : this(array.AsSpan(), ClearMode.Auto, customPool) { }
+
+        /// <summary>
+        /// Constructs a PooledList, copying the contents of the given collection. The
+        /// size and capacity of the new list will both be equal to the size of the
+        /// given collection.
+        /// </summary>
+        public PooledList(T[] array, ClearMode clearMode, ArrayPool<T> customPool) : this(array.AsSpan(), clearMode, customPool) { }
+
+        /// <summary>
+        /// Constructs a PooledList, copying the contents of the given collection. The
+        /// size and capacity of the new list will both be equal to the size of the
+        /// given collection.
+        /// </summary>
+        public PooledList(ReadOnlySpan<T> span) : this(span, ClearMode.Auto, ArrayPool<T>.Shared) { }
+
+        /// <summary>
+        /// Constructs a PooledList, copying the contents of the given collection. The
+        /// size and capacity of the new list will both be equal to the size of the
+        /// given collection.
+        /// </summary>
+        public PooledList(ReadOnlySpan<T> span, ClearMode clearMode) : this(span, clearMode, ArrayPool<T>.Shared) { }
+
+        /// <summary>
+        /// Constructs a PooledList, copying the contents of the given collection. The
+        /// size and capacity of the new list will both be equal to the size of the
+        /// given collection.
+        /// </summary>
+        public PooledList(ReadOnlySpan<T> span, ArrayPool<T> customPool) : this(span, ClearMode.Auto, customPool) { }
+
+        /// <summary>
+        /// Constructs a PooledList, copying the contents of the given collection. The
+        /// size and capacity of the new list will both be equal to the size of the
+        /// given collection.
+        /// </summary>
+        public PooledList(ReadOnlySpan<T> span, ClearMode clearMode, ArrayPool<T> customPool)
+        {
+            _pool = customPool ?? ArrayPool<T>.Shared;
+            _clearOnFree = ShouldClear(clearMode);
+
+            int count = span.Length;
+            if (count == 0)
+            {
+                _items = s_emptyArray;
+            }
+            else
+            {
+                _items = _pool.Rent(count);
+                span.CopyTo(_items);
+                _size = count;
+            }
+        }
+
+        /// <summary>
+        /// Constructs a PooledList, copying the contents of the given collection. The
+        /// size and capacity of the new list will both be equal to the size of the
+        /// given collection.
+        /// </summary>
+        public PooledList(IEnumerable<T> collection) : this(collection, ClearMode.Auto, ArrayPool<T>.Shared) { }
+
+        /// <summary>
+        /// Constructs a PooledList, copying the contents of the given collection. The
+        /// size and capacity of the new list will both be equal to the size of the
+        /// given collection.
+        /// </summary>
+        public PooledList(IEnumerable<T> collection, ClearMode clearMode) : this(collection, clearMode, ArrayPool<T>.Shared) { }
+
+        /// <summary>
+        /// Constructs a PooledList, copying the contents of the given collection. The
+        /// size and capacity of the new list will both be equal to the size of the
+        /// given collection.
+        /// </summary>
+        public PooledList(IEnumerable<T> collection, ArrayPool<T> customPool) : this(collection, ClearMode.Auto, customPool) { }
+
+        /// <summary>
+        /// Constructs a PooledList, copying the contents of the given collection. The
+        /// size and capacity of the new list will both be equal to the size of the
+        /// given collection.
+        /// </summary>
+        public PooledList(IEnumerable<T> collection, ClearMode clearMode, ArrayPool<T> customPool)
+        {
+            _pool = customPool ?? ArrayPool<T>.Shared;
+            _clearOnFree = ShouldClear(clearMode);
+
+            switch (collection)
+            {
+                case null:
+                    ThrowHelper.ThrowArgumentNullException(ExceptionArgument.collection);
+                    break;
+
+                case ICollection<T> c:
+                    int count = c.Count;
+                    if (count == 0)
+                    {
+                        _items = s_emptyArray;
+                    }
+                    else
+                    {
+                        _items = _pool.Rent(count);
+                        c.CopyTo(_items, 0);
+                        _size = count;
+                    }
+                    break;
+
+                default:
+                    _size = 0;
+                    _items = s_emptyArray;
+                    using (var en = collection.GetEnumerator())
+                    {
+                        while (en.MoveNext())
+                            Add(en.Current);
+                    }
+                    break;
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Gets a <see cref="System.Span{T}"/> for the items currently in the collection.
+        /// </summary>
+        public Span<T> Span => _items.AsSpan(0, _size);
+
+        /// <inheritdoc/>
+        ReadOnlySpan<T> IReadOnlyPooledList<T>.Span => Span;
+
+        /// <summary>
+        /// Gets and sets the capacity of this list.  The capacity is the size of
+        /// the internal array used to hold items.  When set, the internal 
+        /// Memory of the list is reallocated to the given capacity.
+        /// Note that the return value for this property may be larger than the property was set to.
+        /// </summary>
+        public int Capacity
+        {
+            get => _items.Length;
+            set
+            {
+                if (value < _size)
+                {
+                    ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.value, ExceptionResource.ArgumentOutOfRange_SmallCapacity);
+                }
+
+                if (value != _items.Length)
+                {
+                    if (value > 0)
+                    {
+                        var newItems = _pool.Rent(value);
+                        if (_size > 0)
+                        {
+                            Array.Copy(_items, newItems, _size);
+                        }
+                        ReturnArray();
+                        _items = newItems;
+                    }
+                    else
+                    {
+                        ReturnArray();
+                        _size = 0;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Read-only property describing how many elements are in the List.
+        /// </summary>
+        public int Count => _size;
+
+        /// <summary>
+        /// Returns the ClearMode behavior for the collection, denoting whether values are
+        /// cleared from internal arrays before returning them to the pool.
+        /// </summary>
+        public ClearMode ClearMode => _clearOnFree ? ClearMode.Always : ClearMode.Never;
+
+        bool IList.IsFixedSize => false;
+
+        bool ICollection<T>.IsReadOnly => false;
+
+        bool IList.IsReadOnly => false;
+
+        int ICollection.Count => _size;
+
+        bool ICollection.IsSynchronized => false;
+
+        // Synchronization root for this object.
+        object ICollection.SyncRoot
+        {
+            get
+            {
+                if (_syncRoot == null)
+                {
+                    Interlocked.CompareExchange<object>(ref _syncRoot, new object(), null);
+                }
+                return _syncRoot;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the element at the given index.
+        /// </summary>
+        public T this[int index]
+        {
+            get
+            {
+                // Following trick can reduce the range check by one
+                if ((uint)index >= (uint)_size)
+                {
+                    ThrowHelper.ThrowArgumentOutOfRange_IndexException();
+                }
+                return _items[index];
+            }
+
+            set
+            {
+                if ((uint)index >= (uint)_size)
+                {
+                    ThrowHelper.ThrowArgumentOutOfRange_IndexException();
+                }
+                _items[index] = value;
+                _version++;
+            }
+        }
+
+        private static bool IsCompatibleObject(object value)
+        {
+            // Non-null values are fine.  Only accept nulls if T is a class or Nullable<U>.
+            // Note that default(T) is not equal to null for value types except when T is Nullable<U>. 
+            return ((value is T) || (value == null && default(T) == null));
+        }
+
+        object IList.this[int index]
+        {
+            get
+            {
+                return this[index];
+            }
+            set
+            {
+                ThrowHelper.IfNullAndNullsAreIllegalThenThrow<T>(value, ExceptionArgument.value);
+
+                try
+                {
+                    this[index] = (T)value;
+                }
+                catch (InvalidCastException)
+                {
+                    ThrowHelper.ThrowWrongValueTypeArgumentException(value, typeof(T));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Adds the given object to the end of this list. The size of the list is
+        /// increased by one. If required, the capacity of the list is doubled
+        /// before adding the new element.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void Add(T item)
+        {
+            _version++;
+            int size = _size;
+            if ((uint)size < (uint)_items.Length)
+            {
+                _size = size + 1;
+                _items[size] = item;
+            }
+            else
+            {
+                AddWithResize(item);
+            }
+        }
+
+        // Non-inline from List.Add to improve its code quality as uncommon path
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private void AddWithResize(T item)
+        {
+            int size = _size;
+            EnsureCapacity(size + 1);
+            _size = size + 1;
+            _items[size] = item;
+        }
+
+        int IList.Add(object item)
+        {
+            ThrowHelper.IfNullAndNullsAreIllegalThenThrow<T>(item, ExceptionArgument.item);
+
+            try
+            {
+                Add((T)item);
+            }
+            catch (InvalidCastException)
+            {
+                ThrowHelper.ThrowWrongValueTypeArgumentException(item, typeof(T));
+            }
+
+            return Count - 1;
+        }
+
+        /// <summary>
+        /// Adds the elements of the given collection to the end of this list. If
+        /// required, the capacity of the list is increased to twice the previous
+        /// capacity or the new size, whichever is larger.
+        /// </summary>
+        public void AddRange(IEnumerable<T> collection)
+            => InsertRange(_size, collection);
+
+        /// <summary>
+        /// Adds the elements of the given array to the end of this list. If
+        /// required, the capacity of the list is increased to twice the previous
+        /// capacity or the new size, whichever is larger.
+        /// </summary>
+        public void AddRange(T[] array)
+            => AddRange(array.AsSpan());
+
+#pragma warning disable CS0419
+        /// <summary>
+        /// Adds the elements of the given <see cref="ReadOnlySpan{T}"/> to the end of this list. If
+        /// required, the capacity of the list is increased to twice the previous
+        /// capacity or the new size, whichever is larger.
+        /// </summary>
+#pragma warning restore CS0419
+        public void AddRange(ReadOnlySpan<T> span)
+        {
+            var newSpan = InsertSpan(_size, span.Length, false);
+            span.CopyTo(newSpan);
+        }
+
+        /// <summary>
+        /// Advances the <see cref="Count"/> by the number of items specified,
+        /// increasing the capacity if required, then returns a Span representing
+        /// the set of items to be added, allowing direct writes to that section
+        /// of the collection.
+        /// </summary>
+        /// <param name="count">The number of items to add.</param>
+        public Span<T> AddSpan(int count)
+            => InsertSpan(_size, count);
+
+        public ReadOnlyCollection<T> AsReadOnly()
+            => new ReadOnlyCollection<T>(this);
+
+        /// <summary>
+        /// Searches a section of the list for a given element using a binary search
+        /// algorithm. 
+        /// </summary>
+        /// 
+        /// <remarks><para>Elements of the list are compared to the search value using
+        /// the given IComparer interface. If comparer is null, elements of
+        /// the list are compared to the search value using the IComparable
+        /// interface, which in that case must be implemented by all elements of the
+        /// list and the given search value. This method assumes that the given
+        /// section of the list is already sorted; if this is not the case, the
+        /// result will be incorrect.</para>
+        ///
+        /// <para>The method returns the index of the given value in the list. If the
+        /// list does not contain the given value, the method returns a negative
+        /// integer. The bitwise complement operator (~) can be applied to a
+        /// negative result to produce the index of the first element (if any) that
+        /// is larger than the given search value. This is also the index at which
+        /// the search value should be inserted into the list in order for the list
+        /// to remain sorted.
+        /// </para></remarks>
+        public int BinarySearch(int index, int count, T item, IComparer<T> comparer)
+        {
+            if (index < 0)
+                ThrowHelper.ThrowIndexArgumentOutOfRange_NeedNonNegNumException();
+            if (count < 0)
+                ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.count, ExceptionResource.ArgumentOutOfRange_NeedNonNegNum);
+            if (_size - index < count)
+                ThrowHelper.ThrowArgumentException(ExceptionResource.Argument_InvalidOffLen);
+
+            return Array.BinarySearch(_items, index, count, item, comparer);
+        }
+
+        /// <summary>
+        /// Searches the list for a given element using a binary search
+        /// algorithm. If the item implements <see cref="IComparable{T}"/>
+        /// then that is used for comparison, otherwise <see cref="Comparer{T}.Default"/> is used.
+        /// </summary>
+        public int BinarySearch(T item)
+            => BinarySearch(0, Count, item, null);
+
+        /// <summary>
+        /// Searches the list for a given element using a binary search
+        /// algorithm. If the item implements <see cref="IComparable{T}"/>
+        /// then that is used for comparison, otherwise <see cref="Comparer{T}.Default"/> is used.
+        /// </summary>
+        public int BinarySearch(T item, IComparer<T> comparer)
+            => BinarySearch(0, Count, item, comparer);
+
+        /// <summary>
+        /// Clears the contents of the PooledList.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void Clear()
+        {
+            _version++;
+            int size = _size;
+            _size = 0;
+
+            if (size > 0 && _clearOnFree)
+            {
+                // Clear the elements so that the gc can reclaim the references.
+                Array.Clear(_items, 0, _size);
+            }
+        }
+
+        /// <summary>
+        /// Contains returns true if the specified element is in the List.
+        /// It does a linear, O(n) search.  Equality is determined by calling
+        /// EqualityComparer{T}.Default.Equals.
+        /// </summary>
+        public bool Contains(T item)
+        {
+            // PERF: IndexOf calls Array.IndexOf, which internally
+            // calls EqualityComparer<T>.Default.IndexOf, which
+            // is specialized for different types. This
+            // boosts performance since instead of making a
+            // virtual method call each iteration of the loop,
+            // via EqualityComparer<T>.Default.Equals, we
+            // only make one virtual call to EqualityComparer.IndexOf.
+
+            return _size != 0 && IndexOf(item) != -1;
+        }
+
+        bool IList.Contains(object item)
+        {
+            if (IsCompatibleObject(item))
+            {
+                return Contains((T)item);
+            }
+            return false;
+        }
+
+        public PooledList<TOutput> ConvertAll<TOutput>(Func<T, TOutput> converter)
+        {
+            if (converter == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.converter);
+            }
+
+            var list = new PooledList<TOutput>(_size);
+            for (int i = 0; i < _size; i++)
+            {
+                list._items[i] = converter(_items[i]);
+            }
+            list._size = _size;
+            return list;
+        }
+
+        /// <summary>
+        /// Copies this list to the given span.
+        /// </summary>
+        public void CopyTo(Span<T> span)
+        {
+            if (span.Length < Count)
+                throw new ArgumentException("Destination span is shorter than the list to be copied.");
+
+            Span.CopyTo(span);
+        }
+
+        void ICollection<T>.CopyTo(T[] array, int arrayIndex)
+        {
+            Array.Copy(_items, 0, array, arrayIndex, _size);
+        }
+
+        // Copies this List into array, which must be of a 
+        // compatible array type.  
+        void ICollection.CopyTo(Array array, int arrayIndex)
+        {
+            if ((array != null) && (array.Rank != 1))
+            {
+                ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_RankMultiDimNotSupported);
+            }
+
+            try
+            {
+                // Array.Copy will check for NULL.
+                Array.Copy(_items, 0, array, arrayIndex, _size);
+            }
+            catch (ArrayTypeMismatchException)
+            {
+                ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
+            }
+        }
+
+        /// <summary>
+        /// Ensures that the capacity of this list is at least the given minimum
+        /// value. If the current capacity of the list is less than min, the
+        /// capacity is increased to twice the current capacity or to min,
+        /// whichever is larger.
+        /// </summary>
+        private void EnsureCapacity(int min)
+        {
+            if (_items.Length < min)
+            {
+                int newCapacity = _items.Length == 0 ? DefaultCapacity : _items.Length * 2;
+                // Allow the list to grow to maximum possible capacity (~2G elements) before encountering overflow.
+                // Note that this check works even when _items.Length overflowed thanks to the (uint) cast
+                if ((uint)newCapacity > MaxArrayLength)
+                    newCapacity = MaxArrayLength;
+                if (newCapacity < min)
+                    newCapacity = min;
+                Capacity = newCapacity;
+            }
+        }
+
+        public bool Exists(Func<T, bool> match)
+            => FindIndex(match) != -1;
+
+        public bool TryFind(Func<T, bool> match, out T result)
+        {
+            if (match == null)
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.match);
+
+            for (int i = 0; i < _size; i++)
+            {
+                if (match(_items[i]))
+                {
+                    result = _items[i];
+                    return true;
+                }
+            }
+
+            result = default;
+            return false;
+        }
+
+        public PooledList<T> FindAll(Func<T, bool> match)
+        {
+            if (match == null)
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.match);
+
+            var list = new PooledList<T>();
+            for (int i = 0; i < _size; i++)
+            {
+                if (match(_items[i]))
+                {
+                    list.Add(_items[i]);
+                }
+            }
+            return list;
+        }
+
+        public int FindIndex(Func<T, bool> match)
+            => FindIndex(0, _size, match);
+
+        public int FindIndex(int startIndex, Func<T, bool> match)
+            => FindIndex(startIndex, _size - startIndex, match);
+
+        public int FindIndex(int startIndex, int count, Func<T, bool> match)
+        {
+            if ((uint)startIndex > (uint)_size)
+                ThrowHelper.ThrowStartIndexArgumentOutOfRange_ArgumentOutOfRange_Index();
+
+            if (count < 0 || startIndex > _size - count)
+                ThrowHelper.ThrowCountArgumentOutOfRange_ArgumentOutOfRange_Count();
+
+            if (match is null)
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.match);
+
+            int endIndex = startIndex + count;
+            for (int i = startIndex; i < endIndex; i++)
+            {
+                if (match(_items[i]))
+                    return i;
+            }
+            return -1;
+        }
+
+        public bool TryFindLast(Func<T, bool> match, out T result)
+        {
+            if (match is null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.match);
+            }
+
+            for (int i = _size - 1; i >= 0; i--)
+            {
+                if (match(_items[i]))
+                {
+                    result = _items[i];
+                    return true;
+                }
+            }
+
+            result = default;
+            return false;
+        }
+
+        public int FindLastIndex(Func<T, bool> match)
+            => FindLastIndex(_size - 1, _size, match);
+
+        public int FindLastIndex(int startIndex, Func<T, bool> match)
+            => FindLastIndex(startIndex, startIndex + 1, match);
+
+        public int FindLastIndex(int startIndex, int count, Func<T, bool> match)
+        {
+            if (match == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.match);
+            }
+
+            if (_size == 0)
+            {
+                // Special case for 0 length List
+                if (startIndex != -1)
+                {
+                    ThrowHelper.ThrowStartIndexArgumentOutOfRange_ArgumentOutOfRange_Index();
+                }
+            }
+            else
+            {
+                // Make sure we're not out of range
+                if ((uint)startIndex >= (uint)_size)
+                {
+                    ThrowHelper.ThrowStartIndexArgumentOutOfRange_ArgumentOutOfRange_Index();
+                }
+            }
+
+            // 2nd half of this also catches when startIndex == MAXINT, so MAXINT - 0 + 1 == -1, which is < 0.
+            if (count < 0 || startIndex - count + 1 < 0)
+            {
+                ThrowHelper.ThrowCountArgumentOutOfRange_ArgumentOutOfRange_Count();
+            }
+
+            int endIndex = startIndex - count;
+            for (int i = startIndex; i > endIndex; i--)
+            {
+                if (match(_items[i]))
+                {
+                    return i;
+                }
+            }
+            return -1;
+        }
+
+        public void ForEach(Action<T> action)
+        {
+            if (action == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.action);
+            }
+
+            int version = _version;
+            for (int i = 0; i < _size; i++)
+            {
+                if (version != _version)
+                {
+                    break;
+                }
+                action(_items[i]);
+            }
+
+            if (version != _version)
+                ThrowHelper.ThrowInvalidOperationException_InvalidOperation_EnumFailedVersion();
+        }
+
+        /// <summary>
+        /// Returns an enumerator for this list with the given
+        /// permission for removal of elements. If modifications made to the list 
+        /// while an enumeration is in progress, the MoveNext and 
+        /// GetObject methods of the enumerator will throw an exception.
+        /// </summary>
+        public Enumerator GetEnumerator()
+            => new Enumerator(this);
+
+        IEnumerator<T> IEnumerable<T>.GetEnumerator()
+            => new Enumerator(this);
+
+        IEnumerator IEnumerable.GetEnumerator()
+            => new Enumerator(this);
+
+        /// <summary>
+        /// Equivalent to PooledList.Span.Slice(index, count).
+        /// </summary>
+        public Span<T> GetRange(int index, int count)
+        {
+            if (index < 0)
+            {
+                ThrowHelper.ThrowIndexArgumentOutOfRange_NeedNonNegNumException();
+            }
+
+            if (count < 0)
+            {
+                ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.count, ExceptionResource.ArgumentOutOfRange_NeedNonNegNum);
+            }
+
+            if (_size - index < count)
+            {
+                ThrowHelper.ThrowArgumentException(ExceptionResource.Argument_InvalidOffLen);
+            }
+
+            return Span.Slice(index, count);
+        }
+
+        /// <summary>
+        /// Returns the index of the first occurrence of a given value in
+        /// this list. The list is searched forwards from beginning to end.
+        /// </summary>
+        public int IndexOf(T item)
+            => Array.IndexOf(_items, item, 0, _size);
+
+        int IList.IndexOf(object item)
+        {
+            if (IsCompatibleObject(item))
+            {
+                return IndexOf((T)item);
+            }
+            return -1;
+        }
+
+        /// <summary>
+        /// Returns the index of the first occurrence of a given value in a range of
+        /// this list. The list is searched forwards, starting at index
+        /// index and ending at count number of elements. 
+        /// </summary>
+        public int IndexOf(T item, int index)
+        {
+            if (index > _size)
+                ThrowHelper.ThrowArgumentOutOfRange_IndexException();
+            return Array.IndexOf(_items, item, index, _size - index);
+        }
+
+        /// <summary>
+        /// Returns the index of the first occurrence of a given value in a range of
+        /// this list. The list is searched forwards, starting at index
+        /// index and upto count number of elements. 
+        /// </summary>
+        public int IndexOf(T item, int index, int count)
+        {
+            if (index > _size)
+                ThrowHelper.ThrowArgumentOutOfRange_IndexException();
+
+            if (count < 0 || index > _size - count)
+                ThrowHelper.ThrowCountArgumentOutOfRange_ArgumentOutOfRange_Count();
+
+            return Array.IndexOf(_items, item, index, count);
+        }
+
+        /// <summary>
+        /// Inserts an element into this list at a given index. The size of the list
+        /// is increased by one. If required, the capacity of the list is doubled
+        /// before inserting the new element.
+        /// </summary>
+        public void Insert(int index, T item)
+        {
+            // Note that insertions at the end are legal.
+            if ((uint)index > (uint)_size)
+            {
+                ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.index, ExceptionResource.ArgumentOutOfRange_ListInsert);
+            }
+
+            if (_size == _items.Length)
+                EnsureCapacity(_size + 1);
+            if (index < _size)
+            {
+                Array.Copy(_items, index, _items, index + 1, _size - index);
+            }
+            _items[index] = item;
+            _size++;
+            _version++;
+        }
+
+        void IList.Insert(int index, object item)
+        {
+            ThrowHelper.IfNullAndNullsAreIllegalThenThrow<T>(item, ExceptionArgument.item);
+
+            try
+            {
+                Insert(index, (T)item);
+            }
+            catch (InvalidCastException)
+            {
+                ThrowHelper.ThrowWrongValueTypeArgumentException(item, typeof(T));
+            }
+        }
+
+        /// <summary>
+        /// Inserts the elements of the given collection at a given index. If
+        /// required, the capacity of the list is increased to twice the previous
+        /// capacity or the new size, whichever is larger.  Ranges may be added
+        /// to the end of the list by setting index to the List's size.
+        /// </summary>
+        public void InsertRange(int index, IEnumerable<T> collection)
+        {
+            if ((uint)index > (uint)_size)
+            {
+                ThrowHelper.ThrowArgumentOutOfRange_IndexException();
+            }
+
+            switch (collection)
+            {
+                case null:
+                    ThrowHelper.ThrowArgumentNullException(ExceptionArgument.collection);
+                    break;
+
+                case ICollection<T> c:
+                    int count = c.Count;
+                    if (count > 0)
+                    {
+                        EnsureCapacity(_size + count);
+                        if (index < _size)
+                        {
+                            Array.Copy(_items, index, _items, index + count, _size - index);
+                        }
+
+                        // If we're inserting a List into itself, we want to be able to deal with that.
+                        if (this == c)
+                        {
+                            // Copy first part of _items to insert location
+                            Array.Copy(_items, 0, _items, index, index);
+                            // Copy last part of _items back to inserted location
+                            Array.Copy(_items, index + count, _items, index * 2, _size - index);
+                        }
+                        else
+                        {
+                            c.CopyTo(_items, index);
+                        }
+                        _size += count;
+                    }
+                    break;
+
+                default:
+                    using (var en = collection.GetEnumerator())
+                    {
+                        while (en.MoveNext())
+                        {
+                            Insert(index++, en.Current);
+                        }
+                    }
+                    break;
+            }
+
+            _version++;
+        }
+
+        /// <summary>
+        /// Inserts the elements of the given collection at a given index. If
+        /// required, the capacity of the list is increased to twice the previous
+        /// capacity or the new size, whichever is larger.  Ranges may be added
+        /// to the end of the list by setting index to the List's size.
+        /// </summary>
+        public void InsertRange(int index, ReadOnlySpan<T> span)
+        {
+            var newSpan = InsertSpan(index, span.Length, false);
+            span.CopyTo(newSpan);
+        }
+
+        /// <summary>
+        /// Inserts the elements of the given collection at a given index. If
+        /// required, the capacity of the list is increased to twice the previous
+        /// capacity or the new size, whichever is larger.  Ranges may be added
+        /// to the end of the list by setting index to the List's size.
+        /// </summary>
+        public void InsertRange(int index, T[] array)
+        {
+            if (array is null)
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array);
+            InsertRange(index, array.AsSpan());
+        }
+
+        /// <summary>
+        /// Advances the <see cref="Count"/> by the number of items specified,
+        /// increasing the capacity if required, then returns a Span representing
+        /// the set of items to be added, allowing direct writes to that section
+        /// of the collection.
+        /// </summary>
+        public Span<T> InsertSpan(int index, int count)
+            => InsertSpan(index, count, true);
+
+        private Span<T> InsertSpan(int index, int count, bool clearOutput)
+        {
+            EnsureCapacity(_size + count);
+
+            if (index < _size)
+            {
+                Array.Copy(_items, index, _items, index + count, _size - index);
+            }
+
+            _size += count;
+            _version++;
+
+            var output = _items.AsSpan(index, count);
+
+            if (clearOutput && _clearOnFree)
+            {
+                output.Clear();
+            }
+
+            return output;
+        }
+
+        /// <summary>
+        /// Returns the index of the last occurrence of a given value in a range of
+        /// this list. The list is searched backwards, starting at the end 
+        /// and ending at the first element in the list.
+        /// </summary>
+        public int LastIndexOf(T item)
+        {
+            if (_size == 0)
+            {  // Special case for empty list
+                return -1;
+            }
+            else
+            {
+                return LastIndexOf(item, _size - 1, _size);
+            }
+        }
+
+        /// <summary>
+        /// Returns the index of the last occurrence of a given value in a range of
+        /// this list. The list is searched backwards, starting at index
+        /// index and ending at the first element in the list.
+        /// </summary>
+        public int LastIndexOf(T item, int index)
+        {
+            if (index >= _size)
+                ThrowHelper.ThrowArgumentOutOfRange_IndexException();
+            return LastIndexOf(item, index, index + 1);
+        }
+
+        /// <summary>
+        /// Returns the index of the last occurrence of a given value in a range of
+        /// this list. The list is searched backwards, starting at index
+        /// index and upto count elements
+        /// </summary>
+        public int LastIndexOf(T item, int index, int count)
+        {
+            if (Count != 0 && index < 0)
+            {
+                ThrowHelper.ThrowIndexArgumentOutOfRange_NeedNonNegNumException();
+            }
+
+            if (Count != 0 && count < 0)
+            {
+                ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.count, ExceptionResource.ArgumentOutOfRange_NeedNonNegNum);
+            }
+
+            if (_size == 0)
+            {
+                // Special case for empty list
+                return -1;
+            }
+
+            if (index >= _size)
+            {
+                ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.index, ExceptionResource.ArgumentOutOfRange_BiggerThanCollection);
+            }
+
+            if (count > index + 1)
+            {
+                ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.count, ExceptionResource.ArgumentOutOfRange_BiggerThanCollection);
+            }
+
+            return Array.LastIndexOf(_items, item, index, count);
+        }
+
+        // Removes the element at the given index. The size of the list is
+        // decreased by one.
+        public bool Remove(T item)
+        {
+            int index = IndexOf(item);
+            if (index >= 0)
+            {
+                RemoveAt(index);
+                return true;
+            }
+
+            return false;
+        }
+
+        void IList.Remove(object item)
+        {
+            if (IsCompatibleObject(item))
+            {
+                Remove((T)item);
+            }
+        }
+
+        /// <summary>
+        /// This method removes all items which match the predicate.
+        /// The complexity is O(n).
+        /// </summary>
+        public int RemoveAll(Func<T, bool> match)
+        {
+            if (match == null)
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.match);
+
+            int freeIndex = 0;   // the first free slot in items array
+
+            // Find the first item which needs to be removed.
+            while (freeIndex < _size && !match(_items[freeIndex]))
+                freeIndex++;
+            if (freeIndex >= _size)
+                return 0;
+
+            int current = freeIndex + 1;
+            while (current < _size)
+            {
+                // Find the first item which needs to be kept.
+                while (current < _size && match(_items[current]))
+                    current++;
+
+                if (current < _size)
+                {
+                    // copy item to the free slot.
+                    _items[freeIndex++] = _items[current++];
+                }
+            }
+
+            if (_clearOnFree)
+            {
+                // Clear the removed elements so that the gc can reclaim the references.
+                Array.Clear(_items, freeIndex, _size - freeIndex);
+            }
+
+            int result = _size - freeIndex;
+            _size = freeIndex;
+            _version++;
+            return result;
+        }
+
+        /// <summary>
+        /// Removes the element at the given index. The size of the list is
+        /// decreased by one.
+        /// </summary>
+        public void RemoveAt(int index)
+        {
+            if ((uint)index >= (uint)_size)
+                ThrowHelper.ThrowArgumentOutOfRange_IndexException();
+
+            _size--;
+            if (index < _size)
+            {
+                Array.Copy(_items, index + 1, _items, index, _size - index);
+            }
+            _version++;
+
+            if (_clearOnFree)
+            {
+                // Clear the removed element so that the gc can reclaim the reference.
+                _items[_size] = default;
+            }
+        }
+
+        /// <summary>
+        /// Removes a range of elements from this list.
+        /// </summary>
+        public void RemoveRange(int index, int count)
+        {
+            if (index < 0)
+                ThrowHelper.ThrowIndexArgumentOutOfRange_NeedNonNegNumException();
+
+            if (count < 0)
+                ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.count, ExceptionResource.ArgumentOutOfRange_NeedNonNegNum);
+
+            if (_size - index < count)
+                ThrowHelper.ThrowArgumentException(ExceptionResource.Argument_InvalidOffLen);
+
+            if (count > 0)
+            {
+                _size -= count;
+                if (index < _size)
+                {
+                    Array.Copy(_items, index + count, _items, index, _size - index);
+                }
+
+                _version++;
+
+                if (_clearOnFree)
+                {
+                    // Clear the removed elements so that the gc can reclaim the references.
+                    Array.Clear(_items, _size, count);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Reverses the elements in this list.
+        /// </summary>
+        public void Reverse()
+            => Reverse(0, _size);
+
+        /// <summary>
+        /// Reverses the elements in a range of this list. Following a call to this
+        /// method, an element in the range given by index and count
+        /// which was previously located at index i will now be located at
+        /// index index + (index + count - i - 1).
+        /// </summary>
+        public void Reverse(int index, int count)
+        {
+            if (index < 0)
+                ThrowHelper.ThrowIndexArgumentOutOfRange_NeedNonNegNumException();
+
+            if (count < 0)
+                ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.count, ExceptionResource.ArgumentOutOfRange_NeedNonNegNum);
+
+            if (_size - index < count)
+                ThrowHelper.ThrowArgumentException(ExceptionResource.Argument_InvalidOffLen);
+
+            if (count > 1)
+            {
+                Array.Reverse(_items, index, count);
+            }
+            _version++;
+        }
+
+        /// <summary>
+        /// Sorts the elements in this list.  Uses the default comparer and 
+        /// Array.Sort.
+        /// </summary>
+        public void Sort()
+            => Sort(0, Count, null);
+
+        /// <summary>
+        /// Sorts the elements in this list.  Uses Array.Sort with the
+        /// provided comparer.
+        /// </summary>
+        /// <param name="comparer"></param>
+        public void Sort(IComparer<T> comparer)
+            => Sort(0, Count, comparer);
+
+        /// <summary>
+        /// Sorts the elements in a section of this list. The sort compares the
+        /// elements to each other using the given IComparer interface. If
+        /// comparer is null, the elements are compared to each other using
+        /// the IComparable interface, which in that case must be implemented by all
+        /// elements of the list.
+        /// 
+        /// This method uses the Array.Sort method to sort the elements.
+        /// </summary>
+        public void Sort(int index, int count, IComparer<T> comparer)
+        {
+            if (index < 0)
+                ThrowHelper.ThrowIndexArgumentOutOfRange_NeedNonNegNumException();
+
+            if (count < 0)
+                ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.count, ExceptionResource.ArgumentOutOfRange_NeedNonNegNum);
+
+            if (_size - index < count)
+                ThrowHelper.ThrowArgumentException(ExceptionResource.Argument_InvalidOffLen);
+
+            if (count > 1)
+            {
+                Array.Sort(_items, index, count, comparer);
+            }
+            _version++;
+        }
+
+        public void Sort(Func<T, T, int> comparison)
+        {
+            if (comparison == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.comparison);
+            }
+
+            if (_size > 1)
+            {
+                // List<T> uses ArraySortHelper here but since it's an internal class,
+                // we're creating an IComparer<T> using the comparison function to avoid
+                // duplicating all that code.
+                Array.Sort(_items, 0, _size, new Comparer(comparison));
+            }
+            _version++;
+        }
+
+        /// <summary>
+        /// ToArray returns an array containing the contents of the List.
+        /// This requires copying the List, which is an O(n) operation.
+        /// </summary>
+        public T[] ToArray()
+        {
+            if (_size == 0)
+            {
+                return s_emptyArray;
+            }
+
+            return Span.ToArray();
+        }
+
+        /// <summary>
+        /// Sets the capacity of this list to the size of the list. This method can
+        /// be used to minimize a list's memory overhead once it is known that no
+        /// new elements will be added to the list. To completely clear a list and
+        /// release all memory referenced by the list, execute the following
+        /// statements:
+        /// <code>
+        /// list.Clear();
+        /// list.TrimExcess();
+        /// </code>
+        /// </summary>
+        public void TrimExcess()
+        {
+            int threshold = (int)(_items.Length * 0.9);
+            if (_size < threshold)
+            {
+                Capacity = _size;
+            }
+        }
+
+        public bool TrueForAll(Func<T, bool> match)
+        {
+            if (match == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.match);
+            }
+
+            for (int i = 0; i < _size; i++)
+            {
+                if (!match(_items[i]))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private void ReturnArray()
+        {
+            if (_items.Length == 0)
+                return;
+
+            try
+            {
+                // Clear the elements so that the gc can reclaim the references.
+                _pool.Return(_items, clearArray: _clearOnFree);
+            }
+            catch (ArgumentException)
+            {
+                // oh well, the array pool didn't like our array
+            }
+
+            _items = s_emptyArray;
+        }
+
+        private static bool ShouldClear(ClearMode mode)
+        {
+#if NETCOREAPP2_1
+            return mode == ClearMode.Always
+                || (mode == ClearMode.Auto && RuntimeHelpers.IsReferenceOrContainsReferences<T>());
+#else
+            return mode != ClearMode.Never;
+#endif
+        }
+
+        /// <summary>
+        /// Returns the internal buffers to the ArrayPool.
+        /// </summary>
+        public void Dispose()
+        {
+            ReturnArray();
+            _size = 0;
+            _version++;
+        }
+
+        void IDeserializationCallback.OnDeserialization(object sender)
+        {
+            // We can't serialize array pools, so deserialized PooledLists will
+            // have to use the shared pool, even if they were using a custom pool
+            // before serialization.
+            _pool = ArrayPool<T>.Shared;
+        }
+
+        public struct Enumerator : IEnumerator<T>, IEnumerator
+        {
+            private readonly PooledList<T> _list;
+            private int _index;
+            private readonly int _version;
+            private T _current;
+
+            internal Enumerator(PooledList<T> list)
+            {
+                _list = list;
+                _index = 0;
+                _version = list._version;
+                _current = default;
+            }
+
+            public void Dispose()
+            {
+            }
+
+            public bool MoveNext()
+            {
+                var localList = _list;
+
+                if (_version == localList._version && ((uint)_index < (uint)localList._size))
+                {
+                    _current = localList._items[_index];
+                    _index++;
+                    return true;
+                }
+                return MoveNextRare();
+            }
+
+            private bool MoveNextRare()
+            {
+                if (_version != _list._version)
+                {
+                    ThrowHelper.ThrowInvalidOperationException_InvalidOperation_EnumFailedVersion();
+                }
+
+                _index = _list._size + 1;
+                _current = default;
+                return false;
+            }
+
+            public T Current => _current;
+
+            object IEnumerator.Current
+            {
+                get
+                {
+                    if (_index == 0 || _index == _list._size + 1)
+                    {
+                        ThrowHelper.ThrowInvalidOperationException_InvalidOperation_EnumOpCantHappen();
+                    }
+                    return Current;
+                }
+            }
+
+            void IEnumerator.Reset()
+            {
+                if (_version != _list._version)
+                {
+                    ThrowHelper.ThrowInvalidOperationException_InvalidOperation_EnumFailedVersion();
+                }
+
+                _index = 0;
+                _current = default;
+            }
+        }
+
+        private readonly struct Comparer : IComparer<T>
+        {
+            private readonly Func<T, T, int> _comparison;
+
+            public Comparer(Func<T, T, int> comparison)
+            {
+                _comparison = comparison;
+            }
+
+            public int Compare(T x, T y) => _comparison(x, y);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Collections/Pooled/PooledStack.cs b/src/Avalonia.Base/Collections/Pooled/PooledStack.cs
new file mode 100644
index 0000000000..104a7f97e9
--- /dev/null
+++ b/src/Avalonia.Base/Collections/Pooled/PooledStack.cs
@@ -0,0 +1,699 @@
+// 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.
+
+/*=============================================================================
+**
+**
+** Purpose: An array implementation of a generic stack.
+**
+**
+=============================================================================*/
+
+using System;
+using System.Buffers;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+using System.Runtime.Serialization;
+using System.Threading;
+
+namespace Avalonia.Collections.Pooled
+{
+    /// <summary>
+    /// A simple stack of objects.  Internally it is implemented as an array,
+    /// so Push can be O(n).  Pop is O(1).
+    /// </summary>
+    [DebuggerTypeProxy(typeof(StackDebugView<>))]
+    [DebuggerDisplay("Count = {Count}")]
+    [Serializable]
+    public class PooledStack<T> : IEnumerable<T>, ICollection, IReadOnlyCollection<T>, IDisposable, IDeserializationCallback
+    {
+        [NonSerialized]
+        private ArrayPool<T> _pool;
+        [NonSerialized]
+        private object _syncRoot;
+
+        private T[] _array; // Storage for stack elements. Do not rename (binary serialization)
+        private int _size; // Number of items in the stack. Do not rename (binary serialization)
+        private int _version; // Used to keep enumerator in sync w/ collection. Do not rename (binary serialization)
+        private readonly bool _clearOnFree;
+
+        private const int DefaultCapacity = 4;
+
+        #region Constructors
+
+        /// <summary>
+        /// Create a stack with the default initial capacity. 
+        /// </summary>
+        public PooledStack() : this(ClearMode.Auto, ArrayPool<T>.Shared) { }
+
+        /// <summary>
+        /// Create a stack with the default initial capacity. 
+        /// </summary>
+        public PooledStack(ClearMode clearMode) : this(clearMode, ArrayPool<T>.Shared) { }
+
+        /// <summary>
+        /// Create a stack with the default initial capacity. 
+        /// </summary>
+        public PooledStack(ArrayPool<T> customPool) : this(ClearMode.Auto, customPool) { }
+
+        /// <summary>
+        /// Create a stack with the default initial capacity and a custom ArrayPool.
+        /// </summary>
+        public PooledStack(ClearMode clearMode, ArrayPool<T> customPool)
+        {
+            _pool = customPool ?? ArrayPool<T>.Shared;
+            _array = Array.Empty<T>();
+            _clearOnFree = ShouldClear(clearMode);
+        }
+
+        /// <summary>
+        /// Create a stack with a specific initial capacity.  The initial capacity
+        /// must be a non-negative number.
+        /// </summary>
+        public PooledStack(int capacity) : this(capacity, ClearMode.Auto, ArrayPool<T>.Shared) { }
+
+        /// <summary>
+        /// Create a stack with a specific initial capacity.  The initial capacity
+        /// must be a non-negative number.
+        /// </summary>
+        public PooledStack(int capacity, ClearMode clearMode) : this(capacity, clearMode, ArrayPool<T>.Shared) { }
+
+        /// <summary>
+        /// Create a stack with a specific initial capacity.  The initial capacity
+        /// must be a non-negative number.
+        /// </summary>
+        public PooledStack(int capacity, ArrayPool<T> customPool) : this(capacity, ClearMode.Auto, customPool) { }
+
+        /// <summary>
+        /// Create a stack with a specific initial capacity.  The initial capacity
+        /// must be a non-negative number.
+        /// </summary>
+        public PooledStack(int capacity, ClearMode clearMode, ArrayPool<T> customPool)
+        {
+            if (capacity < 0)
+            {
+                ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.capacity,
+                    ExceptionResource.ArgumentOutOfRange_NeedNonNegNum);
+            }
+            _pool = customPool ?? ArrayPool<T>.Shared;
+            _array = _pool.Rent(capacity);
+            _clearOnFree = ShouldClear(clearMode);
+        }
+
+        /// <summary>
+        /// Fills a Stack with the contents of a particular collection.  The items are
+        /// pushed onto the stack in the same order they are read by the enumerator.
+        /// </summary>
+        public PooledStack(IEnumerable<T> enumerable) : this(enumerable, ClearMode.Auto, ArrayPool<T>.Shared) { }
+
+        /// <summary>
+        /// Fills a Stack with the contents of a particular collection.  The items are
+        /// pushed onto the stack in the same order they are read by the enumerator.
+        /// </summary>
+        public PooledStack(IEnumerable<T> enumerable, ClearMode clearMode) : this(enumerable, clearMode, ArrayPool<T>.Shared) { }
+
+        /// <summary>
+        /// Fills a Stack with the contents of a particular collection.  The items are
+        /// pushed onto the stack in the same order they are read by the enumerator.
+        /// </summary>
+        public PooledStack(IEnumerable<T> enumerable, ArrayPool<T> customPool) : this(enumerable, ClearMode.Auto, customPool) { }
+
+        /// <summary>
+        /// Fills a Stack with the contents of a particular collection.  The items are
+        /// pushed onto the stack in the same order they are read by the enumerator.
+        /// </summary>
+        public PooledStack(IEnumerable<T> enumerable, ClearMode clearMode, ArrayPool<T> customPool)
+        {
+            _pool = customPool ?? ArrayPool<T>.Shared;
+            _clearOnFree = ShouldClear(clearMode);
+
+            switch (enumerable)
+            {
+                case null:
+                    ThrowHelper.ThrowArgumentNullException(ExceptionArgument.enumerable);
+                    break;
+
+                case ICollection<T> collection:
+                    if (collection.Count == 0)
+                    {
+                        _array = Array.Empty<T>();
+                    }
+                    else
+                    {
+                        _array = _pool.Rent(collection.Count);
+                        collection.CopyTo(_array, 0);
+                        _size = collection.Count;
+                    }
+                    break;
+
+                default:
+                    using (var list = new PooledList<T>(enumerable))
+                    {
+                        _array = _pool.Rent(list.Count);
+                        list.Span.CopyTo(_array);
+                        _size = list.Count;
+                    }
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Fills a Stack with the contents of a particular collection.  The items are
+        /// pushed onto the stack in the same order they are read by the enumerator.
+        /// </summary>
+        public PooledStack(T[] array) : this(array.AsSpan(), ClearMode.Auto, ArrayPool<T>.Shared) { }
+
+        /// <summary>
+        /// Fills a Stack with the contents of a particular collection.  The items are
+        /// pushed onto the stack in the same order they are read by the enumerator.
+        /// </summary>
+        public PooledStack(T[] array, ClearMode clearMode) : this(array.AsSpan(), clearMode, ArrayPool<T>.Shared) { }
+
+        /// <summary>
+        /// Fills a Stack with the contents of a particular collection.  The items are
+        /// pushed onto the stack in the same order they are read by the enumerator.
+        /// </summary>
+        public PooledStack(T[] array, ArrayPool<T> customPool) : this(array.AsSpan(), ClearMode.Auto, customPool) { }
+
+        /// <summary>
+        /// Fills a Stack with the contents of a particular collection.  The items are
+        /// pushed onto the stack in the same order they are read by the enumerator.
+        /// </summary>
+        public PooledStack(T[] array, ClearMode clearMode, ArrayPool<T> customPool) : this(array.AsSpan(), clearMode, customPool) { }
+
+        /// <summary>
+        /// Fills a Stack with the contents of a particular collection.  The items are
+        /// pushed onto the stack in the same order they are read by the enumerator.
+        /// </summary>
+        public PooledStack(ReadOnlySpan<T> span) : this(span, ClearMode.Auto, ArrayPool<T>.Shared) { }
+
+        /// <summary>
+        /// Fills a Stack with the contents of a particular collection.  The items are
+        /// pushed onto the stack in the same order they are read by the enumerator.
+        /// </summary>
+        public PooledStack(ReadOnlySpan<T> span, ClearMode clearMode) : this(span, clearMode, ArrayPool<T>.Shared) { }
+
+        /// <summary>
+        /// Fills a Stack with the contents of a particular collection.  The items are
+        /// pushed onto the stack in the same order they are read by the enumerator.
+        /// </summary>
+        public PooledStack(ReadOnlySpan<T> span, ArrayPool<T> customPool) : this(span, ClearMode.Auto, customPool) { }
+
+        /// <summary>
+        /// Fills a Stack with the contents of a particular collection.  The items are
+        /// pushed onto the stack in the same order they are read by the enumerator.
+        /// </summary>
+        public PooledStack(ReadOnlySpan<T> span, ClearMode clearMode, ArrayPool<T> customPool)
+        {
+            _pool = customPool ?? ArrayPool<T>.Shared;
+            _clearOnFree = ShouldClear(clearMode);
+            _array = _pool.Rent(span.Length);
+            span.CopyTo(_array);
+            _size = span.Length;
+        }
+
+        #endregion
+
+        /// <summary>
+        /// The number of items in the stack.
+        /// </summary>
+        public int Count => _size;
+
+        /// <summary>
+        /// Returns the ClearMode behavior for the collection, denoting whether values are
+        /// cleared from internal arrays before returning them to the pool.
+        /// </summary>
+        public ClearMode ClearMode => _clearOnFree ? ClearMode.Always : ClearMode.Never;
+
+        bool ICollection.IsSynchronized => false;
+
+        object ICollection.SyncRoot
+        {
+            get
+            {
+                if (_syncRoot == null)
+                {
+                    Interlocked.CompareExchange<object>(ref _syncRoot, new object(), null);
+                }
+                return _syncRoot;
+            }
+        }
+
+        /// <summary>
+        /// Removes all Objects from the Stack.
+        /// </summary>
+        public void Clear()
+        {
+            if (_clearOnFree)
+            {
+                Array.Clear(_array, 0, _size); // clear the elements so that the gc can reclaim the references.
+            }
+            _size = 0;
+            _version++;
+        }
+
+        /// <summary>
+        /// Compares items using the default equality comparer
+        /// </summary>
+        public bool Contains(T item)
+        {
+            // PERF: Internally Array.LastIndexOf calls
+            // EqualityComparer<T>.Default.LastIndexOf, which
+            // is specialized for different types. This
+            // boosts performance since instead of making a
+            // virtual method call each iteration of the loop,
+            // via EqualityComparer<T>.Default.Equals, we
+            // only make one virtual call to EqualityComparer.LastIndexOf.
+
+            return _size != 0 && Array.LastIndexOf(_array, item, _size - 1) != -1;
+        }
+
+        /// <summary>
+        /// This method removes all items which match the predicate.
+        /// The complexity is O(n).
+        /// </summary>
+        public int RemoveWhere(Func<T, bool> match)
+        {
+            if (match == null)
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.match);
+
+            int freeIndex = 0;   // the first free slot in items array
+
+            // Find the first item which needs to be removed.
+            while (freeIndex < _size && !match(_array[freeIndex]))
+                freeIndex++;
+            if (freeIndex >= _size)
+                return 0;
+
+            int current = freeIndex + 1;
+            while (current < _size)
+            {
+                // Find the first item which needs to be kept.
+                while (current < _size && match(_array[current]))
+                    current++;
+
+                if (current < _size)
+                {
+                    // copy item to the free slot.
+                    _array[freeIndex++] = _array[current++];
+                }
+            }
+
+            if (_clearOnFree)
+            {
+                // Clear the removed elements so that the gc can reclaim the references.
+                Array.Clear(_array, freeIndex, _size - freeIndex);
+            }
+
+            int result = _size - freeIndex;
+            _size = freeIndex;
+            _version++;
+            return result;
+        }
+
+        // Copies the stack into an array.
+        public void CopyTo(T[] array, int arrayIndex)
+        {
+            if (array == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array);
+            }
+
+            if (arrayIndex < 0 || arrayIndex > array.Length)
+            {
+                ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.arrayIndex);
+            }
+
+            if (array.Length - arrayIndex < _size)
+            {
+                ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_ArrayPlusOffTooSmall);
+            }
+
+            Debug.Assert(array != _array);
+            int srcIndex = 0;
+            int dstIndex = arrayIndex + _size;
+            while (srcIndex < _size)
+            {
+                array[--dstIndex] = _array[srcIndex++];
+            }
+        }
+
+        public void CopyTo(Span<T> span)
+        {
+            if (span.Length < _size)
+            {
+                ThrowHelper.ThrowArgumentException_DestinationTooShort();
+            }
+
+            int srcIndex = 0;
+            int dstIndex = _size;
+            while (srcIndex < _size)
+            {
+                span[--dstIndex] = _array[srcIndex++];
+            }
+        }
+
+        void ICollection.CopyTo(Array array, int arrayIndex)
+        {
+            if (array == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array);
+            }
+
+            if (array.Rank != 1)
+            {
+                ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_RankMultiDimNotSupported);
+            }
+
+            if (array.GetLowerBound(0) != 0)
+            {
+                ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_NonZeroLowerBound, ExceptionArgument.array);
+            }
+
+            if (arrayIndex < 0 || arrayIndex > array.Length)
+            {
+                ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.arrayIndex);
+            }
+
+            if (array.Length - arrayIndex < _size)
+            {
+                ThrowHelper.ThrowArgumentException(ExceptionResource.Argument_InvalidOffLen);
+            }
+
+            try
+            {
+                Array.Copy(_array, 0, array, arrayIndex, _size);
+                Array.Reverse(array, arrayIndex, _size);
+            }
+            catch (ArrayTypeMismatchException)
+            {
+                ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
+            }
+        }
+
+        /// <summary>
+        /// Returns an IEnumerator for this PooledStack.
+        /// </summary>
+        /// <returns></returns>
+        public Enumerator GetEnumerator()
+            => new Enumerator(this);
+
+        /// <internalonly/>
+        IEnumerator<T> IEnumerable<T>.GetEnumerator()
+            => new Enumerator(this);
+
+        IEnumerator IEnumerable.GetEnumerator()
+            => new Enumerator(this);
+
+        public void TrimExcess()
+        {
+            if (_size == 0)
+            {
+                ReturnArray(replaceWith: Array.Empty<T>());
+                _version++;
+                return;
+            }
+
+            int threshold = (int)(_array.Length * 0.9);
+            if (_size < threshold)
+            {
+                var newArray = _pool.Rent(_size);
+                if (newArray.Length < _array.Length)
+                {
+                    Array.Copy(_array, newArray, _size);
+                    ReturnArray(replaceWith: newArray);
+                    _version++;
+                }
+                else
+                {
+                    // The array from the pool wasn't any smaller than the one we already had,
+                    // (we can only control minimum size) so return it and do nothing.
+                    // If we create an exact-sized array not from the pool, we'll
+                    // get an exception when returning it to the pool.
+                    _pool.Return(newArray);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the top object on the stack without removing it.  If the stack
+        /// is empty, Peek throws an InvalidOperationException.
+        /// </summary>
+        public T Peek()
+        {
+            int size = _size - 1;
+            T[] array = _array;
+
+            if ((uint)size >= (uint)array.Length)
+            {
+                ThrowForEmptyStack();
+            }
+
+            return array[size];
+        }
+
+        public bool TryPeek(out T result)
+        {
+            int size = _size - 1;
+            T[] array = _array;
+
+            if ((uint)size >= (uint)array.Length)
+            {
+                result = default;
+                return false;
+            }
+            result = array[size];
+            return true;
+        }
+
+        /// <summary>
+        /// Pops an item from the top of the stack.  If the stack is empty, Pop
+        /// throws an InvalidOperationException.
+        /// </summary>
+        public T Pop()
+        {
+            int size = _size - 1;
+            T[] array = _array;
+
+            // if (_size == 0) is equivalent to if (size == -1), and this case
+            // is covered with (uint)size, thus allowing bounds check elimination 
+            // https://github.com/dotnet/coreclr/pull/9773
+            if ((uint)size >= (uint)array.Length)
+            {
+                ThrowForEmptyStack();
+            }
+
+            _version++;
+            _size = size;
+            T item = array[size];
+            if (_clearOnFree)
+            {
+                array[size] = default;     // Free memory quicker.
+            }
+            return item;
+        }
+
+        public bool TryPop(out T result)
+        {
+            int size = _size - 1;
+            T[] array = _array;
+
+            if ((uint)size >= (uint)array.Length)
+            {
+                result = default;
+                return false;
+            }
+
+            _version++;
+            _size = size;
+            result = array[size];
+            if (_clearOnFree)
+            {
+                array[size] = default;     // Free memory quicker.
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Pushes an item to the top of the stack.
+        /// </summary>
+        public void Push(T item)
+        {
+            int size = _size;
+            T[] array = _array;
+
+            if ((uint)size < (uint)array.Length)
+            {
+                array[size] = item;
+                _version++;
+                _size = size + 1;
+            }
+            else
+            {
+                PushWithResize(item);
+            }
+        }
+
+        // Non-inline from Stack.Push to improve its code quality as uncommon path
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private void PushWithResize(T item)
+        {
+            var newArray = _pool.Rent((_array.Length == 0) ? DefaultCapacity : 2 * _array.Length);
+            Array.Copy(_array, newArray, _size);
+            ReturnArray(replaceWith: newArray);
+            _array[_size] = item;
+            _version++;
+            _size++;
+        }
+
+        /// <summary>
+        /// Copies the Stack to an array, in the same order Pop would return the items.
+        /// </summary>
+        public T[] ToArray()
+        {
+            if (_size == 0)
+                return Array.Empty<T>();
+
+            T[] objArray = new T[_size];
+            int i = 0;
+            while (i < _size)
+            {
+                objArray[i] = _array[_size - i - 1];
+                i++;
+            }
+            return objArray;
+        }
+
+        private void ThrowForEmptyStack()
+        {
+            Debug.Assert(_size == 0);
+            throw new InvalidOperationException("Stack was empty.");
+        }
+
+        private void ReturnArray(T[] replaceWith = null)
+        {
+            if (_array?.Length > 0)
+            {
+                try
+                {
+                    _pool.Return(_array, clearArray: _clearOnFree);
+                }
+                catch (ArgumentException)
+                {
+                    // oh well, the array pool didn't like our array
+                }
+            }
+
+            if (!(replaceWith is null))
+            {
+                _array = replaceWith;
+            }
+        }
+
+        private static bool ShouldClear(ClearMode mode)
+        {
+#if NETCOREAPP2_1
+            return mode == ClearMode.Always
+                || (mode == ClearMode.Auto && RuntimeHelpers.IsReferenceOrContainsReferences<T>());
+#else
+            return mode != ClearMode.Never;
+#endif
+        }
+
+        public void Dispose()
+        {
+            ReturnArray(replaceWith: Array.Empty<T>());
+            _size = 0;
+            _version++;
+        }
+
+        void IDeserializationCallback.OnDeserialization(object sender)
+        {
+            // We can't serialize array pools, so deserialized PooledStacks will
+            // have to use the shared pool, even if they were using a custom pool
+            // before serialization.
+            _pool = ArrayPool<T>.Shared;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1815:OverrideEqualsAndOperatorEqualsOnValueTypes", Justification = "not an expected scenario")]
+        public struct Enumerator : IEnumerator<T>, IEnumerator
+        {
+            private readonly PooledStack<T> _stack;
+            private readonly int _version;
+            private int _index;
+            private T _currentElement;
+
+            internal Enumerator(PooledStack<T> stack)
+            {
+                _stack = stack;
+                _version = stack._version;
+                _index = -2;
+                _currentElement = default;
+            }
+
+            public void Dispose()
+            {
+                _index = -1;
+            }
+
+            public bool MoveNext()
+            {
+                bool retval;
+                if (_version != _stack._version)
+                    throw new InvalidOperationException("Collection was modified during enumeration.");
+                if (_index == -2)
+                {  // First call to enumerator.
+                    _index = _stack._size - 1;
+                    retval = (_index >= 0);
+                    if (retval)
+                        _currentElement = _stack._array[_index];
+                    return retval;
+                }
+                if (_index == -1)
+                {  // End of enumeration.
+                    return false;
+                }
+
+                retval = (--_index >= 0);
+                if (retval)
+                    _currentElement = _stack._array[_index];
+                else
+                    _currentElement = default;
+                return retval;
+            }
+
+            public T Current
+            {
+                get
+                {
+                    if (_index < 0)
+                        ThrowEnumerationNotStartedOrEnded();
+                    return _currentElement;
+                }
+            }
+
+            private void ThrowEnumerationNotStartedOrEnded()
+            {
+                Debug.Assert(_index == -1 || _index == -2);
+                throw new InvalidOperationException(_index == -2 ? "Enumeration was not started." : "Enumeration has ended.");
+            }
+
+            object IEnumerator.Current
+            {
+                get { return Current; }
+            }
+
+            void IEnumerator.Reset()
+            {
+                if (_version != _stack._version)
+                    throw new InvalidOperationException("Collection was modified during enumeration.");
+                _index = -2;
+                _currentElement = default;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Collections/Pooled/StackDebugView.cs b/src/Avalonia.Base/Collections/Pooled/StackDebugView.cs
new file mode 100644
index 0000000000..b042388079
--- /dev/null
+++ b/src/Avalonia.Base/Collections/Pooled/StackDebugView.cs
@@ -0,0 +1,28 @@
+// 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 System;
+using System.Diagnostics;
+
+namespace Avalonia.Collections.Pooled
+{
+    internal sealed class StackDebugView<T>
+    {
+        private readonly PooledStack<T> _stack;
+
+        public StackDebugView(PooledStack<T> stack)
+        {
+            _stack = stack ?? throw new ArgumentNullException(nameof(stack));
+        }
+
+        [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
+        public T[] Items
+        {
+            get
+            {
+                return _stack.ToArray();
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Collections/Pooled/ThrowHelper.cs b/src/Avalonia.Base/Collections/Pooled/ThrowHelper.cs
new file mode 100644
index 0000000000..74558229c3
--- /dev/null
+++ b/src/Avalonia.Base/Collections/Pooled/ThrowHelper.cs
@@ -0,0 +1,691 @@
+// 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.
+
+
+// This file defines an internal class used to throw exceptions in BCL code.
+// The main purpose is to reduce code size.
+//
+// The old way to throw an exception generates quite a lot IL code and assembly code.
+// Following is an example:
+//     C# source
+//          throw new ArgumentNullException(nameof(key), SR.ArgumentNull_Key);
+//     IL code:
+//          IL_0003:  ldstr      "key"
+//          IL_0008:  ldstr      "ArgumentNull_Key"
+//          IL_000d:  call       string System.Environment::GetResourceString(string)
+//          IL_0012:  newobj     instance void System.ArgumentNullException::.ctor(string,string)
+//          IL_0017:  throw
+//    which is 21bytes in IL.
+//
+// So we want to get rid of the ldstr and call to Environment.GetResource in IL.
+// In order to do that, I created two enums: ExceptionResource, ExceptionArgument to represent the
+// argument name and resource name in a small integer. The source code will be changed to
+//    ThrowHelper.ThrowArgumentNullException(ExceptionArgument.key, ExceptionResource.ArgumentNull_Key);
+//
+// The IL code will be 7 bytes.
+//    IL_0008:  ldc.i4.4
+//    IL_0009:  ldc.i4.4
+//    IL_000a:  call       void System.ThrowHelper::ThrowArgumentNullException(valuetype System.ExceptionArgument)
+//    IL_000f:  ldarg.0
+//
+// This will also reduce the Jitted code size a lot.
+//
+// It is very important we do this for generic classes because we can easily generate the same code
+// multiple times for different instantiation.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Runtime.Serialization;
+
+namespace Avalonia.Collections.Pooled
+{
+    internal static class ThrowHelper
+    {
+        internal static void ThrowArrayTypeMismatchException()
+        {
+            throw new ArrayTypeMismatchException();
+        }
+
+        internal static void ThrowIndexOutOfRangeException()
+        {
+            throw new IndexOutOfRangeException();
+        }
+
+        internal static void ThrowArgumentOutOfRangeException()
+        {
+            throw new ArgumentOutOfRangeException();
+        }
+
+        internal static void ThrowArgumentException_DestinationTooShort()
+        {
+            throw new ArgumentException("Destination too short.");
+        }
+
+        internal static void ThrowArgumentException_OverlapAlignmentMismatch()
+        {
+            throw new ArgumentException("Overlap alignment mismatch.");
+        }
+
+        internal static void ThrowArgumentOutOfRange_IndexException()
+        {
+            throw GetArgumentOutOfRangeException(ExceptionArgument.index,
+                                                    ExceptionResource.ArgumentOutOfRange_Index);
+        }
+
+        internal static void ThrowIndexArgumentOutOfRange_NeedNonNegNumException()
+        {
+            throw GetArgumentOutOfRangeException(ExceptionArgument.index,
+                                                    ExceptionResource.ArgumentOutOfRange_NeedNonNegNum);
+        }
+
+        internal static void ThrowValueArgumentOutOfRange_NeedNonNegNumException()
+        {
+            throw GetArgumentOutOfRangeException(ExceptionArgument.value,
+                                                    ExceptionResource.ArgumentOutOfRange_NeedNonNegNum);
+        }
+
+        internal static void ThrowLengthArgumentOutOfRange_ArgumentOutOfRange_NeedNonNegNum()
+        {
+            throw GetArgumentOutOfRangeException(ExceptionArgument.length,
+                                                    ExceptionResource.ArgumentOutOfRange_NeedNonNegNum);
+        }
+
+        internal static void ThrowStartIndexArgumentOutOfRange_ArgumentOutOfRange_Index()
+        {
+            throw GetArgumentOutOfRangeException(ExceptionArgument.startIndex,
+                                                    ExceptionResource.ArgumentOutOfRange_Index);
+        }
+
+        internal static void ThrowCountArgumentOutOfRange_ArgumentOutOfRange_Count()
+        {
+            throw GetArgumentOutOfRangeException(ExceptionArgument.count,
+                                                    ExceptionResource.ArgumentOutOfRange_Count);
+        }
+
+        internal static void ThrowWrongKeyTypeArgumentException<T>(T key, Type targetType)
+        {
+            // Generic key to move the boxing to the right hand side of throw
+            throw GetWrongKeyTypeArgumentException((object)key, targetType);
+        }
+
+        internal static void ThrowWrongValueTypeArgumentException<T>(T value, Type targetType)
+        {
+            // Generic key to move the boxing to the right hand side of throw
+            throw GetWrongValueTypeArgumentException((object)value, targetType);
+        }
+
+        private static ArgumentException GetAddingDuplicateWithKeyArgumentException(object key)
+        {
+            return new ArgumentException($"Error adding duplicate with key: {key}.");
+        }
+
+        internal static void ThrowAddingDuplicateWithKeyArgumentException<T>(T key)
+        {
+            // Generic key to move the boxing to the right hand side of throw
+            throw GetAddingDuplicateWithKeyArgumentException((object)key);
+        }
+
+        internal static void ThrowKeyNotFoundException<T>(T key)
+        {
+            // Generic key to move the boxing to the right hand side of throw
+            throw GetKeyNotFoundException((object)key);
+        }
+
+        internal static void ThrowArgumentException(ExceptionResource resource)
+        {
+            throw GetArgumentException(resource);
+        }
+
+        internal static void ThrowArgumentException(ExceptionResource resource, ExceptionArgument argument)
+        {
+            throw GetArgumentException(resource, argument);
+        }
+
+        private static ArgumentNullException GetArgumentNullException(ExceptionArgument argument)
+        {
+            return new ArgumentNullException(GetArgumentName(argument));
+        }
+
+        internal static void ThrowArgumentNullException(ExceptionArgument argument)
+        {
+            throw GetArgumentNullException(argument);
+        }
+
+        internal static void ThrowArgumentNullException(ExceptionResource resource)
+        {
+            throw new ArgumentNullException(GetResourceString(resource));
+        }
+
+        internal static void ThrowArgumentNullException(ExceptionArgument argument, ExceptionResource resource)
+        {
+            throw new ArgumentNullException(GetArgumentName(argument), GetResourceString(resource));
+        }
+
+        internal static void ThrowArgumentOutOfRangeException(ExceptionArgument argument)
+        {
+            throw new ArgumentOutOfRangeException(GetArgumentName(argument));
+        }
+
+        internal static void ThrowArgumentOutOfRangeException(ExceptionArgument argument, ExceptionResource resource)
+        {
+            throw GetArgumentOutOfRangeException(argument, resource);
+        }
+
+        internal static void ThrowArgumentOutOfRangeException(ExceptionArgument argument, int paramNumber, ExceptionResource resource)
+        {
+            throw GetArgumentOutOfRangeException(argument, paramNumber, resource);
+        }
+
+        internal static void ThrowInvalidOperationException(ExceptionResource resource)
+        {
+            throw GetInvalidOperationException(resource);
+        }
+
+        internal static void ThrowInvalidOperationException(ExceptionResource resource, Exception e)
+        {
+            throw new InvalidOperationException(GetResourceString(resource), e);
+        }
+
+        internal static void ThrowSerializationException(ExceptionResource resource)
+        {
+            throw new SerializationException(GetResourceString(resource));
+        }
+
+        internal static void ThrowSecurityException(ExceptionResource resource)
+        {
+            throw new System.Security.SecurityException(GetResourceString(resource));
+        }
+
+        internal static void ThrowRankException(ExceptionResource resource)
+        {
+            throw new RankException(GetResourceString(resource));
+        }
+
+        internal static void ThrowNotSupportedException(ExceptionResource resource)
+        {
+            throw new NotSupportedException(GetResourceString(resource));
+        }
+
+        internal static void ThrowUnauthorizedAccessException(ExceptionResource resource)
+        {
+            throw new UnauthorizedAccessException(GetResourceString(resource));
+        }
+
+        internal static void ThrowObjectDisposedException(string objectName, ExceptionResource resource)
+        {
+            throw new ObjectDisposedException(objectName, GetResourceString(resource));
+        }
+
+        internal static void ThrowObjectDisposedException(ExceptionResource resource)
+        {
+            throw new ObjectDisposedException(null, GetResourceString(resource));
+        }
+
+        internal static void ThrowNotSupportedException()
+        {
+            throw new NotSupportedException();
+        }
+
+        internal static void ThrowAggregateException(List<Exception> exceptions)
+        {
+            throw new AggregateException(exceptions);
+        }
+
+        internal static void ThrowOutOfMemoryException()
+        {
+            throw new OutOfMemoryException();
+        }
+
+        internal static void ThrowArgumentException_Argument_InvalidArrayType()
+        {
+            throw new ArgumentException("Invalid array type.");
+        }
+
+        internal static void ThrowInvalidOperationException_InvalidOperation_EnumNotStarted()
+        {
+            throw new InvalidOperationException("Enumeration has not started.");
+        }
+
+        internal static void ThrowInvalidOperationException_InvalidOperation_EnumEnded()
+        {
+            throw new InvalidOperationException("Enumeration has ended.");
+        }
+
+        internal static void ThrowInvalidOperationException_EnumCurrent(int index)
+        {
+            throw GetInvalidOperationException_EnumCurrent(index);
+        }
+
+        internal static void ThrowInvalidOperationException_InvalidOperation_EnumFailedVersion()
+        {
+            throw new InvalidOperationException("Collection was modified during enumeration.");
+        }
+
+        internal static void ThrowInvalidOperationException_InvalidOperation_EnumOpCantHappen()
+        {
+            throw new InvalidOperationException("Invalid enumerator state: enumeration cannot proceed.");
+        }
+
+        internal static void ThrowInvalidOperationException_InvalidOperation_NoValue()
+        {
+            throw new InvalidOperationException("No value provided.");
+        }
+
+        internal static void ThrowInvalidOperationException_ConcurrentOperationsNotSupported()
+        {
+            throw new InvalidOperationException("Concurrent operations are not supported.");
+        }
+
+        internal static void ThrowInvalidOperationException_HandleIsNotInitialized()
+        {
+            throw new InvalidOperationException("Handle is not initialized.");
+        }
+
+        internal static void ThrowFormatException_BadFormatSpecifier()
+        {
+            throw new FormatException("Bad format specifier.");
+        }
+
+        private static ArgumentException GetArgumentException(ExceptionResource resource)
+        {
+            return new ArgumentException(GetResourceString(resource));
+        }
+
+        private static InvalidOperationException GetInvalidOperationException(ExceptionResource resource)
+        {
+            return new InvalidOperationException(GetResourceString(resource));
+        }
+
+        private static ArgumentException GetWrongKeyTypeArgumentException(object key, Type targetType)
+        {
+            return new ArgumentException($"Wrong key type. Expected {targetType}, got: '{key}'.", nameof(key));
+        }
+
+        private static ArgumentException GetWrongValueTypeArgumentException(object value, Type targetType)
+        {
+            return new ArgumentException($"Wrong value type. Expected {targetType}, got: '{value}'.", nameof(value));
+        }
+
+        private static KeyNotFoundException GetKeyNotFoundException(object key)
+        {
+            return new KeyNotFoundException($"Key not found: {key}");
+        }
+
+        private static ArgumentOutOfRangeException GetArgumentOutOfRangeException(ExceptionArgument argument, ExceptionResource resource)
+        {
+            return new ArgumentOutOfRangeException(GetArgumentName(argument), GetResourceString(resource));
+        }
+
+        private static ArgumentException GetArgumentException(ExceptionResource resource, ExceptionArgument argument)
+        {
+            return new ArgumentException(GetResourceString(resource), GetArgumentName(argument));
+        }
+
+        private static ArgumentOutOfRangeException GetArgumentOutOfRangeException(ExceptionArgument argument, int paramNumber, ExceptionResource resource)
+        {
+            return new ArgumentOutOfRangeException(GetArgumentName(argument) + "[" + paramNumber.ToString() + "]", GetResourceString(resource));
+        }
+
+        private static InvalidOperationException GetInvalidOperationException_EnumCurrent(int index)
+        {
+            return new InvalidOperationException(
+                index < 0 ?
+                "Enumeration has not started" :
+                "Enumeration has ended");
+        }
+
+        // Allow nulls for reference types and Nullable<U>, but not for value types.
+        // Aggressively inline so the jit evaluates the if in place and either drops the call altogether
+        // Or just leaves null test and call to the Non-returning ThrowHelper.ThrowArgumentNullException
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static void IfNullAndNullsAreIllegalThenThrow<T>(object value, ExceptionArgument argName)
+        {
+            // Note that default(T) is not equal to null for value types except when T is Nullable<U>.
+            if (!(default(T) == null) && value == null)
+                ThrowHelper.ThrowArgumentNullException(argName);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static void ThrowForUnsupportedVectorBaseType<T>() where T : struct
+        {
+            if (typeof(T) != typeof(byte) && typeof(T) != typeof(sbyte) &&
+                typeof(T) != typeof(short) && typeof(T) != typeof(ushort) &&
+                typeof(T) != typeof(int) && typeof(T) != typeof(uint) &&
+                typeof(T) != typeof(long) && typeof(T) != typeof(ulong) &&
+                typeof(T) != typeof(float) && typeof(T) != typeof(double))
+            {
+                ThrowNotSupportedException(ExceptionResource.Arg_TypeNotSupported);
+            }
+        }
+
+#if false // Reflection-based implementation does not work for CoreRT/ProjectN
+        // This function will convert an ExceptionArgument enum value to the argument name string.
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static string GetArgumentName(ExceptionArgument argument)
+        {
+            Debug.Assert(Enum.IsDefined(typeof(ExceptionArgument), argument),
+                "The enum value is not defined, please check the ExceptionArgument Enum.");
+
+            return argument.ToString();
+        }
+#endif
+
+        private static string GetArgumentName(ExceptionArgument argument)
+        {
+            switch (argument)
+            {
+                case ExceptionArgument.obj:
+                    return "obj";
+                case ExceptionArgument.dictionary:
+                    return "dictionary";
+                case ExceptionArgument.array:
+                    return "array";
+                case ExceptionArgument.info:
+                    return "info";
+                case ExceptionArgument.key:
+                    return "key";
+                case ExceptionArgument.text:
+                    return "text";
+                case ExceptionArgument.values:
+                    return "values";
+                case ExceptionArgument.value:
+                    return "value";
+                case ExceptionArgument.startIndex:
+                    return "startIndex";
+                case ExceptionArgument.task:
+                    return "task";
+                case ExceptionArgument.ch:
+                    return "ch";
+                case ExceptionArgument.s:
+                    return "s";
+                case ExceptionArgument.input:
+                    return "input";
+                case ExceptionArgument.list:
+                    return "list";
+                case ExceptionArgument.index:
+                    return "index";
+                case ExceptionArgument.capacity:
+                    return "capacity";
+                case ExceptionArgument.collection:
+                    return "collection";
+                case ExceptionArgument.item:
+                    return "item";
+                case ExceptionArgument.converter:
+                    return "converter";
+                case ExceptionArgument.match:
+                    return "match";
+                case ExceptionArgument.count:
+                    return "count";
+                case ExceptionArgument.action:
+                    return "action";
+                case ExceptionArgument.comparison:
+                    return "comparison";
+                case ExceptionArgument.exceptions:
+                    return "exceptions";
+                case ExceptionArgument.exception:
+                    return "exception";
+                case ExceptionArgument.enumerable:
+                    return "enumerable";
+                case ExceptionArgument.start:
+                    return "start";
+                case ExceptionArgument.format:
+                    return "format";
+                case ExceptionArgument.culture:
+                    return "culture";
+                case ExceptionArgument.comparer:
+                    return "comparer";
+                case ExceptionArgument.comparable:
+                    return "comparable";
+                case ExceptionArgument.source:
+                    return "source";
+                case ExceptionArgument.state:
+                    return "state";
+                case ExceptionArgument.length:
+                    return "length";
+                case ExceptionArgument.comparisonType:
+                    return "comparisonType";
+                case ExceptionArgument.manager:
+                    return "manager";
+                case ExceptionArgument.sourceBytesToCopy:
+                    return "sourceBytesToCopy";
+                case ExceptionArgument.callBack:
+                    return "callBack";
+                case ExceptionArgument.creationOptions:
+                    return "creationOptions";
+                case ExceptionArgument.function:
+                    return "function";
+                case ExceptionArgument.delay:
+                    return "delay";
+                case ExceptionArgument.millisecondsDelay:
+                    return "millisecondsDelay";
+                case ExceptionArgument.millisecondsTimeout:
+                    return "millisecondsTimeout";
+                case ExceptionArgument.timeout:
+                    return "timeout";
+                case ExceptionArgument.type:
+                    return "type";
+                case ExceptionArgument.sourceIndex:
+                    return "sourceIndex";
+                case ExceptionArgument.sourceArray:
+                    return "sourceArray";
+                case ExceptionArgument.destinationIndex:
+                    return "destinationIndex";
+                case ExceptionArgument.destinationArray:
+                    return "destinationArray";
+                case ExceptionArgument.other:
+                    return "other";
+                case ExceptionArgument.newSize:
+                    return "newSize";
+                case ExceptionArgument.lowerBounds:
+                    return "lowerBounds";
+                case ExceptionArgument.lengths:
+                    return "lengths";
+                case ExceptionArgument.len:
+                    return "len";
+                case ExceptionArgument.keys:
+                    return "keys";
+                case ExceptionArgument.indices:
+                    return "indices";
+                case ExceptionArgument.endIndex:
+                    return "endIndex";
+                case ExceptionArgument.elementType:
+                    return "elementType";
+                case ExceptionArgument.arrayIndex:
+                    return "arrayIndex";
+                default:
+                    Debug.Fail("The enum value is not defined, please check the ExceptionArgument Enum.");
+                    return argument.ToString();
+            }
+        }
+
+#if false // Reflection-based implementation does not work for CoreRT/ProjectN
+        // This function will convert an ExceptionResource enum value to the resource string.
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static string GetResourceString(ExceptionResource resource)
+        {
+            Debug.Assert(Enum.IsDefined(typeof(ExceptionResource), resource),
+                "The enum value is not defined, please check the ExceptionResource Enum.");
+
+            return SR.GetResourceString(resource.ToString());
+        }
+#endif
+
+        private static string GetResourceString(ExceptionResource resource)
+        {
+            switch (resource)
+            {
+                case ExceptionResource.ArgumentOutOfRange_Index:
+                    return "Argument 'index' was out of the range of valid values.";
+                case ExceptionResource.ArgumentOutOfRange_Count:
+                    return "Argument 'count' was out of the range of valid values.";
+                case ExceptionResource.Arg_ArrayPlusOffTooSmall:
+                    return "Array plus offset too small.";
+                case ExceptionResource.NotSupported_ReadOnlyCollection:
+                    return "This operation is not supported on a read-only collection.";
+                case ExceptionResource.Arg_RankMultiDimNotSupported:
+                    return "Multi-dimensional arrays are not supported.";
+                case ExceptionResource.Arg_NonZeroLowerBound:
+                    return "Arrays with a non-zero lower bound are not supported.";
+                case ExceptionResource.ArgumentOutOfRange_ListInsert:
+                    return "Insertion index was out of the range of valid values.";
+                case ExceptionResource.ArgumentOutOfRange_NeedNonNegNum:
+                    return "The number must be non-negative.";
+                case ExceptionResource.ArgumentOutOfRange_SmallCapacity:
+                    return "The capacity cannot be set below the current Count.";
+                case ExceptionResource.Argument_InvalidOffLen:
+                    return "Invalid offset length.";
+                case ExceptionResource.ArgumentOutOfRange_BiggerThanCollection:
+                    return "The given value was larger than the size of the collection.";
+                case ExceptionResource.Serialization_MissingKeys:
+                    return "Serialization error: missing keys.";
+                case ExceptionResource.Serialization_NullKey:
+                    return "Serialization error: null key.";
+                case ExceptionResource.NotSupported_KeyCollectionSet:
+                    return "The KeyCollection does not support modification.";
+                case ExceptionResource.NotSupported_ValueCollectionSet:
+                    return "The ValueCollection does not support modification.";
+                case ExceptionResource.InvalidOperation_NullArray:
+                    return "Null arrays are not supported.";
+                case ExceptionResource.InvalidOperation_HSCapacityOverflow:
+                    return "Set hash capacity overflow. Cannot increase size.";
+                case ExceptionResource.NotSupported_StringComparison:
+                    return "String comparison not supported.";
+                case ExceptionResource.ConcurrentCollection_SyncRoot_NotSupported:
+                    return "SyncRoot not supported.";
+                case ExceptionResource.ArgumentException_OtherNotArrayOfCorrectLength:
+                    return "The other array is not of the correct length.";
+                case ExceptionResource.ArgumentOutOfRange_EndIndexStartIndex:
+                    return "The end index does not come after the start index.";
+                case ExceptionResource.ArgumentOutOfRange_HugeArrayNotSupported:
+                    return "Huge arrays are not supported.";
+                case ExceptionResource.Argument_AddingDuplicate:
+                    return "Duplicate item added.";
+                case ExceptionResource.Argument_InvalidArgumentForComparison:
+                    return "Invalid argument for comparison.";
+                case ExceptionResource.Arg_LowerBoundsMustMatch:
+                    return "Array lower bounds must match.";
+                case ExceptionResource.Arg_MustBeType:
+                    return "Argument must be of type: ";
+                case ExceptionResource.InvalidOperation_IComparerFailed:
+                    return "IComparer failed.";
+                case ExceptionResource.NotSupported_FixedSizeCollection:
+                    return "This operation is not suppored on a fixed-size collection.";
+                case ExceptionResource.Rank_MultiDimNotSupported:
+                    return "Multi-dimensional arrays are not supported.";
+                case ExceptionResource.Arg_TypeNotSupported:
+                    return "Type not supported.";
+                default:
+                    Debug.Assert(false,
+                        "The enum value is not defined, please check the ExceptionResource Enum.");
+                    return resource.ToString();
+            }
+        }
+    }
+
+    //
+    // The convention for this enum is using the argument name as the enum name
+    //
+    internal enum ExceptionArgument
+    {
+        obj,
+        dictionary,
+        array,
+        info,
+        key,
+        text,
+        values,
+        value,
+        startIndex,
+        task,
+        ch,
+        s,
+        input,
+        list,
+        index,
+        capacity,
+        collection,
+        item,
+        converter,
+        match,
+        count,
+        action,
+        comparison,
+        exceptions,
+        exception,
+        enumerable,
+        start,
+        format,
+        culture,
+        comparer,
+        comparable,
+        source,
+        state,
+        length,
+        comparisonType,
+        manager,
+        sourceBytesToCopy,
+        callBack,
+        creationOptions,
+        function,
+        delay,
+        millisecondsDelay,
+        millisecondsTimeout,
+        timeout,
+        type,
+        sourceIndex,
+        sourceArray,
+        destinationIndex,
+        destinationArray,
+        other,
+        newSize,
+        lowerBounds,
+        lengths,
+        len,
+        keys,
+        indices,
+        endIndex,
+        elementType,
+        arrayIndex
+    }
+
+    //
+    // The convention for this enum is using the resource name as the enum name
+    //
+    internal enum ExceptionResource
+    {
+        ArgumentOutOfRange_Index,
+        ArgumentOutOfRange_Count,
+        Arg_ArrayPlusOffTooSmall,
+        NotSupported_ReadOnlyCollection,
+        Arg_RankMultiDimNotSupported,
+        Arg_NonZeroLowerBound,
+        ArgumentOutOfRange_ListInsert,
+        ArgumentOutOfRange_NeedNonNegNum,
+        ArgumentOutOfRange_SmallCapacity,
+        Argument_InvalidOffLen,
+        ArgumentOutOfRange_BiggerThanCollection,
+        Serialization_MissingKeys,
+        Serialization_NullKey,
+        NotSupported_KeyCollectionSet,
+        NotSupported_ValueCollectionSet,
+        InvalidOperation_NullArray,
+        InvalidOperation_HSCapacityOverflow,
+        NotSupported_StringComparison,
+        ConcurrentCollection_SyncRoot_NotSupported,
+        ArgumentException_OtherNotArrayOfCorrectLength,
+        ArgumentOutOfRange_EndIndexStartIndex,
+        ArgumentOutOfRange_HugeArrayNotSupported,
+        Argument_AddingDuplicate,
+        Argument_InvalidArgumentForComparison,
+        Arg_LowerBoundsMustMatch,
+        Arg_MustBeType,
+        InvalidOperation_IComparerFailed,
+        NotSupported_FixedSizeCollection,
+        Rank_MultiDimNotSupported,
+        Arg_TypeNotSupported,
+    }
+}
diff --git a/src/Avalonia.Base/Contract.cs b/src/Avalonia.Base/Contract.cs
index 0b67601db5..27427700ac 100644
--- a/src/Avalonia.Base/Contract.cs
+++ b/src/Avalonia.Base/Contract.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Runtime.CompilerServices;
 using JetBrains.Annotations;
diff --git a/src/Avalonia.Base/Data/AssignBindingAttribute.cs b/src/Avalonia.Base/Data/AssignBindingAttribute.cs
index 0d050449cd..15bd32c7c2 100644
--- a/src/Avalonia.Base/Data/AssignBindingAttribute.cs
+++ b/src/Avalonia.Base/Data/AssignBindingAttribute.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Data
diff --git a/src/Avalonia.Base/Data/BindingChainException.cs b/src/Avalonia.Base/Data/BindingChainException.cs
index a609ace4ec..86112ce12d 100644
--- a/src/Avalonia.Base/Data/BindingChainException.cs
+++ b/src/Avalonia.Base/Data/BindingChainException.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Data
 {
diff --git a/src/Avalonia.Base/Data/BindingMode.cs b/src/Avalonia.Base/Data/BindingMode.cs
index 1e0e80f496..0d04c2eb10 100644
--- a/src/Avalonia.Base/Data/BindingMode.cs
+++ b/src/Avalonia.Base/Data/BindingMode.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Data
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Data/BindingNotification.cs b/src/Avalonia.Base/Data/BindingNotification.cs
index 7c55321a80..516c26d1d3 100644
--- a/src/Avalonia.Base/Data/BindingNotification.cs
+++ b/src/Avalonia.Base/Data/BindingNotification.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Data
 {
@@ -30,6 +27,12 @@ namespace Avalonia.Data
     /// Represents a binding notification that can be a valid binding value, or a binding or
     /// data validation error.
     /// </summary>
+    /// <remarks>
+    /// This class is very similar to <see cref="BindingValue{T}"/>, but where <see cref="BindingValue{T}"/>
+    /// is used by typed bindings, this class is used to hold binding and data validation errors in
+    /// untyped bindings. As Avalonia moves towards using typed bindings by default we may want to remove
+    /// this class.
+    /// </remarks>
     public class BindingNotification
     {
         /// <summary>
@@ -236,6 +239,26 @@ namespace Avalonia.Data
             _value = value;
         }
 
+        public BindingValue<object> ToBindingValue()
+        {
+            if (ErrorType == BindingErrorType.None)
+            {
+                return HasValue ? new BindingValue<object>(Value) : BindingValue<object>.Unset;
+            }
+            else if (ErrorType == BindingErrorType.Error)
+            {
+                return BindingValue<object>.BindingError(
+                    Error,
+                    HasValue ? new Optional<object>(Value) : Optional<object>.Empty);
+            }
+            else
+            {
+                return BindingValue<object>.DataValidationError(
+                    Error,
+                    HasValue ? new Optional<object>(Value) : Optional<object>.Empty);
+            }
+        }
+
         /// <inheritdoc/>
         public override string ToString()
         {
diff --git a/src/Avalonia.Base/Data/BindingOperations.cs b/src/Avalonia.Base/Data/BindingOperations.cs
index 44b47329ac..dc8421fb35 100644
--- a/src/Avalonia.Base/Data/BindingOperations.cs
+++ b/src/Avalonia.Base/Data/BindingOperations.cs
@@ -1,16 +1,13 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Linq;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
+using Avalonia.Reactive;
 
 namespace Avalonia.Data
 {
     public static class BindingOperations
     {
-        public static readonly object DoNothing = new object();
+        public static readonly object DoNothing = new DoNothingType();
 
         /// <summary>
         /// Applies an <see cref="InstancedBinding"/> a property on an <see cref="IAvaloniaObject"/>.
@@ -56,25 +53,51 @@ namespace Avalonia.Data
 
                     if (source != null)
                     {
+                        // Perf: Avoid allocating closure in the outer scope.
+                        var targetCopy = target;
+                        var propertyCopy = property;
+                        var bindingCopy = binding;
+
                         return source
                             .Where(x => BindingNotification.ExtractValue(x) != AvaloniaProperty.UnsetValue)
                             .Take(1)
-                            .Subscribe(x => target.SetValue(property, x, binding.Priority));
+                            .Subscribe(x => targetCopy.SetValue(
+                                propertyCopy,
+                                BindingNotification.ExtractValue(x),
+                                bindingCopy.Priority));
                     }
                     else
                     {
                         target.SetValue(property, binding.Value, binding.Priority);
                         return Disposable.Empty;
                     }
+
                 case BindingMode.OneWayToSource:
+                {
+                    // Perf: Avoid allocating closure in the outer scope.
+                    var bindingCopy = binding;
+
                     return Observable.CombineLatest(
                         binding.Observable,
                         target.GetObservable(property),
                         (_, v) => v)
-                    .Subscribe(x => binding.Subject.OnNext(x));
+                    .Subscribe(x => bindingCopy.Subject.OnNext(x));
+                }
+
                 default:
                     throw new ArgumentException("Invalid binding mode.");
             }
         }
     }
+
+    public sealed class DoNothingType
+    {
+        internal DoNothingType() { }
+
+        /// <summary>
+        /// Returns the string representation of <see cref="BindingOperations.DoNothing"/>.
+        /// </summary>
+        /// <returns>The string "(do nothing)".</returns>
+        public override string ToString() => "(do nothing)";
+    }
 }
diff --git a/src/Avalonia.Base/Data/BindingPriority.cs b/src/Avalonia.Base/Data/BindingPriority.cs
index 55246cabf5..68b2912ffe 100644
--- a/src/Avalonia.Base/Data/BindingPriority.cs
+++ b/src/Avalonia.Base/Data/BindingPriority.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Data
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Data/BindingValue.cs b/src/Avalonia.Base/Data/BindingValue.cs
new file mode 100644
index 0000000000..6e3c9ae67b
--- /dev/null
+++ b/src/Avalonia.Base/Data/BindingValue.cs
@@ -0,0 +1,436 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using Avalonia.Utilities;
+
+#nullable enable
+
+namespace Avalonia.Data
+{
+    /// <summary>
+    /// Describes the type of a <see cref="BindingValue{T}"/>.
+    /// </summary>
+    [Flags]
+    public enum BindingValueType
+    {
+        /// <summary>
+        /// An unset value: the target property will revert to its unbound state until a new
+        /// binding value is produced.
+        /// </summary>
+        UnsetValue = 0,
+
+        /// <summary>
+        /// Do nothing: the binding value will be ignored.
+        /// </summary>
+        DoNothing = 1,
+
+        /// <summary>
+        /// A simple value.
+        /// </summary>
+        Value = 2 | HasValue,
+
+        /// <summary>
+        /// A binding error, such as a missing source property.
+        /// </summary>
+        BindingError = 3 | HasError,
+
+        /// <summary>
+        /// A data validation error.
+        /// </summary>
+        DataValidationError = 4 | HasError,
+
+        /// <summary>
+        /// A binding error with a fallback value.
+        /// </summary>
+        BindingErrorWithFallback = BindingError | HasValue,
+
+        /// <summary>
+        /// A data validation error with a fallback value.
+        /// </summary>
+        DataValidationErrorWithFallback = DataValidationError | HasValue,
+
+        TypeMask = 0x00ff,
+        HasValue = 0x0100,
+        HasError = 0x0200,
+    }
+
+    /// <summary>
+    /// A value passed into a binding.
+    /// </summary>
+    /// <typeparam name="T">The value type.</typeparam>
+    /// <remarks>
+    /// The avalonia binding system is typed, and as such additional state is stored in this
+    /// structure. A binding value can be in a number of states, described by the
+    /// <see cref="Type"/> property:
+    /// 
+    /// - <see cref="BindingValueType.Value"/>: a simple value
+    /// - <see cref="BindingValueType.UnsetValue"/>: the target property will revert to its unbound
+    ///   state until a new binding value is produced. Represented by
+    ///   <see cref="AvaloniaProperty.UnsetValue"/> in an untyped context
+    /// - <see cref="BindingValueType.DoNothing"/>: the binding value will be ignored. Represented
+    ///   by <see cref="BindingOperations.DoNothing"/> in an untyped context
+    /// - <see cref="BindingValueType.BindingError"/>: a binding error, such as a missing source
+    ///   property, with an optional fallback value
+    /// - <see cref="BindingValueType.DataValidationError"/>: a data validation error, with an
+    ///   optional fallback value
+    ///   
+    /// To create a new binding value you can:
+    /// 
+    /// - For a simple value, call the <see cref="BindingValue{T}"/> constructor or use an implicit
+    ///   conversion from <typeparamref name="T"/>
+    /// - For an unset value, use <see cref="Unset"/> or simply `default`
+    /// - For other types, call one of the static factory methods
+    /// </remarks>
+    public readonly struct BindingValue<T>
+    {
+        [AllowNull] private readonly T _value;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BindingValue{T}"/> struct with a type of
+        /// <see cref="BindingValueType.Value"/>
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public BindingValue([AllowNull] T value)
+        {
+            ValidateValue(value);
+            _value = value;
+            Type = BindingValueType.Value;
+            Error = null;
+        }
+
+        private BindingValue(BindingValueType type, [AllowNull] T value, Exception? error)
+        {
+            _value = value;
+            Type = type;
+            Error = error;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the binding value represents either a binding or data
+        /// validation error.
+        /// </summary>
+        public bool HasError => Type.HasFlagCustom(BindingValueType.HasError);
+
+        /// <summary>
+        /// Gets a value indicating whether the binding value has a value.
+        /// </summary>
+        public bool HasValue => Type.HasFlagCustom(BindingValueType.HasValue);
+
+        /// <summary>
+        /// Gets the type of the binding value.
+        /// </summary>
+        public BindingValueType Type { get; }
+
+        /// <summary>
+        /// Gets the binding value or fallback value.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">
+        /// <see cref="HasValue"/> is false.
+        /// </exception>
+        public T Value => HasValue ? _value : throw new InvalidOperationException("BindingValue has no value.");
+
+        /// <summary>
+        /// Gets the binding or data validation error.
+        /// </summary>
+        public Exception? Error { get; }
+
+        /// <summary>
+        /// Converts the binding value to an <see cref="Optional{T}"/>.
+        /// </summary>
+        /// <returns></returns>
+        public Optional<T> ToOptional() => HasValue ? new Optional<T>(_value) : default;
+
+        /// <inheritdoc/>
+        public override string ToString() => HasError ? $"Error: {Error!.Message}" : _value?.ToString() ?? "(null)";
+
+        /// <summary>
+        /// Converts the value to untyped representation, using <see cref="AvaloniaProperty.UnsetValue"/>,
+        /// <see cref="BindingOperations.DoNothing"/> and <see cref="BindingNotification"/> where
+        /// appropriate.
+        /// </summary>
+        /// <returns>The untyped representation of the binding value.</returns>
+        public object? ToUntyped()
+        {
+            return Type switch
+            {
+                BindingValueType.UnsetValue => AvaloniaProperty.UnsetValue,
+                BindingValueType.DoNothing => BindingOperations.DoNothing,
+                BindingValueType.Value => _value,
+                BindingValueType.BindingError =>
+                    new BindingNotification(Error, BindingErrorType.Error),
+                BindingValueType.BindingErrorWithFallback =>
+                    new BindingNotification(Error, BindingErrorType.Error, Value),
+                BindingValueType.DataValidationError =>
+                    new BindingNotification(Error, BindingErrorType.DataValidationError),
+                BindingValueType.DataValidationErrorWithFallback =>
+                    new BindingNotification(Error, BindingErrorType.DataValidationError, Value),
+                _ => throw new NotSupportedException("Invalid BindingValueType."),
+            };
+        }
+
+        /// <summary>
+        /// Returns a new binding value with the specified value.
+        /// </summary>
+        /// <param name="value">The new value.</param>
+        /// <returns>The new binding value.</returns>
+        /// <exception cref="InvalidOperationException">
+        /// The binding type is <see cref="BindingValueType.UnsetValue"/> or
+        /// <see cref="BindingValueType.DoNothing"/>.
+        /// </exception>
+        public BindingValue<T> WithValue([AllowNull] T value)
+        {
+            if (Type == BindingValueType.DoNothing)
+            {
+                throw new InvalidOperationException("Cannot add value to DoNothing binding value.");
+            }
+
+            var type = Type == BindingValueType.UnsetValue ? BindingValueType.Value : Type;
+            return new BindingValue<T>(type | BindingValueType.HasValue, value, Error);
+        }
+
+        /// <summary>
+        /// Gets the value of the binding value if present, otherwise the default value.
+        /// </summary>
+        /// <returns>The value.</returns>
+        [return: MaybeNull]
+        public T GetValueOrDefault() => HasValue ? _value : default;
+
+        /// <summary>
+        /// Gets the value of the binding value if present, otherwise a default value.
+        /// </summary>
+        /// <param name="defaultValue">The default value.</param>
+        /// <returns>The value.</returns>
+        public T GetValueOrDefault(T defaultValue) => HasValue ? _value : defaultValue;
+
+        /// <summary>
+        /// Gets the value if present, otherwise the default value.
+        /// </summary>
+        /// <returns>
+        /// The value if present and of the correct type, `default(TResult)` if the value is
+        /// not present or of an incorrect type.
+        /// </returns>
+        [return: MaybeNull]
+        public TResult GetValueOrDefault<TResult>()
+        {
+            return HasValue ?
+                _value is TResult result ? result : default
+                : default;
+        }
+
+        /// <summary>
+        /// Gets the value of the binding value if present, otherwise a default value.
+        /// </summary>
+        /// <param name="defaultValue">The default value.</param>
+        /// <returns>
+        /// The value if present and of the correct type, `default(TResult)` if the value is
+        /// present but not of the correct type or null, or <paramref name="defaultValue"/> if the
+        /// value is not present.
+        /// </returns>
+        [return: MaybeNull]
+        public TResult GetValueOrDefault<TResult>([AllowNull] TResult defaultValue)
+        {
+            return HasValue ?
+                _value is TResult result ? result : default
+                : defaultValue;
+        }
+
+        /// <summary>
+        /// Creates a <see cref="BindingValue{T}"/> from an object, handling the special values
+        /// <see cref="AvaloniaProperty.UnsetValue"/> and <see cref="BindingOperations.DoNothing"/>.
+        /// </summary>
+        /// <param name="value">The untyped value.</param>
+        /// <returns>The typed binding value.</returns>
+        public static BindingValue<T> FromUntyped(object? value)
+        {
+            return value switch
+            {
+                UnsetValueType _ => Unset,
+                DoNothingType _ => DoNothing,
+                BindingNotification n => n.ToBindingValue().Cast<T>(),
+                _ => new BindingValue<T>((T)value)
+            };
+        }
+
+        /// <summary>
+        /// Creates a binding value from an instance of the underlying value type.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public static implicit operator BindingValue<T>([AllowNull] T value) => new BindingValue<T>(value);
+
+        /// <summary>
+        /// Creates a binding value from an <see cref="Optional{T}"/>.
+        /// </summary>
+        /// <param name="optional">The optional value.</param>
+
+        public static implicit operator BindingValue<T>(Optional<T> optional)
+        {
+            return optional.HasValue ? optional.Value : Unset;
+        }
+
+        /// <summary>
+        /// Returns a binding value with a type of <see cref="BindingValueType.UnsetValue"/>.
+        /// </summary>
+        public static BindingValue<T> Unset => new BindingValue<T>(BindingValueType.UnsetValue, default, null);
+
+        /// <summary>
+        /// Returns a binding value with a type of <see cref="BindingValueType.DoNothing"/>.
+        /// </summary>
+        public static BindingValue<T> DoNothing => new BindingValue<T>(BindingValueType.DoNothing, default, null);
+
+        /// <summary>
+        /// Returns a binding value with a type of <see cref="BindingValueType.BindingError"/>.
+        /// </summary>
+        /// <param name="e">The binding error.</param>
+        public static BindingValue<T> BindingError(Exception e)
+        {
+            e = e ?? throw new ArgumentNullException(nameof(e));
+
+            return new BindingValue<T>(BindingValueType.BindingError, default, e);
+        }
+
+        /// <summary>
+        /// Returns a binding value with a type of <see cref="BindingValueType.BindingErrorWithFallback"/>.
+        /// </summary>
+        /// <param name="e">The binding error.</param>
+        /// <param name="fallbackValue">The fallback value.</param>
+        public static BindingValue<T> BindingError(Exception e, T fallbackValue)
+        {
+            e = e ?? throw new ArgumentNullException(nameof(e));
+
+            return new BindingValue<T>(BindingValueType.BindingErrorWithFallback, fallbackValue, e);
+        }
+
+        /// <summary>
+        /// Returns a binding value with a type of <see cref="BindingValueType.BindingError"/> or
+        /// <see cref="BindingValueType.BindingErrorWithFallback"/>.
+        /// </summary>
+        /// <param name="e">The binding error.</param>
+        /// <param name="fallbackValue">The fallback value.</param>
+        public static BindingValue<T> BindingError(Exception e, Optional<T> fallbackValue)
+        {
+            e = e ?? throw new ArgumentNullException(nameof(e));
+
+            return new BindingValue<T>(
+                fallbackValue.HasValue ?
+                    BindingValueType.BindingErrorWithFallback :
+                    BindingValueType.BindingError,
+                fallbackValue.HasValue ? fallbackValue.Value : default,
+                e);
+        }
+
+        /// <summary>
+        /// Returns a binding value with a type of <see cref="BindingValueType.DataValidationError"/>.
+        /// </summary>
+        /// <param name="e">The data validation error.</param>
+        public static BindingValue<T> DataValidationError(Exception e)
+        {
+            e = e ?? throw new ArgumentNullException(nameof(e));
+
+            return new BindingValue<T>(BindingValueType.DataValidationError, default, e);
+        }
+
+        /// <summary>
+        /// Returns a binding value with a type of <see cref="BindingValueType.DataValidationErrorWithFallback"/>.
+        /// </summary>
+        /// <param name="e">The data validation error.</param>
+        /// <param name="fallbackValue">The fallback value.</param>
+        public static BindingValue<T> DataValidationError(Exception e, T fallbackValue)
+        {
+            e = e ?? throw new ArgumentNullException(nameof(e));
+
+            return new BindingValue<T>(BindingValueType.DataValidationErrorWithFallback, fallbackValue, e);
+        }
+
+        /// <summary>
+        /// Returns a binding value with a type of <see cref="BindingValueType.DataValidationError"/> or
+        /// <see cref="BindingValueType.DataValidationErrorWithFallback"/>.
+        /// </summary>
+        /// <param name="e">The binding error.</param>
+        /// <param name="fallbackValue">The fallback value.</param>
+        public static BindingValue<T> DataValidationError(Exception e, Optional<T> fallbackValue)
+        {
+            e = e ?? throw new ArgumentNullException(nameof(e));
+
+            return new BindingValue<T>(
+                fallbackValue.HasValue ?
+                    BindingValueType.DataValidationErrorWithFallback :
+                    BindingValueType.DataValidationError,
+                fallbackValue.HasValue ? fallbackValue.Value : default,
+                e);
+        }
+
+        private static void ValidateValue([AllowNull] T value)
+        {
+            if (value is UnsetValueType)
+            {
+                throw new InvalidOperationException("AvaloniaValue.UnsetValue is not a valid value for BindingValue<>.");
+            }
+
+            if (value is DoNothingType)
+            {
+                throw new InvalidOperationException("BindingOperations.DoNothing is not a valid value for BindingValue<>.");
+            }
+
+            if (value is BindingValue<object>)
+            {
+                throw new InvalidOperationException("BindingValue<object> cannot be wrapped in a BindingValue<>.");
+            }
+        }
+    }
+
+    public static class BindingValueExtensions
+    {
+        /// <summary>
+        /// Casts the type of a <see cref="BindingValue{T}"/> using only the C# cast operator.
+        /// </summary>
+        /// <typeparam name="T">The target type.</typeparam>
+        /// <param name="value">The binding value.</param>
+        /// <returns>The cast value.</returns>
+        public static BindingValue<T> Cast<T>(this BindingValue<object> value)
+        {
+            return value.Type switch
+            {
+                BindingValueType.DoNothing => BindingValue<T>.DoNothing,
+                BindingValueType.UnsetValue => BindingValue<T>.Unset,
+                BindingValueType.Value => new BindingValue<T>((T)value.Value),
+                BindingValueType.BindingError => BindingValue<T>.BindingError(value.Error!),
+                BindingValueType.BindingErrorWithFallback => BindingValue<T>.BindingError(
+                        value.Error!,
+                        (T)value.Value),
+                BindingValueType.DataValidationError => BindingValue<T>.DataValidationError(value.Error!),
+                BindingValueType.DataValidationErrorWithFallback => BindingValue<T>.DataValidationError(
+                        value.Error!,
+                        (T)value.Value),
+                _ => throw new NotSupportedException("Invalid BindingValue type."),
+            };
+        }
+
+        /// <summary>
+        /// Casts the type of a <see cref="BindingValue{T}"/> using the implicit conversions
+        /// allowed by the C# language.
+        /// </summary>
+        /// <typeparam name="T">The target type.</typeparam>
+        /// <param name="value">The binding value.</param>
+        /// <returns>The cast value.</returns>
+        /// <remarks>
+        /// Note that this method uses reflection and as such may be slow.
+        /// </remarks>
+        public static BindingValue<T> Convert<T>(this BindingValue<object> value)
+        {
+            return value.Type switch
+            {
+                BindingValueType.DoNothing => BindingValue<T>.DoNothing,
+                BindingValueType.UnsetValue => BindingValue<T>.Unset,
+                BindingValueType.Value => new BindingValue<T>(TypeUtilities.ConvertImplicit<T>(value.Value)),
+                BindingValueType.BindingError => BindingValue<T>.BindingError(value.Error!),
+                BindingValueType.BindingErrorWithFallback => BindingValue<T>.BindingError(
+                        value.Error!,
+                        TypeUtilities.ConvertImplicit<T>(value.Value)),
+                BindingValueType.DataValidationError => BindingValue<T>.DataValidationError(value.Error!),
+                BindingValueType.DataValidationErrorWithFallback => BindingValue<T>.DataValidationError(
+                        value.Error!,
+                        TypeUtilities.ConvertImplicit<T>(value.Value)),
+                _ => throw new NotSupportedException("Invalid BindingValue type."),
+            };
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Data/Converters/AlwaysEnabledDelegateCommand.cs b/src/Avalonia.Base/Data/Converters/AlwaysEnabledDelegateCommand.cs
deleted file mode 100644
index 7f4c83772d..0000000000
--- a/src/Avalonia.Base/Data/Converters/AlwaysEnabledDelegateCommand.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Globalization;
-using System.Reflection;
-using System.Windows.Input;
-using Avalonia.Utilities;
-
-namespace Avalonia.Data.Converters
-{
-    class AlwaysEnabledDelegateCommand : ICommand
-    {
-        private readonly Delegate action;
-
-        private ParameterInfo parameterInfo;
-
-        public AlwaysEnabledDelegateCommand(Delegate action)
-        {
-            this.action = action;
-            var parameters = action.Method.GetParameters();
-            parameterInfo = parameters.Length == 0 ? null : parameters[0];
-        }
-
-#pragma warning disable 0067
-        public event EventHandler CanExecuteChanged;
-#pragma warning restore 0067
-
-        public bool CanExecute(object parameter) => true;
-
-        public void Execute(object parameter)
-        {
-            if (parameterInfo == null)
-            {
-                action.DynamicInvoke();
-            }
-            else
-            {
-                TypeUtilities.TryConvert(parameterInfo.ParameterType, parameter, CultureInfo.CurrentCulture, out object convertedParameter);
-                action.DynamicInvoke(convertedParameter); 
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Base/Data/Converters/BoolConverters.cs b/src/Avalonia.Base/Data/Converters/BoolConverters.cs
index 6b429e1087..6740c2168f 100644
--- a/src/Avalonia.Base/Data/Converters/BoolConverters.cs
+++ b/src/Avalonia.Base/Data/Converters/BoolConverters.cs
@@ -1,12 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Linq;
 
 namespace Avalonia.Data.Converters
 {
     /// <summary>
-    /// Provides a set of useful <see cref="IValueConverter"/>s for working with string values.
+    /// Provides a set of useful <see cref="IValueConverter"/>s for working with bool values.
     /// </summary>
     public static class BoolConverters
     {
diff --git a/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs b/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs
index 0ffd6a9539..83f7e02c16 100644
--- a/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs
+++ b/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
 using System.Windows.Input;
@@ -36,7 +33,7 @@ namespace Avalonia.Data.Converters
 
             if (typeof(ICommand).IsAssignableFrom(targetType) && value is Delegate d && d.Method.GetParameters().Length <= 1)
             {
-                return new AlwaysEnabledDelegateCommand(d);
+                return new MethodToCommandConverter(d);
             }
 
             if (TypeUtilities.TryConvert(targetType, value, culture, out object result))
diff --git a/src/Avalonia.Base/Data/Converters/FuncMultiValueConverter.cs b/src/Avalonia.Base/Data/Converters/FuncMultiValueConverter.cs
index 6e1c4cb0e3..988cc123f9 100644
--- a/src/Avalonia.Base/Data/Converters/FuncMultiValueConverter.cs
+++ b/src/Avalonia.Base/Data/Converters/FuncMultiValueConverter.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -30,7 +27,23 @@ namespace Avalonia.Data.Converters
         /// <inheritdoc/>
         public object Convert(IList<object> values, Type targetType, object parameter, CultureInfo culture)
         {
-            var converted = values.OfType<TIn>().ToList();
+            //standard OfType skip null values, even they are valid for the Type
+            static IEnumerable<TIn> OfTypeWithDefaultSupport(IList<object> list)
+            {
+                foreach (object obj in list)
+                {
+                    if (obj is TIn result)
+                    {
+                        yield return result;
+                    }
+                    else if (Equals(obj, default(TIn)))
+                    {
+                        yield return default(TIn);
+                    }
+                }
+            }
+
+            var converted = OfTypeWithDefaultSupport(values).ToList();
 
             if (converted.Count == values.Count)
             {
diff --git a/src/Avalonia.Base/Data/Converters/FuncValueConverter.cs b/src/Avalonia.Base/Data/Converters/FuncValueConverter.cs
index b747587b4a..9ec600d2bc 100644
--- a/src/Avalonia.Base/Data/Converters/FuncValueConverter.cs
+++ b/src/Avalonia.Base/Data/Converters/FuncValueConverter.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
 using Avalonia.Utilities;
diff --git a/src/Avalonia.Base/Data/Converters/IMultiValueConverter.cs b/src/Avalonia.Base/Data/Converters/IMultiValueConverter.cs
index 3f84fcb3e7..0468835c41 100644
--- a/src/Avalonia.Base/Data/Converters/IMultiValueConverter.cs
+++ b/src/Avalonia.Base/Data/Converters/IMultiValueConverter.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Globalization;
diff --git a/src/Avalonia.Base/Data/Converters/IValueConverter.cs b/src/Avalonia.Base/Data/Converters/IValueConverter.cs
index 754aa7975d..f31f4d522e 100644
--- a/src/Avalonia.Base/Data/Converters/IValueConverter.cs
+++ b/src/Avalonia.Base/Data/Converters/IValueConverter.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
 
diff --git a/src/Avalonia.Base/Data/Converters/MethodToCommandConverter.cs b/src/Avalonia.Base/Data/Converters/MethodToCommandConverter.cs
new file mode 100644
index 0000000000..7e7417d2f5
--- /dev/null
+++ b/src/Avalonia.Base/Data/Converters/MethodToCommandConverter.cs
@@ -0,0 +1,230 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Windows.Input;
+using Avalonia.Utilities;
+
+namespace Avalonia.Data.Converters
+{
+    class MethodToCommandConverter : ICommand
+    {
+        readonly static Func<object, bool> AlwaysEnabled = (_) => true;
+        readonly static MethodInfo tryConvert = typeof(TypeUtilities)
+            .GetMethod(nameof(TypeUtilities.TryConvert), BindingFlags.Public | BindingFlags.Static);
+        readonly static PropertyInfo currentCulture = typeof(CultureInfo)
+            .GetProperty(nameof(CultureInfo.CurrentCulture), BindingFlags.Public | BindingFlags.Static);
+        readonly Func<object, bool> canExecute;
+        readonly Action<object> execute;
+        readonly WeakPropertyChangedProxy weakPropertyChanged;
+        readonly PropertyChangedEventHandler propertyChangedEventHandler;
+        readonly string[] dependencyProperties;
+
+        public MethodToCommandConverter(Delegate action)
+        {
+            var target = action.Target;
+            var canExecuteMethodName = "Can" + action.Method.Name;
+            var parameters = action.Method.GetParameters();
+            var parameterInfo = parameters.Length == 0 ? null : parameters[0].ParameterType;
+
+            if (parameterInfo == null)
+            {
+                execute = CreateExecute(target, action.Method);
+            }
+            else
+            {
+                execute = CreateExecute(target, action.Method, parameterInfo);
+            }
+
+            var canExecuteMethod = action.Method.DeclaringType.GetRuntimeMethods()
+                .FirstOrDefault(m => m.Name == canExecuteMethodName
+                    && m.GetParameters().Length == 1
+                    && m.GetParameters()[0].ParameterType == typeof(object));
+            if (canExecuteMethod == null)
+            {
+                canExecute = AlwaysEnabled;
+            }
+            else
+            {
+                canExecute = CreateCanExecute(target, canExecuteMethod);
+                dependencyProperties = canExecuteMethod
+                    .GetCustomAttributes(typeof(Metadata.DependsOnAttribute), true)
+                    .OfType<Metadata.DependsOnAttribute>()
+                    .Select(x => x.Name)
+                    .ToArray();
+                if (dependencyProperties.Any()
+                    && target is INotifyPropertyChanged inpc)
+                {
+                    propertyChangedEventHandler = OnPropertyChanged;
+                    weakPropertyChanged = new WeakPropertyChangedProxy(inpc, propertyChangedEventHandler);
+                }
+            }
+        }
+
+        void OnPropertyChanged(object sender,PropertyChangedEventArgs args)
+        {
+            if (string.IsNullOrWhiteSpace(args.PropertyName)
+                               || dependencyProperties?.Contains(args.PropertyName) == true)
+            {
+                Threading.Dispatcher.UIThread.Post(() => CanExecuteChanged?.Invoke(this, EventArgs.Empty)
+                    , Threading.DispatcherPriority.Input);
+            }
+        }
+
+#pragma warning disable 0067
+        public event EventHandler CanExecuteChanged;
+#pragma warning restore 0067
+
+        public bool CanExecute(object parameter) => canExecute(parameter);
+
+        public void Execute(object parameter) => execute(parameter);
+
+
+        static Action<object> CreateExecute(object target
+            , System.Reflection.MethodInfo method)
+        {
+
+            var parameter = Expression.Parameter(typeof(object), "parameter");
+
+            var instance = Expression.Convert
+            (
+                Expression.Constant(target),
+                method.DeclaringType
+            );
+
+
+            var call = Expression.Call
+            (
+                instance,
+                method
+            );
+
+
+            return Expression
+                .Lambda<Action<object>>(call, parameter)
+                .Compile();
+        }
+
+        static Action<object> CreateExecute(object target
+            , System.Reflection.MethodInfo method
+            , Type parameterType)
+        {
+
+            var parameter = Expression.Parameter(typeof(object), "parameter");
+
+            var instance = Expression.Convert
+            (
+                Expression.Constant(target),
+                method.DeclaringType
+            );
+
+            Expression body;
+
+            if (parameterType == typeof(object))
+            {
+                body = Expression.Call(instance,
+                    method,
+                    parameter
+                    );
+            }
+            else
+            {
+                var arg0 = Expression.Variable(typeof(object), "argX");
+                var convertCall = Expression.Call(tryConvert,
+                     Expression.Constant(parameterType),
+                     parameter,
+                      Expression.Property(null, currentCulture),
+                     arg0
+                    );
+
+                var call = Expression.Call(instance,
+                    method,
+                    Expression.Convert(arg0, parameterType)
+                    );
+                body = Expression.Block(new[] { arg0 },
+                    convertCall,
+                    call
+                    );
+
+            }
+            Action<object> action = null;
+            try
+            {
+                action = Expression
+                   .Lambda<Action<object>>(body, parameter)
+                   .Compile();
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return action;
+        }
+
+        static Func<object, bool> CreateCanExecute(object target
+            , System.Reflection.MethodInfo method)
+        {
+            var parameter = Expression.Parameter(typeof(object), "parameter");
+            var instance = Expression.Convert
+            (
+                Expression.Constant(target),
+                method.DeclaringType
+            );
+            var call = Expression.Call
+            (
+                instance,
+                method,
+                parameter
+            );
+            return Expression
+                .Lambda<Func<object, bool>>(call, parameter)
+                .Compile();
+        }
+
+
+        internal class WeakPropertyChangedProxy
+        {
+            readonly WeakReference<PropertyChangedEventHandler> _listener = new WeakReference<PropertyChangedEventHandler>(null);
+            readonly PropertyChangedEventHandler _handler;
+            internal WeakReference<INotifyPropertyChanged> Source { get; } = new WeakReference<INotifyPropertyChanged>(null);
+
+            public WeakPropertyChangedProxy()
+            {
+                _handler = new PropertyChangedEventHandler(OnPropertyChanged);
+            }
+
+            public WeakPropertyChangedProxy(INotifyPropertyChanged source, PropertyChangedEventHandler listener) : this()
+            {
+                SubscribeTo(source, listener);
+            }
+
+            public void SubscribeTo(INotifyPropertyChanged source, PropertyChangedEventHandler listener)
+            {
+                source.PropertyChanged += _handler;
+
+                Source.SetTarget(source);
+                _listener.SetTarget(listener);
+            }
+
+            public void Unsubscribe()
+            {
+                if (Source.TryGetTarget(out INotifyPropertyChanged source) && source != null)
+                    source.PropertyChanged -= _handler;
+
+                Source.SetTarget(null);
+                _listener.SetTarget(null);
+            }
+
+            void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
+            {
+                if (_listener.TryGetTarget(out var handler) && handler != null)
+                    handler(sender, e);
+                else
+                    Unsubscribe();
+            }
+           
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Data/Converters/ObjectConverters.cs b/src/Avalonia.Base/Data/Converters/ObjectConverters.cs
index 3cadfd5b47..755d826dda 100644
--- a/src/Avalonia.Base/Data/Converters/ObjectConverters.cs
+++ b/src/Avalonia.Base/Data/Converters/ObjectConverters.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 
 namespace Avalonia.Data.Converters
 {
diff --git a/src/Avalonia.Base/Data/Converters/StringConverters.cs b/src/Avalonia.Base/Data/Converters/StringConverters.cs
index 42eb8e1d81..4b0a845770 100644
--- a/src/Avalonia.Base/Data/Converters/StringConverters.cs
+++ b/src/Avalonia.Base/Data/Converters/StringConverters.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 
 namespace Avalonia.Data.Converters
 {
diff --git a/src/Avalonia.Base/Data/Core/BindingExpression.cs b/src/Avalonia.Base/Data/Core/BindingExpression.cs
index 986e2cf012..c4f61dfedb 100644
--- a/src/Avalonia.Base/Data/Core/BindingExpression.cs
+++ b/src/Avalonia.Base/Data/Core/BindingExpression.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
 using System.Reactive.Linq;
@@ -21,6 +18,7 @@ namespace Avalonia.Data.Core
         private readonly ExpressionObserver _inner;
         private readonly Type _targetType;
         private readonly object _fallbackValue;
+        private readonly object _targetNullValue;
         private readonly BindingPriority _priority;
         InnerListener _innerListener;
         WeakReference<object> _value;
@@ -51,7 +49,7 @@ namespace Avalonia.Data.Core
             IValueConverter converter,
             object converterParameter = null,
             BindingPriority priority = BindingPriority.LocalValue)
-            : this(inner, targetType, AvaloniaProperty.UnsetValue, converter, converterParameter, priority)
+            : this(inner, targetType, AvaloniaProperty.UnsetValue, AvaloniaProperty.UnsetValue, converter, converterParameter, priority)
         {
         }
 
@@ -63,6 +61,9 @@ namespace Avalonia.Data.Core
         /// <param name="fallbackValue">
         /// The value to use when the binding is unable to produce a value.
         /// </param>
+        /// <param name="targetNullValue">
+        /// The value to use when the binding result is null.
+        /// </param>
         /// <param name="converter">The value converter to use.</param>
         /// <param name="converterParameter">
         /// A parameter to pass to <paramref name="converter"/>.
@@ -72,6 +73,7 @@ namespace Avalonia.Data.Core
             ExpressionObserver inner, 
             Type targetType,
             object fallbackValue,
+            object targetNullValue,
             IValueConverter converter,
             object converterParameter = null,
             BindingPriority priority = BindingPriority.LocalValue)
@@ -85,6 +87,7 @@ namespace Avalonia.Data.Core
             Converter = converter;
             ConverterParameter = converterParameter;
             _fallbackValue = fallbackValue;
+            _targetNullValue = targetNullValue;
             _priority = priority;
         }
 
@@ -165,8 +168,7 @@ namespace Avalonia.Data.Core
                             }
                             else
                             {
-                                Logger.TryGet(LogEventLevel.Error)?.Log(
-                                    LogArea.Binding,
+                                Logger.TryGet(LogEventLevel.Error, LogArea.Binding)?.Log(
                                     this,
                                     "Could not convert FallbackValue {FallbackValue} to {Type}",
                                     _fallbackValue,
@@ -196,6 +198,11 @@ namespace Avalonia.Data.Core
         /// <inheritdoc/>
         private object ConvertValue(object value)
         {
+            if (value == null && _targetNullValue != AvaloniaProperty.UnsetValue)
+            {
+                return _targetNullValue;
+            }
+
             if (value == BindingOperations.DoNothing)
             {
                 return value;
diff --git a/src/Avalonia.Base/Data/Core/ClrPropertyInfo.cs b/src/Avalonia.Base/Data/Core/ClrPropertyInfo.cs
new file mode 100644
index 0000000000..f66411c2c2
--- /dev/null
+++ b/src/Avalonia.Base/Data/Core/ClrPropertyInfo.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace Avalonia.Data.Core
+{
+    public class ClrPropertyInfo : IPropertyInfo
+    {
+        private readonly Func<object, object> _getter;
+        private readonly Action<object, object> _setter;
+
+        public ClrPropertyInfo(string name, Func<object, object> getter, Action<object, object> setter, Type propertyType)
+        {
+            _getter = getter;
+            _setter = setter;
+            PropertyType = propertyType;
+            Name = name;
+        }
+
+        public string Name { get; }
+        public Type PropertyType { get; }
+
+        public object Get(object target)
+        {
+            if (_getter == null)
+                throw new NotSupportedException("Property " + Name + " doesn't have a getter");
+            return _getter(target);
+        }
+
+        public void Set(object target, object value)
+        {
+            if (_setter == null)
+                throw new NotSupportedException("Property " + Name + " doesn't have a setter");
+            _setter(target, value);
+        }
+
+        public bool CanSet => _setter != null;
+        public bool CanGet => _getter != null;
+    }
+
+    public class ReflectionClrPropertyInfo : ClrPropertyInfo
+    {
+        static Action<object, object> CreateSetter(PropertyInfo info)
+        {
+            if (info.SetMethod == null)
+                return null;
+            var target = Expression.Parameter(typeof(object), "target");
+            var value = Expression.Parameter(typeof(object), "value");
+            return Expression.Lambda<Action<object, object>>(
+                    Expression.Call(Expression.Convert(target, info.DeclaringType), info.SetMethod,
+                        Expression.Convert(value, info.SetMethod.GetParameters()[0].ParameterType)),
+                    target, value)
+                .Compile();
+        }
+        
+        static Func<object, object> CreateGetter(PropertyInfo info)
+        {
+            if (info.GetMethod == null)
+                return null;
+            var target = Expression.Parameter(typeof(object), "target");
+            return Expression.Lambda<Func<object, object>>(
+                    Expression.Convert(Expression.Call(Expression.Convert(target, info.DeclaringType), info.GetMethod),
+                        typeof(object)))
+                .Compile();
+        }
+
+        public ReflectionClrPropertyInfo(PropertyInfo info) : base(info.Name,
+            CreateGetter(info), CreateSetter(info), info.PropertyType)
+        {
+            
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Data/Core/CommonPropertyNames.cs b/src/Avalonia.Base/Data/Core/CommonPropertyNames.cs
index 6760c3f259..da6f407d81 100644
--- a/src/Avalonia.Base/Data/Core/CommonPropertyNames.cs
+++ b/src/Avalonia.Base/Data/Core/CommonPropertyNames.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Data.Core
 {
     public static class CommonPropertyNames
diff --git a/src/Avalonia.Base/Data/Core/EmptyExpressionNode.cs b/src/Avalonia.Base/Data/Core/EmptyExpressionNode.cs
index d5658b124b..4e142fbee9 100644
--- a/src/Avalonia.Base/Data/Core/EmptyExpressionNode.cs
+++ b/src/Avalonia.Base/Data/Core/EmptyExpressionNode.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Data.Core
+namespace Avalonia.Data.Core
 {
     public class EmptyExpressionNode : ExpressionNode
     {
diff --git a/src/Avalonia.Base/Data/Core/ExpressionNode.cs b/src/Avalonia.Base/Data/Core/ExpressionNode.cs
index c2e5c8e4f3..84cbe32318 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionNode.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionNode.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Data.Core
diff --git a/src/Avalonia.Base/Data/Core/ExpressionObserver.cs b/src/Avalonia.Base/Data/Core/ExpressionObserver.cs
index 7060fd3451..7ecaa278d7 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionObserver.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionObserver.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
@@ -21,7 +18,7 @@ namespace Avalonia.Data.Core
         /// An ordered collection of property accessor plugins that can be used to customize
         /// the reading and subscription of property values on a type.
         /// </summary>
-        public static readonly IList<IPropertyAccessorPlugin> PropertyAccessors =
+        public static readonly List<IPropertyAccessorPlugin> PropertyAccessors =
             new List<IPropertyAccessorPlugin>
             {
                 new AvaloniaPropertyAccessorPlugin(),
@@ -33,7 +30,7 @@ namespace Avalonia.Data.Core
         /// An ordered collection of validation checker plugins that can be used to customize
         /// the validation of view model and model data.
         /// </summary>
-        public static readonly IList<IDataValidationPlugin> DataValidators =
+        public static readonly List<IDataValidationPlugin> DataValidators =
             new List<IDataValidationPlugin>
             {
                 new DataAnnotationsValidationPlugin(),
@@ -45,7 +42,7 @@ namespace Avalonia.Data.Core
         /// An ordered collection of stream plugins that can be used to customize the behavior
         /// of the '^' stream binding operator.
         /// </summary>
-        public static readonly IList<IStreamPlugin> StreamHandlers =
+        public static readonly List<IStreamPlugin> StreamHandlers =
             new List<IStreamPlugin>
             {
                 new TaskStreamPlugin(),
@@ -57,6 +54,7 @@ namespace Avalonia.Data.Core
         private object _root;
         private IDisposable _rootSubscription;
         private WeakReference<object> _value;
+        private IReadOnlyList<ITransformNode> _transformNodes;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ExpressionObserver"/> class.
@@ -191,6 +189,24 @@ namespace Avalonia.Data.Core
                 description ?? expression.ToString());
         }
 
+        private IReadOnlyList<ITransformNode> GetTransformNodesFromChain()
+        {
+            LinkedList<ITransformNode> transforms = new LinkedList<ITransformNode>();
+            var node = _node;
+            while (node != null)
+            {
+                if (node is ITransformNode transform)
+                {
+                    transforms.AddFirst(transform);
+                }
+                node = node.Next;
+            }
+
+            return new List<ITransformNode>(transforms);
+        }
+
+        private IReadOnlyList<ITransformNode> TransformNodes => (_transformNodes ?? (_transformNodes = GetTransformNodesFromChain()));
+
         /// <summary>
         /// Attempts to set the value of a property expression.
         /// </summary>
@@ -206,18 +222,13 @@ namespace Avalonia.Data.Core
         {
             if (Leaf is SettableNode settable)
             {
-                var node = _node;
-                while (node != null)
+                foreach (var transform in TransformNodes)
                 {
-                    if (node is ITransformNode transform)
+                    value = transform.Transform(value);
+                    if (value is BindingNotification)
                     {
-                        value = transform.Transform(value);
-                        if (value is BindingNotification)
-                        {
-                            return false;
-                        }
+                        return false;
                     }
-                    node = node.Next;
                 }
                 return settable.SetTargetValue(value, priority);
             }
diff --git a/src/Avalonia.Base/Data/Core/ExpressionParseException.cs b/src/Avalonia.Base/Data/Core/ExpressionParseException.cs
index 2432410203..b0d5c21dab 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionParseException.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionParseException.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Data.Core
diff --git a/src/Avalonia.Base/Data/Core/IPropertyInfo.cs b/src/Avalonia.Base/Data/Core/IPropertyInfo.cs
new file mode 100644
index 0000000000..2417d0ffc4
--- /dev/null
+++ b/src/Avalonia.Base/Data/Core/IPropertyInfo.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace Avalonia.Data.Core
+{
+    public interface IPropertyInfo
+    {
+        string Name { get; }
+        object Get(object target);
+        void Set(object target, object value);
+        bool CanSet { get; }
+        bool CanGet { get; }
+        Type PropertyType { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Data/Core/LogicalNotNode.cs b/src/Avalonia.Base/Data/Core/LogicalNotNode.cs
index 6d58b18a9f..6d09befeba 100644
--- a/src/Avalonia.Base/Data/Core/LogicalNotNode.cs
+++ b/src/Avalonia.Base/Data/Core/LogicalNotNode.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
 
@@ -15,8 +12,19 @@ namespace Avalonia.Data.Core
             base.NextValueChanged(Negate(value));
         }
 
-        private static object Negate(object v)
+        private static object Negate(object value)
         {
+            var notification = value as BindingNotification;
+            var v = BindingNotification.ExtractValue(value);
+
+            BindingNotification GenerateError(Exception e)
+            {
+                notification ??= new BindingNotification(AvaloniaProperty.UnsetValue);
+                notification.AddError(e, BindingErrorType.Error);
+                notification.ClearValue();
+                return notification;
+            }
+
             if (v != AvaloniaProperty.UnsetValue)
             {
                 var s = v as string;
@@ -31,9 +39,7 @@ namespace Avalonia.Data.Core
                     }
                     else
                     {
-                        return new BindingNotification(
-                            new InvalidCastException($"Unable to convert '{s}' to bool."), 
-                            BindingErrorType.Error);
+                        return GenerateError(new InvalidCastException($"Unable to convert '{s}' to bool."));
                     }
                 }
                 else
@@ -41,24 +47,31 @@ namespace Avalonia.Data.Core
                     try
                     {
                         var boolean = Convert.ToBoolean(v, CultureInfo.InvariantCulture);
-                        return !boolean;
+
+                        if (notification is object)
+                        {
+                            notification.SetValue(!boolean);
+                            return notification;
+                        }
+                        else
+                        {
+                            return !boolean;
+                        }
                     }
                     catch (InvalidCastException)
                     {
                         // The error message here is "Unable to cast object of type 'System.Object'
                         // to type 'System.IConvertible'" which is kinda useless so provide our own.
-                        return new BindingNotification(
-                            new InvalidCastException($"Unable to convert '{v}' to bool."),
-                            BindingErrorType.Error);
+                        return GenerateError(new InvalidCastException($"Unable to convert '{v}' to bool."));
                     }
                     catch (Exception e)
                     {
-                        return new BindingNotification(e, BindingErrorType.Error);
+                        return GenerateError(e);
                     }
                 }
             }
 
-            return AvaloniaProperty.UnsetValue;
+            return notification ?? AvaloniaProperty.UnsetValue;
         }
 
         public object Transform(object value)
diff --git a/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs
index ab4a109cc2..c1e8eb115d 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs
@@ -1,8 +1,5 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Reactive.Linq;
+using System.Runtime.ExceptionServices;
 
 namespace Avalonia.Data.Core.Plugins
 {
@@ -76,7 +73,7 @@ namespace Avalonia.Data.Core.Plugins
             return false;
         }
 
-        private class Accessor : PropertyAccessorBase
+        private class Accessor : PropertyAccessorBase, IObserver<object>
         {
             private readonly WeakReference<AvaloniaObject> _reference;
             private readonly AvaloniaProperty _property;
@@ -117,7 +114,7 @@ namespace Avalonia.Data.Core.Plugins
 
             protected override void SubscribeCore()
             {
-                _subscription = Instance?.GetObservable(_property).Subscribe(PublishValue);
+                _subscription = Instance?.GetObservable(_property).Subscribe(this);
             }
 
             protected override void UnsubscribeCore()
@@ -125,6 +122,20 @@ namespace Avalonia.Data.Core.Plugins
                 _subscription?.Dispose();
                 _subscription = null;
             }
+
+            void IObserver<object>.OnCompleted()
+            {
+            }
+
+            void IObserver<object>.OnError(Exception error)
+            {
+                ExceptionDispatchInfo.Capture(error).Throw();
+            }
+
+            void IObserver<object>.OnNext(object value)
+            {
+                PublishValue(value);
+            }
         }
     }
 }
diff --git a/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs
index f5b545d2ff..f052283b22 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
@@ -66,12 +63,12 @@ namespace Avalonia.Data.Core.Plugins
             {
                 if (errors.Count == 1)
                 {
-                    return new ValidationException(errors[0].ErrorMessage);
+                    return new DataValidationException(errors[0].ErrorMessage);
                 }
                 else
                 {
                     return new AggregateException(
-                        errors.Select(x => new ValidationException(x.ErrorMessage)));
+                        errors.Select(x => new DataValidationException(x.ErrorMessage)));
                 }
             }
         }
diff --git a/src/Avalonia.Base/Data/Core/Plugins/DataValidationBase.cs b/src/Avalonia.Base/Data/Core/Plugins/DataValidationBase.cs
index 2e0d1aa805..63e2c3a97b 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/DataValidationBase.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/DataValidationBase.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Data.Core.Plugins
 {
diff --git a/src/Avalonia.Base/Data/Core/Plugins/ExceptionValidationPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/ExceptionValidationPlugin.cs
index f305912fe1..f7ab48943a 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/ExceptionValidationPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/ExceptionValidationPlugin.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Reflection;
 
 namespace Avalonia.Data.Core.Plugins
diff --git a/src/Avalonia.Base/Data/Core/Plugins/IDataValidationPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/IDataValidationPlugin.cs
index 5b1af22f14..324279e9f0 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/IDataValidationPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/IDataValidationPlugin.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Data.Core.Plugins
 {
diff --git a/src/Avalonia.Base/Data/Core/Plugins/IPropertyAccessor.cs b/src/Avalonia.Base/Data/Core/Plugins/IPropertyAccessor.cs
index 33ea5bba08..688fb8cdc2 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/IPropertyAccessor.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/IPropertyAccessor.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Data.Core.Plugins
diff --git a/src/Avalonia.Base/Data/Core/Plugins/IPropertyAccessorPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/IPropertyAccessorPlugin.cs
index a0021fa4d4..b176225fba 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/IPropertyAccessorPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/IPropertyAccessorPlugin.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Data.Core.Plugins
diff --git a/src/Avalonia.Base/Data/Core/Plugins/IStreamPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/IStreamPlugin.cs
index 3df578d25b..514e6f430a 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/IStreamPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/IStreamPlugin.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Data.Core.Plugins
 {
diff --git a/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs
index b353d03bcd..7be2a6db86 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
diff --git a/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
index cbceb58204..3bf6842cd6 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
@@ -1,10 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Reactive.Linq;
 using System.Reflection;
 using Avalonia.Utilities;
 
@@ -16,8 +12,11 @@ namespace Avalonia.Data.Core.Plugins
     /// </summary>
     public class InpcPropertyAccessorPlugin : IPropertyAccessorPlugin
     {
+        private readonly Dictionary<(Type, string), PropertyInfo> _propertyLookup =
+            new Dictionary<(Type, string), PropertyInfo>();
+        
         /// <inheritdoc/>
-        public bool Match(object obj, string propertyName) => true;
+        public bool Match(object obj, string propertyName) => GetFirstPropertyWithName(obj.GetType(), propertyName) != null;
 
         /// <summary>
         /// Starts monitoring the value of a property on an object.
@@ -34,7 +33,8 @@ namespace Avalonia.Data.Core.Plugins
             Contract.Requires<ArgumentNullException>(propertyName != null);
 
             reference.TryGetTarget(out object instance);
-            var p = instance.GetType().GetRuntimeProperties().FirstOrDefault(x => x.Name == propertyName);
+
+            var p = GetFirstPropertyWithName(instance.GetType(), propertyName);
 
             if (p != null)
             {
@@ -48,6 +48,42 @@ namespace Avalonia.Data.Core.Plugins
             }
         }
 
+        private PropertyInfo GetFirstPropertyWithName(Type type, string propertyName)
+        {
+            var key = (type, propertyName);
+            
+            if (!_propertyLookup.TryGetValue(key, out PropertyInfo propertyInfo))
+            {
+                propertyInfo = TryFindAndCacheProperty(type, propertyName);
+            }
+
+            return propertyInfo;
+        }
+        
+        private PropertyInfo TryFindAndCacheProperty(Type type, string propertyName)
+        {
+            PropertyInfo found = null;
+
+            const BindingFlags bindingFlags =
+                BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance;
+
+            var properties = type.GetProperties(bindingFlags);
+
+            foreach (PropertyInfo propertyInfo in properties)
+            {
+                if (propertyInfo.Name == propertyName)
+                {
+                    found = propertyInfo;
+
+                    break;
+                }
+            }
+
+            _propertyLookup.Add((type, propertyName), found);
+
+            return found;
+        }
+
         private class Accessor : PropertyAccessorBase, IWeakSubscriber<PropertyChangedEventArgs>
         {
             private readonly WeakReference<object> _reference;
diff --git a/src/Avalonia.Base/Data/Core/Plugins/MethodAccessorPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/MethodAccessorPlugin.cs
index c19ee8dba7..5d694f4cf9 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/MethodAccessorPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/MethodAccessorPlugin.cs
@@ -1,13 +1,16 @@
 using System;
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq.Expressions;
 using System.Reflection;
 
 namespace Avalonia.Data.Core.Plugins
 {
-    class MethodAccessorPlugin : IPropertyAccessorPlugin
+    public class MethodAccessorPlugin : IPropertyAccessorPlugin
     {
-        public bool Match(object obj, string methodName)
-            => obj.GetType().GetRuntimeMethods().Any(x => x.Name == methodName);
+        private readonly Dictionary<(Type, string), MethodInfo> _methodLookup =
+            new Dictionary<(Type, string), MethodInfo>();
+
+        public bool Match(object obj, string methodName) => GetFirstMethodWithName(obj.GetType(), methodName) != null;
 
         public IPropertyAccessor Start(WeakReference<object> reference, string methodName)
         {
@@ -15,17 +18,22 @@ namespace Avalonia.Data.Core.Plugins
             Contract.Requires<ArgumentNullException>(methodName != null);
 
             reference.TryGetTarget(out object instance);
-            var method = instance.GetType().GetRuntimeMethods().FirstOrDefault(x => x.Name == methodName);
+
+            var method = GetFirstMethodWithName(instance.GetType(), methodName);
 
             if (method != null)
             {
-                if (method.GetParameters().Length + (method.ReturnType == typeof(void) ? 0 : 1) > 8)
+                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));
+                    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);
+                return new Accessor(reference, method, parameters);
             }
             else
             {
@@ -35,31 +43,72 @@ namespace Avalonia.Data.Core.Plugins
             }
         }
 
+        private MethodInfo GetFirstMethodWithName(Type type, string methodName)
+        {
+            var key = (type, methodName);
+
+            if (!_methodLookup.TryGetValue(key, out MethodInfo methodInfo))
+            {
+                methodInfo = TryFindAndCacheMethod(type, methodName);
+            }
+
+            return methodInfo;
+        }
+
+        private MethodInfo TryFindAndCacheMethod(Type type, string methodName)
+        {
+            MethodInfo found = null;
+
+            const BindingFlags bindingFlags =
+                BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance;
+
+            var methods = type.GetMethods(bindingFlags);
+
+            foreach (MethodInfo methodInfo in methods)
+            {
+                if (methodInfo.Name == methodName)
+                {
+                    found = methodInfo;
+
+                    break;
+                }
+            }
+
+            _methodLookup.Add((type, methodName), found);
+
+            return found;
+        }
+
         private sealed class Accessor : PropertyAccessorBase
         {
-            public Accessor(WeakReference<object> reference, MethodInfo method)
+            public Accessor(WeakReference<object> reference, MethodInfo method, ParameterInfo[] parameters)
             {
                 Contract.Requires<ArgumentNullException>(reference != null);
                 Contract.Requires<ArgumentNullException>(method != null);
 
-                var paramTypes = method.GetParameters().Select(param => param.ParameterType).ToArray();
                 var returnType = method.ReturnType;
-                
-                if (returnType == typeof(void))
+                bool hasReturn = returnType != typeof(void);
+
+                var signatureTypeCount = (hasReturn ? 1 : 0) + parameters.Length;
+
+                var paramTypes = new Type[signatureTypeCount];
+
+                for (var i = 0; i < parameters.Length; i++)
                 {
-                    if (paramTypes.Length == 0)
-                    {
-                        PropertyType = typeof(Action);
-                    }
-                    else
-                    {
-                        PropertyType = Type.GetType($"System.Action`{paramTypes.Length}").MakeGenericType(paramTypes); 
-                    }
+                    ParameterInfo parameter = parameters[i];
+
+                    paramTypes[i] = parameter.ParameterType;
+                }
+
+                if (hasReturn)
+                {
+                    paramTypes[paramTypes.Length - 1] = returnType;
+
+                    PropertyType = Expression.GetFuncType(paramTypes);
                 }
                 else
                 {
-                    var genericTypeParameters = paramTypes.Concat(new[] { returnType }).ToArray();
-                    PropertyType = Type.GetType($"System.Func`{genericTypeParameters.Length}").MakeGenericType(genericTypeParameters);
+                    PropertyType = Expression.GetActionType(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 ef5ce05821..33a1d02211 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/ObservableStreamPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/ObservableStreamPlugin.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Linq;
 using System.Reactive.Linq;
 using System.Reflection;
diff --git a/src/Avalonia.Base/Data/Core/Plugins/PropertyAccessorBase.cs b/src/Avalonia.Base/Data/Core/Plugins/PropertyAccessorBase.cs
index e840b2c5c9..59e8e01a44 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/PropertyAccessorBase.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/PropertyAccessorBase.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Data.Core.Plugins
 {
diff --git a/src/Avalonia.Base/Data/Core/Plugins/TaskStreamPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/TaskStreamPlugin.cs
index a3d2714747..debf050a97 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/TaskStreamPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/TaskStreamPlugin.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using System.Reflection;
@@ -62,7 +59,7 @@ namespace Avalonia.Data.Core.Plugins
             return Observable.Empty<object>();
         }
 
-        protected IObservable<object> HandleCompleted(Task task)
+        private IObservable<object> HandleCompleted(Task task)
         {
             var resultProperty = task.GetType().GetRuntimeProperty("Result");
             
diff --git a/src/Avalonia.Base/Data/Core/PropertyAccessorNode.cs b/src/Avalonia.Base/Data/Core/PropertyAccessorNode.cs
index 70f53b8b88..d5e835cabd 100644
--- a/src/Avalonia.Base/Data/Core/PropertyAccessorNode.cs
+++ b/src/Avalonia.Base/Data/Core/PropertyAccessorNode.cs
@@ -1,9 +1,5 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Linq;
-using System.Reactive.Linq;
+using System.Diagnostics;
 using Avalonia.Data.Core.Plugins;
 
 namespace Avalonia.Data.Core
@@ -11,6 +7,7 @@ namespace Avalonia.Data.Core
     public class PropertyAccessorNode : SettableNode
     {
         private readonly bool _enableValidation;
+        private IPropertyAccessorPlugin _customPlugin;
         private IPropertyAccessor _accessor;
 
         public PropertyAccessorNode(string propertyName, bool enableValidation)
@@ -19,6 +16,13 @@ namespace Avalonia.Data.Core
             _enableValidation = enableValidation;
         }
 
+        public PropertyAccessorNode(string propertyName, bool enableValidation, IPropertyAccessorPlugin customPlugin)
+        {
+            PropertyName = propertyName;
+            _enableValidation = enableValidation;
+            _customPlugin = customPlugin;
+        }
+
         public override string Description => PropertyName;
         public string PropertyName { get; }
         public override Type PropertyType => _accessor?.PropertyType;
@@ -41,9 +45,21 @@ namespace Avalonia.Data.Core
         {
             reference.TryGetTarget(out object target);
 
-            var plugin = ExpressionObserver.PropertyAccessors.FirstOrDefault(x => x.Match(target, PropertyName));
+            var plugin = _customPlugin ?? GetPropertyAccessorPluginForObject(target);
             var accessor = plugin?.Start(reference, PropertyName);
 
+            // We need to handle accessor fallback before handling validation. Validators do not support null accessors.
+            if (accessor == null)
+            {
+                reference.TryGetTarget(out object instance);
+
+                var message = $"Could not find a matching property accessor for '{PropertyName}' on '{instance}'";
+
+                var exception = new MissingMemberException(message);
+
+                accessor = new PropertyError(new BindingNotification(exception, BindingErrorType.Error));
+            }
+
             if (_enableValidation && Next == null)
             {
                 foreach (var validator in ExpressionObserver.DataValidators)
@@ -55,16 +71,27 @@ namespace Avalonia.Data.Core
                 }
             }
 
-            if (accessor == null)
+            if (accessor is null)
             {
-                throw new NotSupportedException(
-                    $"Could not find a matching property accessor for {PropertyName}.");
+                throw new AvaloniaInternalException("Data validators must return non-null accessor.");
             }
 
             _accessor = accessor;
             accessor.Subscribe(ValueChanged);
         }
 
+        private IPropertyAccessorPlugin GetPropertyAccessorPluginForObject(object target)
+        {
+            foreach (IPropertyAccessorPlugin x in ExpressionObserver.PropertyAccessors)
+            {
+                if (x.Match(target, PropertyName))
+                {
+                    return x;
+                }
+            }
+            return null;
+        }
+
         protected override void StopListeningCore()
         {
             _accessor.Dispose();
diff --git a/src/Avalonia.Base/Data/Core/PropertyPath.cs b/src/Avalonia.Base/Data/Core/PropertyPath.cs
new file mode 100644
index 0000000000..665953c4a1
--- /dev/null
+++ b/src/Avalonia.Base/Data/Core/PropertyPath.cs
@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Avalonia.Data.Core
+{
+    public class PropertyPath
+    {
+        public IReadOnlyList<IPropertyPathElement> Elements { get; }
+
+        public PropertyPath(IEnumerable<IPropertyPathElement> elements)
+        {
+            Elements = elements.ToList();
+        }
+    }
+
+    public class PropertyPathBuilder
+    {
+        readonly List<IPropertyPathElement> _elements = new List<IPropertyPathElement>();
+        
+        public PropertyPathBuilder Property(IPropertyInfo property)
+        {
+            _elements.Add(new PropertyPropertyPathElement(property));
+            return this;
+        }
+        
+
+        public PropertyPathBuilder ChildTraversal()
+        {
+            _elements.Add(new ChildTraversalPropertyPathElement());
+            return this;
+        }
+
+        public PropertyPathBuilder EnsureType(Type type)
+        {
+            _elements.Add(new EnsureTypePropertyPathElement(type));
+            return this;
+        }
+
+        public PropertyPathBuilder Cast(Type type)
+        {
+            _elements.Add(new CastTypePropertyPathElement(type));
+            return this;
+        }
+
+        public PropertyPath Build()
+        {
+            return new PropertyPath(_elements);
+        }
+    }
+
+    public interface IPropertyPathElement
+    {
+        
+    }
+
+    public class PropertyPropertyPathElement : IPropertyPathElement
+    {
+        public IPropertyInfo Property { get; }
+
+        public PropertyPropertyPathElement(IPropertyInfo property)
+        {
+            Property = property;
+        }
+    }
+
+    public class ChildTraversalPropertyPathElement : IPropertyPathElement
+    {
+        
+    }
+
+    public class EnsureTypePropertyPathElement : IPropertyPathElement
+    {
+        public Type Type { get; }
+
+        public EnsureTypePropertyPathElement(Type type)
+        {
+            Type = type;
+        }
+    }
+
+    public class CastTypePropertyPathElement : IPropertyPathElement
+    {
+        public CastTypePropertyPathElement(Type type)
+        {
+            Type = type;
+        }
+
+        public Type Type { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Data/Core/StreamNode.cs b/src/Avalonia.Base/Data/Core/StreamNode.cs
index 183e0662aa..023999f5c5 100644
--- a/src/Avalonia.Base/Data/Core/StreamNode.cs
+++ b/src/Avalonia.Base/Data/Core/StreamNode.cs
@@ -1,38 +1,54 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
+using Avalonia.Data.Core.Plugins;
 
 namespace Avalonia.Data.Core
 {
     public class StreamNode : ExpressionNode
     {
+        private IStreamPlugin _customPlugin = null;
         private IDisposable _subscription;
 
         public override string Description => "^";
 
+        public StreamNode() { }
+
+        public StreamNode(IStreamPlugin customPlugin)
+        {
+            _customPlugin = customPlugin;
+        }
+
         protected override void StartListeningCore(WeakReference<object> reference)
         {
+            GetPlugin(reference)?.Start(reference).Subscribe(ValueChanged);
+        }
+
+        protected override void StopListeningCore()
+        {
+            _subscription?.Dispose();
+            _subscription = null;
+        }
+
+        private IStreamPlugin GetPlugin(WeakReference<object> reference)
+        {
+            if (_customPlugin != null)
+            {
+                return _customPlugin;
+            }
+
             foreach (var plugin in ExpressionObserver.StreamHandlers)
             {
                 if (plugin.Match(reference))
                 {
-                    _subscription = plugin.Start(reference).Subscribe(ValueChanged);
-                    return;
+                    return plugin;
                 }
             }
 
-            // TODO: Improve error.
+            // TODO: Improve error
             ValueChanged(new BindingNotification(
                 new MarkupBindingChainException("Stream operator applied to unsupported type", Description),
                 BindingErrorType.Error));
-        }
-
-        protected override void StopListeningCore()
-        {
-            _subscription?.Dispose();
-            _subscription = null;
+            return null;
         }
     }
 }
diff --git a/src/Avalonia.Base/Data/Core/TypeCastNode.cs b/src/Avalonia.Base/Data/Core/TypeCastNode.cs
new file mode 100644
index 0000000000..476fd5527f
--- /dev/null
+++ b/src/Avalonia.Base/Data/Core/TypeCastNode.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Avalonia.Data.Core
+{
+    public class TypeCastNode : ExpressionNode
+    {
+        public override string Description => $"as {TargetType.FullName}";
+
+        public Type TargetType { get; }
+
+        public TypeCastNode(Type type)
+        {
+            TargetType = type;
+        }
+
+        protected virtual object Cast(object value)
+        {
+            return TargetType.IsInstanceOfType(value) ? value : null;
+        }
+
+        protected override void StartListeningCore(WeakReference<object> reference)
+        {
+            if (reference.TryGetTarget(out object target))
+            {
+                target = Cast(target);
+                reference = target == null ? NullReference : new WeakReference<object>(target);
+            }
+
+            base.StartListeningCore(reference);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Data/IBinding.cs b/src/Avalonia.Base/Data/IBinding.cs
index 95239cae06..bc91cf8960 100644
--- a/src/Avalonia.Base/Data/IBinding.cs
+++ b/src/Avalonia.Base/Data/IBinding.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Data
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Data/IndexerBinding.cs b/src/Avalonia.Base/Data/IndexerBinding.cs
index 6b5a84989a..cc3baa4530 100644
--- a/src/Avalonia.Base/Data/IndexerBinding.cs
+++ b/src/Avalonia.Base/Data/IndexerBinding.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Data
 {
diff --git a/src/Avalonia.Base/Data/IndexerDescriptor.cs b/src/Avalonia.Base/Data/IndexerDescriptor.cs
index fef21a55c4..3cf6767b89 100644
--- a/src/Avalonia.Base/Data/IndexerDescriptor.cs
+++ b/src/Avalonia.Base/Data/IndexerDescriptor.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive;
 
diff --git a/src/Avalonia.Base/Data/InstancedBinding.cs b/src/Avalonia.Base/Data/InstancedBinding.cs
index dc35fe076b..0d20f25fe2 100644
--- a/src/Avalonia.Base/Data/InstancedBinding.cs
+++ b/src/Avalonia.Base/Data/InstancedBinding.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Subjects;
 
diff --git a/src/Avalonia.Base/Data/Optional.cs b/src/Avalonia.Base/Data/Optional.cs
new file mode 100644
index 0000000000..8e044d7896
--- /dev/null
+++ b/src/Avalonia.Base/Data/Optional.cs
@@ -0,0 +1,156 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable enable
+
+namespace Avalonia.Data
+{
+    /// <summary>
+    /// An optional typed value.
+    /// </summary>
+    /// <typeparam name="T">The value type.</typeparam>
+    /// <remarks>
+    /// This struct is similar to <see cref="Nullable{T}"/> except it also accepts reference types:
+    /// note that null is a valid value for reference types. It is also similar to
+    /// <see cref="BindingValue{T}"/> but has only two states: "value present" and "value missing".
+    /// 
+    /// To create a new optional value you can:
+    /// 
+    /// - For a simple value, call the <see cref="Optional{T}"/> constructor or use an implicit
+    ///   conversion from <typeparamref name="T"/>
+    /// - For an missing value, use <see cref="Empty"/> or simply `default`
+    /// </remarks>
+    public readonly struct Optional<T> : IEquatable<Optional<T>>
+    {
+        [AllowNull] private readonly T _value;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Optional{T}"/> struct with value.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public Optional([AllowNull] T value)
+        {
+            _value = value;
+            HasValue = true;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether a value is present.
+        /// </summary>
+        public bool HasValue { get; }
+
+        /// <summary>
+        /// Gets the value.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">
+        /// <see cref="HasValue"/> is false.
+        /// </exception>
+        public T Value => HasValue ? _value : throw new InvalidOperationException("Optional has no value.");
+
+        /// <inheritdoc/>
+        public override bool Equals(object? obj) => obj is Optional<T> o && this == o;
+
+        /// <inheritdoc/>
+        public bool Equals(Optional<T> other) => this == other;
+
+        /// <inheritdoc/>
+        public override int GetHashCode() => HasValue ? _value?.GetHashCode() ?? 0 : 0;
+
+        /// <summary>
+        /// Casts the value (if any) to an <see cref="object"/>.
+        /// </summary>
+        /// <returns>The cast optional value.</returns>
+        public Optional<object> ToObject() => HasValue ? new Optional<object>(_value) : default;
+
+        /// <inheritdoc/>
+        public override string ToString() => HasValue ? _value?.ToString() ?? "(null)" : "(empty)";
+
+        /// <summary>
+        /// Gets the value if present, otherwise the default value.
+        /// </summary>
+        /// <returns>The value.</returns>
+        [return: MaybeNull]
+        public T GetValueOrDefault() => HasValue ? _value : default;
+
+        /// <summary>
+        /// Gets the value if present, otherwise a default value.
+        /// </summary>
+        /// <param name="defaultValue">The default value.</param>
+        /// <returns>The value.</returns>
+        public T GetValueOrDefault(T defaultValue) => HasValue ? _value : defaultValue;
+
+        /// <summary>
+        /// Gets the value if present, otherwise the default value.
+        /// </summary>
+        /// <returns>
+        /// The value if present and of the correct type, `default(TResult)` if the value is
+        /// not present or of an incorrect type.
+        /// </returns>
+        [return: MaybeNull]
+        public TResult GetValueOrDefault<TResult>()
+        {
+            return HasValue ?
+                _value is TResult result ? result : default
+                : default;
+        }
+
+        /// <summary>
+        /// Gets the value if present, otherwise a default value.
+        /// </summary>
+        /// <param name="defaultValue">The default value.</param>
+        /// <returns>
+        /// The value if present and of the correct type, `default(TResult)` if the value is
+        /// present but not of the correct type or null, or <paramref name="defaultValue"/> if the
+        /// value is not present.
+        /// </returns>
+        [return: MaybeNull]
+        public TResult GetValueOrDefault<TResult>([AllowNull] TResult defaultValue)
+        {
+            return HasValue ?
+                _value is TResult result ? result : default
+                : defaultValue;
+        }
+
+        /// <summary>
+        /// Creates an <see cref="Optional{T}"/> from an instance of the underlying value type.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public static implicit operator Optional<T>([AllowNull] T value) => new Optional<T>(value);
+
+        /// <summary>
+        /// Compares two <see cref="Optional{T}"/>s for inequality.
+        /// </summary>
+        /// <param name="x">The first value.</param>
+        /// <param name="y">The second value.</param>
+        /// <returns>True if the values are unequal; otherwise false.</returns>
+        public static bool operator !=(Optional<T> x, Optional<T> y) => !(x == y);
+
+        /// <summary>
+        /// Compares two <see cref="Optional{T}"/>s for equality.
+        /// </summary>
+        /// <param name="x">The first value.</param>
+        /// <param name="y">The second value.</param>
+        /// <returns>True if the values are equal; otherwise false.</returns>
+        public static bool operator ==(Optional<T> x, Optional<T> y)
+        {
+            if (!x.HasValue && !y.HasValue)
+            {
+                return true;
+            }
+            else if (x.HasValue && y.HasValue)
+            {
+                return EqualityComparer<T>.Default.Equals(x.Value, y.Value);
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Returns an <see cref="Optional{T}"/> without a value.
+        /// </summary>
+        public static Optional<T> Empty => default;
+    }
+}
diff --git a/src/Avalonia.Base/Diagnostics/AvaloniaObjectExtensions.cs b/src/Avalonia.Base/Diagnostics/AvaloniaObjectExtensions.cs
index 7afbcabd2a..d7b1f2e053 100644
--- a/src/Avalonia.Base/Diagnostics/AvaloniaObjectExtensions.cs
+++ b/src/Avalonia.Base/Diagnostics/AvaloniaObjectExtensions.cs
@@ -1,6 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using System;
 using Avalonia.Data;
 
 namespace Avalonia.Diagnostics
@@ -21,35 +19,7 @@ namespace Avalonia.Diagnostics
         /// </returns>
         public static AvaloniaPropertyValue GetDiagnostic(this AvaloniaObject o, AvaloniaProperty property)
         {
-            var set = o.GetSetValues();
-
-            if (set.TryGetValue(property, out var obj))
-            {
-                if (obj is PriorityValue value)
-                {
-                    return new AvaloniaPropertyValue(
-                        property,
-                        o.GetValue(property),
-                        (BindingPriority)value.ValuePriority,
-                        value.GetDiagnostic());
-                }
-                else
-                {
-                    return new AvaloniaPropertyValue(
-                        property,
-                        obj,
-                        BindingPriority.LocalValue,
-                        "Local value");
-                }
-            }
-            else
-            {
-                return new AvaloniaPropertyValue(
-                    property,
-                    o.GetValue(property),
-                    BindingPriority.Unset,
-                    "Unset");
-            }
+            return o.GetDiagnosticInternal(property);
         }
     }
 }
diff --git a/src/Avalonia.Base/Diagnostics/AvaloniaPropertyValue.cs b/src/Avalonia.Base/Diagnostics/AvaloniaPropertyValue.cs
index af15f66bb0..c881c389c1 100644
--- a/src/Avalonia.Base/Diagnostics/AvaloniaPropertyValue.cs
+++ b/src/Avalonia.Base/Diagnostics/AvaloniaPropertyValue.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Data;
 
 namespace Avalonia.Diagnostics
diff --git a/src/Avalonia.Base/Diagnostics/IAvaloniaObjectDebug.cs b/src/Avalonia.Base/Diagnostics/IAvaloniaObjectDebug.cs
index f1d31cc1e7..7f09425905 100644
--- a/src/Avalonia.Base/Diagnostics/IAvaloniaObjectDebug.cs
+++ b/src/Avalonia.Base/Diagnostics/IAvaloniaObjectDebug.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Diagnostics
diff --git a/src/Avalonia.Base/Diagnostics/INotifyCollectionChangedDebug.cs b/src/Avalonia.Base/Diagnostics/INotifyCollectionChangedDebug.cs
index 557d5bdc42..36152e6430 100644
--- a/src/Avalonia.Base/Diagnostics/INotifyCollectionChangedDebug.cs
+++ b/src/Avalonia.Base/Diagnostics/INotifyCollectionChangedDebug.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Specialized;
 using Avalonia.Collections;
diff --git a/src/Avalonia.Base/DirectProperty.cs b/src/Avalonia.Base/DirectProperty.cs
index 1ce73c20ba..a8120fbd4f 100644
--- a/src/Avalonia.Base/DirectProperty.cs
+++ b/src/Avalonia.Base/DirectProperty.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Data;
 
@@ -16,7 +13,7 @@ namespace Avalonia
     /// <see cref="AvaloniaProperty"/> system. They hold a getter and an optional setter which
     /// allows the avalonia property system to read and write the current value.
     /// </remarks>
-    public class DirectProperty<TOwner, TValue> : AvaloniaProperty<TValue>, IDirectPropertyAccessor
+    public class DirectProperty<TOwner, TValue> : DirectPropertyBase<TValue>, IDirectPropertyAccessor
         where TOwner : IAvaloniaObject
     {
         /// <summary>
@@ -47,7 +44,7 @@ namespace Avalonia
         /// <param name="setter">Sets the value of the property. May be null.</param>
         /// <param name="metadata">Optional overridden metadata.</param>
         private DirectProperty(
-            AvaloniaProperty<TValue> source,
+            DirectPropertyBase<TValue> source,
             Func<TOwner, TValue> getter,
             Action<TOwner, TValue> setter,
             DirectPropertyMetadata<TValue> metadata)
@@ -65,6 +62,9 @@ namespace Avalonia
         /// <inheritdoc/>
         public override bool IsReadOnly => Setter == null;
 
+        /// <inheritdoc/>
+        public override Type Owner => typeof(TOwner);
+
         /// <summary>
         /// Gets the getter function.
         /// </summary>
@@ -75,9 +75,6 @@ namespace Avalonia
         /// </summary>
         public Action<TOwner, TValue> Setter { get; }
 
-        /// <inheritdoc/>
-        Type IDirectPropertyAccessor.Owner => typeof(TOwner);
-
         /// <summary>
         /// Registers the direct property on another type.
         /// </summary>
@@ -107,6 +104,45 @@ namespace Avalonia
 
             metadata.Merge(GetMetadata<TOwner>(), this);
 
+            var result = new DirectProperty<TNewOwner, TValue>(
+                (DirectPropertyBase<TValue>)this,
+                getter,
+                setter,
+                metadata);
+
+            AvaloniaPropertyRegistry.Instance.Register(typeof(TNewOwner), result);
+            return result;
+        }
+
+        /// <summary>
+        /// Registers the direct property on another type.
+        /// </summary>
+        /// <typeparam name="TNewOwner">The type of the additional owner.</typeparam>
+        /// <param name="getter">Gets the current value of the property.</param>
+        /// <param name="setter">Sets the value of the property.</param>
+        /// <param name="unsetValue">
+        /// The value to use when the property is set to <see cref="AvaloniaProperty.UnsetValue"/>
+        /// </param>
+        /// <param name="defaultBindingMode">The default binding mode for the property.</param>
+        /// <param name="enableDataValidation">
+        /// Whether the property is interested in data validation.
+        /// </param>
+        /// <returns>The property.</returns>
+        public DirectProperty<TNewOwner, TValue> AddOwnerWithDataValidation<TNewOwner>(
+            Func<TNewOwner, TValue> getter,
+            Action<TNewOwner,TValue> setter,
+            TValue unsetValue = default(TValue),
+            BindingMode defaultBindingMode = BindingMode.Default,
+            bool enableDataValidation = false)
+                where TNewOwner : AvaloniaObject
+        {
+            var metadata = new DirectPropertyMetadata<TValue>(
+                unsetValue: unsetValue,
+                defaultBindingMode: defaultBindingMode,
+                enableDataValidation: enableDataValidation);
+
+            metadata.Merge(GetMetadata<TOwner>(), this);
+
             var result = new DirectProperty<TNewOwner, TValue>(
                 this,
                 getter,
@@ -117,6 +153,26 @@ namespace Avalonia
             return result;
         }
 
+        /// <inheritdoc/>
+        internal override TValue InvokeGetter(IAvaloniaObject instance)
+        {
+            return Getter((TOwner)instance);
+        }
+
+        /// <inheritdoc/>
+        internal override void InvokeSetter(IAvaloniaObject instance, BindingValue<TValue> value)
+        {
+            if (Setter == null)
+            {
+                throw new ArgumentException($"The property {Name} is readonly.");
+            }
+
+            if (value.HasValue)
+            {
+                Setter((TOwner)instance, value.Value);
+            }
+        }
+
         /// <inheritdoc/>
         object IDirectPropertyAccessor.GetValue(IAvaloniaObject instance)
         {
diff --git a/src/Avalonia.Base/DirectPropertyBase.cs b/src/Avalonia.Base/DirectPropertyBase.cs
new file mode 100644
index 0000000000..e6cc1edfdf
--- /dev/null
+++ b/src/Avalonia.Base/DirectPropertyBase.cs
@@ -0,0 +1,187 @@
+using System;
+using Avalonia.Data;
+using Avalonia.Reactive;
+using Avalonia.Utilities;
+
+#nullable enable
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Base class for direct properties.
+    /// </summary>
+    /// <typeparam name="TValue">The type of the property's value.</typeparam>
+    /// <remarks>
+    /// Whereas <see cref="DirectProperty{TOwner, TValue}"/> is typed on the owner type, this base
+    /// class provides a non-owner-typed interface to a direct poperty.
+    /// </remarks>
+    public abstract class DirectPropertyBase<TValue> : AvaloniaProperty<TValue>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DirectPropertyBase{TValue}"/> class.
+        /// </summary>
+        /// <param name="name">The name of the property.</param>
+        /// <param name="ownerType">The type of the class that registers the property.</param>
+        /// <param name="metadata">The property metadata.</param>
+        protected DirectPropertyBase(
+            string name,
+            Type ownerType,
+            AvaloniaPropertyMetadata metadata)
+            : base(name, ownerType, metadata)
+        {
+        }
+
+        /// <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>
+        /// <param name="source">The property to copy.</param>
+        /// <param name="ownerType">The new owner type.</param>
+        /// <param name="metadata">Optional overridden metadata.</param>
+        protected DirectPropertyBase(
+            DirectPropertyBase<TValue> source,
+            Type ownerType,
+            AvaloniaPropertyMetadata metadata)
+            : base(source, ownerType, metadata)
+        {
+        }
+
+        /// <summary>
+        /// Gets the type that registered the property.
+        /// </summary>
+        public abstract Type Owner { get; }
+
+        /// <summary>
+        /// Gets the value of the property on the instance.
+        /// </summary>
+        /// <param name="instance">The instance.</param>
+        /// <returns>The property value.</returns>
+        internal abstract TValue InvokeGetter(IAvaloniaObject instance);
+
+        /// <summary>
+        /// Sets the value of the property on the instance.
+        /// </summary>
+        /// <param name="instance">The instance.</param>
+        /// <param name="value">The value.</param>
+        internal abstract void InvokeSetter(IAvaloniaObject instance, BindingValue<TValue> value);
+
+        /// <summary>
+        /// Gets the unset value for the property on the specified type.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <returns>The unset value.</returns>
+        public TValue GetUnsetValue(Type type)
+        {
+            type = type ?? throw new ArgumentNullException(nameof(type));
+            return GetMetadata(type).UnsetValue;
+        }
+
+        /// <summary>
+        /// Gets the property metadata for the specified type.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <returns>
+        /// The property metadata.
+        /// </returns>
+        public new DirectPropertyMetadata<TValue> GetMetadata(Type type)
+        {
+            return (DirectPropertyMetadata<TValue>)base.GetMetadata(type);
+        }
+
+        /// <summary>
+        /// Overrides the metadata for the property on the specified type.
+        /// </summary>
+        /// <typeparam name="T">The type.</typeparam>
+        /// <param name="metadata">The metadata.</param>
+        public void OverrideMetadata<T>(DirectPropertyMetadata<TValue> metadata) where T : IAvaloniaObject
+        {
+            base.OverrideMetadata(typeof(T), metadata);
+        }
+
+        /// <summary>
+        /// Overrides the metadata for the property on the specified type.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <param name="metadata">The metadata.</param>
+        public void OverrideMetadata(Type type, DirectPropertyMetadata<TValue> metadata)
+        {
+            base.OverrideMetadata(type, metadata);
+        }
+
+        /// <inheritdoc/>
+        public override void Accept<TData>(IAvaloniaPropertyVisitor<TData> vistor, ref TData data)
+        {
+            vistor.Visit(this, ref data);
+        }
+
+        /// <inheritdoc/>
+        internal override void RouteClearValue(IAvaloniaObject o)
+        {
+            o.ClearValue<TValue>(this);
+        }
+
+        /// <inheritdoc/>
+        internal override object? RouteGetValue(IAvaloniaObject o)
+        {
+            return o.GetValue<TValue>(this);
+        }
+
+        internal override object? RouteGetBaseValue(IAvaloniaObject o, BindingPriority maxPriority)
+        {
+            return o.GetValue<TValue>(this);
+        }
+
+        /// <inheritdoc/>
+        internal override IDisposable? RouteSetValue(
+            IAvaloniaObject o,
+            object value,
+            BindingPriority priority)
+        {
+            var v = TryConvert(value);
+
+            if (v.HasValue)
+            {
+                o.SetValue<TValue>(this, (TValue)v.Value);
+            }
+            else if (v.Type == BindingValueType.UnsetValue)
+            {
+                o.ClearValue(this);
+            }
+            else if (v.HasError)
+            {
+                throw v.Error!;
+            }
+
+            return null;
+        }
+
+        /// <inheritdoc/>
+        internal override IDisposable RouteBind(
+            IAvaloniaObject o,
+            IObservable<BindingValue<object>> source,
+            BindingPriority priority)
+        {
+            var adapter = TypedBindingAdapter<TValue>.Create(o, this, source);
+            return o.Bind<TValue>(this, adapter);
+        }
+
+        internal override void RouteInheritanceParentChanged(AvaloniaObject o, IAvaloniaObject oldParent)
+        {
+            throw new NotSupportedException("Direct properties do not support inheritance.");
+        }
+    }
+}
diff --git a/src/Avalonia.Base/DirectPropertyMetadata`1.cs b/src/Avalonia.Base/DirectPropertyMetadata`1.cs
index 26de578a45..205967984d 100644
--- a/src/Avalonia.Base/DirectPropertyMetadata`1.cs
+++ b/src/Avalonia.Base/DirectPropertyMetadata`1.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Data;
 
 namespace Avalonia
@@ -8,7 +5,7 @@ namespace Avalonia
     /// <summary>
     /// Metadata for direct avalonia properties.
     /// </summary>
-    public class DirectPropertyMetadata<TValue> : PropertyMetadata, IDirectPropertyMetadata
+    public class DirectPropertyMetadata<TValue> : AvaloniaPropertyMetadata, IDirectPropertyMetadata
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StyledPropertyMetadata{TValue}"/> class.
@@ -50,7 +47,7 @@ namespace Avalonia
         object IDirectPropertyMetadata.UnsetValue => UnsetValue;
 
         /// <inheritdoc/>
-        public override void Merge(PropertyMetadata baseMetadata, AvaloniaProperty property)
+        public override void Merge(AvaloniaPropertyMetadata baseMetadata, AvaloniaProperty property)
         {
             base.Merge(baseMetadata, property);
 
diff --git a/src/Avalonia.Base/EnumExtensions.cs b/src/Avalonia.Base/EnumExtensions.cs
index a8306c2d69..1e4864283f 100644
--- a/src/Avalonia.Base/EnumExtensions.cs
+++ b/src/Avalonia.Base/EnumExtensions.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Runtime.CompilerServices;
 
diff --git a/src/Avalonia.Base/IAvaloniaObject.cs b/src/Avalonia.Base/IAvaloniaObject.cs
index 5a3829167a..0452f77d4c 100644
--- a/src/Avalonia.Base/IAvaloniaObject.cs
+++ b/src/Avalonia.Base/IAvaloniaObject.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Data;
 
@@ -17,16 +14,24 @@ namespace Avalonia
         event EventHandler<AvaloniaPropertyChangedEventArgs> PropertyChanged;
 
         /// <summary>
-        /// Raised when an inheritable <see cref="AvaloniaProperty"/> value changes on this object.
+        /// Clears an <see cref="AvaloniaProperty"/>'s local value.
         /// </summary>
-        event EventHandler<AvaloniaPropertyChangedEventArgs> InheritablePropertyChanged;
+        /// <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>
-        object GetValue(AvaloniaProperty property);
+        T GetValue<T>(StyledPropertyBase<T> property);
 
         /// <summary>
         /// Gets a <see cref="AvaloniaProperty"/> value.
@@ -34,7 +39,20 @@ namespace Avalonia
         /// <typeparam name="T">The type of the property.</typeparam>
         /// <param name="property">The property.</param>
         /// <returns>The value.</returns>
-        T GetValue<T>(AvaloniaProperty<T> property);
+        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);
 
         /// <summary>
         /// Checks whether a <see cref="AvaloniaProperty"/> is animating.
@@ -53,12 +71,13 @@ 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>
-        void SetValue(
-            AvaloniaProperty property, 
-            object value, 
+        IDisposable SetValue<T>(
+            StyledPropertyBase<T> property,
+            T value,
             BindingPriority priority = BindingPriority.LocalValue);
 
         /// <summary>
@@ -67,24 +86,21 @@ namespace Avalonia
         /// <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>
-        void SetValue<T>(
-            AvaloniaProperty<T> property,
-            T value,
-            BindingPriority priority = BindingPriority.LocalValue);
+        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(
-            AvaloniaProperty property,
-            IObservable<object> source,
+        IDisposable Bind<T>(
+            StyledPropertyBase<T> property,
+            IObservable<BindingValue<T>> source,
             BindingPriority priority = BindingPriority.LocalValue);
 
         /// <summary>
@@ -93,13 +109,52 @@ namespace Avalonia
         /// <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>(
+            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,
-            IObservable<T> source,
-            BindingPriority priority = BindingPriority.LocalValue);
+            Optional<T> oldValue,
+            Optional<T> newValue);
     }
 }
diff --git a/src/Avalonia.Base/IDescription.cs b/src/Avalonia.Base/IDescription.cs
index db43f7a140..b3d9f16bb7 100644
--- a/src/Avalonia.Base/IDescription.cs
+++ b/src/Avalonia.Base/IDescription.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia
 {
     /// <summary>
diff --git a/src/Avalonia.Base/IDirectPropertyAccessor.cs b/src/Avalonia.Base/IDirectPropertyAccessor.cs
index 4f46652693..6ae71bc2c6 100644
--- a/src/Avalonia.Base/IDirectPropertyAccessor.cs
+++ b/src/Avalonia.Base/IDirectPropertyAccessor.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia
diff --git a/src/Avalonia.Base/IDirectPropertyMetadata.cs b/src/Avalonia.Base/IDirectPropertyMetadata.cs
index c283855e5f..992fa4ffc9 100644
--- a/src/Avalonia.Base/IDirectPropertyMetadata.cs
+++ b/src/Avalonia.Base/IDirectPropertyMetadata.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia
 {
     /// <summary>
diff --git a/src/Avalonia.Base/IPriorityValueOwner.cs b/src/Avalonia.Base/IPriorityValueOwner.cs
deleted file mode 100644
index 1d6e5e59ad..0000000000
--- a/src/Avalonia.Base/IPriorityValueOwner.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using Avalonia.Data;
-using Avalonia.Utilities;
-
-namespace Avalonia
-{
-    /// <summary>
-    /// An owner of a <see cref="PriorityValue"/>.
-    /// </summary>
-    internal interface IPriorityValueOwner
-    {
-        /// <summary>
-        /// Called when a <see cref="PriorityValue"/>'s value changes.
-        /// </summary>
-        /// <param name="property">The the property that has changed.</param>
-        /// <param name="priority">The priority of the value.</param>
-        /// <param name="oldValue">The old value.</param>
-        /// <param name="newValue">The new value.</param>
-        void Changed(AvaloniaProperty property, int priority, object oldValue, object newValue);
-
-        /// <summary>
-        /// Called when a <see cref="BindingNotification"/> is received by a 
-        /// <see cref="PriorityValue"/>.
-        /// </summary>
-        /// <param name="property">The the property that has changed.</param>
-        /// <param name="notification">The notification.</param>
-        void BindingNotificationReceived(AvaloniaProperty property, BindingNotification notification);
-
-        /// <summary>
-        /// Returns deferred setter for given non-direct property.
-        /// </summary>
-        /// <param name="property">Property.</param>
-        /// <returns>Deferred setter for given property.</returns>
-        DeferredSetter<object> GetNonDirectDeferredSetter(AvaloniaProperty property);
-
-        /// <summary>
-        /// Logs a binding error.
-        /// </summary>
-        /// <param name="property">The property the error occurred on.</param>
-        /// <param name="e">The binding error.</param>
-        void LogError(AvaloniaProperty property, Exception e);
-
-        /// <summary>
-        /// Ensures that the current thread is the UI thread.
-        /// </summary>
-        void VerifyAccess();
-    }
-}
diff --git a/src/Avalonia.Base/IStyledPropertyAccessor.cs b/src/Avalonia.Base/IStyledPropertyAccessor.cs
index f2ec5bd33f..45d106164f 100644
--- a/src/Avalonia.Base/IStyledPropertyAccessor.cs
+++ b/src/Avalonia.Base/IStyledPropertyAccessor.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia
@@ -18,14 +15,5 @@ namespace Avalonia
         /// The default value.
         /// </returns>
         object GetDefaultValue(Type type);
-
-        /// <summary>
-        /// Gets a validation function for the property on the specified type.
-        /// </summary>
-        /// <param name="type">The type.</param>
-        /// <returns>
-        /// The validation function, or null if no validation function exists.
-        /// </returns>
-        Func<IAvaloniaObject, object, object> GetValidationFunc(Type type);
     }
 }
diff --git a/src/Avalonia.Base/IStyledPropertyMetadata.cs b/src/Avalonia.Base/IStyledPropertyMetadata.cs
index 22cda075fa..a68b65e5e0 100644
--- a/src/Avalonia.Base/IStyledPropertyMetadata.cs
+++ b/src/Avalonia.Base/IStyledPropertyMetadata.cs
@@ -1,8 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-
 namespace Avalonia
 {
     /// <summary>
@@ -14,10 +9,5 @@ namespace Avalonia
         /// Gets the default value for the property.
         /// </summary>
         object DefaultValue { get; }
-
-        /// <summary>
-        /// Gets the property's validation function.
-        /// </summary>
-        Func<IAvaloniaObject, object, object> Validate { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Logging/ILogSink.cs b/src/Avalonia.Base/Logging/ILogSink.cs
index 8b5751b0af..71268d5965 100644
--- a/src/Avalonia.Base/Logging/ILogSink.cs
+++ b/src/Avalonia.Base/Logging/ILogSink.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Logging
 {
     /// <summary>
@@ -9,11 +6,12 @@ namespace Avalonia.Logging
     public interface ILogSink
     {
         /// <summary>
-        /// Checks if given log level is enabled.
+        /// Checks if given log level and area is enabled.
         /// </summary>
         /// <param name="level">The log event level.</param>
+        /// <param name="area">The log area.</param>
         /// <returns><see langword="true"/> if given log level is enabled.</returns>
-        bool IsEnabled(LogEventLevel level);
+        bool IsEnabled(LogEventLevel level, string area);
 
         /// <summary>
         /// Logs an event.
diff --git a/src/Avalonia.Base/Logging/LogArea.cs b/src/Avalonia.Base/Logging/LogArea.cs
index 6bc1609cbc..2ad220dddd 100644
--- a/src/Avalonia.Base/Logging/LogArea.cs
+++ b/src/Avalonia.Base/Logging/LogArea.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Logging
 {
     /// <summary>
@@ -37,5 +34,10 @@ namespace Avalonia.Logging
         /// The log event comes from the control system.
         /// </summary>
         public const string Control = "Control";
+
+        /// <summary>
+        /// The log event comes from Win32Platform.
+        /// </summary>
+        public const string Win32Platform = nameof(Win32Platform);
     }
 }
diff --git a/src/Avalonia.Base/Logging/LogEventLevel.cs b/src/Avalonia.Base/Logging/LogEventLevel.cs
index fbb3b14d59..68406667ff 100644
--- a/src/Avalonia.Base/Logging/LogEventLevel.cs
+++ b/src/Avalonia.Base/Logging/LogEventLevel.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Logging
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Logging/Logger.cs b/src/Avalonia.Base/Logging/Logger.cs
index c895c70094..ed3fad93fc 100644
--- a/src/Avalonia.Base/Logging/Logger.cs
+++ b/src/Avalonia.Base/Logging/Logger.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Logging
 {
     /// <summary>
@@ -17,36 +14,39 @@ namespace Avalonia.Logging
         /// Checks if given log level is enabled.
         /// </summary>
         /// <param name="level">The log event level.</param>
+        /// <param name="area">The log area.</param>
         /// <returns><see langword="true"/> if given log level is enabled.</returns>
-        public static bool IsEnabled(LogEventLevel level)
+        public static bool IsEnabled(LogEventLevel level, string area)
         {
-            return Sink?.IsEnabled(level) == true;
+            return Sink?.IsEnabled(level, area) == true;
         }
 
         /// <summary>
         /// Returns parametrized logging sink if given log level is enabled.
         /// </summary>
         /// <param name="level">The log event level.</param>
+        /// <param name="area">The area that the event originates from.</param>
         /// <returns>Log sink or <see langword="null"/> if log level is not enabled.</returns>
-        public static ParametrizedLogger? TryGet(LogEventLevel level)
+        public static ParametrizedLogger? TryGet(LogEventLevel level, string area)
         {
-            if (!IsEnabled(level))
+            if (!IsEnabled(level, area))
             {
                 return null;
             }
 
-            return new ParametrizedLogger(Sink, level);
+            return new ParametrizedLogger(Sink, level, area);
         }
 
         /// <summary>
         /// Returns parametrized logging sink if given log level is enabled.
         /// </summary>
         /// <param name="level">The log event level.</param>
+        /// <param name="area">The area that the event originates from.</param>
         /// <param name="outLogger">Log sink that is valid only if method returns <see langword="true"/>.</param>
         /// <returns><see langword="true"/> if logger was obtained successfully.</returns>
-        public static bool TryGet(LogEventLevel level, out ParametrizedLogger outLogger)
+        public static bool TryGet(LogEventLevel level, string area, out ParametrizedLogger outLogger)
         {
-            ParametrizedLogger? logger = TryGet(level);
+            ParametrizedLogger? logger = TryGet(level, area);
 
             outLogger = logger.GetValueOrDefault();
 
diff --git a/src/Avalonia.Base/Logging/ParametrizedLogger.cs b/src/Avalonia.Base/Logging/ParametrizedLogger.cs
index 1550cc1b40..adadb0f990 100644
--- a/src/Avalonia.Base/Logging/ParametrizedLogger.cs
+++ b/src/Avalonia.Base/Logging/ParametrizedLogger.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Runtime.CompilerServices;
 
 namespace Avalonia.Logging
@@ -12,11 +9,13 @@ namespace Avalonia.Logging
     {
         private readonly ILogSink _sink;
         private readonly LogEventLevel _level;
+        private readonly string _area;
 
-        public ParametrizedLogger(ILogSink sink, LogEventLevel level)
+        public ParametrizedLogger(ILogSink sink, LogEventLevel level, string area)
         {
             _sink = sink;
             _level = level;
+            _area = area;
         }
 
         /// <summary>
@@ -27,58 +26,51 @@ namespace Avalonia.Logging
         /// <summary>
         /// Logs an event.
         /// </summary>
-        /// <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>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void Log(
-            string area,
             object source,
             string messageTemplate)
         {
-            _sink.Log(_level, area, source, messageTemplate);
+            _sink.Log(_level, _area, source, messageTemplate);
         }
 
         /// <summary>
         /// Logs an event.
         /// </summary>
-        /// <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>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void Log<T0>(
-            string area,
             object source,
             string messageTemplate,
             T0 propertyValue0)
         {
-            _sink.Log(_level, area, source, messageTemplate, propertyValue0);
+            _sink.Log(_level, _area, source, messageTemplate, propertyValue0);
         }
 
         /// <summary>
         /// Logs an event.
         /// </summary>
-        /// <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>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void Log<T0, T1>(
-            string area,
             object source,
             string messageTemplate,
             T0 propertyValue0,
             T1 propertyValue1)
         {
-            _sink.Log(_level, area, source, messageTemplate, propertyValue0, propertyValue1);
+            _sink.Log(_level, _area, source, messageTemplate, propertyValue0, propertyValue1);
         }
 
         /// <summary>
         /// Logs an event.
         /// </summary>
-        /// <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>
@@ -86,20 +78,18 @@ namespace Avalonia.Logging
         /// <param name="propertyValue2">Message property value.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void Log<T0, T1, T2>(
-            string area,
             object source,
             string messageTemplate,
             T0 propertyValue0,
             T1 propertyValue1,
             T2 propertyValue2)
         {
-            _sink.Log(_level, area, source, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            _sink.Log(_level, _area, source, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
         }
 
         /// <summary>
         /// Logs an event.
         /// </summary>
-        /// <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>
@@ -108,7 +98,6 @@ namespace Avalonia.Logging
         /// <param name="propertyValue3">Message property value.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void Log<T0, T1, T2, T3>(
-            string area,
             object source,
             string messageTemplate,
             T0 propertyValue0,
@@ -116,13 +105,12 @@ namespace Avalonia.Logging
             T2 propertyValue2,
             T3 propertyValue3)
         {
-            _sink.Log(_level, area, source, messageTemplate, propertyValue0, propertyValue1, propertyValue2, propertyValue3);
+            _sink.Log(_level, _area, source, messageTemplate, propertyValue0, propertyValue1, propertyValue2, propertyValue3);
         }
 
         /// <summary>
         /// Logs an event.
         /// </summary>
-        /// <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>
@@ -132,7 +120,6 @@ namespace Avalonia.Logging
         /// <param name="propertyValue4">Message property value.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void Log<T0, T1, T2, T3, T4>(
-            string area,
             object source,
             string messageTemplate,
             T0 propertyValue0,
@@ -141,13 +128,12 @@ namespace Avalonia.Logging
             T3 propertyValue3,
             T4 propertyValue4)
         {
-            _sink.Log(_level, area, source, messageTemplate, propertyValue0, propertyValue1, propertyValue2, propertyValue3, propertyValue4);
+            _sink.Log(_level, _area, source, messageTemplate, propertyValue0, propertyValue1, propertyValue2, propertyValue3, propertyValue4);
         }
 
         /// <summary>
         /// Logs an event.
         /// </summary>
-        /// <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>
@@ -158,7 +144,6 @@ namespace Avalonia.Logging
         /// <param name="propertyValue5">Message property value.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void Log<T0, T1, T2, T3, T4, T5>(
-            string area,
             object source,
             string messageTemplate,
             T0 propertyValue0,
@@ -168,7 +153,7 @@ namespace Avalonia.Logging
             T4 propertyValue4,
             T5 propertyValue5)
         {
-            _sink.Log(_level, area, source, messageTemplate, propertyValue0, propertyValue1, propertyValue2, propertyValue3, propertyValue4, propertyValue5);
+            _sink.Log(_level, _area, source, messageTemplate, propertyValue0, propertyValue1, propertyValue2, propertyValue3, propertyValue4, propertyValue5);
         }
     }
 }
diff --git a/src/Avalonia.Base/Logging/TraceLogSink.cs b/src/Avalonia.Base/Logging/TraceLogSink.cs
new file mode 100644
index 0000000000..f597844378
--- /dev/null
+++ b/src/Avalonia.Base/Logging/TraceLogSink.cs
@@ -0,0 +1,179 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+using Avalonia.Utilities;
+
+namespace Avalonia.Logging
+{
+    public class TraceLogSink : ILogSink
+    {
+        private readonly LogEventLevel _level;
+        private readonly IList<string> _areas;
+
+        public TraceLogSink(
+            LogEventLevel minimumLevel,
+            IList<string> areas = null)
+        {
+            _level = minimumLevel;
+            _areas = areas?.Count > 0 ? areas : null;
+        }
+
+        public bool IsEnabled(LogEventLevel level, string area)
+        {
+            return level >= _level && (_areas?.Contains(area) ?? true);
+        }
+
+        public void Log(LogEventLevel level, string area, object source, string messageTemplate)
+        {
+            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));
+            }
+        }
+
+        public void Log(LogEventLevel level, string area, object source, string messageTemplate, params object[] propertyValues)
+        {
+            if (IsEnabled(level, area))
+            {
+                Trace.WriteLine(Format(area, messageTemplate, source, propertyValues));
+            }
+        }
+
+        private static string Format<T0, T1, T2>(
+            string area,
+            string template,
+            object source,
+            T0 v0 = default,
+            T1 v1 = default,
+            T2 v2 = default)
+        {
+            var result = new StringBuilder(template.Length);
+            var r = new CharacterReader(template.AsSpan());
+            var i = 0;
+
+            result.Append('[');
+            result.Append(area);
+            result.Append("] ");
+
+            while (!r.End)
+            {
+                var c = r.Take();
+
+                if (c != '{')
+                {
+                    result.Append(c);
+                }
+                else
+                {
+                    if (r.Peek != '{')
+                    {
+                        result.Append('\'');
+                        result.Append(i++ switch
+                        {
+                            0 => v0,
+                            1 => v1,
+                            2 => v2,
+                            _ => null
+                        });
+                        result.Append('\'');
+                        r.TakeUntil('}');
+                        r.Take();
+                    }
+                    else
+                    {
+                        result.Append('{');
+                        r.Take();
+                    }
+                }
+            }
+
+            if (source is object)
+            {
+                result.Append(" (");
+                result.Append(source.GetType().Name);
+                result.Append(" #");
+                result.Append(source.GetHashCode());
+                result.Append(')');
+            }
+
+            return result.ToString();
+        }
+
+        private static string Format(
+            string area,
+            string template,
+            object source,
+            object[] v)
+        {
+            var result = new StringBuilder(template.Length);
+            var r = new CharacterReader(template.AsSpan());
+            var i = 0;
+
+            result.Append('[');
+            result.Append(area);
+            result.Append(']');
+
+            while (!r.End)
+            {
+                var c = r.Take();
+
+                if (c != '{')
+                {
+                    result.Append(c);
+                }
+                else
+                {
+                    if (r.Peek != '{')
+                    {
+                        result.Append('\'');
+                        result.Append(i < v.Length ? v[i++] : null);
+                        result.Append('\'');
+                        r.TakeUntil('}');
+                        r.Take();
+                    }
+                    else
+                    {
+                        result.Append('{');
+                        r.Take();
+                    }
+                }
+            }
+
+            if (source is object)
+            {
+                result.Append('(');
+                result.Append(source.GetType().Name);
+                result.Append(" #");
+                result.Append(source.GetHashCode());
+                result.Append(')');
+            }
+
+            return result.ToString();
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Metadata/AmbientAttribute.cs b/src/Avalonia.Base/Metadata/AmbientAttribute.cs
index db36953300..85ca6c4ec9 100644
--- a/src/Avalonia.Base/Metadata/AmbientAttribute.cs
+++ b/src/Avalonia.Base/Metadata/AmbientAttribute.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Metadata
diff --git a/src/Avalonia.Base/Metadata/ContentAttribute.cs b/src/Avalonia.Base/Metadata/ContentAttribute.cs
index 803769561d..a0b2fa0e1d 100644
--- a/src/Avalonia.Base/Metadata/ContentAttribute.cs
+++ b/src/Avalonia.Base/Metadata/ContentAttribute.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Metadata
diff --git a/src/Avalonia.Base/Metadata/DependsOnAttribute.cs b/src/Avalonia.Base/Metadata/DependsOnAttribute.cs
index a719d33d59..caee71ebfd 100644
--- a/src/Avalonia.Base/Metadata/DependsOnAttribute.cs
+++ b/src/Avalonia.Base/Metadata/DependsOnAttribute.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Metadata
@@ -8,7 +5,7 @@ namespace Avalonia.Metadata
     /// <summary>
     /// Indicates that the property depends on the value of another property in markup.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Property)]
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Method, Inherited = true, AllowMultiple = true)]
     public class DependsOnAttribute : Attribute
     {
         /// <summary>
diff --git a/src/Avalonia.Base/Metadata/NullableAttributes.cs b/src/Avalonia.Base/Metadata/NullableAttributes.cs
new file mode 100644
index 0000000000..91f5e81863
--- /dev/null
+++ b/src/Avalonia.Base/Metadata/NullableAttributes.cs
@@ -0,0 +1,140 @@
+#pragma warning disable MA0048 // File name must match type name
+#define INTERNAL_NULLABLE_ATTRIBUTES
+#if NETSTANDARD2_0 ||  NETCOREAPP2_0 ||  NETCOREAPP2_1 ||  NETCOREAPP2_2 || NET45 || NET451 || NET452 || NET6 || NET461 || NET462 || NET47 || NET471 || NET472 || NET48
+
+// https://github.com/dotnet/corefx/blob/48363ac826ccf66fbe31a5dcb1dc2aab9a7dd768/src/Common/src/CoreLib/System/Diagnostics/CodeAnalysis/NullableAttributes.cs
+
+// 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.
+
+namespace System.Diagnostics.CodeAnalysis
+{
+    /// <summary>Specifies that null is allowed as an input even if the corresponding type disallows it.</summary>
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
+#if INTERNAL_NULLABLE_ATTRIBUTES
+    internal
+#else
+    public
+#endif
+        sealed class AllowNullAttribute : Attribute
+    { }
+
+    /// <summary>Specifies that null is disallowed as an input even if the corresponding type allows it.</summary>
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
+#if INTERNAL_NULLABLE_ATTRIBUTES
+    internal
+#else
+    public
+#endif
+        sealed class DisallowNullAttribute : Attribute
+    { }
+
+    /// <summary>Specifies that an output may be null even if the corresponding type disallows it.</summary>
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)]
+#if INTERNAL_NULLABLE_ATTRIBUTES
+    internal
+#else
+    public
+#endif
+        sealed class MaybeNullAttribute : Attribute
+    { }
+
+    /// <summary>Specifies that an output will not be null even if the corresponding type allows it.</summary>
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)]
+#if INTERNAL_NULLABLE_ATTRIBUTES
+    internal
+#else
+    public
+#endif
+        sealed class NotNullAttribute : Attribute
+    { }
+
+    /// <summary>Specifies that when a method returns <see cref="ReturnValue"/>, the parameter may be null even if the corresponding type disallows it.</summary>
+    [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
+#if INTERNAL_NULLABLE_ATTRIBUTES
+    internal
+#else
+    public
+#endif
+        sealed class MaybeNullWhenAttribute : Attribute
+    {
+        /// <summary>Initializes the attribute with the specified return value condition.</summary>
+        /// <param name="returnValue">
+        /// The return value condition. If the method returns this value, the associated parameter may be null.
+        /// </param>
+        public MaybeNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
+
+        /// <summary>Gets the return value condition.</summary>
+        public bool ReturnValue { get; }
+    }
+
+    /// <summary>Specifies that when a method returns <see cref="ReturnValue"/>, the parameter will not be null even if the corresponding type allows it.</summary>
+    [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
+#if INTERNAL_NULLABLE_ATTRIBUTES
+    internal
+#else
+    public
+#endif
+        sealed class NotNullWhenAttribute : Attribute
+    {
+        /// <summary>Initializes the attribute with the specified return value condition.</summary>
+        /// <param name="returnValue">
+        /// The return value condition. If the method returns this value, the associated parameter will not be null.
+        /// </param>
+        public NotNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
+
+        /// <summary>Gets the return value condition.</summary>
+        public bool ReturnValue { get; }
+    }
+
+    /// <summary>Specifies that the output will be non-null if the named parameter is non-null.</summary>
+    [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple = true, Inherited = false)]
+#if INTERNAL_NULLABLE_ATTRIBUTES
+    internal
+#else
+    public
+#endif
+        sealed class NotNullIfNotNullAttribute : Attribute
+    {
+        /// <summary>Initializes the attribute with the associated parameter name.</summary>
+        /// <param name="parameterName">
+        /// The associated parameter name.  The output will be non-null if the argument to the parameter specified is non-null.
+        /// </param>
+        public NotNullIfNotNullAttribute(string parameterName) => ParameterName = parameterName;
+
+        /// <summary>Gets the associated parameter name.</summary>
+        public string ParameterName { get; }
+    }
+
+    /// <summary>Applied to a method that will never return under any circumstance.</summary>
+    [AttributeUsage(AttributeTargets.Method, Inherited = false)]
+#if INTERNAL_NULLABLE_ATTRIBUTES
+    internal
+#else
+    public
+#endif
+        sealed class DoesNotReturnAttribute : Attribute
+    { }
+
+    /// <summary>Specifies that the method will not return if the associated Boolean parameter is passed the specified value.</summary>
+    [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
+#if INTERNAL_NULLABLE_ATTRIBUTES
+    internal
+#else
+    public
+#endif
+        sealed class DoesNotReturnIfAttribute : Attribute
+    {
+        /// <summary>Initializes the attribute with the specified parameter value.</summary>
+        /// <param name="parameterValue">
+        /// The condition parameter value. Code after the method will be considered unreachable by diagnostics if the argument to
+        /// the associated parameter matches this value.
+        /// </param>
+        public DoesNotReturnIfAttribute(bool parameterValue) => ParameterValue = parameterValue;
+
+        /// <summary>Gets the condition parameter value.</summary>
+        public bool ParameterValue { get; }
+    }
+}
+#endif
diff --git a/src/Avalonia.Base/Metadata/TemplateContent.cs b/src/Avalonia.Base/Metadata/TemplateContent.cs
index ecc16b04a2..fcd7d69e7b 100644
--- a/src/Avalonia.Base/Metadata/TemplateContent.cs
+++ b/src/Avalonia.Base/Metadata/TemplateContent.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Metadata
diff --git a/src/Avalonia.Base/Metadata/XmlnsDefinitionAttribute.cs b/src/Avalonia.Base/Metadata/XmlnsDefinitionAttribute.cs
index d6ff2d8b84..d43fa55f5c 100644
--- a/src/Avalonia.Base/Metadata/XmlnsDefinitionAttribute.cs
+++ b/src/Avalonia.Base/Metadata/XmlnsDefinitionAttribute.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Metadata
diff --git a/src/Avalonia.Base/Metadata/XmlnsPrefixAttribute.cs b/src/Avalonia.Base/Metadata/XmlnsPrefixAttribute.cs
new file mode 100644
index 0000000000..ad017822e4
--- /dev/null
+++ b/src/Avalonia.Base/Metadata/XmlnsPrefixAttribute.cs
@@ -0,0 +1,39 @@
+using System;
+
+namespace Avalonia.Metadata
+{
+    /// <summary>
+    /// Use to predefine the prefix associated to an xml namespace in a xaml file
+    /// </summary>
+    /// <remarks>
+    /// example:
+    /// [assembly: XmlnsPrefix("https://github.com/avaloniaui", "av")]
+    /// xaml:
+    /// xmlns:av="https://github.com/avaloniaui"
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    public sealed class XmlnsPrefixAttribute : Attribute
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="xmlNamespace">XML namespce</param>
+        /// <param name="prefix">recommended prefix</param>
+        public XmlnsPrefixAttribute(string xmlNamespace, string prefix)
+        {
+            XmlNamespace = xmlNamespace ?? throw new ArgumentNullException(nameof(xmlNamespace));
+
+            Prefix = prefix ?? throw new ArgumentNullException(nameof(prefix));
+        }
+
+        /// <summary>
+        /// XML Namespace
+        /// </summary>
+        public string XmlNamespace { get; }
+
+        /// <summary>
+        /// New Xml Namespace
+        /// </summary>
+        public string Prefix { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IAssetLoader.cs b/src/Avalonia.Base/Platform/IAssetLoader.cs
index 4356fac4c0..c2e422cabb 100644
--- a/src/Avalonia.Base/Platform/IAssetLoader.cs
+++ b/src/Avalonia.Base/Platform/IAssetLoader.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/Avalonia.Base/Platform/IMacOSTopLevelPlatformHandle.cs b/src/Avalonia.Base/Platform/IMacOSTopLevelPlatformHandle.cs
new file mode 100644
index 0000000000..e399976bbe
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IMacOSTopLevelPlatformHandle.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Avalonia.Platform
+{
+    public interface IMacOSTopLevelPlatformHandle
+    {
+        IntPtr NSView { get; }
+        IntPtr GetNSViewRetained();
+        IntPtr NSWindow { get; }
+        IntPtr GetNSWindowRetained();
+    }
+}
diff --git a/src/Avalonia.Base/Platform/IPlatformHandle.cs b/src/Avalonia.Base/Platform/IPlatformHandle.cs
index 39c34e97fd..a3b9d8f07c 100644
--- a/src/Avalonia.Base/Platform/IPlatformHandle.cs
+++ b/src/Avalonia.Base/Platform/IPlatformHandle.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Platform
diff --git a/src/Avalonia.Base/Platform/IPlatformThreadingInterface.cs b/src/Avalonia.Base/Platform/IPlatformThreadingInterface.cs
index 9f5417ca95..2137f965cc 100644
--- a/src/Avalonia.Base/Platform/IPlatformThreadingInterface.cs
+++ b/src/Avalonia.Base/Platform/IPlatformThreadingInterface.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Threading;
 using Avalonia.Threading;
diff --git a/src/Avalonia.Base/Platform/PlatformHandle.cs b/src/Avalonia.Base/Platform/PlatformHandle.cs
index 24cc8f2651..bed25a3b5b 100644
--- a/src/Avalonia.Base/Platform/PlatformHandle.cs
+++ b/src/Avalonia.Base/Platform/PlatformHandle.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Platform
diff --git a/src/Avalonia.Base/PriorityBindingEntry.cs b/src/Avalonia.Base/PriorityBindingEntry.cs
deleted file mode 100644
index 7f5415c2d8..0000000000
--- a/src/Avalonia.Base/PriorityBindingEntry.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Runtime.ExceptionServices;
-using Avalonia.Data;
-using Avalonia.Threading;
-
-namespace Avalonia
-{
-    /// <summary>
-    /// A registered binding in a <see cref="PriorityValue"/>.
-    /// </summary>
-    internal class PriorityBindingEntry : IDisposable, IObserver<object>
-    {
-        private readonly PriorityLevel _owner;
-        private IDisposable _subscription;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PriorityBindingEntry"/> class.
-        /// </summary>
-        /// <param name="owner">The owner.</param>
-        /// <param name="index">
-        /// The binding index. Later bindings should have higher indexes.
-        /// </param>
-        public PriorityBindingEntry(PriorityLevel owner, int index)
-        {
-            _owner = owner;
-            Index = index;
-        }
-
-        /// <summary>
-        /// Gets the observable associated with the entry.
-        /// </summary>
-        public IObservable<object> Observable { get; private set; }
-
-        /// <summary>
-        /// Gets a description of the binding.
-        /// </summary>
-        public string Description
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets the binding entry index. Later bindings will have higher indexes.
-        /// </summary>
-        public int Index
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the binding has completed.
-        /// </summary>
-        public bool HasCompleted { get; private set; }
-
-        /// <summary>
-        /// The current value of the binding.
-        /// </summary>
-        public object Value
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Starts listening to the binding.
-        /// </summary>
-        /// <param name="binding">The binding.</param>
-        public void Start(IObservable<object> binding)
-        {
-            Contract.Requires<ArgumentNullException>(binding != null);
-
-            if (_subscription != null)
-            {
-                throw new Exception("PriorityValue.Entry.Start() called more than once.");
-            }
-
-            Observable = binding;
-            Value = AvaloniaProperty.UnsetValue;
-
-            if (binding is IDescription)
-            {
-                Description = ((IDescription)binding).Description;
-            }
-
-            _subscription = binding.Subscribe(this);
-        }
-
-        /// <summary>
-        /// Ends the binding subscription.
-        /// </summary>
-        public void Dispose()
-        {
-            _subscription?.Dispose();
-        }
-
-        void IObserver<object>.OnNext(object value)
-        {
-            void Signal(PriorityBindingEntry instance, object newValue)
-            {
-                var notification = newValue as BindingNotification;
-
-                if (notification != null)
-                {
-                    if (notification.HasValue || notification.ErrorType == BindingErrorType.Error)
-                    {
-                        instance.Value = notification.Value;
-                        instance._owner.Changed(instance);
-                    }
-
-                    if (notification.ErrorType != BindingErrorType.None)
-                    {
-                        instance._owner.Error(instance, notification);
-                    }
-                }
-                else
-                {
-                    instance.Value = newValue;
-                    instance._owner.Changed(instance);
-                }
-            }
-
-            if (Dispatcher.UIThread.CheckAccess())
-            {
-                Signal(this, value);
-            }
-            else
-            {
-                // To avoid allocating closure in the outer scope we need to capture variables
-                // locally. This allows us to skip most of the allocations when on UI thread.
-                var instance = this;
-                var newValue = value;
-
-                Dispatcher.UIThread.Post(() => Signal(instance, newValue));
-            }
-        }
-
-        void IObserver<object>.OnCompleted()
-        {
-            HasCompleted = true;
-
-            if (Dispatcher.UIThread.CheckAccess())
-            {
-                _owner.Completed(this);
-            }
-            else
-            {
-                Dispatcher.UIThread.Post(() => _owner.Completed(this));
-            }
-        }
-
-        void IObserver<object>.OnError(Exception error)
-        {
-            ExceptionDispatchInfo.Capture(error).Throw();
-        }
-    }
-}
diff --git a/src/Avalonia.Base/PriorityLevel.cs b/src/Avalonia.Base/PriorityLevel.cs
deleted file mode 100644
index a2364083ea..0000000000
--- a/src/Avalonia.Base/PriorityLevel.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
-using Avalonia.Data;
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Stores bindings for a priority level in a <see cref="PriorityValue"/>.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// Each priority level in a <see cref="PriorityValue"/> has a current <see cref="Value"/>,
-    /// a list of <see cref="Bindings"/> and a <see cref="DirectValue"/>. When there are no
-    /// bindings present, or all bindings return <see cref="AvaloniaProperty.UnsetValue"/> then
-    /// <code>Value</code> will equal <code>DirectValue</code>.
-    /// </para>
-    /// <para>
-    /// When there are bindings present, then the latest added binding that doesn't return
-    /// <code>UnsetValue</code> will take precedence. The active binding is returned by the
-    /// <see cref="ActiveBindingIndex"/> property (which refers to the active binding's
-    /// <see cref="PriorityBindingEntry.Index"/> property rather than the index in
-    /// <code>Bindings</code>).
-    /// </para>
-    /// <para>
-    /// If <code>DirectValue</code> is set while a binding is active, then it will replace the
-    /// current value until the active binding fires again.
-    /// </para>
-    /// </remarks>
-    internal class PriorityLevel
-    {
-        private object _directValue;
-        private int _nextIndex;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PriorityLevel"/> class.
-        /// </summary>
-        /// <param name="owner">The owner.</param>
-        /// <param name="priority">The priority.</param>
-        public PriorityLevel(
-            PriorityValue owner,
-            int priority)
-        {
-            Contract.Requires<ArgumentNullException>(owner != null);
-
-            Owner = owner;
-            Priority = priority;
-            Value = _directValue = AvaloniaProperty.UnsetValue;
-            ActiveBindingIndex = -1;
-            Bindings = new LinkedList<PriorityBindingEntry>();
-        }
-
-        /// <summary>
-        /// Gets the owner of the level.
-        /// </summary>
-        public PriorityValue Owner { get; }
-
-        /// <summary>
-        /// Gets the priority of this level.
-        /// </summary>
-        public int Priority { get; }
-
-        /// <summary>
-        /// Gets or sets the direct value for this priority level.
-        /// </summary>
-        public object DirectValue
-        {
-            get
-            {
-                return _directValue;
-            }
-
-            set
-            {
-                Value = _directValue = value;
-                Owner.LevelValueChanged(this);
-            }
-        }
-
-        /// <summary>
-        /// Gets the current binding for the priority level.
-        /// </summary>
-        public object Value { get; private set; }
-
-        /// <summary>
-        /// Gets the <see cref="PriorityBindingEntry.Index"/> value of the active binding, or -1
-        /// if no binding is active.
-        /// </summary>
-        public int ActiveBindingIndex { get; private set; }
-
-        /// <summary>
-        /// Gets the bindings for the priority level.
-        /// </summary>
-        public LinkedList<PriorityBindingEntry> Bindings { get; }
-
-        /// <summary>
-        /// Adds a binding.
-        /// </summary>
-        /// <param name="binding">The binding to add.</param>
-        /// <returns>A disposable used to remove the binding.</returns>
-        public IDisposable Add(IObservable<object> binding)
-        {
-            Contract.Requires<ArgumentNullException>(binding != null);
-
-            var entry = new PriorityBindingEntry(this, _nextIndex++);
-            var node = Bindings.AddFirst(entry);
-
-            entry.Start(binding);
-
-            return new RemoveBindingDisposable(node, Bindings, this);
-        }
-
-        /// <summary>
-        /// Invoked when an entry in <see cref="Bindings"/> changes value.
-        /// </summary>
-        /// <param name="entry">The entry that changed.</param>
-        public void Changed(PriorityBindingEntry entry)
-        {
-            if (entry.Index >= ActiveBindingIndex)
-            {
-                if (entry.Value != AvaloniaProperty.UnsetValue)
-                {
-                    Value = entry.Value;
-                    ActiveBindingIndex = entry.Index;
-                    Owner.LevelValueChanged(this);
-                }
-                else
-                {
-                    ActivateFirstBinding();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Invoked when an entry in <see cref="Bindings"/> completes.
-        /// </summary>
-        /// <param name="entry">The entry that completed.</param>
-        public void Completed(PriorityBindingEntry entry)
-        {
-            Bindings.Remove(entry);
-
-            if (entry.Index >= ActiveBindingIndex)
-            {
-                ActivateFirstBinding();
-            }
-        }
-
-        /// <summary>
-        /// Invoked when an entry in <see cref="Bindings"/> encounters a recoverable error.
-        /// </summary>
-        /// <param name="entry">The entry that completed.</param>
-        /// <param name="error">The error.</param>
-        public void Error(PriorityBindingEntry entry, BindingNotification error)
-        {
-            Owner.LevelError(this, error);
-        }
-
-        /// <summary>
-        /// Activates the first binding that has a value.
-        /// </summary>
-        private void ActivateFirstBinding()
-        {
-            foreach (var binding in Bindings)
-            {
-                if (binding.Value != AvaloniaProperty.UnsetValue)
-                {
-                    Value = binding.Value;
-                    ActiveBindingIndex = binding.Index;
-                    Owner.LevelValueChanged(this);
-                    return;
-                }
-            }
-
-            Value = DirectValue;
-            ActiveBindingIndex = -1;
-            Owner.LevelValueChanged(this);
-        }
-
-        private sealed class RemoveBindingDisposable : IDisposable
-        {
-            private readonly LinkedList<PriorityBindingEntry> _bindings;
-            private readonly PriorityLevel _priorityLevel;
-            private LinkedListNode<PriorityBindingEntry> _binding;
-
-            public RemoveBindingDisposable(
-                LinkedListNode<PriorityBindingEntry> binding,
-                LinkedList<PriorityBindingEntry> bindings,
-                PriorityLevel priorityLevel)
-            {
-                _binding = binding;
-                _bindings = bindings;
-                _priorityLevel = priorityLevel;
-            }
-
-            public void Dispose()
-            {
-                LinkedListNode<PriorityBindingEntry> binding = Interlocked.Exchange(ref _binding, null);
-
-                if (binding == null)
-                {
-                    // Some system is trying to remove binding twice.
-                    Debug.Assert(false);
-
-                    return;
-                }
-
-                PriorityBindingEntry entry = binding.Value;
-
-                if (!entry.HasCompleted)
-                {
-                    _bindings.Remove(binding);
-
-                    entry.Dispose();
-
-                    if (entry.Index >= _priorityLevel.ActiveBindingIndex)
-                    {
-                        _priorityLevel.ActivateFirstBinding();
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Base/PriorityValue.cs b/src/Avalonia.Base/PriorityValue.cs
deleted file mode 100644
index 61184ef7b1..0000000000
--- a/src/Avalonia.Base/PriorityValue.cs
+++ /dev/null
@@ -1,315 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Avalonia.Data;
-using Avalonia.Logging;
-using Avalonia.Utilities;
-
-namespace Avalonia
-{
-    /// <summary>
-    /// Maintains a list of prioritized bindings together with a current value.
-    /// </summary>
-    /// <remarks>
-    /// Bindings, in the form of <see cref="IObservable{Object}"/>s are added to the object using
-    /// the <see cref="Add"/> method. With the observable is passed a priority, where lower values
-    /// represent higher priorities. The current <see cref="Value"/> is selected from the highest
-    /// priority binding that doesn't return <see cref="AvaloniaProperty.UnsetValue"/>. Where there
-    /// are multiple bindings registered with the same priority, the most recently added binding
-    /// has a higher priority. Each time the value changes, the 
-    /// <see cref="IPriorityValueOwner.Changed"/> method on the 
-    /// owner object is fired with the old and new values.
-    /// </remarks>
-    internal sealed class PriorityValue : ISetAndNotifyHandler<(object,int)>
-    {
-        private readonly Type _valueType;
-        private readonly SingleOrDictionary<int, PriorityLevel> _levels = new SingleOrDictionary<int, PriorityLevel>();
-        private readonly Func<object, object> _validate;
-        private (object value, int priority) _value;
-        private DeferredSetter<object> _setter;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PriorityValue"/> class.
-        /// </summary>
-        /// <param name="owner">The owner of the object.</param>
-        /// <param name="property">The property that the value represents.</param>
-        /// <param name="valueType">The value type.</param>
-        /// <param name="validate">An optional validation function.</param>
-        public PriorityValue(
-            IPriorityValueOwner owner,
-            AvaloniaProperty property, 
-            Type valueType,
-            Func<object, object> validate = null)
-        {
-            Owner = owner;
-            Property = property;
-            _valueType = valueType;
-            _value = (AvaloniaProperty.UnsetValue, int.MaxValue);
-            _validate = validate;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the property is animating.
-        /// </summary>
-        public bool IsAnimating
-        {
-            get
-            {
-                return ValuePriority <= (int)BindingPriority.Animation && 
-                    GetLevel(ValuePriority).ActiveBindingIndex != -1;
-            }
-        }
-
-        /// <summary>
-        /// Gets the owner of the value.
-        /// </summary>
-        public IPriorityValueOwner Owner { get; }
-
-        /// <summary>
-        /// Gets the property that the value represents.
-        /// </summary>
-        public AvaloniaProperty Property { get; }
-
-        /// <summary>
-        /// Gets the current value.
-        /// </summary>
-        public object Value => _value.value;
-
-        /// <summary>
-        /// Gets the priority of the binding that is currently active.
-        /// </summary>
-        public int ValuePriority => _value.priority;
-
-        /// <summary>
-        /// Adds a new binding.
-        /// </summary>
-        /// <param name="binding">The binding.</param>
-        /// <param name="priority">The binding priority.</param>
-        /// <returns>
-        /// A disposable that will remove the binding.
-        /// </returns>
-        public IDisposable Add(IObservable<object> binding, int priority)
-        {
-            return GetLevel(priority).Add(binding);
-        }
-
-        /// <summary>
-        /// Sets the value for a specified priority.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="priority">The priority</param>
-        public void SetValue(object value, int priority)
-        {
-            GetLevel(priority).DirectValue = value;
-        }
-
-        /// <summary>
-        /// Gets the currently active bindings on this object.
-        /// </summary>
-        /// <returns>An enumerable collection of bindings.</returns>
-        public IEnumerable<PriorityBindingEntry> GetBindings()
-        {
-            foreach (var level in _levels)
-            {
-                foreach (var binding in level.Value.Bindings)
-                {
-                    yield return binding;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Returns diagnostic string that can help the user debug the bindings in effect on
-        /// this object.
-        /// </summary>
-        /// <returns>A diagnostic string.</returns>
-        public string GetDiagnostic()
-        {
-            var b = new StringBuilder();
-            var first = true;
-
-            foreach (var level in _levels)
-            {
-                if (!first)
-                {
-                    b.AppendLine();
-                }
-
-                b.Append(ValuePriority == level.Key ? "*" : string.Empty);
-                b.Append("Priority ");
-                b.Append(level.Key);
-                b.Append(": ");
-                b.AppendLine(level.Value.Value?.ToString() ?? "(null)");
-                b.AppendLine("--------");
-                b.Append("Direct: ");
-                b.AppendLine(level.Value.DirectValue?.ToString() ?? "(null)");
-
-                foreach (var binding in level.Value.Bindings)
-                {
-                    b.Append(level.Value.ActiveBindingIndex == binding.Index ? "*" : string.Empty);
-                    b.Append(binding.Description ?? binding.Observable.GetType().Name);
-                    b.Append(": ");
-                    b.AppendLine(binding.Value?.ToString() ?? "(null)");
-                }
-
-                first = false;
-            }
-
-            return b.ToString();
-        }
-
-        /// <summary>
-        /// Called when the value for a priority level changes.
-        /// </summary>
-        /// <param name="level">The priority level of the changed entry.</param>
-        public void LevelValueChanged(PriorityLevel level)
-        {
-            if (level.Priority <= ValuePriority)
-            {
-                if (level.Value != AvaloniaProperty.UnsetValue)
-                {
-                    UpdateValue(level.Value, level.Priority);
-                }
-                else
-                {
-                    foreach (var i in _levels.Values.OrderBy(x => x.Priority))
-                    {
-                        if (i.Value != AvaloniaProperty.UnsetValue)
-                        {
-                            UpdateValue(i.Value, i.Priority);
-                            return;
-                        }
-                    }
-
-                    UpdateValue(AvaloniaProperty.UnsetValue, int.MaxValue);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Called when a priority level encounters an error.
-        /// </summary>
-        /// <param name="level">The priority level of the changed entry.</param>
-        /// <param name="error">The binding error.</param>
-        public void LevelError(PriorityLevel level, BindingNotification error)
-        {
-            Owner.LogError(Property, error.Error);
-        }
-
-        /// <summary>
-        /// Causes a revalidation of the value.
-        /// </summary>
-        public void Revalidate()
-        {
-            if (_validate != null)
-            {
-                PriorityLevel level;
-
-                if (_levels.TryGetValue(ValuePriority, out level))
-                {
-                    UpdateValue(level.Value, level.Priority);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the <see cref="PriorityLevel"/> with the specified priority, creating it if it
-        /// doesn't already exist.
-        /// </summary>
-        /// <param name="priority">The priority.</param>
-        /// <returns>The priority level.</returns>
-        private PriorityLevel GetLevel(int priority)
-        {
-            PriorityLevel result;
-
-            if (!_levels.TryGetValue(priority, out result))
-            {
-                result = new PriorityLevel(this, priority);
-                _levels.Add(priority, result);
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Updates the current <see cref="Value"/> and notifies all subscribers.
-        /// </summary>
-        /// <param name="value">The value to set.</param>
-        /// <param name="priority">The priority level that the value came from.</param>
-        private void UpdateValue(object value, int priority)
-        {
-            var newValue = (value, priority);
-
-            if (newValue == _value)
-            {
-                return;
-            }
-
-            if (_setter == null)
-            {
-                _setter = Owner.GetNonDirectDeferredSetter(Property);
-            }
-
-            _setter.SetAndNotifyCallback(Property, this, ref _value, newValue);
-        }
-
-        void ISetAndNotifyHandler<(object, int)>.HandleSetAndNotify(AvaloniaProperty property, ref (object, int) backing, (object, int) value)
-        {
-            SetAndNotify(ref backing, value);
-        }
-
-        private void SetAndNotify(ref (object value, int priority) backing, (object value, int priority) update)
-        {
-            var val = update.value;
-            var notification = val as BindingNotification;
-            object castValue;
-
-            if (notification != null)
-            {
-                val = (notification.HasValue) ? notification.Value : null;
-            }
-
-            if (TypeUtilities.TryConvertImplicit(_valueType, val, out castValue))
-            {
-                var old = backing.value;
-
-                if (_validate != null && castValue != AvaloniaProperty.UnsetValue)
-                {
-                    castValue = _validate(castValue);
-                }
-
-                backing = (castValue, update.priority);
-
-                if (notification?.HasValue == true)
-                {
-                    notification.SetValue(castValue);
-                }
-
-                if (notification == null || notification.HasValue)
-                {
-                    Owner?.Changed(Property, ValuePriority, old, Value);
-                }
-
-                if (notification != null)
-                {
-                    Owner?.BindingNotificationReceived(Property, notification);
-                }
-            }
-            else
-            {
-                Logger.TryGet(LogEventLevel.Error)?.Log(
-                    LogArea.Binding,
-                    Owner,
-                    "Binding produced invalid value for {$Property} ({$PropertyType}): {$Value} ({$ValueType})",
-                    Property.Name,
-                    _valueType,
-                    val,
-                    val?.GetType());
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Base/Properties/AssemblyInfo.cs b/src/Avalonia.Base/Properties/AssemblyInfo.cs
index 75d58f45d5..b054c186ae 100644
--- a/src/Avalonia.Base/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Base/Properties/AssemblyInfo.cs
@@ -5,6 +5,18 @@ using System.Runtime.CompilerServices;
 using Avalonia.Metadata;
 
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Data.Converters")]
+#if SIGNED_BUILD
+[assembly: InternalsVisibleTo("Avalonia.Base.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] 
+[assembly: InternalsVisibleTo("Avalonia.Controls.DataGrid, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.Markup.Xaml.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.Visuals, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+#else
 [assembly: InternalsVisibleTo("Avalonia.Base.UnitTests")]
 [assembly: InternalsVisibleTo("Avalonia.UnitTests")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] 
\ No newline at end of file
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
+[assembly: InternalsVisibleTo("Avalonia.Controls.DataGrid")]
+[assembly: InternalsVisibleTo("Avalonia.Markup.Xaml.UnitTests")]
+[assembly: InternalsVisibleTo("Avalonia.Visuals")]
+#endif
diff --git a/src/Avalonia.Base/PropertyStore/BindingEntry.cs b/src/Avalonia.Base/PropertyStore/BindingEntry.cs
new file mode 100644
index 0000000000..0d563947e7
--- /dev/null
+++ b/src/Avalonia.Base/PropertyStore/BindingEntry.cs
@@ -0,0 +1,111 @@
+using System;
+using Avalonia.Data;
+using Avalonia.Threading;
+
+#nullable enable
+
+namespace Avalonia.PropertyStore
+{
+    /// <summary>
+    /// Represents an untyped interface to <see cref="BindingEntry{T}"/>.
+    /// </summary>
+    internal interface IBindingEntry : IPriorityValueEntry, IDisposable
+    {
+    }
+
+    /// <summary>
+    /// Stores a binding in a <see cref="ValueStore"/> or <see cref="PriorityValue{T}"/>.
+    /// </summary>
+    /// <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 IDisposable? _subscription;
+        private Optional<T> _value;
+
+        public BindingEntry(
+            IAvaloniaObject owner,
+            StyledPropertyBase<T> property,
+            IObservable<BindingValue<T>> source,
+            BindingPriority priority,
+            IValueSink sink)
+        {
+            _owner = owner;
+            Property = property;
+            Source = source;
+            Priority = priority;
+            _sink = sink;
+        }
+
+        public StyledPropertyBase<T> Property { get; }
+        public BindingPriority Priority { get; }
+        public IObservable<BindingValue<T>> Source { get; }
+        Optional<object> IValue.GetValue() => _value.ToObject();
+
+        public Optional<T> GetValue(BindingPriority maxPriority)
+        {
+            return Priority >= maxPriority ? _value : Optional<T>.Empty;
+        }
+
+        public void Dispose()
+        {
+            _subscription?.Dispose();
+            _subscription = null;
+            _sink.Completed(Property, this, _value);
+        }
+
+        public void OnCompleted() => _sink.Completed(Property, this, _value);
+
+        public void OnError(Exception error)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void OnNext(BindingValue<T> value)
+        {
+            if (Dispatcher.UIThread.CheckAccess())
+            {
+                UpdateValue(value); 
+            }
+            else
+            {
+                // To avoid allocating closure in the outer scope we need to capture variables
+                // locally. This allows us to skip most of the allocations when on UI thread.
+                var instance = this;
+                var newValue = value;
+
+                Dispatcher.UIThread.Post(() => instance.UpdateValue(newValue));
+            }
+        }
+
+        public void Start()
+        {
+            _subscription = Source.Subscribe(this);
+        }
+
+        public void Reparent(IValueSink sink) => _sink = sink;
+        
+        private void UpdateValue(BindingValue<T> value)
+        {
+            if (value.HasValue && Property.ValidateValue?.Invoke(value.Value) == false)
+            {
+                value = Property.GetDefaultValue(_owner.GetType());
+            }
+
+            if (value.Type == BindingValueType.DoNothing)
+            {
+                return;
+            }
+
+            var old = _value;
+
+            if (value.Type != BindingValueType.DataValidationError)
+            {
+                _value = value.ToOptional();
+            }
+
+            _sink.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(_owner, Property, old, value, Priority));
+        }
+    }
+}
diff --git a/src/Avalonia.Base/PropertyStore/ConstantValueEntry.cs b/src/Avalonia.Base/PropertyStore/ConstantValueEntry.cs
new file mode 100644
index 0000000000..46f6f9a137
--- /dev/null
+++ b/src/Avalonia.Base/PropertyStore/ConstantValueEntry.cs
@@ -0,0 +1,42 @@
+using System;
+using Avalonia.Data;
+
+#nullable enable
+
+namespace Avalonia.PropertyStore
+{
+    /// <summary>
+    /// Stores a value with a priority in a <see cref="ValueStore"/> or
+    /// <see cref="PriorityValue{T}"/>.
+    /// </summary>
+    /// <typeparam name="T">The property type.</typeparam>
+    internal class ConstantValueEntry<T> : IPriorityValueEntry<T>, IDisposable
+    {
+        private IValueSink _sink;
+        private Optional<T> _value;
+
+        public ConstantValueEntry(
+            StyledPropertyBase<T> property,
+            T value,
+            BindingPriority priority,
+            IValueSink sink)
+        {
+            Property = property;
+            _value = value;
+            Priority = priority;
+            _sink = sink;
+        }
+
+        public StyledPropertyBase<T> Property { get; }
+        public BindingPriority Priority { get; }
+        Optional<object> IValue.GetValue() => _value.ToObject();
+
+        public Optional<T> GetValue(BindingPriority maxPriority = BindingPriority.Animation)
+        {
+            return Priority >= maxPriority ? _value : Optional<T>.Empty;
+        }
+
+        public void Dispose() => _sink.Completed(Property, this, _value);
+        public void Reparent(IValueSink sink) => _sink = sink;
+    }
+}
diff --git a/src/Avalonia.Base/PropertyStore/IPriorityValueEntry.cs b/src/Avalonia.Base/PropertyStore/IPriorityValueEntry.cs
new file mode 100644
index 0000000000..4d82381323
--- /dev/null
+++ b/src/Avalonia.Base/PropertyStore/IPriorityValueEntry.cs
@@ -0,0 +1,20 @@
+#nullable enable
+
+namespace Avalonia.PropertyStore
+{
+    /// <summary>
+    /// Represents an untyped interface to <see cref="IPriorityValueEntry{T}"/>.
+    /// </summary>
+    internal interface IPriorityValueEntry : IValue
+    {
+        void Reparent(IValueSink sink);
+    }
+
+    /// <summary>
+    /// Represents an object that can act as an entry in a <see cref="PriorityValue{T}"/>.
+    /// </summary>
+    /// <typeparam name="T">The property type.</typeparam>
+    internal interface IPriorityValueEntry<T> : IPriorityValueEntry, IValue<T>
+    {
+    }
+}
diff --git a/src/Avalonia.Base/PropertyStore/IValue.cs b/src/Avalonia.Base/PropertyStore/IValue.cs
new file mode 100644
index 0000000000..249cfc360c
--- /dev/null
+++ b/src/Avalonia.Base/PropertyStore/IValue.cs
@@ -0,0 +1,24 @@
+using Avalonia.Data;
+
+#nullable enable
+
+namespace Avalonia.PropertyStore
+{
+    /// <summary>
+    /// Represents an untyped interface to <see cref="IValue{T}"/>.
+    /// </summary>
+    internal interface IValue
+    {
+        Optional<object> GetValue();
+        BindingPriority Priority { get; }
+    }
+
+    /// <summary>
+    /// Represents an object that can act as an entry in a <see cref="ValueStore"/>.
+    /// </summary>
+    /// <typeparam name="T">The property type.</typeparam>
+    internal interface IValue<T> : IValue
+    {
+        Optional<T> GetValue(BindingPriority maxPriority = BindingPriority.Animation);
+    }
+}
diff --git a/src/Avalonia.Base/PropertyStore/IValueSink.cs b/src/Avalonia.Base/PropertyStore/IValueSink.cs
new file mode 100644
index 0000000000..3a1e9731d8
--- /dev/null
+++ b/src/Avalonia.Base/PropertyStore/IValueSink.cs
@@ -0,0 +1,19 @@
+using Avalonia.Data;
+
+#nullable enable
+
+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
new file mode 100644
index 0000000000..859e9ba81c
--- /dev/null
+++ b/src/Avalonia.Base/PropertyStore/LocalValueEntry.cs
@@ -0,0 +1,28 @@
+using System.Diagnostics.CodeAnalysis;
+using Avalonia.Data;
+
+#nullable enable
+
+namespace Avalonia.PropertyStore
+{
+    /// <summary>
+    /// Stores a value with local value priority in a <see cref="ValueStore"/> or
+    /// <see cref="PriorityValue{T}"/>.
+    /// </summary>
+    /// <typeparam name="T">The property type.</typeparam>
+    internal class LocalValueEntry<T> : IValue<T>
+    {
+        [AllowNull] private T _value;
+
+        public LocalValueEntry([AllowNull] T value) => _value = value;
+        public BindingPriority Priority => BindingPriority.LocalValue;
+        Optional<object> IValue.GetValue() => new Optional<object>(_value);
+        
+        public Optional<T> GetValue(BindingPriority maxPriority)
+        {
+            return BindingPriority.LocalValue >= maxPriority ? _value : Optional<T>.Empty;
+        }
+
+        public void SetValue(T value) => _value = value;
+    }
+}
diff --git a/src/Avalonia.Base/PropertyStore/PriorityValue.cs b/src/Avalonia.Base/PropertyStore/PriorityValue.cs
new file mode 100644
index 0000000000..5e223cad60
--- /dev/null
+++ b/src/Avalonia.Base/PropertyStore/PriorityValue.cs
@@ -0,0 +1,259 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using Avalonia.Data;
+
+#nullable enable
+
+namespace Avalonia.PropertyStore
+{
+    /// <summary>
+    /// Stores a set of prioritized values and bindings in a <see cref="ValueStore"/>.
+    /// </summary>
+    /// <typeparam name="T">The property type.</typeparam>
+    /// <remarks>
+    /// When more than a single value or binding is applied to a property in an
+    /// <see cref="AvaloniaObject"/>, the entry in the <see cref="ValueStore"/> is converted into
+    /// a <see cref="PriorityValue{T}"/>. This class holds any number of
+    /// <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
+    {
+        private readonly IAvaloniaObject _owner;
+        private readonly IValueSink _sink;
+        private readonly List<IPriorityValueEntry<T>> _entries = new List<IPriorityValueEntry<T>>();
+        private readonly Func<IAvaloniaObject, T, T>? _coerceValue;
+        private Optional<T> _localValue;
+        private Optional<T> _value;
+
+        public PriorityValue(
+            IAvaloniaObject owner,
+            StyledPropertyBase<T> property,
+            IValueSink sink)
+        {
+            _owner = owner;
+            Property = property;
+            _sink = sink;
+
+            if (property.HasCoercion)
+            {
+                var metadata = property.GetMetadata(owner.GetType());
+                _coerceValue = metadata.CoerceValue;
+            }
+        }
+
+        public PriorityValue(
+            IAvaloniaObject owner,
+            StyledPropertyBase<T> property,
+            IValueSink sink,
+            IPriorityValueEntry<T> existing)
+            : this(owner, property, sink)
+        {
+            existing.Reparent(this);
+            _entries.Add(existing);
+
+            var v = existing.GetValue();
+            
+            if (v.HasValue)
+            {
+                _value = v;
+                Priority = existing.Priority;
+            }
+        }
+
+        public PriorityValue(
+            IAvaloniaObject owner,
+            StyledPropertyBase<T> property,
+            IValueSink sink,
+            LocalValueEntry<T> existing)
+            : this(owner, property, sink)
+        {
+            _value = _localValue = existing.GetValue(BindingPriority.LocalValue);
+            Priority = BindingPriority.LocalValue;
+        }
+
+        public StyledPropertyBase<T> Property { get; }
+        public BindingPriority Priority { get; private set; } = BindingPriority.Unset;
+        public IReadOnlyList<IPriorityValueEntry<T>> Entries => _entries;
+        Optional<object> IValue.GetValue() => _value.ToObject();
+
+        public void ClearLocalValue()
+        {
+            UpdateEffectiveValue(new AvaloniaPropertyChangedEventArgs<T>(
+                _owner,
+                Property,
+                default,
+                default,
+                BindingPriority.LocalValue));
+        }
+
+        public Optional<T> GetValue(BindingPriority maxPriority = BindingPriority.Animation)
+        {
+            if (Priority == BindingPriority.Unset)
+            {
+                return default;
+            }
+
+            if (Priority >= maxPriority)
+            {
+                return _value;
+            }
+
+            return CalculateValue(maxPriority).Item1;
+        }
+
+        public IDisposable? SetValue(T value, BindingPriority priority)
+        {
+            IDisposable? result = null;
+
+            if (priority == BindingPriority.LocalValue)
+            {
+                _localValue = value;
+            }
+            else
+            {
+                var insert = FindInsertPoint(priority);
+                var entry = new ConstantValueEntry<T>(Property, value, priority, this);
+                _entries.Insert(insert, entry);
+                result = entry;
+            }
+
+            UpdateEffectiveValue(new AvaloniaPropertyChangedEventArgs<T>(
+                _owner,
+                Property,
+                default,
+                value,
+                priority));
+
+            return result;
+        }
+
+        public BindingEntry<T> AddBinding(IObservable<BindingValue<T>> source, BindingPriority priority)
+        {
+            var binding = new BindingEntry<T>(_owner, Property, source, priority, this);
+            var insert = FindInsertPoint(binding.Priority);
+            _entries.Insert(insert, binding);
+            return binding;
+        }
+
+        public void CoerceValue() => UpdateEffectiveValue(null);
+
+        void IValueSink.ValueChanged<TValue>(AvaloniaPropertyChangedEventArgs<TValue> change)
+        {
+            if (change.Priority == BindingPriority.LocalValue)
+            {
+                _localValue = default;
+            }
+
+            if (change is AvaloniaPropertyChangedEventArgs<T> c)
+            {
+                UpdateEffectiveValue(c);
+            }
+        }
+
+        void IValueSink.Completed<TValue>(
+            StyledPropertyBase<TValue> property,
+            IPriorityValueEntry entry,
+            Optional<TValue> oldValue)
+        {
+            _entries.Remove((IPriorityValueEntry<T>)entry);
+
+            if (oldValue is Optional<T> o)
+            {
+                UpdateEffectiveValue(new AvaloniaPropertyChangedEventArgs<T>(
+                    _owner,
+                    Property,
+                    o,
+                    default,
+                    entry.Priority));
+            }
+        }
+
+        private int FindInsertPoint(BindingPriority priority)
+        {
+            var result = _entries.Count;
+
+            for (var i = 0; i < _entries.Count; ++i)
+            {
+                if (_entries[i].Priority < priority)
+                {
+                    result = i;
+                    break;
+                }
+            }
+
+            return result;
+        }
+
+        public (Optional<T>, BindingPriority) CalculateValue(BindingPriority maxPriority)
+        {
+            var reachedLocalValues = false;
+
+            for (var i = _entries.Count - 1; i >= 0; --i)
+            {
+                var entry = _entries[i];
+
+                if (entry.Priority < maxPriority)
+                {
+                    continue;
+                }
+
+                if (!reachedLocalValues &&
+                    entry.Priority >= BindingPriority.LocalValue &&
+                    maxPriority <= BindingPriority.LocalValue &&
+                    _localValue.HasValue)
+                {
+                    return (_localValue, BindingPriority.LocalValue);
+                }
+
+                var entryValue = entry.GetValue();
+
+                if (entryValue.HasValue)
+                {
+                    return (entryValue, entry.Priority);
+                }
+            }
+
+            if (!reachedLocalValues &&
+                maxPriority <= BindingPriority.LocalValue &&
+                _localValue.HasValue)
+            {
+                return (_localValue, BindingPriority.LocalValue);
+            }
+
+            return (default, BindingPriority.Unset);
+        }
+
+        private void UpdateEffectiveValue(AvaloniaPropertyChangedEventArgs<T>? change)
+        {
+            var (value, priority) = CalculateValue(BindingPriority.Animation);
+
+            if (value.HasValue && _coerceValue != null)
+            {
+                value = _coerceValue(_owner, value.Value);
+            }
+
+            Priority = priority;
+
+            if (value != _value)
+            {
+                var old = _value;
+                _value = value;
+
+                _sink.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
+                    _owner,
+                    Property,
+                    old,
+                    value,
+                    Priority));
+            }
+            else if (change is object)
+            {
+                change.MarkNonEffectiveValue();
+                change.SetOldValue(default);
+                _sink.ValueChanged(change);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Reactive/AvaloniaPropertyBindingObservable.cs b/src/Avalonia.Base/Reactive/AvaloniaPropertyBindingObservable.cs
new file mode 100644
index 0000000000..be044b0559
--- /dev/null
+++ b/src/Avalonia.Base/Reactive/AvaloniaPropertyBindingObservable.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Data;
+
+#nullable enable
+
+namespace Avalonia.Reactive
+{
+    internal class AvaloniaPropertyBindingObservable<T> : LightweightObservableBase<BindingValue<T>>, IDescription
+    {
+        private readonly WeakReference<IAvaloniaObject> _target;
+        private readonly AvaloniaProperty _property;
+        private T _value;
+
+#nullable disable
+        public AvaloniaPropertyBindingObservable(
+            IAvaloniaObject target,
+            AvaloniaProperty property)
+        {
+            _target = new WeakReference<IAvaloniaObject>(target);
+            _property = property;
+        }
+#nullable enable
+
+        public string Description => $"{_target.GetType().Name}.{_property.Name}";
+
+        protected override void Initialize()
+        {
+            if (_target.TryGetTarget(out var target))
+            {
+                _value = (T)target.GetValue(_property);
+                target.PropertyChanged += PropertyChanged;
+            }
+        }
+
+        protected override void Deinitialize()
+        {
+            if (_target.TryGetTarget(out var target))
+            {
+                target.PropertyChanged -= PropertyChanged;
+            }
+        }
+
+        protected override void Subscribed(IObserver<BindingValue<T>> observer, bool first)
+        {
+            observer.OnNext(new BindingValue<T>(_value));
+        }
+
+        private void PropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Property == _property)
+            {
+                if (e is AvaloniaPropertyChangedEventArgs<T> typedArgs)
+                {
+                    var newValue = e.Sender.GetValue(typedArgs.Property);
+
+                    if (!typedArgs.OldValue.HasValue || !EqualityComparer<T>.Default.Equals(newValue, _value))
+                    {
+                        _value = newValue;
+                        PublishNext(_value);
+                    }
+                }
+                else
+                {
+                    var newValue = e.Sender.GetValue(e.Property);
+
+                    if (!Equals(newValue, _value))
+                    {
+                        _value = (T)newValue;
+                        PublishNext(_value);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Reactive/AvaloniaPropertyObservable.cs b/src/Avalonia.Base/Reactive/AvaloniaPropertyObservable.cs
index 4385ab13ef..238aba5c96 100644
--- a/src/Avalonia.Base/Reactive/AvaloniaPropertyObservable.cs
+++ b/src/Avalonia.Base/Reactive/AvaloniaPropertyObservable.cs
@@ -44,8 +44,22 @@ namespace Avalonia.Reactive
         {
             if (e.Property == _property)
             {
-                _value = (T)e.NewValue;
-                PublishNext(_value);
+                T newValue;
+
+                if (e is AvaloniaPropertyChangedEventArgs<T> typed)
+                {
+                    newValue = typed.Sender.GetValue(typed.Property);
+                }
+                else
+                {
+                    newValue = (T)e.Sender.GetValue(e.Property);
+                }
+
+                if (!Equals(newValue, _value))
+                {
+                    _value = (T)newValue;
+                    PublishNext(_value);
+                }
             }
         }
     }
diff --git a/src/Avalonia.Base/Reactive/BindingValueAdapter.cs b/src/Avalonia.Base/Reactive/BindingValueAdapter.cs
new file mode 100644
index 0000000000..8c80e9f48c
--- /dev/null
+++ b/src/Avalonia.Base/Reactive/BindingValueAdapter.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Reactive.Subjects;
+using Avalonia.Data;
+
+#nullable enable
+
+namespace Avalonia.Reactive
+{
+    internal class BindingValueAdapter<T> : SingleSubscriberObservableBase<BindingValue<T>>,
+        IObserver<T>
+    {
+        private readonly IObservable<T> _source;
+        private IDisposable? _subscription;
+
+        public BindingValueAdapter(IObservable<T> source) => _source = source;
+        public void OnCompleted() => PublishCompleted();
+        public void OnError(Exception error) => PublishError(error);
+        public void OnNext(T value) => PublishNext(BindingValue<T>.FromUntyped(value));
+        protected override void Subscribed() => _subscription = _source.Subscribe(this);
+        protected override void Unsubscribed() => _subscription?.Dispose();
+    }
+
+    internal class BindingValueSubjectAdapter<T> : SingleSubscriberObservableBase<BindingValue<T>>,
+        ISubject<BindingValue<T>>
+    {
+        private readonly ISubject<T> _source;
+        private readonly Inner _inner;
+        private IDisposable? _subscription;
+
+        public BindingValueSubjectAdapter(ISubject<T> source)
+        {
+            _source = source;
+            _inner = new Inner(this);
+        }
+
+        public void OnCompleted() => _source.OnCompleted();
+        public void OnError(Exception error) => _source.OnError(error);
+        
+        public void OnNext(BindingValue<T> value)
+        {
+            if (value.HasValue)
+            {
+                _source.OnNext(value.Value);
+            }
+        }
+
+        protected override void Subscribed() => _subscription = _source.Subscribe(_inner);
+        protected override void Unsubscribed() => _subscription?.Dispose();
+
+        private class Inner : IObserver<T>
+        {
+            private readonly BindingValueSubjectAdapter<T> _owner;
+
+            public Inner(BindingValueSubjectAdapter<T> owner) => _owner = owner;
+
+            public void OnCompleted() => _owner.PublishCompleted();
+            public void OnError(Exception error) => _owner.PublishError(error);
+            public void OnNext(T value) => _owner.PublishNext(BindingValue<T>.FromUntyped(value));
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Reactive/BindingValueExtensions.cs b/src/Avalonia.Base/Reactive/BindingValueExtensions.cs
new file mode 100644
index 0000000000..6f0d29dd0f
--- /dev/null
+++ b/src/Avalonia.Base/Reactive/BindingValueExtensions.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Reactive.Subjects;
+using Avalonia.Data;
+
+#nullable enable
+
+namespace Avalonia.Reactive
+{
+    public static class BindingValueExtensions
+    {
+        public static IObservable<BindingValue<T>> ToBindingValue<T>(this IObservable<T> source)
+        {
+            source = source ?? throw new ArgumentNullException(nameof(source));
+            return new BindingValueAdapter<T>(source);
+        }
+
+        public static ISubject<BindingValue<T>> ToBindingValue<T>(this ISubject<T> source)
+        {
+            source = source ?? throw new ArgumentNullException(nameof(source));
+            return new BindingValueSubjectAdapter<T>(source);
+        }
+
+        public static IObservable<object?> ToUntyped<T>(this IObservable<BindingValue<T>> source)
+        {
+            source = source ?? throw new ArgumentNullException(nameof(source));
+            return new UntypedBindingAdapter<T>(source);
+        }
+
+        public static ISubject<object?> ToUntyped<T>(this ISubject<BindingValue<T>> source)
+        {
+            source = source ?? throw new ArgumentNullException(nameof(source));
+            return new UntypedBindingSubjectAdapter<T>(source);
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Reactive/LightweightObservableBase.cs b/src/Avalonia.Base/Reactive/LightweightObservableBase.cs
index 41009e4cd3..f5052e5858 100644
--- a/src/Avalonia.Base/Reactive/LightweightObservableBase.cs
+++ b/src/Avalonia.Base/Reactive/LightweightObservableBase.cs
@@ -116,20 +116,33 @@ namespace Avalonia.Reactive
         {
             if (Volatile.Read(ref _observers) != null)
             {
-                IObserver<T>[] observers;
-
+                IObserver<T>[] observers = null;
+                IObserver<T> singleObserver = null;
                 lock (this)
                 {
                     if (_observers == null)
                     {
                         return;
                     }
-                    observers = _observers.ToArray();
+                    if (_observers.Count == 1)
+                    {
+                        singleObserver = _observers[0];
+                    }
+                    else
+                    {
+                        observers = _observers.ToArray();
+                    }
                 }
-
-                foreach (var observer in observers)
+                if (singleObserver != null)
                 {
-                    observer.OnNext(value);
+                    singleObserver.OnNext(value);
+                }
+                else
+                {
+                    foreach (var observer in observers)
+                    {
+                        observer.OnNext(value);
+                    }
                 }
             }
         }
diff --git a/src/Avalonia.Base/Reactive/ObservableEx.cs b/src/Avalonia.Base/Reactive/ObservableEx.cs
index a1ec8f9a8a..8e963fb9d5 100644
--- a/src/Avalonia.Base/Reactive/ObservableEx.cs
+++ b/src/Avalonia.Base/Reactive/ObservableEx.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Disposables;
 
diff --git a/src/Avalonia.Base/Reactive/SingleSubscriberObservableBase.cs b/src/Avalonia.Base/Reactive/SingleSubscriberObservableBase.cs
index cd8ce2cd80..d3ac3dac8a 100644
--- a/src/Avalonia.Base/Reactive/SingleSubscriberObservableBase.cs
+++ b/src/Avalonia.Base/Reactive/SingleSubscriberObservableBase.cs
@@ -36,7 +36,7 @@ namespace Avalonia.Reactive
             return this;
         }
 
-        void IDisposable.Dispose()
+        public virtual void Dispose()
         {
             Unsubscribed();
             _observer = null;
diff --git a/src/Avalonia.Base/Reactive/TypedBindingAdapter.cs b/src/Avalonia.Base/Reactive/TypedBindingAdapter.cs
new file mode 100644
index 0000000000..b99cef0f51
--- /dev/null
+++ b/src/Avalonia.Base/Reactive/TypedBindingAdapter.cs
@@ -0,0 +1,62 @@
+using System;
+using Avalonia.Data;
+using Avalonia.Logging;
+
+#nullable enable
+
+namespace Avalonia.Reactive
+{
+    internal class TypedBindingAdapter<T> : SingleSubscriberObservableBase<BindingValue<T>>,
+        IObserver<BindingValue<object>>
+    {
+        private readonly IAvaloniaObject _target;
+        private readonly AvaloniaProperty<T> _property;
+        private readonly IObservable<BindingValue<object>> _source;
+        private IDisposable? _subscription;
+
+        public TypedBindingAdapter(
+            IAvaloniaObject target,
+            AvaloniaProperty<T> property,
+            IObservable<BindingValue<object>> source)
+        {
+            _target = target;
+            _property = property;
+            _source = source;
+        }
+
+        public void OnNext(BindingValue<object> value)
+        {
+            try
+            {
+                PublishNext(value.Convert<T>());
+            }
+            catch (InvalidCastException e)
+            {
+                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());
+                PublishNext(BindingValue<T>.BindingError(e));
+            }
+        }
+
+        public void OnCompleted() => PublishCompleted();
+        public void OnError(Exception error) => PublishError(error);
+
+        public static IObservable<BindingValue<T>> Create(
+            IAvaloniaObject target,
+            AvaloniaProperty<T> property,
+            IObservable<BindingValue<object>> source)
+        {
+            return source is IObservable<BindingValue<T>> result ?
+                result :
+                new TypedBindingAdapter<T>(target, property, source);
+        }
+
+        protected override void Subscribed() => _subscription = _source.Subscribe(this);
+        protected override void Unsubscribed() => _subscription?.Dispose();
+    }
+}
diff --git a/src/Avalonia.Base/Reactive/UntypedBindingAdapter.cs b/src/Avalonia.Base/Reactive/UntypedBindingAdapter.cs
new file mode 100644
index 0000000000..03c1afcea9
--- /dev/null
+++ b/src/Avalonia.Base/Reactive/UntypedBindingAdapter.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Reactive.Subjects;
+using Avalonia.Data;
+
+#nullable enable
+
+namespace Avalonia.Reactive
+{
+    internal class UntypedBindingAdapter<T> : SingleSubscriberObservableBase<object?>,
+        IObserver<BindingValue<T>>
+    {
+        private readonly IObservable<BindingValue<T>> _source;
+        private IDisposable? _subscription;
+
+        public UntypedBindingAdapter(IObservable<BindingValue<T>> source) => _source = source;
+        public void OnCompleted() => PublishCompleted();
+        public void OnError(Exception error) => PublishError(error);
+        public void OnNext(BindingValue<T> value) => value.ToUntyped();
+        protected override void Subscribed() => _subscription = _source.Subscribe(this);
+        protected override void Unsubscribed() => _subscription?.Dispose();
+    }
+
+    internal class UntypedBindingSubjectAdapter<T> : SingleSubscriberObservableBase<object?>,
+        ISubject<object?>
+    {
+        private readonly ISubject<BindingValue<T>> _source;
+        private readonly Inner _inner;
+        private IDisposable? _subscription;
+
+        public UntypedBindingSubjectAdapter(ISubject<BindingValue<T>> source)
+        {
+            _source = source;
+            _inner = new Inner(this);
+        }
+
+        public void OnCompleted() => _source.OnCompleted();
+        public void OnError(Exception error) => _source.OnError(error);
+        public void OnNext(object? value)
+        {
+            _source.OnNext(BindingValue<T>.FromUntyped(value));
+        }
+
+        protected override void Subscribed() => _subscription = _source.Subscribe(_inner);
+        protected override void Unsubscribed() => _subscription?.Dispose();
+
+        private class Inner : IObserver<BindingValue<T>>
+        {
+            private readonly UntypedBindingSubjectAdapter<T> _owner;
+
+            public Inner(UntypedBindingSubjectAdapter<T> owner) => _owner = owner;
+
+            public void OnCompleted() => _owner.PublishCompleted();
+            public void OnError(Exception error) => _owner.PublishError(error);
+            public void OnNext(BindingValue<T> value) => _owner.PublishNext(value.ToUntyped());
+        }
+    }
+}
diff --git a/src/Avalonia.Base/StyledProperty.cs b/src/Avalonia.Base/StyledProperty.cs
index 4eb85a046e..75275858cd 100644
--- a/src/Avalonia.Base/StyledProperty.cs
+++ b/src/Avalonia.Base/StyledProperty.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia
@@ -17,14 +14,16 @@ namespace Avalonia
         /// <param name="ownerType">The type of the class that registers the property.</param>
         /// <param name="metadata">The property metadata.</param>
         /// <param name="inherits">Whether the property inherits its value.</param>
+        /// <param name="validate">A value validation callback.</param>
         /// <param name="notifying">A <see cref="AvaloniaProperty.Notifying"/> callback.</param>
         public StyledProperty(
             string name,
             Type ownerType,
             StyledPropertyMetadata<TValue> metadata,
             bool inherits = false,
+            Func<TValue, bool> validate = null,
             Action<IAvaloniaObject, bool> notifying = null)
-            : base(name, ownerType, metadata, inherits, notifying)
+            : base(name, ownerType, metadata, inherits, validate, notifying)
         {
         }
 
diff --git a/src/Avalonia.Base/StyledPropertyBase.cs b/src/Avalonia.Base/StyledPropertyBase.cs
index 27a502246a..3e92c3bdf7 100644
--- a/src/Avalonia.Base/StyledPropertyBase.cs
+++ b/src/Avalonia.Base/StyledPropertyBase.cs
@@ -1,15 +1,15 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Diagnostics;
+using Avalonia.Data;
+using Avalonia.Reactive;
+using Avalonia.Utilities;
 
 namespace Avalonia
 {
     /// <summary>
     /// Base class for styled properties.
     /// </summary>
-    public class StyledPropertyBase<TValue> : AvaloniaProperty<TValue>, IStyledPropertyAccessor
+    public abstract class StyledPropertyBase<TValue> : AvaloniaProperty<TValue>, IStyledPropertyAccessor
     {
         private bool _inherits;
 
@@ -20,12 +20,14 @@ namespace Avalonia
         /// <param name="ownerType">The type of the class that registers the property.</param>
         /// <param name="metadata">The property metadata.</param>
         /// <param name="inherits">Whether the property inherits its value.</param>
+        /// <param name="validate">A value validation callback.</param>
         /// <param name="notifying">A <see cref="AvaloniaProperty.Notifying"/> callback.</param>
         protected StyledPropertyBase(
             string name,
             Type ownerType,            
             StyledPropertyMetadata<TValue> metadata,
             bool inherits = false,
+            Func<TValue, bool> validate = null,
             Action<IAvaloniaObject, bool> notifying = null)
                 : base(name, ownerType, metadata, notifying)
         {
@@ -38,6 +40,14 @@ namespace Avalonia
             }
 
             _inherits = inherits;
+            ValidateValue = validate;
+            HasCoercion |= metadata.CoerceValue != null;
+
+            if (validate?.Invoke(metadata.DefaultValue) == false)
+            {
+                throw new ArgumentException(
+                    $"'{metadata.DefaultValue}' is not a valid default value for '{name}'.");
+            }
         }
 
         /// <summary>
@@ -59,6 +69,29 @@ namespace Avalonia
         /// </value>
         public override bool Inherits => _inherits;
 
+        /// <summary>
+        /// Gets the value validation callback for the property.
+        /// </summary>
+        public Func<TValue, bool> ValidateValue { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether this property has any value coercion callbacks defined
+        /// in its metadata.
+        /// </summary>
+        internal bool HasCoercion { get; private set; }
+
+        public TValue CoerceValue(IAvaloniaObject instance, TValue baseValue)
+        {
+            var metadata = GetMetadata(instance.GetType());
+
+            if (metadata.CoerceValue != null)
+            {
+                return metadata.CoerceValue.Invoke(instance, baseValue);
+            }
+
+            return baseValue;
+        }
+
         /// <summary>
         /// Gets the default value for the property on the specified type.
         /// </summary>
@@ -68,7 +101,7 @@ namespace Avalonia
         {
             Contract.Requires<ArgumentNullException>(type != null);
 
-            return GetMetadata(type).DefaultValue.Typed;
+            return GetMetadata(type).DefaultValue;
         }
 
         /// <summary>
@@ -120,31 +153,24 @@ namespace Avalonia
         /// <param name="metadata">The metadata.</param>
         public void OverrideMetadata(Type type, StyledPropertyMetadata<TValue> metadata)
         {
+            if (ValidateValue != null)
+            {
+                if (!ValidateValue(metadata.DefaultValue))
+                {
+                    throw new ArgumentException(
+                        $"'{metadata.DefaultValue}' is not a valid default value for '{Name}'.");
+                }
+            }
+
+            HasCoercion |= metadata.CoerceValue != null;
+
             base.OverrideMetadata(type, metadata);
         }
 
-        /// <summary>
-        /// Overrides the validation function for the specified type.
-        /// </summary>
-        /// <typeparam name="THost">The type.</typeparam>
-        /// <param name="validate">The validation function.</param>
-        public void OverrideValidation<THost>(Func<THost, TValue, TValue> validate)
-            where THost : IAvaloniaObject
+        /// <inheritdoc/>
+        public override void Accept<TData>(IAvaloniaPropertyVisitor<TData> vistor, ref TData data)
         {
-            Func<IAvaloniaObject, TValue, TValue> f;
-
-            if (validate != null)
-            {
-                f = Cast(validate);
-            }
-            else
-            {
-                // Passing null to the validation function means that the property metadata merge
-                // will take the base validation function, so instead use an empty validation.
-                f = (o, v) => v;
-            }
-
-            base.OverrideMetadata(typeof(THost), new StyledPropertyMetadata<TValue>(validate: f));
+            vistor.Visit(this, ref data);
         }
 
         /// <summary>
@@ -157,20 +183,74 @@ namespace Avalonia
         }
 
         /// <inheritdoc/>
-        Func<IAvaloniaObject, object, object> IStyledPropertyAccessor.GetValidationFunc(Type type)
+        object IStyledPropertyAccessor.GetDefaultValue(Type type) => GetDefaultBoxedValue(type);
+
+        /// <inheritdoc/>
+        internal override void RouteClearValue(IAvaloniaObject o)
         {
-            Contract.Requires<ArgumentNullException>(type != null);
-            return ((IStyledPropertyMetadata)base.GetMetadata(type)).Validate;
+            o.ClearValue<TValue>(this);
         }
 
         /// <inheritdoc/>
-        object IStyledPropertyAccessor.GetDefaultValue(Type type) => GetDefaultBoxedValue(type);
+        internal override object RouteGetValue(IAvaloniaObject o)
+        {
+            return o.GetValue<TValue>(this);
+        }
+
+        /// <inheritdoc/>
+        internal override object RouteGetBaseValue(IAvaloniaObject o, BindingPriority maxPriority)
+        {
+            var value = o.GetBaseValue<TValue>(this, maxPriority);
+            return value.HasValue ? value.Value : AvaloniaProperty.UnsetValue;
+        }
+
+        /// <inheritdoc/>
+        internal override IDisposable RouteSetValue(
+            IAvaloniaObject o,
+            object value,
+            BindingPriority priority)
+        {
+            var v = TryConvert(value);
+
+            if (v.HasValue)
+            {
+                return o.SetValue<TValue>(this, (TValue)v.Value, priority);
+            }
+            else if (v.Type == BindingValueType.UnsetValue)
+            {
+                o.ClearValue(this);
+            }
+            else if (v.HasError)
+            {
+                throw v.Error;
+            }
+
+            return null;
+        }
+
+        /// <inheritdoc/>
+        internal override IDisposable RouteBind(
+            IAvaloniaObject o,
+            IObservable<BindingValue<object>> source,
+            BindingPriority priority)
+        {
+            var adapter = TypedBindingAdapter<TValue>.Create(o, this, source);
+            return o.Bind<TValue>(this, adapter, priority);
+        }
+
+        /// <inheritdoc/>
+        internal override void RouteInheritanceParentChanged(
+            AvaloniaObject o,
+            IAvaloniaObject oldParent)
+        {
+            o.InheritanceParentChanged(this, oldParent);
+        }
 
         private object GetDefaultBoxedValue(Type type)
         {
             Contract.Requires<ArgumentNullException>(type != null);
 
-            return GetMetadata(type).DefaultValue.Boxed;
+            return GetMetadata(type).DefaultValue;
         }
 
         [DebuggerHidden]
diff --git a/src/Avalonia.Base/StyledPropertyMetadata`1.cs b/src/Avalonia.Base/StyledPropertyMetadata`1.cs
index d1a0e2dc53..ec7bff4dfb 100644
--- a/src/Avalonia.Base/StyledPropertyMetadata`1.cs
+++ b/src/Avalonia.Base/StyledPropertyMetadata`1.cs
@@ -1,8 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Diagnostics;
 using Avalonia.Data;
 
 namespace Avalonia
@@ -10,68 +6,55 @@ namespace Avalonia
     /// <summary>
     /// Metadata for styled avalonia properties.
     /// </summary>
-    public class StyledPropertyMetadata<TValue> : PropertyMetadata, IStyledPropertyMetadata
+    public class StyledPropertyMetadata<TValue> : AvaloniaPropertyMetadata, IStyledPropertyMetadata
     {
+        private Optional<TValue> _defaultValue;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="StyledPropertyMetadata{TValue}"/> class.
         /// </summary>
         /// <param name="defaultValue">The default value of the property.</param>
-        /// <param name="validate">A validation function.</param>
         /// <param name="defaultBindingMode">The default binding mode.</param>
+        /// <param name="coerce">A value coercion callback.</param>
         public StyledPropertyMetadata(
-            TValue defaultValue = default,
-            Func<IAvaloniaObject, TValue, TValue> validate = null,
-            BindingMode defaultBindingMode = BindingMode.Default)
+            Optional<TValue> defaultValue = default,
+            BindingMode defaultBindingMode = BindingMode.Default,
+            Func<IAvaloniaObject, TValue, TValue> coerce = null)
                 : base(defaultBindingMode)
         {
-            DefaultValue = new BoxedValue<TValue>(defaultValue);
-            Validate = validate;
+            _defaultValue = defaultValue;
+            CoerceValue = coerce;
         }
 
         /// <summary>
         /// Gets the default value for the property.
         /// </summary>
-        internal BoxedValue<TValue> DefaultValue { get; private set; }
+        public TValue DefaultValue => _defaultValue.GetValueOrDefault();
 
         /// <summary>
-        /// Gets the validation callback.
+        /// Gets the value coercion callback, if any.
         /// </summary>
-        public Func<IAvaloniaObject, TValue, TValue> Validate { get; private set; }
-
-        object IStyledPropertyMetadata.DefaultValue => DefaultValue.Boxed;
+        public Func<IAvaloniaObject, TValue, TValue> CoerceValue { get; private set; }
 
-        Func<IAvaloniaObject, object, object> IStyledPropertyMetadata.Validate => Cast(Validate);
+        object IStyledPropertyMetadata.DefaultValue => DefaultValue;
 
         /// <inheritdoc/>
-        public override void Merge(PropertyMetadata baseMetadata, AvaloniaProperty property)
+        public override void Merge(AvaloniaPropertyMetadata baseMetadata, AvaloniaProperty property)
         {
             base.Merge(baseMetadata, property);
 
             if (baseMetadata is StyledPropertyMetadata<TValue> src)
             {
-                if (DefaultValue.Boxed == null)
+                if (!_defaultValue.HasValue)
                 {
-                    DefaultValue = src.DefaultValue;
+                    _defaultValue = src.DefaultValue;
                 }
 
-                if (Validate == null)
+                if (CoerceValue == null)
                 {
-                    Validate = src.Validate;
+                    CoerceValue = src.CoerceValue;
                 }
             }
         }
-
-        [DebuggerHidden]
-        private static Func<IAvaloniaObject, object, object> Cast(Func<IAvaloniaObject, TValue, TValue> f)
-        {
-            if (f == null)
-            {
-                return null;
-            }
-            else
-            {
-                return (o, v) => f(o, (TValue)v);
-            }
-        }
     }
 }
diff --git a/src/Avalonia.Base/Threading/AvaloniaScheduler.cs b/src/Avalonia.Base/Threading/AvaloniaScheduler.cs
index 46529f0a5a..397826df53 100644
--- a/src/Avalonia.Base/Threading/AvaloniaScheduler.cs
+++ b/src/Avalonia.Base/Threading/AvaloniaScheduler.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Concurrency;
 using System.Reactive.Disposables;
@@ -12,6 +9,16 @@ namespace Avalonia.Threading
     /// </summary>
     public class AvaloniaScheduler : LocalScheduler
     {
+        /// <summary>
+        /// Users can schedule actions on the dispatcher thread while being on the correct thread already.
+        /// We are optimizing this case by invoking user callback immediately which can lead to stack overflows in certain cases.
+        /// To prevent this we are limiting amount of reentrant calls to <see cref="Schedule{TState}"/> before we will
+        /// schedule on a dispatcher anyway.
+        /// </summary>
+        private const int MaxReentrantSchedules = 32;
+
+        private int _reentrancyGuard;
+
         /// <summary>
         /// The instance of the <see cref="AvaloniaScheduler"/>.
         /// </summary>
@@ -27,31 +34,58 @@ namespace Avalonia.Threading
         /// <inheritdoc/>
         public override IDisposable Schedule<TState>(TState state, TimeSpan dueTime, Func<IScheduler, TState, IDisposable> action)
         {
-            var composite = new CompositeDisposable(2);
+            IDisposable PostOnDispatcher()
+            {
+                var composite = new CompositeDisposable(2);
+
+                var cancellation = new CancellationDisposable();
+
+                Dispatcher.UIThread.Post(() =>
+                {
+                    if (!cancellation.Token.IsCancellationRequested)
+                    {
+                        composite.Add(action(this, state));
+                    }
+                }, DispatcherPriority.DataBind);
+
+                composite.Add(cancellation);
+
+                return composite;
+            }
+
             if (dueTime == TimeSpan.Zero)
             {
                 if (!Dispatcher.UIThread.CheckAccess())
                 {
-                    var cancellation = new CancellationDisposable();
-                    Dispatcher.UIThread.Post(() =>
-                    {
-                        if (!cancellation.Token.IsCancellationRequested)
-                        {
-                            composite.Add(action(this, state));
-                        }
-                    }, DispatcherPriority.DataBind);
-                    composite.Add(cancellation); 
+                    return PostOnDispatcher();
                 }
                 else
                 {
-                    return action(this, state);
+                    if (_reentrancyGuard >= MaxReentrantSchedules)
+                    {
+                        return PostOnDispatcher();
+                    }
+
+                    try
+                    {
+                        _reentrancyGuard++;
+
+                        return action(this, state);
+                    }
+                    finally
+                    {
+                        _reentrancyGuard--;
+                    }
                 }
             }
             else
             {
+                var composite = new CompositeDisposable(2);
+
                 composite.Add(DispatcherTimer.RunOnce(() => composite.Add(action(this, state)), dueTime));
+
+                return composite;
             }
-            return composite;
         }
     }
 }
diff --git a/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs b/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs
index 278efbcd0d..1a78792173 100644
--- a/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs
+++ b/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs
@@ -1,6 +1,5 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using System;
+using System.Runtime.ConstrainedExecution;
 using System.Threading;
 
 namespace Avalonia.Threading
@@ -42,5 +41,7 @@ namespace Avalonia.Threading
             else
                 Dispatcher.UIThread.InvokeAsync(() => d(state), DispatcherPriority.Send).Wait();
         }
+
+
     }
 }
diff --git a/src/Avalonia.Base/Threading/Dispatcher.cs b/src/Avalonia.Base/Threading/Dispatcher.cs
index 55a9b6984a..fe2cec11f0 100644
--- a/src/Avalonia.Base/Threading/Dispatcher.cs
+++ b/src/Avalonia.Base/Threading/Dispatcher.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/src/Avalonia.Base/Threading/DispatcherPriority.cs b/src/Avalonia.Base/Threading/DispatcherPriority.cs
index 1faa2da7f8..a2b4b86bac 100644
--- a/src/Avalonia.Base/Threading/DispatcherPriority.cs
+++ b/src/Avalonia.Base/Threading/DispatcherPriority.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Threading
 {
     /// <summary>
@@ -20,7 +17,7 @@ namespace Avalonia.Threading
         SystemIdle = 1,
 
         /// <summary>
-        /// The job will be processed when the application sis idle.
+        /// The job will be processed when the application is idle.
         /// </summary>
         ApplicationIdle = 2,
 
diff --git a/src/Avalonia.Base/Threading/DispatcherTimer.cs b/src/Avalonia.Base/Threading/DispatcherTimer.cs
index 4a8a9d673f..56cde9738e 100644
--- a/src/Avalonia.Base/Threading/DispatcherTimer.cs
+++ b/src/Avalonia.Base/Threading/DispatcherTimer.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Disposables;
 using Avalonia.Platform;
@@ -17,7 +14,7 @@ namespace Avalonia.Threading
         private readonly DispatcherPriority _priority;
 
         private TimeSpan _interval;
-        
+
         /// <summary>
         /// Initializes a new instance of the <see cref="DispatcherTimer"/> class.
         /// </summary>
@@ -157,6 +154,8 @@ namespace Avalonia.Threading
             TimeSpan interval,
             DispatcherPriority priority = DispatcherPriority.Normal)
         {
+            interval = (interval != TimeSpan.Zero) ? interval : TimeSpan.FromTicks(1);
+            
             var timer = new DispatcherTimer(priority) { Interval = interval };
 
             timer.Tick += (s, e) =>
@@ -200,7 +199,7 @@ namespace Avalonia.Threading
             }
         }
 
-        
+
 
         /// <summary>
         /// Raises the <see cref="Tick"/> event on the dispatcher thread.
diff --git a/src/Avalonia.Base/Threading/JobRunner.cs b/src/Avalonia.Base/Threading/JobRunner.cs
index b922370e84..58f623fb3f 100644
--- a/src/Avalonia.Base/Threading/JobRunner.cs
+++ b/src/Avalonia.Base/Threading/JobRunner.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/Avalonia.Base/Utilities/AvaloniaPropertyValueStore.cs b/src/Avalonia.Base/Utilities/AvaloniaPropertyValueStore.cs
index ac128d83de..6e52b6770a 100644
--- a/src/Avalonia.Base/Utilities/AvaloniaPropertyValueStore.cs
+++ b/src/Avalonia.Base/Utilities/AvaloniaPropertyValueStore.cs
@@ -1,8 +1,8 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable enable
 
 namespace Avalonia.Utilities
 {
@@ -12,12 +12,14 @@ namespace Avalonia.Utilities
     /// <typeparam name="TValue">Stored value type.</typeparam>
     internal sealed class AvaloniaPropertyValueStore<TValue>
     {
+        // The last item in the list is always int.MaxValue.
+        private static readonly Entry[] s_emptyEntries = { new Entry { PropertyId = int.MaxValue, Value = default! } };
+        
         private Entry[] _entries;
 
         public AvaloniaPropertyValueStore()
         {
-            // The last item in the list is always int.MaxValue
-            _entries = new[] { new Entry { PropertyId = int.MaxValue, Value = default } };
+            _entries = s_emptyEntries;
         }
 
         private (int, bool) TryFindEntry(int propertyId)
@@ -89,7 +91,7 @@ namespace Avalonia.Utilities
             return (0, false);
         }
 
-        public bool TryGetValue(AvaloniaProperty property, out TValue value)
+        public bool TryGetValue(AvaloniaProperty property, [MaybeNull] out TValue value)
         {
             (int index, bool found) = TryFindEntry(property.Id);
             if (!found)
@@ -129,6 +131,38 @@ namespace Avalonia.Utilities
             _entries[TryFindEntry(property.Id).Item1].Value = value;
         }
 
+        public void Remove(AvaloniaProperty property)
+        {
+            var (index, found) = TryFindEntry(property.Id);
+
+            if (found)
+            {
+                var newLength = _entries.Length - 1;
+                
+                // Special case - one element left means that value store is empty so we can just reuse our "empty" array.
+                if (newLength == 1)
+                {
+                    _entries = s_emptyEntries;
+                    
+                    return;
+                }
+                
+                var entries = new Entry[newLength];
+
+                int ix = 0;
+
+                for (int i = 0; i < _entries.Length; ++i)
+                {
+                    if (i != index)
+                    {
+                        entries[ix++] = _entries[i];
+                    }
+                }
+
+                _entries = entries;
+            }
+        }
+
         public Dictionary<AvaloniaProperty, TValue> ToDictionary()
         {
             var dict = new Dictionary<AvaloniaProperty, TValue>(_entries.Length - 1);
diff --git a/src/Avalonia.Base/Utilities/CharacterReader.cs b/src/Avalonia.Base/Utilities/CharacterReader.cs
index 9be2d230d4..2b98785d0d 100644
--- a/src/Avalonia.Base/Utilities/CharacterReader.cs
+++ b/src/Avalonia.Base/Utilities/CharacterReader.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Utilities
@@ -82,5 +79,25 @@ namespace Avalonia.Utilities
             Position += len;
             return span;
         }
+
+        public ReadOnlySpan<char> TryPeek(int count)
+        {
+            if (_s.Length < count)
+                return ReadOnlySpan<char>.Empty;
+            return _s.Slice(0, count);
+        }
+
+        public ReadOnlySpan<char> PeekWhitespace()
+        {
+            var trimmed = _s.TrimStart();
+            return _s.Slice(0, _s.Length - trimmed.Length);
+        }
+
+        public void Skip(int count)
+        {
+            if (_s.Length < count)
+                throw new IndexOutOfRangeException();
+            _s = _s.Slice(count);
+        }
     }
 }
diff --git a/src/Avalonia.Base/Utilities/DeferredSetter.cs b/src/Avalonia.Base/Utilities/DeferredSetter.cs
deleted file mode 100644
index fe9b0e58a0..0000000000
--- a/src/Avalonia.Base/Utilities/DeferredSetter.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-
-namespace Avalonia.Utilities
-{
-    /// <summary>
-    /// A utility class to enable deferring assignment until after property-changed notifications are sent.
-    /// Used to fix #855.
-    /// </summary>
-    /// <typeparam name="TSetRecord">The type of value with which to track the delayed assignment.</typeparam>
-    internal sealed class DeferredSetter<TSetRecord>
-    {
-        private readonly SingleOrQueue<TSetRecord> _pendingValues;
-        private bool _isNotifying;
-
-        public DeferredSetter()
-        {
-            _pendingValues = new SingleOrQueue<TSetRecord>();
-        }
-
-        private static void SetAndRaisePropertyChanged(AvaloniaObject source, AvaloniaProperty<TSetRecord> property, ref TSetRecord backing, TSetRecord value)
-        {
-            var old = backing;
-
-            backing = value;
-
-            source.RaisePropertyChanged(property, old, value);
-        }
-
-        public bool SetAndNotify(
-            AvaloniaObject source,
-            AvaloniaProperty<TSetRecord> property,
-            ref TSetRecord backing,
-            TSetRecord value)
-        {
-            if (!_isNotifying)
-            {
-                using (new NotifyDisposable(this))
-                {
-                    SetAndRaisePropertyChanged(source, property, ref backing, value);
-                }
-
-                if (!_pendingValues.Empty)
-                {
-                    using (new NotifyDisposable(this))
-                    {
-                        while (!_pendingValues.Empty)
-                        {
-                            SetAndRaisePropertyChanged(source, property, ref backing, _pendingValues.Dequeue());
-                        }
-                    }
-                }
-
-                return true;
-            }
-
-            _pendingValues.Enqueue(value);
-
-            return false;
-        }
-
-        public bool SetAndNotifyCallback<TValue>(AvaloniaProperty property, ISetAndNotifyHandler<TValue> setAndNotifyHandler, ref TValue backing, TValue value)
-            where TValue : TSetRecord
-        {
-            if (!_isNotifying)
-            {
-                using (new NotifyDisposable(this))
-                {
-                    setAndNotifyHandler.HandleSetAndNotify(property, ref backing, value);
-                }
-
-                if (!_pendingValues.Empty)
-                {
-                    using (new NotifyDisposable(this))
-                    {
-                        while (!_pendingValues.Empty)
-                        {
-                            setAndNotifyHandler.HandleSetAndNotify(property, ref backing, (TValue)_pendingValues.Dequeue());
-                        }
-                    }
-                }
-
-                return true;
-            }
-
-            _pendingValues.Enqueue(value);
-
-            return false;
-        }
-
-        /// <summary>
-        /// Disposable that marks the property as currently notifying.
-        /// When disposed, marks the property as done notifying.
-        /// </summary>
-        private readonly struct NotifyDisposable : IDisposable
-        {
-            private readonly DeferredSetter<TSetRecord> _setter;
-
-            internal NotifyDisposable(DeferredSetter<TSetRecord> setter)
-            {
-                _setter = setter;
-                _setter._isNotifying = true;
-            }
-
-            public void Dispose()
-            {
-                _setter._isNotifying = false;
-            }
-        }
-    }
-
-    /// <summary>
-    /// Handler for set and notify requests.
-    /// </summary>
-    /// <typeparam name="TValue">Value type.</typeparam>
-    internal interface ISetAndNotifyHandler<TValue>
-    {
-        /// <summary>
-        /// Handles deferred setter requests to set a value.
-        /// </summary>
-        /// <param name="property">Property being set.</param>
-        /// <param name="backing">Backing field reference.</param>
-        /// <param name="value">New value.</param>
-        void HandleSetAndNotify(AvaloniaProperty property, ref TValue backing, TValue value);
-    }
-}
diff --git a/src/Avalonia.Base/Utilities/DisposableLock.cs b/src/Avalonia.Base/Utilities/DisposableLock.cs
new file mode 100644
index 0000000000..b06e97da00
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/DisposableLock.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Threading;
+
+namespace Avalonia.Utilities
+{
+    public class DisposableLock
+    {
+        private readonly object _lock = new object();
+
+        /// <summary>
+        /// Tries to take a lock
+        /// </summary>
+        /// <returns>IDisposable if succeeded to obtain the lock</returns>
+        public IDisposable TryLock()
+        {
+            if (Monitor.TryEnter(_lock))
+                return new UnlockDisposable(_lock);
+            return null;
+        }
+
+        /// <summary>
+        /// Enters a waiting lock
+        /// </summary>
+        public IDisposable Lock()
+        {
+            Monitor.Enter(_lock);
+            return new UnlockDisposable(_lock);
+        }
+
+        private sealed class UnlockDisposable : IDisposable
+        {
+            private object _lock;
+
+            public UnlockDisposable(object @lock)
+            {
+                _lock = @lock;
+            }
+
+            public void Dispose()
+            {
+                object @lock = Interlocked.Exchange(ref _lock, null);
+
+                if (@lock != null)
+                {
+                    Monitor.Exit(@lock);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Utilities/IAvaloniaPropertyVisitor.cs b/src/Avalonia.Base/Utilities/IAvaloniaPropertyVisitor.cs
new file mode 100644
index 0000000000..4b889eb129
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/IAvaloniaPropertyVisitor.cs
@@ -0,0 +1,34 @@
+#nullable enable
+
+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/IWeakSubscriber.cs b/src/Avalonia.Base/Utilities/IWeakSubscriber.cs
index 5518d41168..a2907eea2e 100644
--- a/src/Avalonia.Base/Utilities/IWeakSubscriber.cs
+++ b/src/Avalonia.Base/Utilities/IWeakSubscriber.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Utilities
diff --git a/src/Avalonia.Base/Utilities/IdentifierParser.cs b/src/Avalonia.Base/Utilities/IdentifierParser.cs
index a57a2b7ba5..b105d0746b 100644
--- a/src/Avalonia.Base/Utilities/IdentifierParser.cs
+++ b/src/Avalonia.Base/Utilities/IdentifierParser.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Globalization;
 
 namespace Avalonia.Utilities
@@ -15,7 +12,7 @@ namespace Avalonia.Utilities
         {
             if (IsValidIdentifierStart(r.Peek))
             {
-                return r.TakeWhile(IsValidIdentifierChar);
+                return r.TakeWhile(c => IsValidIdentifierChar(c));
             }
             else
             {
diff --git a/src/Avalonia.Base/Utilities/ImmutableReadOnlyListStructEnumerator.cs b/src/Avalonia.Base/Utilities/ImmutableReadOnlyListStructEnumerator.cs
new file mode 100644
index 0000000000..a1246c57b5
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/ImmutableReadOnlyListStructEnumerator.cs
@@ -0,0 +1,48 @@
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Avalonia.Utilities
+{
+    public struct ImmutableReadOnlyListStructEnumerator<T> : IEnumerator, IEnumerator<T>
+    {
+        private readonly IReadOnlyList<T> _readOnlyList;
+        private int _pos;
+
+        public ImmutableReadOnlyListStructEnumerator(IReadOnlyList<T> readOnlyList)
+        {
+            _readOnlyList = readOnlyList;
+            _pos = -1;
+            Current = default;
+        }
+
+        public T Current
+        {
+            get;
+            private set;
+        }
+
+        object IEnumerator.Current => Current;
+
+        public void Dispose() { }
+
+        public bool MoveNext()
+        {
+            if (_pos >= _readOnlyList.Count - 1)
+            {
+                return false;
+            }
+
+            Current = _readOnlyList[++_pos];
+
+            return true;
+
+        }
+
+        public void Reset()
+        {
+            _pos = -1;
+
+            Current = default;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Utilities/KeywordParser.cs b/src/Avalonia.Base/Utilities/KeywordParser.cs
new file mode 100644
index 0000000000..16ef95f5f4
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/KeywordParser.cs
@@ -0,0 +1,46 @@
+using System;
+
+namespace Avalonia.Utilities
+{
+#if !BUILDTASK
+    public
+#endif
+    static class KeywordParser
+    {
+        public static bool CheckKeyword(this ref CharacterReader r, string keyword)
+        {
+            return (CheckKeywordInternal(ref r, keyword) >= 0);
+        }
+        
+        static int CheckKeywordInternal(this ref CharacterReader r, string keyword)
+        {
+            var ws = r.PeekWhitespace();
+
+            var chars = r.TryPeek(ws.Length + keyword.Length);
+            if (chars.IsEmpty)
+                return -1;
+            if (SpanEquals(chars.Slice(ws.Length), keyword.AsSpan()))
+                return chars.Length;
+            return -1;
+        }
+
+        static bool SpanEquals(ReadOnlySpan<char> left, ReadOnlySpan<char> right)
+        {
+            if (left.Length != right.Length)
+                return false;
+            for(var c=0; c<left.Length;c++)
+                if (left[c] != right[c])
+                    return false;
+            return true;
+        }
+
+        public static bool TakeIfKeyword(this ref CharacterReader r, string keyword)
+        {
+            var l = CheckKeywordInternal(ref r, keyword);
+            if (l < 0)
+                return false;
+            r.Skip(l);
+            return true;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Utilities/MathUtilities.cs b/src/Avalonia.Base/Utilities/MathUtilities.cs
index 027028480c..446b366dc8 100644
--- a/src/Avalonia.Base/Utilities/MathUtilities.cs
+++ b/src/Avalonia.Base/Utilities/MathUtilities.cs
@@ -1,16 +1,20 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Runtime.InteropServices;
 
 namespace Avalonia.Utilities
 {
     /// <summary>
     /// Provides math utilities not provided in System.Math.
     /// </summary>
-    public static class MathUtilities
+#if !BUILDTASK
+    public
+#endif
+    static class MathUtilities
     {
+        // smallest such that 1.0+DoubleEpsilon != 1.0
+        internal static readonly double DoubleEpsilon = 2.2204460492503131e-016;
+
+        private const float FloatEpsilon = 1.192092896e-07F;
+
         /// <summary>
         /// AreClose - Returns whether or not two doubles are "close".  That is, whether or 
         /// not they are within epsilon of each other.
@@ -21,11 +25,26 @@ namespace Avalonia.Utilities
         {
             //in case they are Infinities (then epsilon check does not work)
             if (value1 == value2) return true;
-            double eps = (Math.Abs(value1) + Math.Abs(value2) + 10.0) * double.Epsilon;
+            double eps = (Math.Abs(value1) + Math.Abs(value2) + 10.0) * DoubleEpsilon;
             double delta = value1 - value2;
             return (-eps < delta) && (eps > delta);
         }
 
+        /// <summary>
+        /// AreClose - Returns whether or not two floats are "close".  That is, whether or 
+        /// not they are within epsilon of each other.
+        /// </summary> 
+        /// <param name="value1"> The first float to compare. </param>
+        /// <param name="value2"> The second float to compare. </param>
+        public static bool AreClose(float value1, float value2)
+        {
+            //in case they are Infinities (then epsilon check does not work)
+            if (value1 == value2) return true;
+            float eps = (Math.Abs(value1) + Math.Abs(value2) + 10.0f) * FloatEpsilon;
+            float delta = value1 - value2;
+            return (-eps < delta) && (eps > delta);
+        }
+
         /// <summary>
         /// LessThan - Returns whether or not the first double is less than the second double.
         /// That is, whether or not the first is strictly less than *and* not within epsilon of
@@ -38,6 +57,18 @@ namespace Avalonia.Utilities
             return (value1 < value2) && !AreClose(value1, value2);
         }
 
+        /// <summary>
+        /// LessThan - Returns whether or not the first float is less than the second float.
+        /// That is, whether or not the first is strictly less than *and* not within epsilon of
+        /// the other number.
+        /// </summary>
+        /// <param name="value1"> The first single float to compare. </param>
+        /// <param name="value2"> The second single float to compare. </param>
+        public static bool LessThan(float value1, float value2)
+        {
+            return (value1 < value2) && !AreClose(value1, value2);
+        }
+
         /// <summary>
         /// GreaterThan - Returns whether or not the first double is greater than the second double.
         /// That is, whether or not the first is strictly greater than *and* not within epsilon of
@@ -50,6 +81,18 @@ namespace Avalonia.Utilities
             return (value1 > value2) && !AreClose(value1, value2);
         }
 
+        /// <summary>
+        /// GreaterThan - Returns whether or not the first float is greater than the second float.
+        /// That is, whether or not the first is strictly greater than *and* not within epsilon of
+        /// the other number.
+        /// </summary>
+        /// <param name="value1"> The first float to compare. </param>
+        /// <param name="value2"> The second float to compare. </param>
+        public static bool GreaterThan(float value1, float value2)
+        {
+            return (value1 > value2) && !AreClose(value1, value2);
+        }
+
         /// <summary>
         /// LessThanOrClose - Returns whether or not the first double is less than or close to
         /// the second double.  That is, whether or not the first is strictly less than or within
@@ -62,6 +105,18 @@ namespace Avalonia.Utilities
             return (value1 < value2) || AreClose(value1, value2);
         }
 
+        /// <summary>
+        /// LessThanOrClose - Returns whether or not the first float is less than or close to
+        /// the second float.  That is, whether or not the first is strictly less than or within
+        /// epsilon of the other number.
+        /// </summary>
+        /// <param name="value1"> The first float to compare. </param>
+        /// <param name="value2"> The second float to compare. </param>
+        public static bool LessThanOrClose(float value1, float value2)
+        {
+            return (value1 < value2) || AreClose(value1, value2);
+        }
+
         /// <summary>
         /// GreaterThanOrClose - Returns whether or not the first double is greater than or close to
         /// the second double.  That is, whether or not the first is strictly greater than or within
@@ -74,6 +129,18 @@ namespace Avalonia.Utilities
             return (value1 > value2) || AreClose(value1, value2);
         }
 
+        /// <summary>
+        /// GreaterThanOrClose - Returns whether or not the first float is greater than or close to
+        /// the second float.  That is, whether or not the first is strictly greater than or within
+        /// epsilon of the other number.
+        /// </summary>
+        /// <param name="value1"> The first float to compare. </param>
+        /// <param name="value2"> The second float to compare. </param>
+        public static bool GreaterThanOrClose(float value1, float value2)
+        {
+            return (value1 > value2) || AreClose(value1, value2);
+        }
+
         /// <summary>
         /// IsOne - Returns whether or not the double is "close" to 1.  Same as AreClose(double, 1),
         /// but this is faster.
@@ -81,7 +148,17 @@ namespace Avalonia.Utilities
         /// <param name="value"> The double to compare to 1. </param>
         public static bool IsOne(double value)
         {
-            return Math.Abs(value - 1.0) < 10.0 * double.Epsilon;
+            return Math.Abs(value - 1.0) < 10.0 * DoubleEpsilon;
+        }
+
+        /// <summary>
+        /// IsOne - Returns whether or not the float is "close" to 1.  Same as AreClose(float, 1),
+        /// but this is faster.
+        /// </summary>
+        /// <param name="value"> The float to compare to 1. </param>
+        public static bool IsOne(float value)
+        {
+            return Math.Abs(value - 1.0f) < 10.0f * FloatEpsilon;
         }
 
         /// <summary>
@@ -91,7 +168,17 @@ namespace Avalonia.Utilities
         /// <param name="value"> The double to compare to 0. </param>
         public static bool IsZero(double value)
         {
-            return Math.Abs(value) < 10.0 * double.Epsilon;
+            return Math.Abs(value) < 10.0 * DoubleEpsilon;
+        }
+
+        /// <summary>
+        /// IsZero - Returns whether or not the float is "close" to 0.  Same as AreClose(float, 0),
+        /// but this is faster.
+        /// </summary>
+        /// <param name="value"> The float to compare to 0. </param>
+        public static bool IsZero(float value)
+        {
+            return Math.Abs(value) < 10.0f * FloatEpsilon;
         }
 
         /// <summary>
@@ -103,6 +190,11 @@ namespace Avalonia.Utilities
         /// <returns>The clamped value.</returns>
         public static double Clamp(double val, double min, double max)
         {
+            if (min > max)
+            {
+                ThrowCannotBeGreaterThanException(min, max);
+            }
+
             if (val < min)
             {
                 return min;
@@ -117,39 +209,6 @@ namespace Avalonia.Utilities
             }
         }
 
-        /// <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
-        /// 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.AreClose(dpiScale, 1.0))
-            {
-                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>
         /// Clamps a value between a minimum and maximum value.
         /// </summary>
@@ -161,7 +220,7 @@ namespace Avalonia.Utilities
         {
             if (min > max)
             {
-                throw new ArgumentException($"{min} cannot be greater than {max}.");
+                ThrowCannotBeGreaterThanException(min, max);
             }
 
             if (val < min)
@@ -177,5 +236,40 @@ namespace Avalonia.Utilities
                 return val;
             }
         }
+
+        /// <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 Deg2Rad(double angle)
+        {
+            return angle * (Math.PI / 180d);
+        }
+
+        /// <summary>
+        /// Converts an angle in gradians to radians.
+        /// </summary>
+        /// <param name="angle">The angle in gradians.</param>
+        /// <returns>The angle in radians.</returns>
+        public static double Grad2Rad(double angle)
+        {
+            return angle * (Math.PI / 200d);
+        }
+
+        /// <summary>
+        /// Converts an angle in turns to radians.
+        /// </summary>
+        /// <param name="angle">The angle in turns.</param>
+        /// <returns>The angle in radians.</returns>
+        public static double Turn2Rad(double angle)
+        {
+            return angle * 2 * Math.PI;
+        }
+        
+        private static void ThrowCannotBeGreaterThanException(double min, double max)
+        {
+            throw new ArgumentException($"{min} cannot be greater than {max}.");
+        }
     }
 }
diff --git a/src/Avalonia.Base/Utilities/NonPumpingLockHelper.cs b/src/Avalonia.Base/Utilities/NonPumpingLockHelper.cs
new file mode 100644
index 0000000000..fd4e5d2ace
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/NonPumpingLockHelper.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace Avalonia.Utilities
+{
+    public class NonPumpingLockHelper
+    {
+        public interface IHelperImpl
+        {
+            IDisposable Use();
+        }
+
+        public static IDisposable Use() => AvaloniaLocator.Current.GetService<IHelperImpl>()?.Use();
+    }
+}
diff --git a/src/Avalonia.Base/Utilities/StringTokenizer.cs b/src/Avalonia.Base/Utilities/StringTokenizer.cs
index a159bfb72e..24e99febb9 100644
--- a/src/Avalonia.Base/Utilities/StringTokenizer.cs
+++ b/src/Avalonia.Base/Utilities/StringTokenizer.cs
@@ -4,7 +4,10 @@ using static System.Char;
 
 namespace Avalonia.Utilities
 {
-    public struct StringTokenizer : IDisposable
+#if !BUILDTASK
+    public
+#endif
+    struct StringTokenizer : IDisposable
     {
         private const char DefaultSeparatorChar = ',';
 
diff --git a/src/Avalonia.Base/Utilities/StyleClassParser.cs b/src/Avalonia.Base/Utilities/StyleClassParser.cs
new file mode 100644
index 0000000000..2db58f73d9
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/StyleClassParser.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Globalization;
+
+namespace Avalonia.Utilities
+{
+#if !BUILDTASK
+    public
+#endif
+    static class StyleClassParser
+    {
+        public static ReadOnlySpan<char> ParseStyleClass(this ref CharacterReader r)
+        {
+            if (IsValidIdentifierStart(r.Peek))
+            {
+                return r.TakeWhile(c => IsValidIdentifierChar(c));
+            }
+            else
+            {
+                return ReadOnlySpan<char>.Empty;
+            }
+        }
+
+        private static bool IsValidIdentifierStart(char c)
+        {
+            return char.IsLetter(c) || c == '_';
+        }
+
+        private static bool IsValidIdentifierChar(char c)
+        {
+            if (IsValidIdentifierStart(c) || c == '-')
+            {
+                return true;
+            }
+            else
+            {
+                var cat = CharUnicodeInfo.GetUnicodeCategory(c);
+                return cat == UnicodeCategory.NonSpacingMark ||
+                       cat == UnicodeCategory.SpacingCombiningMark ||
+                       cat == UnicodeCategory.ConnectorPunctuation ||
+                       cat == UnicodeCategory.Format ||
+                       cat == UnicodeCategory.DecimalDigitNumber;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Utilities/TypeUtilities.cs b/src/Avalonia.Base/Utilities/TypeUtilities.cs
index d85eb4cd76..d0d88166a7 100644
--- a/src/Avalonia.Base/Utilities/TypeUtilities.cs
+++ b/src/Avalonia.Base/Utilities/TypeUtilities.cs
@@ -1,7 +1,5 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
@@ -92,8 +90,7 @@ namespace Avalonia.Utilities
         /// <returns>True if the type accepts null values; otherwise false.</returns>
         public static bool AcceptsNull(Type type)
         {
-            var t = type.GetTypeInfo();
-            return !t.IsValueType || (t.IsGenericType && (t.GetGenericTypeDefinition() == typeof(Nullable<>)));
+            return !type.IsValueType || IsNullableType(type);
         }
 
         /// <summary>
@@ -118,47 +115,46 @@ namespace Avalonia.Utilities
                 return true;
             }
 
+            var toUnderl = Nullable.GetUnderlyingType(to) ?? to;
             var from = value.GetType();
-            var fromTypeInfo = from.GetTypeInfo();
-            var toTypeInfo = to.GetTypeInfo();
 
-            if (toTypeInfo.IsAssignableFrom(fromTypeInfo))
+            if (toUnderl.IsAssignableFrom(from))
             {
                 result = value;
                 return true;
             }
 
-            if (to == typeof(string))
+            if (toUnderl == typeof(string))
             {
-                result = Convert.ToString(value);
+                result = Convert.ToString(value, culture);
                 return true;
             }
 
-            if (toTypeInfo.IsEnum && from == typeof(string))
+            if (toUnderl.IsEnum && from == typeof(string))
             {
-                if (Enum.IsDefined(to, (string)value))
+                if (Enum.IsDefined(toUnderl, (string)value))
                 {
-                    result = Enum.Parse(to, (string)value);
+                    result = Enum.Parse(toUnderl, (string)value);
                     return true;
                 }
             }
 
-            if (!fromTypeInfo.IsEnum && toTypeInfo.IsEnum)
+            if (!from.IsEnum && toUnderl.IsEnum)
             {
                 result = null;
 
-                if (TryConvert(Enum.GetUnderlyingType(to), value, culture, out object enumValue))
+                if (TryConvert(Enum.GetUnderlyingType(toUnderl), value, culture, out object enumValue))
                 {
-                    result = Enum.ToObject(to, enumValue);
+                    result = Enum.ToObject(toUnderl, enumValue);
                     return true;
                 }
             }
 
-            if (fromTypeInfo.IsEnum && IsNumeric(to))
+            if (from.IsEnum && IsNumeric(toUnderl))
             {
                 try
                 {
-                    result = Convert.ChangeType((int)value, to, culture);
+                    result = Convert.ChangeType((int)value, toUnderl, culture);
                     return true;
                 }
                 catch
@@ -169,7 +165,7 @@ namespace Avalonia.Utilities
             }
 
             var convertableFrom = Array.IndexOf(InbuiltTypes, from);
-            var convertableTo = Array.IndexOf(InbuiltTypes, to);
+            var convertableTo = Array.IndexOf(InbuiltTypes, toUnderl);
 
             if (convertableFrom != -1 && convertableTo != -1)
             {
@@ -177,7 +173,7 @@ namespace Avalonia.Utilities
                 {
                     try
                     {
-                        result = Convert.ChangeType(value, to, culture);
+                        result = Convert.ChangeType(value, toUnderl, culture);
                         return true;
                     }
                     catch
@@ -188,7 +184,23 @@ namespace Avalonia.Utilities
                 }
             }
 
-            var cast = FindTypeConversionOperatorMethod(from, to, OperatorType.Implicit | OperatorType.Explicit);
+            var toTypeConverter = TypeDescriptor.GetConverter(toUnderl);
+
+            if (toTypeConverter.CanConvertFrom(from) == true)
+            {
+                result = toTypeConverter.ConvertFrom(null, culture, value);
+                return true;
+            }
+
+            var fromTypeConverter = TypeDescriptor.GetConverter(from);
+
+            if (fromTypeConverter.CanConvertTo(toUnderl) == true)
+            {
+                result = fromTypeConverter.ConvertTo(null, culture, value, toUnderl);
+                return true;
+            }
+
+            var cast = FindTypeConversionOperatorMethod(from, toUnderl, OperatorType.Implicit | OperatorType.Explicit);
 
             if (cast != null)
             {
@@ -223,10 +235,8 @@ namespace Avalonia.Utilities
             }
 
             var from = value.GetType();
-            var fromTypeInfo = from.GetTypeInfo();
-            var toTypeInfo = to.GetTypeInfo();
 
-            if (toTypeInfo.IsAssignableFrom(fromTypeInfo))
+            if (to.IsAssignableFrom(from))
             {
                 result = value;
                 return true;
@@ -289,6 +299,17 @@ namespace Avalonia.Utilities
             return TryConvertImplicit(type, value, out object result) ? result : Default(type);
         }
 
+        public static T ConvertImplicit<T>(object value)
+        {
+            if (TryConvertImplicit(typeof(T), value, out var result))
+            {
+                return (T)result;
+            }
+
+            throw new InvalidCastException(
+                $"Unable to convert object '{value ?? "(null)"}' of type '{value?.GetType()}' to type '{typeof(T)}'.");
+        }
+
         /// <summary>
         /// Gets the default value for the specified type.
         /// </summary>
@@ -296,9 +317,7 @@ namespace Avalonia.Utilities
         /// <returns>The default value.</returns>
         public static object Default(Type type)
         {
-            var typeInfo = type.GetTypeInfo();
-
-            if (typeInfo.IsValueType)
+            if (type.IsValueType)
             {
                 return Activator.CreateInstance(type);
             }
@@ -324,9 +343,11 @@ namespace Avalonia.Utilities
                 return false;
             }
 
-            if (type.GetTypeInfo().IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
+            Type underlyingType = Nullable.GetUnderlyingType(type);
+
+            if (underlyingType != null)
             {
-                return IsNumeric(Nullable.GetUnderlyingType(type));
+                return IsNumeric(underlyingType);
             }
             else
             {
@@ -341,6 +362,11 @@ namespace Avalonia.Utilities
             Explicit = 2
         }
 
+        private static bool IsNullableType(Type type)
+        {
+            return type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>);
+        }
+
         private static MethodInfo FindTypeConversionOperatorMethod(Type fromType, Type toType, OperatorType operatorType)
         {
             const string implicitName = "op_Implicit";
diff --git a/src/Avalonia.Base/Utilities/ValueSingleOrList.cs b/src/Avalonia.Base/Utilities/ValueSingleOrList.cs
new file mode 100644
index 0000000000..dc32cedb76
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/ValueSingleOrList.cs
@@ -0,0 +1,94 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Utilities
+{
+    /// <summary>
+    /// A list like struct optimized for holding zero or one items.
+    /// </summary>
+    /// <typeparam name="T">The type of items held in the list.</typeparam>
+    /// <remarks>
+    /// Once more than value has been added to this storage it will switch to using <see cref="List"/> internally.
+    /// </remarks>
+    public ref struct ValueSingleOrList<T>
+    {
+        private bool _isSingleSet;
+
+        /// <summary>
+        /// Single contained value. Only valid if <see cref="IsSingle"/> is set.
+        /// </summary>
+        public T Single { get; private set; }
+
+        /// <summary>
+        /// List of values.
+        /// </summary>
+        public List<T> List { get; private set; }
+
+        /// <summary>
+        /// If this struct is backed by a list.
+        /// </summary>
+        public bool HasList => List != null;
+
+        /// <summary>
+        /// If this struct contains only single value and storage was not promoted to a list.
+        /// </summary>
+        public bool IsSingle => List == null && _isSingleSet;
+
+        /// <summary>
+        /// Adds a value.
+        /// </summary>
+        /// <param name="value">Value to add.</param>
+        public void Add(T value)
+        {
+            if (List != null)
+            {
+                List.Add(value);
+            }
+            else
+            {
+                if (!_isSingleSet)
+                {
+                    Single = value;
+
+                    _isSingleSet = true;
+                }
+                else
+                {
+                    List = new List<T>();
+
+                    List.Add(Single);
+                    List.Add(value);
+
+                    Single = default;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Removes a value.
+        /// </summary>
+        /// <param name="value">Value to remove.</param>
+        public bool Remove(T value)
+        {
+            if (List != null)
+            {
+                return List.Remove(value);
+            }
+
+            if (!_isSingleSet)
+            {
+                return false;
+            }
+
+            if (EqualityComparer<T>.Default.Equals(Single, value))
+            {
+                Single = default;
+
+                _isSingleSet = false;
+
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Utilities/WeakEventHandlerManager.cs b/src/Avalonia.Base/Utilities/WeakEventHandlerManager.cs
index 37e25d0fac..28c9dcc262 100644
--- a/src/Avalonia.Base/Utilities/WeakEventHandlerManager.cs
+++ b/src/Avalonia.Base/Utilities/WeakEventHandlerManager.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -183,11 +180,16 @@ namespace Avalonia.Utilities
                 for (int c = 0; c < _count; c++)
                 {
                     var r = _data[c];
+
+                    TSubscriber target = null;
+
+                    r.Subscriber?.TryGetTarget(out target);
+
                     //Mark current index as first empty
-                    if (r.Subscriber == null && empty == -1)
+                    if (target == null && empty == -1)
                         empty = c;
                     //If current element isn't null and we have an empty one
-                    if (r.Subscriber != null && empty != -1)
+                    if (target != null && empty != -1)
                     {
                         _data[c] = default;
                         _data[empty] = r;
diff --git a/src/Avalonia.Base/Utilities/WeakObservable.cs b/src/Avalonia.Base/Utilities/WeakObservable.cs
index b1fe78c206..20e01c751f 100644
--- a/src/Avalonia.Base/Utilities/WeakObservable.cs
+++ b/src/Avalonia.Base/Utilities/WeakObservable.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Reactive;
 using System.Reactive.Linq;
 
diff --git a/src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs b/src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs
index f1e8fa6f9b..65128e7932 100644
--- a/src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs
+++ b/src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/Avalonia.Base/ValueStore.cs b/src/Avalonia.Base/ValueStore.cs
index e06c5996c9..6b89fcbdb9 100644
--- a/src/Avalonia.Base/ValueStore.cs
+++ b/src/Avalonia.Base/ValueStore.cs
@@ -1,205 +1,296 @@
 using System;
-using System.Collections.Generic;
 using Avalonia.Data;
+using Avalonia.PropertyStore;
 using Avalonia.Utilities;
 
+#nullable enable
+
 namespace Avalonia
 {
-    internal class ValueStore : IPriorityValueOwner
+    /// <summary>
+    /// Stores styled property values for an <see cref="AvaloniaObject"/>.
+    /// </summary>
+    /// <remarks>
+    /// At its core this class consists of an <see cref="AvaloniaProperty"/> to 
+    /// <see cref="IValue"/> mapping which holds the current values for each set property. This
+    /// <see cref="IValue"/> can be in one of 4 states:
+    /// 
+    /// - For a single local value it will be an instance of <see cref="LocalValueEntry{T}"/>.
+    /// - For a single value of a priority other than LocalValue it will be an instance of
+    ///   <see cref="ConstantValueEntry{T}"/>`
+    /// - 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
     {
-        private readonly AvaloniaPropertyValueStore<object> _propertyValues;
-        private readonly AvaloniaPropertyValueStore<object> _deferredSetters;
         private readonly AvaloniaObject _owner;
+        private readonly IValueSink _sink;
+        private readonly AvaloniaPropertyValueStore<IValue> _values;
 
         public ValueStore(AvaloniaObject owner)
         {
-            _owner = owner;
-            _propertyValues = new AvaloniaPropertyValueStore<object>();
-            _deferredSetters = new AvaloniaPropertyValueStore<object>();
+            _sink = _owner = owner;
+            _values = new AvaloniaPropertyValueStore<IValue>();
         }
 
-        public IDisposable AddBinding(
-            AvaloniaProperty property,
-            IObservable<object> source,
-            BindingPriority priority)
+        public bool IsAnimating(AvaloniaProperty property)
         {
-            PriorityValue priorityValue;
-
-            if (_propertyValues.TryGetValue(property, out var v))
+            if (_values.TryGetValue(property, out var slot))
             {
-                priorityValue = v as PriorityValue;
-
-                if (priorityValue == null)
-                {
-                    priorityValue = CreatePriorityValue(property);
-                    priorityValue.SetValue(v, (int)BindingPriority.LocalValue);
-                    _propertyValues.SetValue(property, priorityValue);
-                }
+                return slot.Priority < BindingPriority.LocalValue;
             }
-            else
+
+            return false;
+        }
+
+        public bool IsSet(AvaloniaProperty property)
+        {
+            if (_values.TryGetValue(property, out var slot))
             {
-                priorityValue = CreatePriorityValue(property);
-                _propertyValues.AddValue(property, priorityValue);
+                return slot.GetValue().HasValue;
             }
 
-            return priorityValue.Add(source, (int)priority);
+            return false;
         }
 
-        public void AddValue(AvaloniaProperty property, object value, int priority)
+        public bool TryGetValue<T>(
+            StyledPropertyBase<T> property,
+            BindingPriority maxPriority,
+            out T value)
         {
-            PriorityValue priorityValue;
-
-            if (_propertyValues.TryGetValue(property, out var v))
+            if (_values.TryGetValue(property, out var slot))
             {
-                priorityValue = v as PriorityValue;
+                var v = ((IValue<T>)slot).GetValue(maxPriority);
 
-                if (priorityValue == null)
+                if (v.HasValue)
                 {
-                    if (priority == (int)BindingPriority.LocalValue)
-                    {
-                        Validate(property, ref value);
-                        _propertyValues.SetValue(property, value);
-                        Changed(property, priority, v, value);
-                        return;
-                    }
-                    else
-                    {
-                        priorityValue = CreatePriorityValue(property);
-                        priorityValue.SetValue(v, (int)BindingPriority.LocalValue);
-                        _propertyValues.SetValue(property, priorityValue);
-                    }
+                    value = v.Value;
+                    return true;
                 }
             }
+
+            value = default!;
+            return false;
+        }
+
+        public IDisposable? SetValue<T>(StyledPropertyBase<T> property, T value, BindingPriority priority)
+        {
+            if (property.ValidateValue?.Invoke(value) == false)
+            {
+                throw new ArgumentException($"{value} is not a valid value for '{property.Name}.");
+            }
+
+            IDisposable? result = null;
+
+            if (_values.TryGetValue(property, out var slot))
+            {
+                result = SetExisting(slot, property, value, priority);
+            }
+            else if (property.HasCoercion)
+            {
+                // If the property has any coercion callbacks then always create a PriorityValue.
+                var entry = new PriorityValue<T>(_owner, property, this);
+                _values.AddValue(property, entry);
+                result = entry.SetValue(value, priority);
+            }
             else
             {
-                if (value == AvaloniaProperty.UnsetValue)
-                {
-                    return;
-                }
+                var change = new AvaloniaPropertyChangedEventArgs<T>(_owner, property, default, value, priority);
 
-                if (priority == (int)BindingPriority.LocalValue)
+                if (priority == BindingPriority.LocalValue)
                 {
-                    Validate(property, ref value);
-                    _propertyValues.AddValue(property, value);
-                    Changed(property, priority, AvaloniaProperty.UnsetValue, value);
-                    return;
+                    _values.AddValue(property, new LocalValueEntry<T>(value));
+                    _sink.ValueChanged(change);
                 }
                 else
                 {
-                    priorityValue = CreatePriorityValue(property);
-                    _propertyValues.AddValue(property, priorityValue);
+                    var entry = new ConstantValueEntry<T>(property, value, priority, this);
+                    _values.AddValue(property, entry);
+                    _sink.ValueChanged(change);
+                    result = entry;
                 }
             }
 
-            priorityValue.SetValue(value, priority);
+            return result;
         }
 
-        public void BindingNotificationReceived(AvaloniaProperty property, BindingNotification notification)
+        public IDisposable AddBinding<T>(
+            StyledPropertyBase<T> property,
+            IObservable<BindingValue<T>> source,
+            BindingPriority priority)
         {
-            _owner.BindingNotificationReceived(property, notification);
+            if (_values.TryGetValue(property, out var slot))
+            {
+                return BindExisting(slot, property, source, priority);
+            }
+            else if (property.HasCoercion)
+            {
+                // If the property has any coercion callbacks then always create a PriorityValue.
+                var entry = new PriorityValue<T>(_owner, property, this);
+                var binding = entry.AddBinding(source, priority);
+                _values.AddValue(property, entry);
+                binding.Start();
+                return binding;
+            }
+            else
+            {
+                var entry = new BindingEntry<T>(_owner, property, source, priority, this);
+                _values.AddValue(property, entry);
+                entry.Start();
+                return entry;
+            }
         }
 
-        public void Changed(AvaloniaProperty property, int priority, object oldValue, object newValue)
+        public void ClearLocalValue<T>(StyledPropertyBase<T> property)
         {
-            _owner.PriorityValueChanged(property, priority, oldValue, newValue);
-        }
+            if (_values.TryGetValue(property, out var slot))
+            {
+                if (slot is PriorityValue<T> p)
+                {
+                    p.ClearLocalValue();
+                }
+                else
+                {
+                    var remove = slot is ConstantValueEntry<T> c ?
+                        c.Priority == BindingPriority.LocalValue : 
+                        !(slot is IPriorityValueEntry<T>);
 
-        public IDictionary<AvaloniaProperty, object> GetSetValues()
-        {
-            return _propertyValues.ToDictionary();
+                    if (remove)
+                    {
+                        var old = TryGetValue(property, BindingPriority.LocalValue, out var value) ? value : default;
+                        _values.Remove(property);
+                        _sink.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
+                            _owner,
+                            property,
+                            new Optional<T>(old),
+                            default,
+                            BindingPriority.Unset));
+                    }
+                }
+            }
         }
 
-        public void LogError(AvaloniaProperty property, Exception e)
+        public void CoerceValue<T>(StyledPropertyBase<T> property)
         {
-            _owner.LogBindingError(property, e);
+            if (_values.TryGetValue(property, out var slot))
+            {
+                if (slot is PriorityValue<T> p)
+                {
+                    p.CoerceValue();
+                }
+            }
         }
 
-        public object GetValue(AvaloniaProperty property)
+        public Diagnostics.AvaloniaPropertyValue? GetDiagnostic(AvaloniaProperty property)
         {
-            var result = AvaloniaProperty.UnsetValue;
-
-            if (_propertyValues.TryGetValue(property, out var value))
+            if (_values.TryGetValue(property, out var slot))
             {
-                result = (value is PriorityValue priorityValue) ? priorityValue.Value : value;
+                var slotValue = slot.GetValue();
+                return new Diagnostics.AvaloniaPropertyValue(
+                    property,
+                    slotValue.HasValue ? slotValue.Value : AvaloniaProperty.UnsetValue,
+                    slot.Priority,
+                    null);
             }
 
-            return result;
+            return null;
         }
 
-        public bool IsAnimating(AvaloniaProperty property)
+        void IValueSink.ValueChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
         {
-            return _propertyValues.TryGetValue(property, out var value) && value is PriorityValue priority && priority.IsAnimating;
+            _sink.ValueChanged(change);
         }
 
-        public bool IsSet(AvaloniaProperty property)
+        void IValueSink.Completed<T>(
+            StyledPropertyBase<T> property,
+            IPriorityValueEntry entry,
+            Optional<T> oldValue)
         {
-            if (_propertyValues.TryGetValue(property, out var value))
+            if (_values.TryGetValue(property, out var slot))
             {
-                return ((value as PriorityValue)?.Value ?? value) != AvaloniaProperty.UnsetValue;
+                if (slot == entry)
+                {
+                    _values.Remove(property);
+                    _sink.Completed(property, entry, oldValue);
+                }
             }
-
-            return false;
         }
 
-        public void Revalidate(AvaloniaProperty property)
+        private IDisposable? SetExisting<T>(
+            object slot,
+            StyledPropertyBase<T> property,
+            T value,
+            BindingPriority priority)
         {
-            if (_propertyValues.TryGetValue(property, out var value))
+            IDisposable? result = null;
+
+            if (slot is IPriorityValueEntry<T> e)
             {
-                (value as PriorityValue)?.Revalidate();
+                var priorityValue = new PriorityValue<T>(_owner, property, this, e);
+                _values.SetValue(property, priorityValue);
+                result = priorityValue.SetValue(value, priority);
             }
-        }
-
-        public void VerifyAccess() => _owner.VerifyAccess();
-
-        private PriorityValue CreatePriorityValue(AvaloniaProperty property)
-        {
-            var validate = ((IStyledPropertyAccessor)property).GetValidationFunc(_owner.GetType());
-            Func<object, object> validate2 = null;
-
-            if (validate != null)
+            else if (slot is PriorityValue<T> p)
             {
-                validate2 = v => validate(_owner, v);
+                result = p.SetValue(value, priority);
+            }
+            else if (slot is LocalValueEntry<T> l)
+            {
+                if (priority == BindingPriority.LocalValue)
+                {
+                    var old = l.GetValue(BindingPriority.LocalValue);
+                    l.SetValue(value);
+                    _sink.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
+                        _owner,
+                        property,
+                        old,
+                        value,
+                        priority));
+                }
+                else
+                {
+                    var priorityValue = new PriorityValue<T>(_owner, property, this, l);
+                    result = priorityValue.SetValue(value, priority);
+                    _values.SetValue(property, priorityValue);
+                }
+            }
+            else
+            {
+                throw new NotSupportedException("Unrecognised value store slot type.");
             }
 
-            return new PriorityValue(
-                this,
-                property,
-                property.PropertyType,
-                validate2);
+            return result;
         }
 
-        private void Validate(AvaloniaProperty property, ref object value)
+        private IDisposable BindExisting<T>(
+            object slot,
+            StyledPropertyBase<T> property,
+            IObservable<BindingValue<T>> source,
+            BindingPriority priority)
         {
-            var validate = ((IStyledPropertyAccessor)property).GetValidationFunc(_owner.GetType());
+            PriorityValue<T> priorityValue;
 
-            if (validate != null && value != AvaloniaProperty.UnsetValue)
+            if (slot is IPriorityValueEntry<T> e)
             {
-                value = validate(_owner, value);
+                priorityValue = new PriorityValue<T>(_owner, property, this, e);
             }
-        }
-
-        private DeferredSetter<T> GetDeferredSetter<T>(AvaloniaProperty property)
-        {
-            if (_deferredSetters.TryGetValue(property, out var deferredSetter))
+            else if (slot is PriorityValue<T> p)
             {
-                return (DeferredSetter<T>)deferredSetter;
+                priorityValue = p;
+            }
+            else if (slot is LocalValueEntry<T> l)
+            {
+                priorityValue = new PriorityValue<T>(_owner, property, this, l);
+            }
+            else
+            {
+                throw new NotSupportedException("Unrecognised value store slot type.");
             }
 
-            var newDeferredSetter = new DeferredSetter<T>();
-
-            _deferredSetters.AddValue(property, newDeferredSetter);
-
-            return newDeferredSetter;
-        }
-
-        public DeferredSetter<object> GetNonDirectDeferredSetter(AvaloniaProperty property)
-        {
-            return GetDeferredSetter<object>(property);
-        }
-
-        public DeferredSetter<T> GetDirectDeferredSetter<T>(AvaloniaProperty<T> property)
-        {
-            return GetDeferredSetter<T>(property);
+            var binding = priorityValue.AddBinding(source, priority);
+            _values.SetValue(property, priorityValue);
+            binding.Start();
+            return binding;
         }
     }
 }
diff --git a/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj b/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
index 582e4499c5..90f6abc873 100644
--- a/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
+++ b/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0</TargetFrameworks>
-        <TargetFrameworks Condition="$(Configuration) == 'Debug'">netstandard2.0;netcoreapp2.0</TargetFrameworks>
+        <TargetFrameworks Condition="$(Configuration) == 'Debug'">netstandard2.0;netcoreapp3.1</TargetFrameworks>
         <OutputType>exe</OutputType>
         <GenerateDocumentationFile>false</GenerateDocumentationFile>
         <BuildOutputTargetFolder>tools</BuildOutputTargetFolder>
-        <DefineConstants>$(DefineConstants);BUILDTASK;XAMLIL_CECIL_INTERNAL;XAMLIL_INTERNAL</DefineConstants>
+        <DefineConstants>$(DefineConstants);BUILDTASK;XAMLX_CECIL_INTERNAL;XAMLX_INTERNAL</DefineConstants>
         <CopyLocalLockFileAssemblies Condition="$(TargetFramework) == 'netstandard2.0'">true</CopyLocalLockFileAssemblies>
         <NoWarn>NU1605</NoWarn>
     </PropertyGroup>
@@ -17,19 +17,22 @@
       <Compile Include="../Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaResourceXamlInfo.cs">
         <Link>Shared/AvaloniaResourceXamlInfo.cs</Link>
       </Compile>
-      <Compile Include="../Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/**/*.cs">
+      <Compile Include="../Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/**/*.cs">
         <Link>XamlIlExtensions/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
       <Compile Remove="external/cecil/**/*.*" />
-      <Compile Include="../Markup/Avalonia.Markup.Xaml/XamlIl\xamlil.github\src\XamlIl\**\*.cs">
+      <Compile Include="../Markup/Avalonia.Markup.Xaml.Loader/xamlil.github\src\XamlX\**\*.cs">
         <Link>XamlIl/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
-      <Compile Include="../Markup/Avalonia.Markup.Xaml/XamlIl\xamlil.github\src\XamlIl.Cecil\**\*.cs">
+      <Compile Include="../Markup/Avalonia.Markup.Xaml.Loader\xamlil.github\src\XamlX.IL.Cecil\**\*.cs">
         <Link>XamlIl.Cecil/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
       <Compile Include="../Markup/Avalonia.Markup\Markup\Parsers\SelectorGrammar.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
+      <Compile Include="../Markup/Avalonia.Markup\Markup\Parsers\PropertyPathGrammar.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
       <Compile Include="../Markup/Avalonia.Markup.Xaml/Parsers/PropertyParser.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
@@ -38,33 +41,58 @@
       </Compile>
       <Compile Include="../Avalonia.Base/Utilities/CharacterReader.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
-      </Compile>      
+      </Compile>
       <Compile Include="../Avalonia.Base/Utilities/IdentifierParser.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
-      
-      <Compile Remove="../Markup/Avalonia.Markup.Xaml/XamlIl\xamlil.github\**\obj\**\*.cs" />
-      <Compile Remove="../Markup/Avalonia.Markup.Xaml/XamlIl\xamlil.github\src\XamlIl\TypeSystem\SreTypeSystem.cs" />
-      <PackageReference Include="Avalonia.Unofficial.Cecil" Version="20190417.2.0" PrivateAssets="All" />
-      <PackageReference Condition="$(TargetFramework) == 'netstandard2.0'" Include="ILRepack.MSBuild.Task" Version="2.0.13" PrivateAssets="All" />
+      <Compile Include="../Avalonia.Base/Utilities/StringTokenizer.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
+      <Compile Include="../Avalonia.Base/Utilities/MathUtilities.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
+      <Compile Include="..\Markup\Avalonia.Markup\Markup\Parsers\ArgumentListParser.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
+      <Compile Include="../Avalonia.Base/Utilities/KeywordParser.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
+      <Compile Include="..\Markup\Avalonia.Markup\Markup\Parsers\BindingExpressionGrammar.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
+      <Compile Include="../Avalonia.Base/Utilities/StyleClassParser.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
+      <Compile Include="../Avalonia.Visuals/Thickness.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
+      <Compile Include="../Avalonia.Visuals/Size.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
+      <Compile Include="../Avalonia.Visuals/Vector.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
+      <Compile Include="../Avalonia.Visuals/Point.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
+      <Compile Include="../Avalonia.Visuals/Matrix.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
+      <Compile Include="../Avalonia.Visuals/CornerRadius.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
+      <Compile Include="../Avalonia.Visuals/Media/Color.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
+      <Compile Include="../Avalonia.Visuals/Media/KnownColors.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
+      <Compile Include="../Avalonia.Controls/GridLength.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
+      <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="Microsoft.Build.Framework" Version="15.1.548" PrivateAssets="All" />
     </ItemGroup>
-
-  <Target Name="ILRepack" AfterTargets="Build" Condition="$(TargetFramework) == 'netstandard2.0'">
-
-    <PropertyGroup>
-      <WorkingDirectory>$(MSBuildThisFileDirectory)bin\$(Configuration)\$(TargetFramework)</WorkingDirectory>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <InputAssemblies Include="Mono.Cecil.dll" />
-    </ItemGroup>
-    <ILRepack OutputType="$(OutputType)" MainAssembly="$(AssemblyName).dll" OutputAssembly="$(AssemblyName).dll" InputAssemblies="@(InputAssemblies)" WorkingDirectory="$(WorkingDirectory)" />
-    <ItemGroup>
-      <DeleteNonNeededResults Include="$(WorkingDirectory)\*.dll" />
-      <DeleteNonNeededResults Remove="$(WorkingDirectory)\Avalonia.Build.Tasks.dll" />
-    </ItemGroup>
-    <Delete Files="@(DeleteNonNeededResults)" />
-
-  </Target>
 </Project>
diff --git a/src/Avalonia.Build.Tasks/ComInteropHelper.cs b/src/Avalonia.Build.Tasks/ComInteropHelper.cs
new file mode 100644
index 0000000000..007231417d
--- /dev/null
+++ b/src/Avalonia.Build.Tasks/ComInteropHelper.cs
@@ -0,0 +1,130 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
+using XamlX.TypeSystem;
+using MethodAttributes = Mono.Cecil.MethodAttributes;
+
+namespace Avalonia.Build.Tasks
+{
+    static class ComInteropHelper
+    {
+        public static void PatchAssembly(AssemblyDefinition asm, CecilTypeSystem typeSystem)
+        {
+            var classToRemoveList = new List<TypeDefinition>();
+            var initializers = new List<MethodDefinition>();
+            foreach (var type in asm.MainModule.Types)
+            {
+                var i = type.Methods.FirstOrDefault(m => m.Name == "__MicroComModuleInit");
+                if (i != null)
+                    initializers.Add(i);
+
+                PatchType(type, classToRemoveList);
+            }
+
+            // Remove All Interop classes
+            foreach (var type in classToRemoveList)
+                asm.MainModule.Types.Remove(type);
+
+            
+            // Patch automatic registrations
+            if (initializers.Count != 0)
+            {
+                var moduleType = asm.MainModule.Types.First(x => x.Name == "<Module>");
+                
+                // Needed for compatibility with upcoming .NET 5 feature, look for existing initializer first
+                var staticCtor = moduleType.Methods.FirstOrDefault(m => m.Name == ".cctor");
+                if (staticCtor == null)
+                {
+                    // Create a new static ctor if none exists
+                    staticCtor = new MethodDefinition(".cctor",
+                        MethodAttributes.HideBySig | MethodAttributes.SpecialName | MethodAttributes.RTSpecialName |
+                        MethodAttributes.Static | MethodAttributes.Private,
+                        asm.MainModule.TypeSystem.Void);
+                    staticCtor.Body.Instructions.Add(Instruction.Create(OpCodes.Ret));
+                    moduleType.Methods.Add(staticCtor);
+                }
+
+                foreach (var i in initializers)
+                    staticCtor.Body.Instructions.Insert(0, Instruction.Create(OpCodes.Call, i));
+            }
+            
+        }
+        
+        
+        
+        static void PatchMethod(MethodDefinition method)
+        {
+            if (method.HasBody)
+            {
+                var ilProcessor = method.Body.GetILProcessor();
+
+                var instructions = method.Body.Instructions;
+                for (int i = 0; i < instructions.Count; i++)
+                {
+                    Instruction instruction = instructions[i];
+
+                    if (instruction.OpCode == OpCodes.Call && instruction.Operand is MethodReference)
+                    {
+                        var methodDescription = (MethodReference)instruction.Operand;
+
+                        if (methodDescription.Name.StartsWith("Calli") && methodDescription.DeclaringType.Name == "LocalInterop")
+                        {
+                            var callSite = new CallSite(methodDescription.ReturnType) { CallingConvention = MethodCallingConvention.StdCall };
+
+                            if (methodDescription.Name.StartsWith("CalliCdecl"))
+                            {
+                                callSite.CallingConvention = MethodCallingConvention.C;
+                            }
+                            else if(methodDescription.Name.StartsWith("CalliThisCall"))
+                            {
+                                callSite.CallingConvention = MethodCallingConvention.ThisCall;
+                            }
+                            else if(methodDescription.Name.StartsWith("CalliStdCall"))
+                            {
+                                callSite.CallingConvention = MethodCallingConvention.StdCall;
+                            }
+                            else if(methodDescription.Name.StartsWith("CalliFastCall"))
+                            {
+                                callSite.CallingConvention = MethodCallingConvention.FastCall;
+                            }
+
+                            // Last parameter is the function ptr, so we don't add it as a parameter for calli
+                            // as it is already an implicit parameter for calli
+                            for (int j = 0; j < methodDescription.Parameters.Count - 1; j++)
+                            {
+                                var parameterDefinition = methodDescription.Parameters[j];
+                                callSite.Parameters.Add(parameterDefinition);
+                            }
+
+                            // Create calli Instruction
+                            var callIInstruction = ilProcessor.Create(OpCodes.Calli, callSite);
+
+                            // Replace instruction
+                            ilProcessor.Replace(instruction, callIInstruction);
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Patches the type.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        static void PatchType(TypeDefinition type, List<TypeDefinition> classToRemoveList)
+        {
+            // Patch methods
+            foreach (var method in type.Methods)
+                PatchMethod(method);
+
+            if (type.Name == "LocalInterop")
+                classToRemoveList.Add(type);
+
+            // Patch nested types
+            foreach (var typeDefinition in type.NestedTypes)
+                PatchType(typeDefinition, classToRemoveList);
+        }
+    }
+}
diff --git a/src/Avalonia.Build.Tasks/CompileAvaloniaXamlTask.cs b/src/Avalonia.Build.Tasks/CompileAvaloniaXamlTask.cs
index 39ee3f6bca..b85991fb77 100644
--- a/src/Avalonia.Build.Tasks/CompileAvaloniaXamlTask.cs
+++ b/src/Avalonia.Build.Tasks/CompileAvaloniaXamlTask.cs
@@ -12,6 +12,8 @@ namespace Avalonia.Build.Tasks
     {
         public bool Execute()
         {
+            Enum.TryParse(ReportImportance, true, out MessageImportance outputImportance);
+
             OutputPath = OutputPath ?? AssemblyFile;
             var outputPdb = GetPdbPath(OutputPath);
             var input = AssemblyFile;
@@ -32,9 +34,14 @@ namespace Avalonia.Build.Tasks
                 }
             }
 
+            var msg = $"CompileAvaloniaXamlTask -> AssemblyFile:{AssemblyFile}, ProjectDirectory:{ProjectDirectory}, OutputPath:{OutputPath}";
+            BuildEngine.LogMessage(msg, outputImportance < MessageImportance.Low ? MessageImportance.High : outputImportance);
+
             var res = XamlCompilerTaskExecutor.Compile(BuildEngine, input,
                 File.ReadAllLines(ReferencesFilePath).Where(l => !string.IsNullOrWhiteSpace(l)).ToArray(),
-                ProjectDirectory, OutputPath, VerifyIl);
+                ProjectDirectory, OutputPath, VerifyIl, outputImportance,
+                (SignAssembly && !DelaySign) ? AssemblyOriginatorKeyFile : null,
+                EnableComInteropPatching, SkipXamlCompilation);
             if (!res.Success)
                 return false;
             if (!res.WrittenFile)
@@ -69,6 +76,15 @@ namespace Avalonia.Build.Tasks
 
         public bool VerifyIl { get; set; }
         
+        public bool EnableComInteropPatching { get; set; }
+        public bool SkipXamlCompilation { get; set; }
+        
+        public string AssemblyOriginatorKeyFile { get; set; }
+        public bool SignAssembly { get; set; }
+        public bool DelaySign { get; set; }
+
+        public string ReportImportance { get; set; }
+
         public IBuildEngine BuildEngine { get; set; }
         public ITaskHost HostObject { get; set; }
     }
diff --git a/src/Avalonia.Build.Tasks/Extensions.cs b/src/Avalonia.Build.Tasks/Extensions.cs
index 440c6d7489..46c12eaf3d 100644
--- a/src/Avalonia.Build.Tasks/Extensions.cs
+++ b/src/Avalonia.Build.Tasks/Extensions.cs
@@ -9,14 +9,19 @@ namespace Avalonia.Build.Tasks
 
         public static void LogError(this IBuildEngine engine, BuildEngineErrorCode code, string file, string message)
         {
-            engine.LogErrorEvent(new BuildErrorEventArgs("Avalonia", FormatErrorCode(code), file ?? "", 0, 0, 0, 0, message, 
+            engine.LogErrorEvent(new BuildErrorEventArgs("Avalonia", FormatErrorCode(code), file ?? "", 0, 0, 0, 0, message,
                 "", "Avalonia"));
         }
-        
+
         public static void LogWarning(this IBuildEngine engine, BuildEngineErrorCode code, string file, string message)
         {
             engine.LogWarningEvent(new BuildWarningEventArgs("Avalonia", FormatErrorCode(code), file ?? "", 0, 0, 0, 0, message,
                 "", "Avalonia"));
         }
+
+        public static void LogMessage(this IBuildEngine engine, string message, MessageImportance imp)
+        {
+            engine.LogMessageEvent(new BuildMessageEventArgs(message, "", "Avalonia", imp));
+        }
     }
 }
diff --git a/src/Avalonia.Build.Tasks/GenerateAvaloniaResourcesTask.cs b/src/Avalonia.Build.Tasks/GenerateAvaloniaResourcesTask.cs
index 98ebb3e7d1..ae2bf99d1e 100644
--- a/src/Avalonia.Build.Tasks/GenerateAvaloniaResourcesTask.cs
+++ b/src/Avalonia.Build.Tasks/GenerateAvaloniaResourcesTask.cs
@@ -22,6 +22,10 @@ namespace Avalonia.Build.Tasks
         [Required]
         public ITaskItem[] EmbeddedResources { get; set; }
 
+        public string ReportImportance { get; set; }
+
+        private MessageImportance _reportImportance;
+
         class Source
         {
             public string Path { get; set; }
@@ -29,15 +33,11 @@ namespace Avalonia.Build.Tasks
             private byte[] _data;
             private string _sourcePath;
 
-            public Source(string file, string root)
+            public Source(string relativePath, string root)
             {
-                file = SPath.GetFullPath(file);
                 root = SPath.GetFullPath(root);
-                var fileUri = new Uri(file, UriKind.Absolute);
-                var rootUri = new Uri(root, UriKind.Absolute);
-                rootUri = new Uri(rootUri.ToString().TrimEnd('/') + '/');
-                Path = '/' + rootUri.MakeRelativeUri(fileUri).ToString().TrimStart('/');
-                _sourcePath = file;
+                Path = "/" + relativePath.Replace('\\', '/');
+                _sourcePath = SPath.Combine(root, relativePath);
                 Size = (int)new FileInfo(_sourcePath).Length;
             }
 
@@ -65,7 +65,14 @@ namespace Avalonia.Build.Tasks
             }
         }
 
-        List<Source> BuildResourceSources() => Resources.Select(r => new Source(r.ItemSpec, Root)).ToList();
+        List<Source> BuildResourceSources()
+           => Resources.Select(r =>
+           {
+              
+               var src = new Source(r.ItemSpec, Root);
+               BuildEngine.LogMessage($"avares -> name:{src.Path}, path: {src.SystemPath}, size:{src.Size}, ItemSpec:{r.ItemSpec}", _reportImportance);
+               return src;
+           }).ToList();
 
         private void Pack(Stream output, List<Source> sources)
         {
@@ -100,7 +107,7 @@ namespace Avalonia.Build.Tasks
             
             foreach (var s in sources.ToList())
             {
-                if (s.Path.ToLowerInvariant().EndsWith(".xaml") || s.Path.ToLowerInvariant().EndsWith(".paml"))
+                if (s.Path.ToLowerInvariant().EndsWith(".xaml") || s.Path.ToLowerInvariant().EndsWith(".paml") || s.Path.ToLowerInvariant().EndsWith(".axaml"))
                 {
                     XamlFileInfo info;
                     try
@@ -136,10 +143,14 @@ namespace Avalonia.Build.Tasks
             sources.Add(new Source("/!AvaloniaResourceXamlInfo", ms.ToArray()));
             return true;
         }
-        
+
         public bool Execute()
         {
-            foreach(var r in EmbeddedResources.Where(r=>r.ItemSpec.EndsWith(".xaml")||r.ItemSpec.EndsWith(".paml")))
+            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();
diff --git a/src/Avalonia.Build.Tasks/Program.cs b/src/Avalonia.Build.Tasks/Program.cs
index 1909c4c6ec..b18c19cd63 100644
--- a/src/Avalonia.Build.Tasks/Program.cs
+++ b/src/Avalonia.Build.Tasks/Program.cs
@@ -29,7 +29,8 @@ namespace Avalonia.Build.Tasks
                 OutputPath = args[2],
                 BuildEngine = new ConsoleBuildEngine(),
                 ProjectDirectory = Directory.GetCurrentDirectory(),
-                VerifyIl = true
+                VerifyIl = true,
+                EnableComInteropPatching = true
             }.Execute() ?
                 0 :
                 2;
diff --git a/src/Avalonia.Build.Tasks/SpanCompat.cs b/src/Avalonia.Build.Tasks/SpanCompat.cs
index d5c406293e..f8960f56ec 100644
--- a/src/Avalonia.Build.Tasks/SpanCompat.cs
+++ b/src/Avalonia.Build.Tasks/SpanCompat.cs
@@ -1,3 +1,4 @@
+#if !NETCOREAPP3_1
 namespace System
 {
     // This is a hack to enable our span code to work inside MSBuild task without referencing System.Memory
@@ -63,6 +64,8 @@ namespace System
         }
 
         public override string ToString() => _length == 0 ? string.Empty : _s.Substring(_start, _length);
+
+        public static implicit operator ReadOnlySpan<T>(char[] arr) => new ReadOnlySpan<T>(new string(arr));
     }
 
     static class SpanCompatExtensions
@@ -71,3 +74,4 @@ namespace System
     }
 
 }
+#endif
diff --git a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.Helpers.cs b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.Helpers.cs
index f94f10f792..5a2c74e16f 100644
--- a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.Helpers.cs
+++ b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.Helpers.cs
@@ -5,7 +5,7 @@ using Avalonia.Utilities;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using Mono.Collections.Generic;
-using XamlIl.TypeSystem;
+using XamlX.TypeSystem;
 
 namespace Avalonia.Build.Tasks
 {
diff --git a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
index e348eb0fbc..6ef8a98fae 100644
--- a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
+++ b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
@@ -7,17 +7,18 @@ using System.Text;
 using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions;
 using Microsoft.Build.Framework;
 using Mono.Cecil;
-using XamlIl.TypeSystem;
 using Avalonia.Utilities;
 using Mono.Cecil.Cil;
 using Mono.Cecil.Rocks;
-using XamlIl;
-using XamlIl.Ast;
-using XamlIl.Parsers;
-using XamlIl.Transform;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Parsers;
+using XamlX.Transform;
+using XamlX.TypeSystem;
 using FieldAttributes = Mono.Cecil.FieldAttributes;
 using MethodAttributes = Mono.Cecil.MethodAttributes;
 using TypeAttributes = Mono.Cecil.TypeAttributes;
+using XamlX.IL;
 
 namespace Avalonia.Build.Tasks
 {
@@ -25,7 +26,8 @@ namespace Avalonia.Build.Tasks
     public static partial class XamlCompilerTaskExecutor
     {
         static bool CheckXamlName(IResource r) => r.Name.ToLowerInvariant().EndsWith(".xaml")
-                                               || r.Name.ToLowerInvariant().EndsWith(".paml");
+                                               || r.Name.ToLowerInvariant().EndsWith(".paml")
+                                               || r.Name.ToLowerInvariant().EndsWith(".axaml");
         
         public class CompileResult
         {
@@ -38,34 +40,76 @@ namespace Avalonia.Build.Tasks
                 WrittenFile = writtenFile;
             }
         }
+
+        public static CompileResult Compile(IBuildEngine engine, string input, string[] references,
+            string projectDirectory,
+            string output, bool verifyIl, MessageImportance logImportance, string strongNameKey, bool patchCom,
+            bool skipXamlCompilation)
+        {
+            var typeSystem = new CecilTypeSystem(references
+                .Where(r => !r.ToLowerInvariant().EndsWith("avalonia.build.tasks.dll"))
+                .Concat(new[] { input }), input);
+            
+            var asm = typeSystem.TargetAssemblyDefinition;
+
+            if (!skipXamlCompilation)
+            {
+                var compileRes = CompileCore(engine, typeSystem, projectDirectory, verifyIl, logImportance);
+                if (compileRes == null && !patchCom)
+                    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);
+
+            asm.Write(output, writerParameters);
+
+            return new CompileResult(true, true);
+            
+        }
         
-        public static CompileResult Compile(IBuildEngine engine, string input, string[] references, string projectDirectory,
-            string output, bool verifyIl)
+        static bool? CompileCore(IBuildEngine engine, CecilTypeSystem typeSystem,
+            string projectDirectory, bool verifyIl, 
+            MessageImportance logImportance)
         {
-            var typeSystem = new CecilTypeSystem(references.Concat(new[] {input}), input);
             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)
                 // Nothing to do
-                return new CompileResult(true);
-            
-            var xamlLanguage = AvaloniaXamlIlLanguage.Configure(typeSystem);
-            var compilerConfig = new XamlIlTransformerConfiguration(typeSystem,
+                return null;
+
+            var clrPropertiesDef = new TypeDefinition("CompiledAvaloniaXaml", "XamlIlHelpers",
+                TypeAttributes.Class, asm.MainModule.TypeSystem.Object);
+            asm.MainModule.Types.Add(clrPropertiesDef);
+            var indexerAccessorClosure = new TypeDefinition("CompiledAvaloniaXaml", "!IndexerAccessorFactoryClosure",
+                TypeAttributes.Class, asm.MainModule.TypeSystem.Object);
+            asm.MainModule.Types.Add(indexerAccessorClosure);
+
+            var (xamlLanguage , emitConfig) = AvaloniaXamlIlLanguage.Configure(typeSystem);
+            var compilerConfig = new AvaloniaXamlIlCompilerConfiguration(typeSystem,
                 typeSystem.TargetAssembly,
                 xamlLanguage,
-                XamlIlXmlnsMappings.Resolve(typeSystem, xamlLanguage),
-                AvaloniaXamlIlLanguage.CustomValueConverter);
+                XamlXmlnsMappings.Resolve(typeSystem, xamlLanguage),
+                AvaloniaXamlIlLanguage.CustomValueConverter,
+                new XamlIlClrPropertyInfoEmitter(typeSystem.CreateTypeBuilder(clrPropertiesDef)),
+                new XamlIlPropertyInfoAccessorFactoryEmitter(typeSystem.CreateTypeBuilder(indexerAccessorClosure)));
 
 
             var contextDef = new TypeDefinition("CompiledAvaloniaXaml", "XamlIlContext", 
                 TypeAttributes.Class, asm.MainModule.TypeSystem.Object);
             asm.MainModule.Types.Add(contextDef);
 
-            var contextClass = XamlIlContextDefinition.GenerateContextClass(typeSystem.CreateTypeBuilder(contextDef), typeSystem,
-                xamlLanguage);
+            var contextClass = XamlILContextDefinition.GenerateContextClass(typeSystem.CreateTypeBuilder(contextDef), typeSystem,
+                xamlLanguage, emitConfig);
 
-            var compiler = new AvaloniaXamlIlCompiler(compilerConfig, contextClass) { EnableIlVerification = verifyIl };
+            var compiler = new AvaloniaXamlIlCompiler(compilerConfig, emitConfig, contextClass) { EnableIlVerification = verifyIl };
 
             var editorBrowsableAttribute = typeSystem
                 .GetTypeReference(typeSystem.FindType("System.ComponentModel.EditorBrowsableAttribute"))
@@ -117,41 +161,43 @@ namespace Avalonia.Build.Tasks
                 asm.MainModule.Types.Add(typeDef);
                 var builder = typeSystem.CreateTypeBuilder(typeDef);
                 
-                foreach (var res in group.Resources.Where(CheckXamlName))
+                foreach (var res in group.Resources.Where(CheckXamlName).OrderBy(x=>x.FilePath.ToLowerInvariant()))
                 {
                     try
                     {
+                        engine.LogMessage($"XAMLIL: {res.Name} -> {res.Uri}", logImportance);
+
                         // StreamReader is needed here to handle BOM
                         var xaml = new StreamReader(new MemoryStream(res.FileContents)).ReadToEnd();
-                        var parsed = XDocumentXamlIlParser.Parse(xaml);
+                        var parsed = XDocumentXamlParser.Parse(xaml);
 
-                        var initialRoot = (XamlIlAstObjectNode)parsed.Root;
+                        var initialRoot = (XamlAstObjectNode)parsed.Root;
                         
                         
-                        var precompileDirective = initialRoot.Children.OfType<XamlIlAstXmlDirective>()
+                        var precompileDirective = initialRoot.Children.OfType<XamlAstXmlDirective>()
                             .FirstOrDefault(d => d.Namespace == XamlNamespaces.Xaml2006 && d.Name == "Precompile");
                         if (precompileDirective != null)
                         {
-                            var precompileText = (precompileDirective.Values[0] as XamlIlAstTextNode)?.Text.Trim()
+                            var precompileText = (precompileDirective.Values[0] as XamlAstTextNode)?.Text.Trim()
                                 .ToLowerInvariant();
                             if (precompileText == "false")
                                 continue;
                             if (precompileText != "true")
-                                throw new XamlIlParseException("Invalid value for x:Precompile", precompileDirective);
+                                throw new XamlParseException("Invalid value for x:Precompile", precompileDirective);
                         }
                         
-                        var classDirective = initialRoot.Children.OfType<XamlIlAstXmlDirective>()
+                        var classDirective = initialRoot.Children.OfType<XamlAstXmlDirective>()
                             .FirstOrDefault(d => d.Namespace == XamlNamespaces.Xaml2006 && d.Name == "Class");
-                        IXamlIlType classType = null;
+                        IXamlType classType = null;
                         if (classDirective != null)
                         {
-                            if (classDirective.Values.Count != 1 || !(classDirective.Values[0] is XamlIlAstTextNode tn))
-                                throw new XamlIlParseException("x:Class should have a string value", classDirective);
+                            if (classDirective.Values.Count != 1 || !(classDirective.Values[0] is XamlAstTextNode tn))
+                                throw new XamlParseException("x:Class should have a string value", classDirective);
                             classType = typeSystem.TargetAssembly.FindType(tn.Text);
                             if (classType == null)
-                                throw new XamlIlParseException($"Unable to find type `{tn.Text}`", classDirective);
+                                throw new XamlParseException($"Unable to find type `{tn.Text}`", classDirective);
                             compiler.OverrideRootType(parsed,
-                                new XamlIlAstClrTypeReference(classDirective, classType, false));
+                                new XamlAstClrTypeReference(classDirective, classType, false));
                             initialRoot.Children.Remove(classDirective);
                         }
                         
@@ -320,7 +366,7 @@ namespace Avalonia.Build.Tasks
                     catch (Exception e)
                     {
                         int lineNumber = 0, linePosition = 0;
-                        if (e is XamlIlParseException xe)
+                        if (e is XamlParseException xe)
                         {
                             lineNumber = xe.LineNumber;
                             linePosition = xe.LinePosition;
@@ -332,28 +378,36 @@ namespace Avalonia.Build.Tasks
                     }
                     res.Remove();
                 }
+                
+                
+                // Technically that's a hack, but it fixes corert incompatibility caused by deterministic builds
+                int dupeCounter = 1;
+                foreach (var grp in typeDef.NestedTypes.GroupBy(x => x.Name))
+                {
+                    if (grp.Count() > 1)
+                    {
+                        foreach (var dupe in grp)
+                            dupe.Name += "_dup" + dupeCounter++;
+                    }
+                }
+                
+                
                 return true;
             }
             
             if (emres.Resources.Count(CheckXamlName) != 0)
                 if (!CompileGroup(emres))
-                    return new CompileResult(false);
+                    return false;
             if (avares.Resources.Count(CheckXamlName) != 0)
             {
                 if (!CompileGroup(avares))
-                    return new CompileResult(false);
+                    return false;
                 avares.Save();
             }
             
             loaderDispatcherMethod.Body.Instructions.Add(Instruction.Create(OpCodes.Ldnull));
             loaderDispatcherMethod.Body.Instructions.Add(Instruction.Create(OpCodes.Ret));
-            
-            asm.Write(output, new WriterParameters
-            {
-                WriteSymbols = asm.MainModule.HasSymbols
-            });
-
-            return new CompileResult(true, true);
+            return true;
         }
         
     }
diff --git a/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj b/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
index 27853a1540..6975642db2 100644
--- a/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
+++ b/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
@@ -22,4 +22,5 @@
   <Import Project="..\..\build\EmbedXaml.props" />
   <Import Project="..\..\build\JetBrains.Annotations.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>
diff --git a/src/Avalonia.Controls.DataGrid/Collections/DataGridSortDescription.cs b/src/Avalonia.Controls.DataGrid/Collections/DataGridSortDescription.cs
index 86113da87e..662ff91329 100644
--- a/src/Avalonia.Controls.DataGrid/Collections/DataGridSortDescription.cs
+++ b/src/Avalonia.Controls.DataGrid/Collections/DataGridSortDescription.cs
@@ -1,22 +1,21 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
-using System.Text;
-using Avalonia.Controls;
 using Avalonia.Controls.Utils;
-using Avalonia.Utilities;
 
 namespace Avalonia.Collections
 {
     public abstract class DataGridSortDescription
     {
         public virtual string PropertyPath => null;
-        public virtual bool Descending => false;
+
+        [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; }
 
@@ -29,7 +28,7 @@ namespace Avalonia.Collections
             return seq.ThenBy(o => o, Comparer);
         }
 
-        internal virtual DataGridSortDescription SwitchSortDirection()
+        public virtual DataGridSortDescription SwitchSortDirection()
         {
             return this;
         }
@@ -108,7 +107,7 @@ namespace Avalonia.Collections
 
         private class DataGridPathSortDescription : DataGridSortDescription
         {
-            private readonly bool _descending;
+            private readonly ListSortDirection _direction;
             private readonly string _propertyPath;
             private readonly Lazy<CultureSensitiveComparer> _cultureSensitiveComparer;
             private readonly Lazy<IComparer<object>> _comparer;
@@ -121,7 +120,7 @@ namespace Avalonia.Collections
                 {
                     if (_internalComparerTyped == null && _internalComparer != null)
                     {
-                        if (_internalComparerTyped is IComparer<object> c)
+                        if (_internalComparer is IComparer<object> c)
                             _internalComparerTyped = c;
                         else
                             _internalComparerTyped = Comparer<object>.Create((x, y) => _internalComparer.Compare(x, y));
@@ -133,19 +132,20 @@ namespace Avalonia.Collections
 
             public override string PropertyPath => _propertyPath;
             public override IComparer<object> Comparer => _comparer.Value;
-            public override bool Descending => _descending;
+            public override ListSortDirection Direction => _direction;
 
-            public DataGridPathSortDescription(string propertyPath, bool descending, CultureInfo culture)
+            public DataGridPathSortDescription(string propertyPath, ListSortDirection direction, IComparer internalComparer, CultureInfo culture)
             {
                 _propertyPath = propertyPath;
-                _descending = descending;
+                _direction = direction;
                 _cultureSensitiveComparer = new Lazy<CultureSensitiveComparer>(() => new CultureSensitiveComparer(culture ?? CultureInfo.CurrentCulture));
+                _internalComparer = internalComparer;
                 _comparer = new Lazy<IComparer<object>>(() => Comparer<object>.Create((x, y) => Compare(x, y)));
             }
-            private DataGridPathSortDescription(DataGridPathSortDescription inner, bool descending)
+            private DataGridPathSortDescription(DataGridPathSortDescription inner, ListSortDirection direction)
             {
                 _propertyPath = inner._propertyPath;
-                _descending = descending;
+                _direction = direction;
                 _propertyType = inner._propertyType;
                 _cultureSensitiveComparer = inner._cultureSensitiveComparer;
                 _internalComparer = inner._internalComparer;
@@ -204,7 +204,7 @@ namespace Avalonia.Collections
 
                 result = _internalComparer?.Compare(v1, v2) ?? 0;
 
-                if (_descending)
+                if (Direction == ListSortDirection.Descending)
                     return -result;
                 else
                     return result;
@@ -221,7 +221,7 @@ namespace Avalonia.Collections
             }
             public override IOrderedEnumerable<object> OrderBy(IEnumerable<object> seq)
             {
-                if(_descending)
+                if (Direction == ListSortDirection.Descending)
                 {
                     return seq.OrderByDescending(o => GetValue(o), InternalComparer);
                 }
@@ -232,25 +232,38 @@ namespace Avalonia.Collections
             }
             public override IOrderedEnumerable<object> ThenBy(IOrderedEnumerable<object> seq)
             {
-                if (_descending)
+                if (Direction == ListSortDirection.Descending)
                 {
                     return seq.ThenByDescending(o => GetValue(o), InternalComparer);
                 }
                 else
                 {
-                    return seq.ThenByDescending(o => GetValue(o), InternalComparer);
+                    return seq.ThenBy(o => GetValue(o), InternalComparer);
                 }
             }
 
-            internal override DataGridSortDescription SwitchSortDirection()
+            public override DataGridSortDescription SwitchSortDirection()
             {
-                return new DataGridPathSortDescription(this, !_descending);
+                var newDirection = _direction == ListSortDirection.Ascending ? ListSortDirection.Descending : ListSortDirection.Ascending;
+                return new DataGridPathSortDescription(this, newDirection);
             }
         }
 
-        public static DataGridSortDescription FromPath(string propertyPath, bool descending = false, CultureInfo culture = null)
+        public static DataGridSortDescription FromPath(string propertyPath, ListSortDirection direction = ListSortDirection.Ascending, CultureInfo culture = null)
+        {
+            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, descending, culture);
+            return new DataGridPathSortDescription(propertyPath, direction, comparer, null);
         }
     }
 
diff --git a/src/Avalonia.Controls.DataGrid/DataGrid.cs b/src/Avalonia.Controls.DataGrid/DataGrid.cs
index b65fd2a8b7..5bb2763566 100644
--- a/src/Avalonia.Controls.DataGrid/DataGrid.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGrid.cs
@@ -1,5 +1,4 @@
-// (c) Copyright Microsoft Corporation.
-// This source is subject to the Microsoft Public License (Ms-PL).
+// 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. 
 
@@ -25,12 +24,14 @@ using Avalonia.Input.Platform;
 using System.ComponentModel.DataAnnotations;
 using Avalonia.Controls.Utils;
 using Avalonia.Layout;
+using Avalonia.Controls.Metadata;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// Displays data in a customizable grid.
     /// </summary>
+    [PseudoClasses(":invalid", ":empty-rows", ":empty-columns")]
     public partial class DataGrid : TemplatedControl
     {
         private const string DATAGRID_elementRowsPresenterName = "PART_RowsPresenter";
@@ -40,6 +41,7 @@ namespace Avalonia.Controls
         private const string DATAGRID_elementRowHeadersPresenterName = "PART_RowHeadersPresenter";
         private const string DATAGRID_elementTopLeftCornerHeaderName = "PART_TopLeftCornerHeader";
         private const string DATAGRID_elementTopRightCornerHeaderName = "PART_TopRightCornerHeader";
+        private const string DATAGRID_elementBottomRightCornerHeaderName = "PART_BottomRightCorner";
         private const string DATAGRID_elementValidationSummary = "PART_ValidationSummary";
         private const string DATAGRID_elementVerticalScrollbarName = "PART_VerticalScrollbar";
 
@@ -65,7 +67,7 @@ namespace Avalonia.Controls
         private const double DATAGRID_minimumColumnHeaderHeight = 4;
         internal const double DATAGRID_maximumStarColumnWidth = 10000;
         internal const double DATAGRID_minimumStarColumnWidth = 0.001;
-        private const double DATAGRID_mouseWheelDelta = 48.0;
+        private const double DATAGRID_mouseWheelDelta = 72.0;
         private const double DATAGRID_maxHeadersThickness = 32768;
 
         private const double DATAGRID_defaultRowHeight = 22;
@@ -80,6 +82,7 @@ namespace Avalonia.Controls
         private INotifyCollectionChanged _topLevelGroup;
         private ContentControl _clipboardContentControl;
 
+        private IVisual _bottomRightCorner;
         private DataGridColumnHeadersPresenter _columnHeadersPresenter;
         private DataGridRowsPresenter _rowsPresenter;
         private ScrollBar _vScrollBar;
@@ -149,6 +152,9 @@ namespace Avalonia.Controls
 
         private IEnumerable _items;
 
+        public event EventHandler<ScrollEventArgs> HorizontalScroll;
+        public event EventHandler<ScrollEventArgs> VerticalScroll;
+
         /// <summary>
         /// Identifies the CanUserReorderColumns dependency property.
         /// </summary>
@@ -202,20 +208,12 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<DataGrid, double>(
                 nameof(ColumnHeaderHeight),
                 defaultValue: double.NaN,
-                validate: ValidateColumnHeaderHeight);
+                validate: IsValidColumnHeaderHeight);
 
-        private static double ValidateColumnHeaderHeight(DataGrid grid, double value)
+        private static bool IsValidColumnHeaderHeight(double value)
         {
-            if (value < DATAGRID_minimumColumnHeaderHeight)
-            {
-                throw DataGridError.DataGrid.ValueMustBeGreaterThanOrEqualTo(nameof(value), nameof(ColumnHeaderHeight), DATAGRID_minimumColumnHeaderHeight);
-            }
-            if (value > DATAGRID_maxHeadersThickness)
-            {
-                throw DataGridError.DataGrid.ValueMustBeGreaterThanOrEqualTo(nameof(value), nameof(ColumnHeaderHeight), DATAGRID_maxHeadersThickness);
-            }
-
-            return value;
+            return double.IsNaN(value) ||
+                (value >= DATAGRID_minimumColumnHeaderHeight && value <= DATAGRID_maxHeadersThickness);
         }
 
         /// <summary>
@@ -273,15 +271,7 @@ namespace Avalonia.Controls
             set { SetValue(FrozenColumnCountProperty, value); }
         }
 
-        private static int ValidateFrozenColumnCount(DataGrid grid, int value)
-        {
-            if (value < 0)
-            {
-                throw DataGridError.DataGrid.ValueMustBeGreaterThanOrEqualTo(nameof(value), nameof(FrozenColumnCount), 0);
-            }
-
-            return value;
-        }
+        private static bool ValidateFrozenColumnCount(int value) => value >= 0;
 
         public static readonly StyledProperty<DataGridGridLinesVisibility> GridLinesVisibilityProperty =
             AvaloniaProperty.Register<DataGrid, DataGridGridLinesVisibility>(nameof(GridLinesVisibility));
@@ -389,36 +379,22 @@ namespace Avalonia.Controls
         public bool IsValid
         {
             get { return _isValid; }
-            internal set { SetAndRaise(IsValidProperty, ref _isValid, value); }
+            internal set 
+            { 
+                SetAndRaise(IsValidProperty, ref _isValid, value);
+                PseudoClasses.Set(":invalid", !value);
+            }
         }
 
         public static readonly StyledProperty<double> MaxColumnWidthProperty =
             AvaloniaProperty.Register<DataGrid, double>(
                 nameof(MaxColumnWidth),
                 defaultValue: DATAGRID_defaultMaxColumnWidth,
-                validate: ValidateMaxColumnWidth);
+                validate: IsValidColumnWidth);
 
-        private static double ValidateMaxColumnWidth(DataGrid grid, double value)
+        private static bool IsValidColumnWidth(double value)
         {
-            if (double.IsNaN(value))
-            {
-                throw DataGridError.DataGrid.ValueCannotBeSetToNAN(nameof(MaxColumnWidth));
-            }
-            if (value < 0)
-            {
-                throw DataGridError.DataGrid.ValueMustBeGreaterThanOrEqualTo(nameof(value), nameof(MaxColumnWidth), 0);
-            }
-            if (grid.MinColumnWidth > value)
-            {
-                throw DataGridError.DataGrid.ValueMustBeGreaterThanOrEqualTo(nameof(value), nameof(MaxColumnWidth), nameof(MinColumnWidth));
-            }
-
-            if (value < 0)
-            {
-                throw DataGridError.DataGrid.ValueMustBeGreaterThanOrEqualTo(nameof(value), nameof(FrozenColumnCount), 0);
-            }
-
-            return value;
+            return !double.IsNaN(value) && value > 0;
         }
 
         /// <summary>
@@ -434,28 +410,11 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<DataGrid, double>(
                 nameof(MinColumnWidth),
                 defaultValue: DATAGRID_defaultMinColumnWidth,
-                validate: ValidateMinColumnWidth);
+                validate: IsValidMinColumnWidth);
 
-        private static double ValidateMinColumnWidth(DataGrid grid, double value)
+        private static bool IsValidMinColumnWidth(double value)
         {
-            if (double.IsNaN(value))
-            {
-                throw DataGridError.DataGrid.ValueCannotBeSetToNAN(nameof(MinColumnWidth));
-            }
-            if (value < 0)
-            {
-                throw DataGridError.DataGrid.ValueMustBeGreaterThanOrEqualTo(nameof(value), nameof(MinColumnWidth), 0);
-            }
-            if (double.IsPositiveInfinity(value))
-            {
-                throw DataGridError.DataGrid.ValueCannotBeSetToInfinity(nameof(MinColumnWidth));
-            }
-            if (grid.MaxColumnWidth < value)
-            {
-                throw DataGridError.DataGrid.ValueMustBeLessThanOrEqualTo(nameof(value), nameof(MinColumnWidth), nameof(MaxColumnWidth));
-            }
-
-            return value;
+            return !double.IsNaN(value) && !double.IsPositiveInfinity(value) && value >= 0;
         }
 
         /// <summary>
@@ -483,19 +442,12 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<DataGrid, double>(
                 nameof(RowHeight),
                 defaultValue: double.NaN,
-                validate: ValidateRowHeight);
-        private static double ValidateRowHeight(DataGrid grid, double value)
+                validate: IsValidRowHeight);
+        private static bool IsValidRowHeight(double value)
         {
-            if (value < DataGridRow.DATAGRIDROW_minimumHeight)
-            {
-                throw DataGridError.DataGrid.ValueMustBeGreaterThanOrEqualTo(nameof(value), nameof(RowHeight), 0);
-            }
-            if (value > DataGridRow.DATAGRIDROW_maximumHeight)
-            {
-                throw DataGridError.DataGrid.ValueMustBeLessThanOrEqualTo(nameof(value), nameof(RowHeight), DataGridRow.DATAGRIDROW_maximumHeight);
-            }
-
-            return value;
+            return double.IsNaN(value) ||
+                (value >= DataGridRow.DATAGRIDROW_minimumHeight &&
+                 value <= DataGridRow.DATAGRIDROW_maximumHeight);
         }
 
         /// <summary>
@@ -511,19 +463,12 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<DataGrid, double>(
                 nameof(RowHeaderWidth),
                 defaultValue: double.NaN,
-                validate: ValidateRowHeaderWidth);
-        private static double ValidateRowHeaderWidth(DataGrid grid, double value)
+                validate: IsValidRowHeaderWidth);
+        private static bool IsValidRowHeaderWidth(double value)
         {
-            if (value < DATAGRID_minimumRowHeaderWidth)
-            {
-                throw DataGridError.DataGrid.ValueMustBeGreaterThanOrEqualTo(nameof(value), nameof(RowHeaderWidth), DATAGRID_minimumRowHeaderWidth);
-            }
-            if (value > DATAGRID_maxHeadersThickness)
-            {
-                throw DataGridError.DataGrid.ValueMustBeLessThanOrEqualTo(nameof(value), nameof(RowHeaderWidth), DATAGRID_maxHeadersThickness);
-            }
-
-            return value;
+            return double.IsNaN(value) ||
+                (value >= DATAGRID_minimumRowHeaderWidth &&
+                 value <= DATAGRID_maxHeadersThickness);
         }
 
         /// <summary>
@@ -721,8 +666,6 @@ namespace Avalonia.Controls
                 HorizontalScrollBarVisibilityProperty,
                 VerticalScrollBarVisibilityProperty);
 
-            PseudoClass<DataGrid, bool>(IsValidProperty, x => !x, ":invalid");
-
             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));
@@ -768,6 +711,7 @@ namespace Avalonia.Controls
 
             DisplayData = new DataGridDisplayData(this);
             ColumnsInternal = CreateColumnsInstance();
+            ColumnsInternal.CollectionChanged += ColumnsInternal_CollectionChanged;
 
             RowHeightEstimate = DATAGRID_defaultRowHeight;
             RowDetailsHeightEstimate = 0;
@@ -784,6 +728,8 @@ namespace Avalonia.Controls
             CurrentCellCoordinates = new DataGridCellCoordinates(-1, -1);
 
             RowGroupHeaderHeightEstimate = DATAGRID_defaultRowHeight;
+
+            UpdatePseudoClasses();
         }
 
         private void SetValueNoCallback<T>(AvaloniaProperty<T> property, T value, BindingPriority priority = BindingPriority.LocalValue)
@@ -827,7 +773,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// ItemsProperty property changed handler.
         /// </summary>
-        /// <param name="e">AvaloniaPropertyChangedEventArgs.</param>
+        /// <param name="e">The event arguments.</param>
         private void OnItemsPropertyChanged(AvaloniaPropertyChangedEventArgs e)
         {
             if (!_areHandlersSuspended)
@@ -908,9 +854,27 @@ namespace Avalonia.Controls
                 // can be set when the DataGrid is not part of the visual tree
                 _measured = false;
                 InvalidateMeasure();
+
+                UpdatePseudoClasses();
             }
         }
 
+        private void ColumnsInternal_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == NotifyCollectionChangedAction.Add
+                || e.Action == NotifyCollectionChangedAction.Remove
+                || e.Action == NotifyCollectionChangedAction.Reset)
+            {
+                UpdatePseudoClasses();
+            }
+        }
+
+        internal void UpdatePseudoClasses()
+        {
+            PseudoClasses.Set(":empty-columns", !ColumnsInternal.GetVisibleColumns().Any());
+            PseudoClasses.Set(":empty-rows", !DataConnection.Any());
+        }
+
         private void OnSelectedIndexChanged(AvaloniaPropertyChangedEventArgs e)
         {
             if (!_areHandlersSuspended)
@@ -1288,6 +1252,11 @@ namespace Avalonia.Controls
             remove { AddHandler(SelectionChangedEvent, value); }
         }
 
+        /// <summary>
+        /// Occurs when the <see cref="DataGridColumn"/> sorting request is triggered.
+        /// </summary>
+        public event EventHandler<DataGridColumnEventArgs> Sorting;
+
         /// <summary>
         /// Occurs when a <see cref="T:Avalonia.Controls.DataGridRow" /> 
         /// object becomes available for reuse.
@@ -1400,7 +1369,6 @@ namespace Avalonia.Controls
         internal DataGridColumnCollection ColumnsInternal
         {
             get;
-            private set;
         }
 
         internal int AnchorSlot
@@ -1886,6 +1854,22 @@ namespace Avalonia.Controls
             }
         }
 
+        private bool IsHorizontalScrollBarOverCells
+        {
+            get
+            {
+                return _columnHeadersPresenter != null && Grid.GetColumnSpan(_columnHeadersPresenter) == 2;
+            }
+        }
+
+        private bool IsVerticalScrollBarOverCells
+        {
+            get
+            {
+                return _rowsPresenter != null && Grid.GetRowSpan(_rowsPresenter) == 2;
+            }
+        }
+
         private int NoSelectionChangeCount
         {
             get
@@ -2305,7 +2289,7 @@ namespace Avalonia.Controls
         /// Builds the visual tree for the column header when a new template is applied.
         /// </summary>
         //TODO Validation UI
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             // The template has changed, so we need to refresh the visuals
             _measured = false;
@@ -2384,6 +2368,7 @@ namespace Avalonia.Controls
             _topLeftCornerHeader = e.NameScope.Find<ContentControl>(DATAGRID_elementTopLeftCornerHeaderName);
             EnsureTopLeftCornerHeader(); // EnsureTopLeftCornerHeader checks for a null _topLeftCornerHeader;
             _topRightCornerHeader = e.NameScope.Find<ContentControl>(DATAGRID_elementTopRightCornerHeaderName);
+            _bottomRightCorner = e.NameScope.Find<IVisual>(DATAGRID_elementBottomRightCornerHeaderName);
         }
 
         /// <summary>
@@ -2537,25 +2522,25 @@ namespace Avalonia.Controls
 
         internal bool ProcessDownKey(KeyEventArgs e)
         {
-            KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift);
+            KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift);
             return ProcessDownKeyInternal(shift, ctrl);
         }
 
         internal bool ProcessEndKey(KeyEventArgs e)
         {
-            KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift);
+            KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift);
             return ProcessEndKey(shift, ctrl);
         }
 
         internal bool ProcessEnterKey(KeyEventArgs e)
         {
-            KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift);
+            KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift);
             return ProcessEnterKey(shift, ctrl);
         }
 
         internal bool ProcessHomeKey(KeyEventArgs e)
         {
-            KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift);
+            KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift);
             return ProcessHomeKey(shift, ctrl);
         }
 
@@ -2595,25 +2580,25 @@ namespace Avalonia.Controls
 
         internal bool ProcessLeftKey(KeyEventArgs e)
         {
-            KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift);
+            KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift);
             return ProcessLeftKey(shift, ctrl);
         }
 
         internal bool ProcessNextKey(KeyEventArgs e)
         {
-            KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift);
+            KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift);
             return ProcessNextKey(shift, ctrl);
         }
 
         internal bool ProcessPriorKey(KeyEventArgs e)
         {
-            KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift);
+            KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift);
             return ProcessPriorKey(shift, ctrl);
         }
 
         internal bool ProcessRightKey(KeyEventArgs e)
         {
-            KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift);
+            KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift);
             return ProcessRightKey(shift, ctrl);
         }
 
@@ -2731,7 +2716,7 @@ namespace Avalonia.Controls
 
         internal bool ProcessUpKey(KeyEventArgs e)
         {
-            KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift);
+            KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift);
             return ProcessUpKey(shift, ctrl);
         }
 
@@ -2742,7 +2727,7 @@ namespace Avalonia.Controls
             {
                 return;
             }
-            Debug.Assert(DoubleUtil.LessThanOrClose(_vScrollBar.Value, _vScrollBar.Maximum));
+            Debug.Assert(MathUtilities.LessThanOrClose(_vScrollBar.Value, _vScrollBar.Maximum));
 
             _verticalScrollChangesIgnored++;
             try
@@ -2759,7 +2744,7 @@ namespace Avalonia.Controls
                 }
                 else if (scrollEventType == ScrollEventType.SmallDecrement)
                 {
-                    if (DoubleUtil.GreaterThan(NegVerticalOffset, 0))
+                    if (MathUtilities.GreaterThan(NegVerticalOffset, 0))
                     {
                         DisplayData.PendingVerticalScrollHeight -= NegVerticalOffset;
                     }
@@ -2778,7 +2763,7 @@ namespace Avalonia.Controls
                     DisplayData.PendingVerticalScrollHeight = _vScrollBar.Value - _verticalOffset;
                 }
 
-                if (!DoubleUtil.IsZero(DisplayData.PendingVerticalScrollHeight))
+                if (!MathUtilities.IsZero(DisplayData.PendingVerticalScrollHeight))
                 {
                     // Invalidate so the scroll happens on idle
                     InvalidateRowsMeasure(invalidateIndividualElements: false);
@@ -2814,7 +2799,7 @@ namespace Avalonia.Controls
                         //We don't need to refresh the state of AutoGenerated column headers because they're up-to-date
                         if (!column.IsAutoGenerated && column.HasHeaderCell)
                         {
-                            column.HeaderCell.ApplyState();
+                            column.HeaderCell.UpdatePseudoClasses();
                         }
                     }
 
@@ -2999,7 +2984,7 @@ namespace Avalonia.Controls
         //TODO: Ensure left button is checked for
         internal bool UpdateStateOnMouseLeftButtonDown(PointerPressedEventArgs pointerPressedEventArgs, int columnIndex, int slot, bool allowEdit)
         {
-            KeyboardHelper.GetMetaKeyState(pointerPressedEventArgs.InputModifiers, out bool ctrl, out bool shift);
+            KeyboardHelper.GetMetaKeyState(pointerPressedEventArgs.KeyModifiers, out bool ctrl, out bool shift);
             return UpdateStateOnMouseLeftButtonDown(pointerPressedEventArgs, columnIndex, slot, allowEdit, shift, ctrl);
         }
 
@@ -3354,6 +3339,10 @@ namespace Avalonia.Controls
                 //  
 
             }
+
+            bool isHorizontalScrollBarOverCells = IsHorizontalScrollBarOverCells;
+            bool isVerticalScrollBarOverCells = IsVerticalScrollBarOverCells;
+
             double cellsWidth = CellsWidth;
             double cellsHeight = CellsHeight;
 
@@ -3369,10 +3358,17 @@ namespace Avalonia.Controls
                 // Compensate if the horizontal scrollbar is already taking up space
                 if (!forceHorizScrollbar && _hScrollBar.IsVisible)
                 {
-                    cellsHeight += _hScrollBar.DesiredSize.Height;
+                    if (!isHorizontalScrollBarOverCells)
+                    {
+                        cellsHeight += _hScrollBar.DesiredSize.Height;
+                    }
+                }
+                if (!isHorizontalScrollBarOverCells)
+                {
+                    horizScrollBarHeight = _hScrollBar.Height + _hScrollBar.Margin.Top + _hScrollBar.Margin.Bottom;
                 }
-                horizScrollBarHeight = _hScrollBar.Height + _hScrollBar.Margin.Top + _hScrollBar.Margin.Bottom;
             }
+
             bool allowVertScrollbar = false;
             bool forceVertScrollbar = false;
             double vertScrollBarWidth = 0;
@@ -3385,9 +3381,15 @@ namespace Avalonia.Controls
                 // Compensate if the vertical scrollbar is already taking up space
                 if (!forceVertScrollbar && _vScrollBar.IsVisible)
                 {
-                    cellsWidth += _vScrollBar.DesiredSize.Width;
+                    if (!isVerticalScrollBarOverCells)
+                    {
+                        cellsWidth += _vScrollBar.DesiredSize.Width;
+                    }
+                }
+                if (!isVerticalScrollBarOverCells)
+                {
+                    vertScrollBarWidth = _vScrollBar.Width + _vScrollBar.Margin.Left + _vScrollBar.Margin.Right;
                 }
-                vertScrollBarWidth = _vScrollBar.Width + _vScrollBar.Margin.Left + _vScrollBar.Margin.Right;
             }
 
             // Now cellsWidth is the width potentially available for displaying data cells.
@@ -3407,22 +3409,24 @@ namespace Avalonia.Controls
                 bool needHorizScrollbarWithoutVertScrollbar = false;
 
                 if (allowHorizScrollbar &&
-                    DoubleUtil.GreaterThan(totalVisibleWidth, cellsWidth) &&
-                    DoubleUtil.LessThan(totalVisibleFrozenWidth, cellsWidth) &&
-                    DoubleUtil.LessThanOrClose(horizScrollBarHeight, cellsHeight))
+                    MathUtilities.GreaterThan(totalVisibleWidth, cellsWidth) &&
+                    MathUtilities.LessThan(totalVisibleFrozenWidth, cellsWidth) &&
+                    MathUtilities.LessThanOrClose(horizScrollBarHeight, cellsHeight))
                 {
                     double oldDataHeight = cellsHeight;
                     cellsHeight -= horizScrollBarHeight;
                     Debug.Assert(cellsHeight >= 0);
                     needHorizScrollbarWithoutVertScrollbar = needHorizScrollbar = true;
-                    if (allowVertScrollbar && (DoubleUtil.LessThanOrClose(totalVisibleWidth - cellsWidth, vertScrollBarWidth) ||
-                        DoubleUtil.LessThanOrClose(cellsWidth - totalVisibleFrozenWidth, vertScrollBarWidth)))
+
+                    if (vertScrollBarWidth > 0 && 
+                        allowVertScrollbar && (MathUtilities.LessThanOrClose(totalVisibleWidth - cellsWidth, vertScrollBarWidth) ||
+                        MathUtilities.LessThanOrClose(cellsWidth - totalVisibleFrozenWidth, vertScrollBarWidth)))
                     {
                         // Would we still need a horizontal scrollbar without the vertical one?
                         UpdateDisplayedRows(DisplayData.FirstScrollingSlot, cellsHeight);
                         if (DisplayData.NumTotallyDisplayedScrollingElements != VisibleSlotCount)
                         {
-                            needHorizScrollbar = DoubleUtil.LessThan(totalVisibleFrozenWidth, cellsWidth - vertScrollBarWidth);
+                            needHorizScrollbar = MathUtilities.LessThan(totalVisibleFrozenWidth, cellsWidth - vertScrollBarWidth);
                         }
                     }
 
@@ -3433,10 +3437,15 @@ namespace Avalonia.Controls
                     }
                 }
 
-                UpdateDisplayedRows(DisplayData.FirstScrollingSlot, cellsHeight);
+                // Store the current FirstScrollingSlot because removing the horizontal scrollbar could scroll
+                // the DataGrid up; however, if we realize later that we need to keep the horizontal scrollbar
+                // then we should use the first slot stored here which is not scrolled.
+                int firstScrollingSlot = DisplayData.FirstScrollingSlot;
+
+                UpdateDisplayedRows(firstScrollingSlot, cellsHeight);
                 if (allowVertScrollbar &&
-                    DoubleUtil.GreaterThan(cellsHeight, 0) &&
-                    DoubleUtil.LessThanOrClose(vertScrollBarWidth, cellsWidth) &&
+                    MathUtilities.GreaterThan(cellsHeight, 0) &&
+                    MathUtilities.LessThanOrClose(vertScrollBarWidth, cellsWidth) &&
                     DisplayData.NumTotallyDisplayedScrollingElements != VisibleSlotCount)
                 {
                     cellsWidth -= vertScrollBarWidth;
@@ -3445,21 +3454,23 @@ namespace Avalonia.Controls
                 }
 
                 DisplayData.FirstDisplayedScrollingCol = ComputeFirstVisibleScrollingColumn();
+
                 // we compute the number of visible columns only after we set up the vertical scroll bar.
                 ComputeDisplayedColumns();
 
-                if (allowHorizScrollbar &&
+                if ((vertScrollBarWidth > 0 || horizScrollBarHeight > 0) && 
+                    allowHorizScrollbar &&
                     needVertScrollbar && !needHorizScrollbar &&
-                    DoubleUtil.GreaterThan(totalVisibleWidth, cellsWidth) &&
-                    DoubleUtil.LessThan(totalVisibleFrozenWidth, cellsWidth) &&
-                    DoubleUtil.LessThanOrClose(horizScrollBarHeight, cellsHeight))
+                    MathUtilities.GreaterThan(totalVisibleWidth, cellsWidth) &&
+                    MathUtilities.LessThan(totalVisibleFrozenWidth, cellsWidth) &&
+                    MathUtilities.LessThanOrClose(horizScrollBarHeight, cellsHeight))
                 {
                     cellsWidth += vertScrollBarWidth;
                     cellsHeight -= horizScrollBarHeight;
                     Debug.Assert(cellsHeight >= 0);
                     needVertScrollbar = false;
 
-                    UpdateDisplayedRows(DisplayData.FirstScrollingSlot, cellsHeight);
+                    UpdateDisplayedRows(firstScrollingSlot, cellsHeight);
                     if (cellsHeight > 0 &&
                         vertScrollBarWidth <= cellsWidth &&
                         DisplayData.NumTotallyDisplayedScrollingElements != VisibleSlotCount)
@@ -3483,7 +3494,7 @@ namespace Avalonia.Controls
                 if (allowVertScrollbar)
                 {
                     if (cellsHeight > 0 &&
-                        DoubleUtil.LessThanOrClose(vertScrollBarWidth, cellsWidth) &&
+                        MathUtilities.LessThanOrClose(vertScrollBarWidth, cellsWidth) &&
                         DisplayData.NumTotallyDisplayedScrollingElements != VisibleSlotCount)
                     {
                         cellsWidth -= vertScrollBarWidth;
@@ -3500,9 +3511,9 @@ namespace Avalonia.Controls
                 if (allowHorizScrollbar)
                 {
                     if (cellsWidth > 0 &&
-                        DoubleUtil.LessThanOrClose(horizScrollBarHeight, cellsHeight) &&
-                        DoubleUtil.GreaterThan(totalVisibleWidth, cellsWidth) &&
-                        DoubleUtil.LessThan(totalVisibleFrozenWidth, cellsWidth))
+                        MathUtilities.LessThanOrClose(horizScrollBarHeight, cellsHeight) &&
+                        MathUtilities.GreaterThan(totalVisibleWidth, cellsWidth) &&
+                        MathUtilities.LessThan(totalVisibleFrozenWidth, cellsWidth))
                     {
                         cellsHeight -= horizScrollBarHeight;
                         Debug.Assert(cellsHeight >= 0);
@@ -3540,6 +3551,15 @@ namespace Avalonia.Controls
                     _topRightCornerHeader.IsVisible = false;
                 }
             }
+
+            if (_bottomRightCorner != null)
+            {
+                // Show the BottomRightCorner when both scrollbars are visible.
+                _bottomRightCorner.IsVisible =
+                    _hScrollBar != null && _hScrollBar.IsVisible &&
+                    _vScrollBar != null && _vScrollBar.IsVisible;
+            }
+
             DisplayData.FullyRecycleElements();
         }
 
@@ -3981,6 +4001,14 @@ namespace Avalonia.Controls
                     dataGridColumn: CurrentColumn,
                     dataGridRow: EditingRow,
                     dataGridCell: editingCell);
+
+                EditingRow.InvalidateDesiredHeight();
+                var column = editingCell.OwningColumn;
+                if (column.Width.IsSizeToCells || column.Width.IsAuto)
+                {// Invalidate desired width and force recalculation
+                    column.SetWidthDesiredValue(0);
+                    EditingRow.OwningGrid.AutoSizeColumn(column, editingCell.DesiredSize.Width);
+                }
             }
 
             // We're done, so raise the CellEditEnded event
@@ -4288,6 +4316,7 @@ namespace Avalonia.Controls
         private void HorizontalScrollBar_Scroll(object sender, ScrollEventArgs e)
         {
             ProcessHorizontalScroll(e.ScrollEventType);
+            HorizontalScroll?.Invoke(sender, e);
         }
 
         private bool IsColumnOutOfBounds(int columnIndex)
@@ -4441,7 +4470,7 @@ namespace Avalonia.Controls
 
         private bool ProcessAKey(KeyEventArgs e)
         {
-            KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift, out bool alt);
+            KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift, out bool alt);
 
             if (ctrl && !shift && !alt && SelectionMode == DataGridSelectionMode.Extended)
             {
@@ -4507,10 +4536,10 @@ namespace Avalonia.Controls
                     return ProcessAKey(e);
 
                 case Key.C:
-                    return ProcessCopyKey(e.Modifiers);
+                    return ProcessCopyKey(e.KeyModifiers);
 
                 case Key.Insert:
-                    return ProcessCopyKey(e.Modifiers);
+                    return ProcessCopyKey(e.KeyModifiers);
             }
             if (focusDataGrid)
             {
@@ -4709,7 +4738,7 @@ namespace Avalonia.Controls
 
         private bool ProcessF2Key(KeyEventArgs e)
         {
-            KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift);
+            KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift);
 
             if (!shift && !ctrl &&
                 _editingColumnIndex == -1 && CurrentColumnIndex != -1 && GetRowSelection(CurrentSlot) &&
@@ -5066,7 +5095,7 @@ namespace Avalonia.Controls
 
         private bool ProcessTabKey(KeyEventArgs e)
         {
-            KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift);
+            KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift);
             return ProcessTabKey(e, shift, ctrl);
         }
 
@@ -5447,7 +5476,7 @@ namespace Avalonia.Controls
         private void SetVerticalOffset(double newVerticalOffset)
         {
             _verticalOffset = newVerticalOffset;
-            if (_vScrollBar != null && !DoubleUtil.AreClose(newVerticalOffset, _vScrollBar.Value))
+            if (_vScrollBar != null && !MathUtilities.AreClose(newVerticalOffset, _vScrollBar.Value))
             {
                 _vScrollBar.Value = _verticalOffset;
             }
@@ -5469,7 +5498,7 @@ namespace Avalonia.Controls
             }
             else if (displayedElement is DataGridRowGroupHeader groupHeader)
             {
-                groupHeader.ApplyState(useTransitions: true);
+                groupHeader.UpdatePseudoClasses();
                 if (AreRowHeadersVisible)
                 {
                     groupHeader.ApplyHeaderStatus();
@@ -5620,6 +5649,7 @@ namespace Avalonia.Controls
         private void VerticalScrollBar_Scroll(object sender, ScrollEventArgs e)
         {
             ProcessVerticalScroll(e.ScrollEventType);
+            VerticalScroll?.Invoke(sender, e);
         }
 
         //TODO: Ensure left button is checked for
@@ -5852,7 +5882,7 @@ namespace Avalonia.Controls
         /// to the Clipboard as text.
         /// </summary>
         /// <returns>Whether or not the DataGrid handled the key press.</returns>
-        private bool ProcessCopyKey(InputModifiers modifiers)
+        private bool ProcessCopyKey(KeyModifiers modifiers)
         {
             KeyboardHelper.GetMetaKeyState(modifiers, out bool ctrl, out bool shift, out bool alt);
 
diff --git a/src/Avalonia.Controls.DataGrid/DataGridBoundColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridBoundColumn.cs
index 09c3d07a41..1e72a07760 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridBoundColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridBoundColumn.cs
@@ -49,13 +49,17 @@ namespace Avalonia.Controls
                     {
                         if(_binding is Avalonia.Data.Binding binding)
                         {
-                            // Force the TwoWay binding mode if there is a Path present.  TwoWay binding requires a Path.
-                            if (!String.IsNullOrEmpty(binding.Path))
+                            if (binding.Mode == BindingMode.OneWayToSource)
+                            {
+                                throw new InvalidOperationException("DataGridColumn doesn't support BindingMode.OneWayToSource. Use BindingMode.TwoWay instead.");
+                            }
+
+                            if (!String.IsNullOrEmpty(binding.Path) && binding.Mode == BindingMode.Default)
                             {
                                 binding.Mode = BindingMode.TwoWay;
                             } 
 
-                            if (binding.Converter == null)
+                            if (binding.Converter == null && string.IsNullOrEmpty(binding.StringFormat))
                             {
                                 binding.Converter = DataGridValueConverter.Instance;
                             }
diff --git a/src/Avalonia.Controls.DataGrid/DataGridCell.cs b/src/Avalonia.Controls.DataGrid/DataGridCell.cs
index e56c534f50..445dc541a7 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridCell.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridCell.cs
@@ -3,6 +3,7 @@
 // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Shapes;
 using Avalonia.Input;
@@ -12,6 +13,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// Represents an individual <see cref="T:Avalonia.Controls.DataGrid" /> cell.
     /// </summary>
+    [PseudoClasses(":selected", ":current", ":edited", ":invalid")]
     public class DataGridCell : ContentControl
     {
         private const string DATAGRIDCELL_elementRightGridLine = "PART_RightGridLine";
@@ -19,7 +21,7 @@ namespace Avalonia.Controls
         private Rectangle _rightGridLine;
         private DataGridColumn _owningColumn;
 
-        bool _isValid;
+        bool _isValid = true;
 
         public static readonly DirectProperty<DataGridCell, bool> IsValidProperty =
             AvaloniaProperty.RegisterDirect<DataGridCell, bool>(
@@ -121,10 +123,8 @@ namespace Avalonia.Controls
         /// <summary>
         /// Builds the visual tree for the cell control when a new template is applied.
         /// </summary>
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
-            base.OnTemplateApplied(e);
-
             UpdatePseudoClasses();
             _rightGridLine = e.NameScope.Find<Rectangle>(DATAGRIDCELL_elementRightGridLine);
             if (_rightGridLine != null && OwningColumn == null)
@@ -164,7 +164,7 @@ namespace Avalonia.Controls
             if (OwningGrid != null)
             {
                 OwningGrid.OnCellPointerPressed(new DataGridCellPointerPressedEventArgs(this, OwningRow, OwningColumn, e));
-                if (e.MouseButton == MouseButton.Left)
+                if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
                 {
                     if (!e.Handled)
                     //if (!e.Handled && OwningGrid.IsTabStop)
@@ -182,7 +182,18 @@ namespace Avalonia.Controls
 
         internal void UpdatePseudoClasses()
         {
+            if (OwningGrid == null || OwningColumn == null || OwningRow == null || !OwningRow.IsVisible || OwningRow.Slot == -1)
+            {
+                return;
+            }
+
+            PseudoClasses.Set(":selected", OwningRow.IsSelected);
+
+            PseudoClasses.Set(":current", IsCurrent);
+
+            PseudoClasses.Set(":edited", IsEdited);
 
+            PseudoClasses.Set(":invalid", !IsValid);
         }
 
         // Makes sure the right gridline has the proper stroke and visibility. If lastVisibleColumn is specified, the 
diff --git a/src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs
index f1bbea9949..e2a067ac61 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs
@@ -17,9 +17,7 @@ namespace Avalonia.Controls
     /// </summary>
     public class DataGridCheckBoxColumn : DataGridBoundColumn
     {
-
         private bool _beganEditWithKeyboard;
-        private bool _isThreeState;
         private CheckBox _currentCheckBox;
         private DataGrid _owningGrid;
 
@@ -31,6 +29,12 @@ namespace Avalonia.Controls
             BindingTarget = CheckBox.IsCheckedProperty;
         }
 
+        /// <summary>
+        /// Defines the <see cref="IsThreeState"/> property.
+        /// </summary>
+        public static StyledProperty<bool> IsThreeStateProperty =
+            CheckBox.IsThreeStateProperty.AddOwner<DataGridCheckBoxColumn>();
+
         /// <summary>
         /// Gets or sets a value that indicates whether the hosted <see cref="T:System.Windows.Controls.CheckBox" /> controls allow three states or two. 
         /// </summary>
@@ -39,17 +43,17 @@ namespace Avalonia.Controls
         /// </returns>
         public bool IsThreeState
         {
-            get
-            {
-                return _isThreeState;
-            }
-            set
+            get => GetValue(IsThreeStateProperty);
+            set => SetValue(IsThreeStateProperty, value);
+        }
+
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == IsThreeStateProperty)
             {
-                if (_isThreeState != value)
-                {
-                    _isThreeState = value;
-                    NotifyPropertyChanged(nameof(IsThreeState));
-                }
+                NotifyPropertyChanged(change.Property.Name);
             }
         }
 
@@ -203,9 +207,9 @@ namespace Avalonia.Controls
             {
                 throw new ArgumentNullException("element");
             }
-            if(element is CheckBox checkBox)
+            if (element is CheckBox checkBox)
             {
-                checkBox.IsThreeState = IsThreeState;
+                DataGridHelper.SyncColumnProperty(this, checkBox, IsThreeStateProperty);
             }
             else
             {
@@ -229,7 +233,7 @@ namespace Avalonia.Controls
         {
             checkBox.HorizontalAlignment = HorizontalAlignment.Center;
             checkBox.VerticalAlignment = VerticalAlignment.Center;
-            checkBox.IsThreeState = IsThreeState;
+            DataGridHelper.SyncColumnProperty(this, checkBox, IsThreeStateProperty);
         }
 
         private bool EnsureOwningGrid()
diff --git a/src/Avalonia.Controls.DataGrid/DataGridColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
index 128fbde0c1..92ddd4e736 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
@@ -665,6 +665,7 @@ namespace Avalonia.Controls
         /// <param name="dataItem">
         /// The data item represented by the row that contains the intended cell.
         /// </param>
+        /// <param name="binding">When the method returns, contains the applied binding.</param>
         /// <returns>
         /// A new editing element that is bound to the column's <see cref="P:Avalonia.Controls.DataGridBoundColumn.Binding" /> property value.
         /// </returns>
@@ -1047,4 +1048,4 @@ namespace Avalonia.Controls
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs b/src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs
index d1651b2d09..7f8d205949 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs
@@ -13,12 +13,15 @@ using System.Diagnostics;
 using Avalonia.Utilities;
 using System;
 using Avalonia.Controls.Utils;
+using Avalonia.Controls.Mixins;
+using Avalonia.Controls.Metadata;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// Represents an individual <see cref="T:Avalonia.Controls.DataGrid" /> column header.
     /// </summary>
+    [PseudoClasses(":dragIndicator", ":pressed", ":sortascending", ":sortdescending")]
     public class DataGridColumnHeader : ContentControl
     {
         private enum DragMode
@@ -39,7 +42,7 @@ namespace Avalonia.Controls
         private static Cursor _originalCursor;
         private static double _originalHorizontalOffset;
         private static double _originalWidth;
-        private bool _desiredSeparatorVisibility;
+        private bool _desiredSeparatorVisibility = true;
         private static Point? _dragStart;
         private static DataGridColumn _dragColumn;
         private static double _frozenColumnsWidth;
@@ -67,7 +70,8 @@ namespace Avalonia.Controls
 
         static DataGridColumnHeader()
         {
-            AreSeparatorsVisibleProperty.Changed.AddClassHandler<DataGridColumnHeader>((x,e) => x.OnAreSeparatorsVisibleChanged(e));
+            AreSeparatorsVisibleProperty.Changed.AddClassHandler<DataGridColumnHeader>((x, e) => x.OnAreSeparatorsVisibleChanged(e));
+            PressedMixin.Attach<DataGridColumnHeader>();
         }
 
         /// <summary>
@@ -103,7 +107,7 @@ namespace Avalonia.Controls
         {
             get;
             set;
-        } 
+        }
         internal DataGrid OwningGrid => OwningColumn?.OwningGrid;
 
         internal int ColumnIndex
@@ -116,19 +120,19 @@ namespace Avalonia.Controls
                 }
                 return OwningColumn.Index;
             }
-        } 
+        }
 
         internal ListSortDirection? CurrentSortingState
         {
             get;
             private set;
-        } 
+        }
 
         private bool IsMouseOver
         {
             get;
             set;
-        } 
+        }
 
         private bool IsPressed
         {
@@ -149,8 +153,7 @@ namespace Avalonia.Controls
             }
         }
 
-        //TODO Implement
-        internal void ApplyState()
+        internal void UpdatePseudoClasses()
         {
             CurrentSortingState = null;
             if (OwningGrid != null
@@ -158,15 +161,16 @@ namespace Avalonia.Controls
                 && OwningGrid.DataConnection.AllowSort)
             {
                 var sort = OwningColumn.GetSortDescription();
-                if(sort != null)
+                if (sort != null)
                 {
-                    CurrentSortingState = sort.Descending ? ListSortDirection.Descending : ListSortDirection.Ascending;
+                    CurrentSortingState = sort.Direction;
                 }
             }
-            PseudoClasses.Set(":sortascending", 
-                CurrentSortingState.HasValue && CurrentSortingState.Value == ListSortDirection.Ascending);
-            PseudoClasses.Set(":sortdescending", 
-                CurrentSortingState.HasValue && CurrentSortingState.Value == ListSortDirection.Descending);
+
+            PseudoClasses.Set(":sortascending",
+                CurrentSortingState == ListSortDirection.Ascending);
+            PseudoClasses.Set(":sortdescending",
+                CurrentSortingState == ListSortDirection.Descending);
         }
 
         internal void UpdateSeparatorVisibility(DataGridColumn lastVisibleColumn)
@@ -190,101 +194,111 @@ namespace Avalonia.Controls
             }
         }
 
-        internal void OnMouseLeftButtonUp_Click(InputModifiers inputModifiers, ref bool handled)
+        internal void OnMouseLeftButtonUp_Click(KeyModifiers keyModifiers, ref bool handled)
         {
             // completed a click without dragging, so we're sorting
-            InvokeProcessSort(inputModifiers);
+            InvokeProcessSort(keyModifiers);
             handled = true;
-        } 
+        }
 
-        internal void InvokeProcessSort(InputModifiers inputModifiers)
+        internal void InvokeProcessSort(KeyModifiers keyModifiers)
         {
             Debug.Assert(OwningGrid != null);
-            if (OwningGrid.WaitForLostFocus(() => InvokeProcessSort(inputModifiers)))
+            if (OwningGrid.WaitForLostFocus(() => InvokeProcessSort(keyModifiers)))
             {
                 return;
             }
             if (OwningGrid.CommitEdit(DataGridEditingUnit.Row, exitEditingMode: true))
             {
-                Avalonia.Threading.Dispatcher.UIThread.Post(() => ProcessSort(inputModifiers));
+                Avalonia.Threading.Dispatcher.UIThread.Post(() => ProcessSort(keyModifiers));
             }
-        } 
+        }
 
         //TODO GroupSorting
-        internal void ProcessSort(InputModifiers inputModifiers)
+        internal void ProcessSort(KeyModifiers keyModifiers)
         {
             // if we can sort:
-            //  - DataConnection.AllowSort is true, and
             //  - AllowUserToSortColumns and CanSort are true, and
-            //  - OwningColumn is bound, and
-            //  - SortDescriptionsCollection exists, and
-            //  - the column's data type is comparable
+            //  - OwningColumn is bound
             // then try to sort
             if (OwningColumn != null
                 && OwningGrid != null
                 && OwningGrid.EditingRow == null
                 && OwningColumn != OwningGrid.ColumnsInternal.FillerColumn
-                && OwningGrid.DataConnection.AllowSort
                 && OwningGrid.CanUserSortColumns
-                && OwningColumn.CanUserSort
-                && OwningGrid.DataConnection.SortDescriptions != null)
+                && OwningColumn.CanUserSort)
             {
-                DataGrid owningGrid = OwningGrid;
+                var ea = new DataGridColumnEventArgs(OwningColumn);
+                OwningGrid.OnColumnSorting(ea);
 
-                DataGridSortDescription newSort;
+                if (!ea.Handled && OwningGrid.DataConnection.AllowSort && OwningGrid.DataConnection.SortDescriptions != null)
+                {
+                    // - DataConnection.AllowSort is true, and
+                    // - SortDescriptionsCollection exists, and
+                    // - the column's data type is comparable
 
-                KeyboardHelper.GetMetaKeyState(inputModifiers, out bool ctrl, out bool shift);
+                    DataGrid owningGrid = OwningGrid;
+                    DataGridSortDescription newSort;
 
-                DataGridSortDescription sort = OwningColumn.GetSortDescription();
-                IDataGridCollectionView collectionView = owningGrid.DataConnection.CollectionView;
-                Debug.Assert(collectionView != null);
-                using (collectionView.DeferRefresh())
-                {
-                    // if shift is held down, we multi-sort, therefore if it isn't, we'll clear the sorts beforehand
-                    if (!shift || owningGrid.DataConnection.SortDescriptions.Count == 0)
-                    {
-                        owningGrid.DataConnection.SortDescriptions.Clear();
-                    }
+                    KeyboardHelper.GetMetaKeyState(keyModifiers, out bool ctrl, out bool shift);
 
-                    if (sort != null)
-                    {
-                        newSort = sort.SwitchSortDirection();
+                    DataGridSortDescription sort = OwningColumn.GetSortDescription();
+                    IDataGridCollectionView collectionView = owningGrid.DataConnection.CollectionView;
+                    Debug.Assert(collectionView != null);
 
-                        // changing direction should not affect sort order, so we replace this column's
-                        // sort description instead of just adding it to the end of the collection
-                        int oldIndex = owningGrid.DataConnection.SortDescriptions.IndexOf(sort);
-                        if (oldIndex >= 0)
-                        {
-                            owningGrid.DataConnection.SortDescriptions.Remove(sort);
-                            owningGrid.DataConnection.SortDescriptions.Insert(oldIndex, newSort);
-                        }
-                        else
-                        {
-                            owningGrid.DataConnection.SortDescriptions.Add(newSort);
-                        }
-                    }
-                    else
+                    using (collectionView.DeferRefresh())
                     {
-                        string propertyName = OwningColumn.GetSortPropertyName();
-                        // no-opt if we couldn't find a property to sort on
-                        if (string.IsNullOrEmpty(propertyName))
+                        // if shift is held down, we multi-sort, therefore if it isn't, we'll clear the sorts beforehand
+                        if (!shift || owningGrid.DataConnection.SortDescriptions.Count == 0)
                         {
-                            return;
+                            owningGrid.DataConnection.SortDescriptions.Clear();
                         }
 
-                        newSort = DataGridSortDescription.FromPath(propertyName, culture: collectionView.Culture);
-                        owningGrid.DataConnection.SortDescriptions.Add(newSort);
+                        // if ctrl is held down, we only clear the sort directions
+                        if (!ctrl)
+                        {
+                            if (sort != null)
+                            {
+                                newSort = sort.SwitchSortDirection();
+
+                                // changing direction should not affect sort order, so we replace this column's
+                                // sort description instead of just adding it to the end of the collection
+                                int oldIndex = owningGrid.DataConnection.SortDescriptions.IndexOf(sort);
+                                if (oldIndex >= 0)
+                                {
+                                    owningGrid.DataConnection.SortDescriptions.Remove(sort);
+                                    owningGrid.DataConnection.SortDescriptions.Insert(oldIndex, newSort);
+                                }
+                                else
+                                {
+                                    owningGrid.DataConnection.SortDescriptions.Add(newSort);
+                                }
+                            }
+                            else
+                            {
+                                string propertyName = OwningColumn.GetSortPropertyName();
+                                // no-opt if we couldn't find a property to sort on
+                                if (string.IsNullOrEmpty(propertyName))
+                                {
+                                    return;
+                                }
+
+                                newSort = DataGridSortDescription.FromPath(propertyName, culture: collectionView.Culture);
+
+                                owningGrid.DataConnection.SortDescriptions.Add(newSort);
+                            }
+                        }
                     }
                 }
             }
-        } 
+        }
 
         private bool CanReorderColumn(DataGridColumn column)
         {
-            return OwningGrid.CanUserReorderColumns 
+            return OwningGrid.CanUserReorderColumns
                 && !(column is DataGridFillerColumn)
                 && (column.CanUserReorderInternal.HasValue && column.CanUserReorderInternal.Value || !column.CanUserReorderInternal.HasValue);
-        } 
+        }
 
         /// <summary>
         /// Determines whether a column can be resized by dragging the border of its header.  If star sizing
@@ -297,12 +311,12 @@ namespace Avalonia.Controls
         private static bool CanResizeColumn(DataGridColumn column)
         {
             if (column.OwningGrid != null && column.OwningGrid.ColumnsInternal != null && column.OwningGrid.UsesStarSizing &&
-                (column.OwningGrid.ColumnsInternal.LastVisibleColumn == column || !DoubleUtil.AreClose(column.OwningGrid.ColumnsInternal.VisibleEdgedColumnsWidth, column.OwningGrid.CellsWidth)))
+                (column.OwningGrid.ColumnsInternal.LastVisibleColumn == column || !MathUtilities.AreClose(column.OwningGrid.ColumnsInternal.VisibleEdgedColumnsWidth, column.OwningGrid.CellsWidth)))
             {
                 return false;
             }
             return column.ActualCanUserResize;
-        }  
+        }
 
         private static bool TrySetResizeColumn(DataGridColumn column)
         {
@@ -316,7 +330,7 @@ namespace Avalonia.Controls
                 return true;
             }
             return false;
-        } 
+        }
 
         //TODO DragDrop
 
@@ -326,8 +340,6 @@ namespace Avalonia.Controls
 
             if (OwningGrid != null && OwningGrid.ColumnHeaders != null)
             {
-                args.Device.Capture(this);
-
                 _dragMode = DragMode.MouseDown;
                 _frozenColumnsWidth = OwningGrid.ColumnsInternal.GetVisibleFrozenEdgedColumnsWidth();
                 _lastMousePositionHeaders = this.Translate(OwningGrid.ColumnHeaders, mousePosition);
@@ -371,7 +383,7 @@ namespace Avalonia.Controls
             {
                 if (_dragMode == DragMode.MouseDown)
                 {
-                   OnMouseLeftButtonUp_Click(args.InputModifiers, ref handled);
+                    OnMouseLeftButtonUp_Click(args.KeyModifiers, ref handled);
                 }
                 else if (_dragMode == DragMode.Reorder)
                 {
@@ -391,7 +403,7 @@ namespace Avalonia.Controls
                 SetDragCursor(mousePosition);
 
                 // Variables that track drag mode states get reset in DataGridColumnHeader_LostMouseCapture
-                args.Device.Capture(null);
+                args.Pointer.Capture(null);
                 OnLostMouseCapture();
                 _dragMode = DragMode.None;
                 handled = true;
@@ -399,8 +411,9 @@ namespace Avalonia.Controls
         }
 
         //TODO DragEvents
-        internal void OnMouseMove(ref bool handled, Point mousePosition, Point mousePositionHeaders)
+        internal void OnMouseMove(PointerEventArgs args, Point mousePosition, Point mousePositionHeaders)
         {
+            var handled = args.Handled;
             if (handled || OwningGrid == null || OwningGrid.ColumnHeaders == null)
             {
                 return;
@@ -424,7 +437,10 @@ namespace Avalonia.Controls
             }
 
             _lastMousePositionHeaders = mousePositionHeaders;
-
+            
+            if (args.Pointer.Captured != this && _dragMode == DragMode.Drag)
+                args.Pointer.Capture(this);
+            
             SetDragCursor(mousePosition);
         }
 
@@ -437,7 +453,7 @@ namespace Avalonia.Controls
 
             Point mousePosition = e.GetPosition(this);
             OnMouseEnter(mousePosition);
-            ApplyState();
+            UpdatePseudoClasses();
         }
 
         private void DataGridColumnHeader_PointerLeave(object sender, PointerEventArgs e)
@@ -448,12 +464,12 @@ namespace Avalonia.Controls
             }
 
             OnMouseLeave();
-            ApplyState();
-        } 
+            UpdatePseudoClasses();
+        }
 
         private void DataGridColumnHeader_PointerPressed(object sender, PointerPressedEventArgs e)
         {
-            if (OwningColumn == null || e.Handled || !IsEnabled || e.MouseButton != MouseButton.Left)
+            if (OwningColumn == null || e.Handled || !IsEnabled || !e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
             {
                 return;
             }
@@ -463,7 +479,7 @@ namespace Avalonia.Controls
             OnMouseLeftButtonDown(ref handled, e, mousePosition);
             e.Handled = handled;
 
-            ApplyState();
+            UpdatePseudoClasses();
         }
 
         private void DataGridColumnHeader_PointerReleased(object sender, PointerReleasedEventArgs e)
@@ -479,7 +495,7 @@ namespace Avalonia.Controls
             OnMouseLeftButtonUp(ref handled, e, mousePosition, mousePositionHeaders);
             e.Handled = handled;
 
-            ApplyState();
+            UpdatePseudoClasses();
         }
 
         private void DataGridColumnHeader_PointerMove(object sender, PointerEventArgs e)
@@ -492,8 +508,7 @@ namespace Avalonia.Controls
             Point mousePosition = e.GetPosition(this);
             Point mousePositionHeaders = e.GetPosition(OwningGrid.ColumnHeaders);
 
-            bool handled = false;
-            OnMouseMove(ref handled, mousePosition, mousePositionHeaders);
+            OnMouseMove(e, mousePosition, mousePositionHeaders);
         }
 
         /// <summary>
@@ -577,7 +592,7 @@ namespace Avalonia.Controls
             {
                 return OwningGrid.Columns.Count - 1;
             }
-        } 
+        }
 
         /// <summary>
         /// Returns true if the mouse is 
@@ -723,7 +738,7 @@ namespace Avalonia.Controls
                     Point targetPosition = new Point(0, 0);
                     if (targetColumn == null || targetColumn == OwningGrid.ColumnsInternal.FillerColumn || targetColumn.IsFrozen != OwningColumn.IsFrozen)
                     {
-                        targetColumn = 
+                        targetColumn =
                             OwningGrid.ColumnsInternal.GetLastColumn(
                                 isVisible: true,
                                 isFrozen: OwningColumn.IsFrozen,
@@ -741,7 +756,7 @@ namespace Avalonia.Controls
 
                 handled = true;
             }
-        } 
+        }
 
         private void OnMouseMove_Resize(ref bool handled, Point mousePositionHeaders)
         {
@@ -764,7 +779,7 @@ namespace Avalonia.Controls
 
                 handled = true;
             }
-        } 
+        }
 
         private void SetDragCursor(Point mousePosition)
         {
diff --git a/src/Avalonia.Controls.DataGrid/DataGridColumns.cs b/src/Avalonia.Controls.DataGrid/DataGridColumns.cs
index 16b63ad696..46bcd0d347 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridColumns.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridColumns.cs
@@ -33,6 +33,11 @@ namespace Avalonia.Controls
             ColumnReordering?.Invoke(this, e);
         }
 
+        protected internal virtual void OnColumnSorting(DataGridColumnEventArgs e)
+        {
+            Sorting?.Invoke(this, e);
+        }
+
         /// <summary>
         /// Adjusts the widths of all columns with DisplayIndex >= displayIndex such that the total
         /// width is adjusted by the given amount, if possible.  If the total desired adjustment amount
@@ -44,7 +49,7 @@ namespace Avalonia.Controls
         /// <returns>The remaining amount of adjustment.</returns>
         internal double AdjustColumnWidths(int displayIndex, double amount, bool userInitiated)
         {
-            if (!DoubleUtil.IsZero(amount))
+            if (!MathUtilities.IsZero(amount))
             {
                 if (amount < 0)
                 {
@@ -777,7 +782,7 @@ namespace Avalonia.Controls
         private double AdjustStarColumnWidths(int displayIndex, double adjustment, bool userInitiated)
         {
             double remainingAdjustment = adjustment;
-            if (DoubleUtil.IsZero(remainingAdjustment))
+            if (MathUtilities.IsZero(remainingAdjustment))
             {
                 return remainingAdjustment;
             }
@@ -843,7 +848,7 @@ namespace Avalonia.Controls
         /// <returns>The remaining amount of adjustment.</returns>
         private double AdjustStarColumnWidths(int displayIndex, double remainingAdjustment, bool userInitiated, Func<DataGridColumn, double> targetWidth)
         {
-            if (DoubleUtil.IsZero(remainingAdjustment))
+            if (MathUtilities.IsZero(remainingAdjustment))
             {
                 return remainingAdjustment;
             }
@@ -1244,7 +1249,7 @@ namespace Avalonia.Controls
             Debug.Assert(amount < 0);
             Debug.Assert(column.Width.UnitType != DataGridLengthUnitType.Star);
 
-            if (DoubleUtil.GreaterThanOrClose(targetWidth, column.Width.DisplayValue))
+            if (MathUtilities.GreaterThanOrClose(targetWidth, column.Width.DisplayValue))
             {
                 return amount;
             }
@@ -1271,7 +1276,7 @@ namespace Avalonia.Controls
         /// <returns>The remaining amount of adjustment.</returns>
         private double DecreaseNonStarColumnWidths(int displayIndex, Func<DataGridColumn, double> targetWidth, double amount, bool reverse, bool affectNewColumns)
         {
-            if (DoubleUtil.GreaterThanOrClose(amount, 0))
+            if (MathUtilities.GreaterThanOrClose(amount, 0))
             {
                 return amount;
             }
@@ -1285,7 +1290,7 @@ namespace Avalonia.Controls
                     (affectNewColumns || column.IsInitialDesiredWidthDetermined)))
             {
                 amount = DecreaseNonStarColumnWidth(column, Math.Max(column.ActualMinWidth, targetWidth(column)), amount);
-                if (DoubleUtil.IsZero(amount))
+                if (MathUtilities.IsZero(amount))
                 {
                     break;
                 }
@@ -1392,7 +1397,7 @@ namespace Avalonia.Controls
         /// <returns>The remaining amount of adjustment.</returns>
         private double IncreaseNonStarColumnWidths(int displayIndex, Func<DataGridColumn, double> targetWidth, double amount, bool reverse, bool affectNewColumns)
         {
-            if (DoubleUtil.LessThanOrClose(amount, 0))
+            if (MathUtilities.LessThanOrClose(amount, 0))
             {
                 return amount;
             }
@@ -1406,7 +1411,7 @@ namespace Avalonia.Controls
                     (affectNewColumns || column.IsInitialDesiredWidthDetermined)))
             {
                 amount = IncreaseNonStarColumnWidth(column, Math.Min(column.ActualMaxWidth, targetWidth(column)), amount);
-                if (DoubleUtil.IsZero(amount))
+                if (MathUtilities.IsZero(amount))
                 {
                     break;
                 }
diff --git a/src/Avalonia.Controls.DataGrid/DataGridDataConnection.cs b/src/Avalonia.Controls.DataGrid/DataGridDataConnection.cs
index e21ee3be37..a94acdec57 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridDataConnection.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridDataConnection.cs
@@ -77,24 +77,7 @@ namespace Avalonia.Controls
             private set;
         }
 
-        public int Count
-        {
-            get
-            {
-                IList list = List;
-                if (list != null)
-                {
-                    return list.Count;
-                }
-
-                if(DataSource is DataGridCollectionView cv)
-                {
-                    return cv.Count;
-                }
-
-                return DataSource?.Cast<object>().Count() ?? 0;
-            }
-        }
+        public int Count => GetCount(true);
 
         public bool DataIsPrimitive
         {
@@ -210,6 +193,24 @@ namespace Avalonia.Controls
             }
         }
 
+        internal bool Any()
+        {
+            return GetCount(false) > 0;
+        }
+
+        /// <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)
+        {
+            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
+            };
+        }
+
         /// <summary>
         /// Puts the entity into editing mode if possible
         /// </summary>
@@ -610,7 +611,7 @@ namespace Avalonia.Controls
             // refresh sort description
             foreach (DataGridColumn column in _owner.ColumnsItemsInternal)
             {
-                column.HeaderCell.ApplyState();
+                column.HeaderCell.UpdatePseudoClasses();
             }
         }
 
@@ -675,6 +676,8 @@ namespace Avalonia.Controls
                     }
                     break;
             }
+
+            _owner.UpdatePseudoClasses();
         }
 
         private void UpdateDataProperties()
diff --git a/src/Avalonia.Controls.DataGrid/DataGridLength.cs b/src/Avalonia.Controls.DataGrid/DataGridLength.cs
index 6a545a35ec..4841ddd494 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridLength.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridLength.cs
@@ -529,7 +529,7 @@ namespace Avalonia.Controls
                     //  in this case drop value part and print only "Star"
                     case DataGridLengthUnitType.Star:
                         return (
-                            DoubleUtil.AreClose(1.0, dataGridLength.Value.Value)
+                            MathUtilities.AreClose(1.0, dataGridLength.Value.Value)
                             ? _starSuffix
                             : Convert.ToString(dataGridLength.Value.Value, culture ?? CultureInfo.CurrentCulture) + DataGridLengthConverter._starSuffix);
 
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRow.cs b/src/Avalonia.Controls.DataGrid/DataGridRow.cs
index c9924660be..c3562c53a4 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridRow.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRow.cs
@@ -3,6 +3,7 @@
 // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Shapes;
 using Avalonia.Controls.Templates;
@@ -20,6 +21,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// Represents a <see cref="T:Avalonia.Controls.DataGrid" /> row.
     /// </summary>
+    [PseudoClasses(":selected", ":editing", ":invalid")]
     public class DataGridRow : TemplatedControl
     {
 
@@ -536,10 +538,8 @@ namespace Avalonia.Controls
         /// <summary>
         /// Builds the visual tree for the column header when a new template is applied.
         /// </summary>
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
-            base.OnTemplateApplied(e);
-
             RootElement = e.NameScope.Find<Panel>(DATAGRIDROW_elementRoot);
             if (RootElement != null)
             {
@@ -626,17 +626,17 @@ namespace Avalonia.Controls
         {
             if (_headerElement != null && OwningGrid.AreRowHeadersVisible)
             {
-                _headerElement.ApplyOwnerStatus();
+                _headerElement.UpdatePseudoClasses();
             }
         }
 
-        //TODO Implement
         internal void UpdatePseudoClasses()
         {
-            PseudoClasses.Set(":selected", IsSelected);
-            PseudoClasses.Set(":editing", IsEditing);
             if (RootElement != null && OwningGrid != null && IsVisible)
             {
+                PseudoClasses.Set(":selected", IsSelected);
+                PseudoClasses.Set(":editing", IsEditing);
+                PseudoClasses.Set(":invalid", !IsValid);
                 ApplyHeaderStatus();
             } 
         }
@@ -769,6 +769,11 @@ namespace Avalonia.Controls
             }
         }
 
+        internal void InvalidateDesiredHeight()
+        {
+            _cellsElement?.InvalidateDesiredHeight();
+        }
+
         internal void ResetGridLine()
         {
             _bottomGridLine = null;
@@ -786,7 +791,7 @@ namespace Avalonia.Controls
 
         private void DataGridRow_PointerPressed(PointerPressedEventArgs e)
         {
-            if(e.MouseButton != MouseButton.Left)
+            if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
             {
                 return;
             }
@@ -881,7 +886,7 @@ namespace Avalonia.Controls
                 && (double.IsNaN(_detailsContent.Height))
                 && (AreDetailsVisible)
                 && (!double.IsNaN(_detailsDesiredHeight))
-                && !DoubleUtil.AreClose(_detailsContent.Bounds.Inflate(_detailsContent.Margin).Height, _detailsDesiredHeight)
+                && !MathUtilities.AreClose(_detailsContent.Bounds.Inflate(_detailsContent.Margin).Height, _detailsDesiredHeight)
                 && Slot != -1)
             {
                 _detailsDesiredHeight = _detailsContent.Bounds.Inflate(_detailsContent.Margin).Height;
@@ -914,23 +919,23 @@ namespace Avalonia.Controls
 
         //TODO Cleanup
         double? _previousDetailsHeight = null;
-
+        
         //TODO Animation 
-        private void DetailsContent_SizeChanged(Rect newValue)
+        private void DetailsContent_HeightChanged(double newValue)
         {
             if (_previousDetailsHeight.HasValue)
             {
                 var oldValue = _previousDetailsHeight.Value;
-                _previousDetailsHeight = newValue.Height;
-                if (newValue.Height != oldValue && newValue.Height != _detailsDesiredHeight)
+                _previousDetailsHeight = newValue;
+                if (newValue != oldValue && newValue != _detailsDesiredHeight)
                 {
 
                     if (AreDetailsVisible && _appliedDetailsTemplate != null)
                     {
                         // Update the new desired height for RowDetails
-                        _detailsDesiredHeight = newValue.Height;
+                        _detailsDesiredHeight = newValue;
 
-                        _detailsElement.ContentHeight = newValue.Height;
+                        _detailsElement.ContentHeight = newValue;
 
                         // Calling this when details are not visible invalidates during layout when we have no work 
                         // to do.  In certain scenarios, this could cause a layout cycle
@@ -940,19 +945,29 @@ namespace Avalonia.Controls
             }
             else
             {
-                _previousDetailsHeight = newValue.Height;
+                _previousDetailsHeight = newValue;
             }
         }
-        private void DetailsContent_BoundsChanged(Rect newValue)
+
+        private void DetailsContent_SizeChanged(Rect newValue)
         {
-            if(_detailsContent != null)
-                DetailsContent_SizeChanged(newValue.Inflate(_detailsContent.Margin));
+            DetailsContent_HeightChanged(newValue.Height);
         }
         private void DetailsContent_MarginChanged(Thickness newValue)
         {
             if (_detailsContent != null)
                 DetailsContent_SizeChanged(_detailsContent.Bounds.Inflate(newValue));
         }
+        private void DetailsContent_LayoutUpdated(object sender, EventArgs e)
+        {
+            if (_detailsContent != null)
+            {
+                var margin = _detailsContent.Margin;
+                var height = _detailsContent.DesiredSize.Height + margin.Top + margin.Bottom;
+
+                DetailsContent_HeightChanged(height);
+            }
+        }
 
         //TODO Animation
         // Sets AreDetailsVisible on the row and animates if necessary
@@ -1032,12 +1047,26 @@ namespace Avalonia.Controls
 
                     if (_detailsContent != null)
                     {
-                        _detailsContentSizeSubscription =
-                            System.Reactive.Disposables.StableCompositeDisposable.Create(
-                                _detailsContent.GetObservable(BoundsProperty)
-                                               .Subscribe(DetailsContent_BoundsChanged),
+                        if (_detailsContent is Layout.Layoutable layoutableContent)
+                        {
+                            layoutableContent.LayoutUpdated += DetailsContent_LayoutUpdated;
+
+                            _detailsContentSizeSubscription =
+                                System.Reactive.Disposables.StableCompositeDisposable.Create(
+                                    System.Reactive.Disposables.Disposable.Create(() => layoutableContent.LayoutUpdated -= DetailsContent_LayoutUpdated),
+                                    _detailsContent.GetObservable(MarginProperty)
+                                                   .Subscribe(DetailsContent_MarginChanged));
+
+
+                        }
+                        else
+                        {
+                            _detailsContentSizeSubscription =
                                 _detailsContent.GetObservable(MarginProperty)
-                                               .Subscribe(DetailsContent_MarginChanged));
+                                               .Subscribe(DetailsContent_MarginChanged);
+
+                        }
+                        
                         _detailsElement.Children.Add(_detailsContent);
                     }
                 }
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs b/src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs
index 7dafef9d8b..1e03b134b1 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs
@@ -3,6 +3,8 @@
 // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Media;
@@ -12,6 +14,7 @@ using System.Reactive.Linq;
 
 namespace Avalonia.Controls
 {
+    [PseudoClasses(":pressed", ":current", ":expanded")]
     public class DataGridRowGroupHeader : TemplatedControl
     {
         private const string DATAGRIDROWGROUPHEADER_expanderButton = "ExpanderButton";
@@ -68,25 +71,11 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<DataGridRowGroupHeader, double>(
                 nameof(SublevelIndent),
                 defaultValue: DataGrid.DATAGRID_defaultRowGroupSublevelIndent,
-                validate: ValidateSublevelIndent);
+                validate: IsValidSublevelIndent);
 
-        private static double ValidateSublevelIndent(DataGridRowGroupHeader header, double value)
+        private static bool IsValidSublevelIndent(double value)
         {
-            // We don't need to revert to the old value if our input is bad because we never read this property value
-            if (double.IsNaN(value))
-            {
-                throw DataGridError.DataGrid.ValueCannotBeSetToNAN(nameof(SublevelIndent));
-            }
-            else if (double.IsInfinity(value))
-            {
-                throw DataGridError.DataGrid.ValueCannotBeSetToInfinity(nameof(SublevelIndent));
-            }
-            else if (value < 0)
-            {
-                throw DataGridError.DataGrid.ValueMustBeGreaterThanOrEqualTo(nameof(value), nameof(SublevelIndent), 0);
-            }
-
-            return value;
+            return !double.IsNaN(value) && !double.IsInfinity(value) && value >= 0;
         }
 
         /// <summary>
@@ -110,6 +99,7 @@ namespace Avalonia.Controls
         static DataGridRowGroupHeader()
         {
             SublevelIndentProperty.Changed.AddClassHandler<DataGridRowGroupHeader>((x,e) => x.OnSublevelIndentChanged(e));
+            PressedMixin.Attach<DataGridRowGroupHeader>();
         }
 
         /// <summary>
@@ -182,7 +172,7 @@ namespace Avalonia.Controls
 
         private IDisposable _expanderButtonSubscription;
 
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             _rootElement = e.NameScope.Find<Panel>(DataGridRow.DATAGRIDROW_elementRoot);
 
@@ -213,22 +203,24 @@ namespace Avalonia.Controls
             _itemCountElement = e.NameScope.Find<TextBlock>(DATAGRIDROWGROUPHEADER_itemCountElement);
             _propertyNameElement = e.NameScope.Find<TextBlock>(DATAGRIDROWGROUPHEADER_propertyNameElement);
             UpdateTitleElements();
-
-            base.OnTemplateApplied(e);
         }
 
         internal void ApplyHeaderStatus()
         {
             if (_headerElement != null && OwningGrid.AreRowHeadersVisible)
             {
-                _headerElement.ApplyOwnerStatus();
+                _headerElement.UpdatePseudoClasses();
             }
         }
 
-        //TODO Implement
-        internal void ApplyState(bool useTransitions)
+        internal void UpdatePseudoClasses()
         {
+            PseudoClasses.Set(":current", IsCurrent);
 
+            if (RowGroupInfo?.CollectionViewGroup != null)
+            {
+                PseudoClasses.Set(":expanded", RowGroupInfo.IsVisible && RowGroupInfo.CollectionViewGroup.ItemCount > 0);
+            }
         }
 
         protected override Size ArrangeOverride(Size finalSize)
@@ -291,7 +283,7 @@ namespace Avalonia.Controls
         //TODO TabStop
         private void DataGridRowGroupHeader_PointerPressed(PointerPressedEventArgs e)
         {
-            if (OwningGrid != null && e.MouseButton == MouseButton.Left)
+            if (OwningGrid != null && e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
             {
                 if (OwningGrid.IsDoubleClickRecordsClickOnCall(this) && !e.Handled)
                 {
@@ -344,7 +336,7 @@ namespace Avalonia.Controls
         {
             if (_headerElement != null && OwningGrid != null)
             {
-                _headerElement.IsVisible = OwningGrid.AreColumnHeadersVisible;
+                _headerElement.IsVisible = OwningGrid.AreRowHeadersVisible;
             }
         }
 
@@ -360,7 +352,7 @@ namespace Avalonia.Controls
         {
             EnsureExpanderButtonIsChecked();
             EnsureHeaderVisibility();
-            ApplyState(useTransitions: false);
+            UpdatePseudoClasses();
             ApplyHeaderStatus();
         }
 
@@ -369,7 +361,7 @@ namespace Avalonia.Controls
             if (IsEnabled)
             {
                 IsMouseOver = true;
-                ApplyState(useTransitions: true);
+                UpdatePseudoClasses();
             }
 
             base.OnPointerEnter(e);
@@ -380,7 +372,7 @@ namespace Avalonia.Controls
             if (IsEnabled)
             {
                 IsMouseOver = false;
-                ApplyState(useTransitions: true);
+                UpdatePseudoClasses();
             }
 
             base.OnPointerLeave(e);
@@ -418,7 +410,7 @@ namespace Avalonia.Controls
 
                 EnsureExpanderButtonIsChecked();
 
-                ApplyState(true /*useTransitions*/);
+                UpdatePseudoClasses();
             }
         }
 
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRowHeader.cs b/src/Avalonia.Controls.DataGrid/DataGridRowHeader.cs
index 5bfe449b63..0cd3589a57 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridRowHeader.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRowHeader.cs
@@ -3,6 +3,7 @@
 // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
+using Avalonia.Controls.Metadata;
 using Avalonia.Input;
 using Avalonia.Media;
 using System.Diagnostics;
@@ -12,9 +13,10 @@ namespace Avalonia.Controls.Primitives
     /// <summary>
     /// Represents an individual <see cref="T:Avalonia.Controls.DataGrid" /> row header. 
     /// </summary>
+    [PseudoClasses(":invalid", ":selected", ":editing", ":current")]
     public class DataGridRowHeader : ContentControl
     {
-        private const string DATAGRIDROWHEADER_elementRootName = "Root";
+        private const string DATAGRIDROWHEADER_elementRootName = "PART_Root";
         private const double DATAGRIDROWHEADER_separatorThickness = 1;
 
         private Control _rootElement;
@@ -94,14 +96,12 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Builds the visual tree for the row header when a new template is applied. 
         /// </summary>
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
-            base.OnTemplateApplied(e);
-
             _rootElement = e.NameScope.Find<Control>(DATAGRIDROWHEADER_elementRootName);
             if (_rootElement != null)
             {
-                ApplyOwnerStatus();
+                UpdatePseudoClasses();
             }
         } 
 
@@ -133,12 +133,27 @@ namespace Avalonia.Controls.Primitives
             return measuredSize;
         }
 
-        //TODO Implement
-        internal void ApplyOwnerStatus()
+        internal void UpdatePseudoClasses()
         {
             if (_rootElement != null && Owner != null && Owner.IsVisible)
             {
+                if (OwningRow != null)
+                {
+                    PseudoClasses.Set(":invalid", !OwningRow.IsValid);
+
+                    PseudoClasses.Set(":selected", OwningRow.IsSelected);
 
+                    PseudoClasses.Set(":editing", OwningRow.IsEditing);
+
+                    if (OwningGrid != null)
+                    {
+                        PseudoClasses.Set(":current", OwningRow.Slot == OwningGrid.CurrentSlot);
+                    }
+                }
+                else if (OwningRowGroupHeader != null && OwningGrid != null)
+                {
+                    PseudoClasses.Set(":current", OwningRowGroupHeader.RowGroupInfo.Slot == OwningGrid.CurrentSlot);
+                }
             }
         }
 
@@ -164,7 +179,7 @@ namespace Avalonia.Controls.Primitives
         //TODO TabStop
         private void DataGridRowHeader_PointerPressed(object sender, PointerPressedEventArgs e)
         {
-            if(e.MouseButton != MouseButton.Left)
+            if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
             {
                 return;
             }
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRows.cs b/src/Avalonia.Controls.DataGrid/DataGridRows.cs
index fda14cf5b4..a69b8eafe1 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridRows.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRows.cs
@@ -329,7 +329,7 @@ namespace Avalonia.Controls
 
         internal void OnRowsMeasure()
         {
-            if (!DoubleUtil.IsZero(DisplayData.PendingVerticalScrollHeight))
+            if (!MathUtilities.IsZero(DisplayData.PendingVerticalScrollHeight))
             {
                 ScrollSlotsByHeight(DisplayData.PendingVerticalScrollHeight);
                 DisplayData.PendingVerticalScrollHeight = 0;
@@ -432,7 +432,7 @@ namespace Avalonia.Controls
             }
             else if (DisplayData.FirstScrollingSlot == slot && slot != -1)
             {
-                if (!DoubleUtil.IsZero(NegVerticalOffset))
+                if (!MathUtilities.IsZero(NegVerticalOffset))
                 {
                     // First displayed row is partially scrolled of. Let's scroll it so that NegVerticalOffset becomes 0.
                     DisplayData.PendingVerticalScrollHeight = -NegVerticalOffset;
@@ -447,7 +447,7 @@ namespace Avalonia.Controls
             {
                 // Scroll up to the new row so it becomes the first displayed row
                 firstFullSlot = DisplayData.FirstScrollingSlot - 1;
-                if (DoubleUtil.GreaterThan(NegVerticalOffset, 0))
+                if (MathUtilities.GreaterThan(NegVerticalOffset, 0))
                 {
                     deltaY = -NegVerticalOffset;
                 }
@@ -470,7 +470,7 @@ namespace Avalonia.Controls
                 // Figure out how much of the last row is cut off
                 double rowHeight = GetExactSlotElementHeight(DisplayData.LastScrollingSlot);
                 double availableHeight = AvailableSlotElementRoom + rowHeight;
-                if (DoubleUtil.AreClose(rowHeight, availableHeight))
+                if (MathUtilities.AreClose(rowHeight, availableHeight))
                 {
                     if (DisplayData.LastScrollingSlot == slot)
                     {
@@ -499,7 +499,7 @@ namespace Avalonia.Controls
                 {
                     ResetDisplayedRows();
                 }
-                if (DoubleUtil.GreaterThanOrClose(GetExactSlotElementHeight(slot), CellsHeight))
+                if (MathUtilities.GreaterThanOrClose(GetExactSlotElementHeight(slot), CellsHeight))
                 {
                     // The entire row won't fit in the DataGrid so we start showing it from the top
                     NegVerticalOffset = 0;
@@ -519,7 +519,7 @@ namespace Avalonia.Controls
             }
 
             // 
-            Debug.Assert(DoubleUtil.LessThanOrClose(NegVerticalOffset, _verticalOffset));
+            Debug.Assert(MathUtilities.LessThanOrClose(NegVerticalOffset, _verticalOffset));
 
             SetVerticalOffset(_verticalOffset);
 
@@ -1660,7 +1660,7 @@ namespace Avalonia.Controls
         private void ScrollSlotsByHeight(double height)
         {
             Debug.Assert(DisplayData.FirstScrollingSlot >= 0);
-            Debug.Assert(!DoubleUtil.IsZero(height));
+            Debug.Assert(!MathUtilities.IsZero(height));
 
             _scrollingByHeight = true;
             try
@@ -1672,7 +1672,7 @@ namespace Avalonia.Controls
                 {
                     // Scrolling Down
                     int lastVisibleSlot = GetPreviousVisibleSlot(SlotCount);
-                    if (_vScrollBar != null && DoubleUtil.AreClose(_vScrollBar.Maximum, newVerticalOffset))
+                    if (_vScrollBar != null && MathUtilities.AreClose(_vScrollBar.Maximum, newVerticalOffset))
                     {
                         // We've scrolled to the bottom of the ScrollBar, automatically place the user at the very bottom
                         // of the DataGrid.  If this produces very odd behavior, evaluate the coping strategy used by
@@ -1684,7 +1684,7 @@ namespace Avalonia.Controls
                     else
                     {
                         deltaY = GetSlotElementHeight(newFirstScrollingSlot) - NegVerticalOffset;
-                        if (DoubleUtil.LessThan(height, deltaY))
+                        if (MathUtilities.LessThan(height, deltaY))
                         {
                             // We've merely covered up more of the same row we're on
                             NegVerticalOffset += height;
@@ -1707,7 +1707,7 @@ namespace Avalonia.Controls
                             }
                             else
                             {
-                                while (DoubleUtil.LessThanOrClose(deltaY, height))
+                                while (MathUtilities.LessThanOrClose(deltaY, height))
                                 {
                                     if (newFirstScrollingSlot < lastVisibleSlot)
                                     {
@@ -1727,7 +1727,7 @@ namespace Avalonia.Controls
 
                                     double rowHeight = GetExactSlotElementHeight(newFirstScrollingSlot);
                                     double remainingHeight = height - deltaY;
-                                    if (DoubleUtil.LessThanOrClose(rowHeight, remainingHeight))
+                                    if (MathUtilities.LessThanOrClose(rowHeight, remainingHeight))
                                     {
                                         deltaY += rowHeight;
                                     }
@@ -1744,7 +1744,7 @@ namespace Avalonia.Controls
                 else
                 {
                     // Scrolling Up
-                    if (DoubleUtil.GreaterThanOrClose(height + NegVerticalOffset, 0))
+                    if (MathUtilities.GreaterThanOrClose(height + NegVerticalOffset, 0))
                     {
                         // We've merely exposing more of the row we're on
                         NegVerticalOffset += height;
@@ -1778,7 +1778,7 @@ namespace Avalonia.Controls
                         else
                         {
                             int lastScrollingSlot = DisplayData.LastScrollingSlot;
-                            while (DoubleUtil.GreaterThan(deltaY, height))
+                            while (MathUtilities.GreaterThan(deltaY, height))
                             {
                                 if (newFirstScrollingSlot > 0)
                                 {
@@ -1797,7 +1797,7 @@ namespace Avalonia.Controls
                                 }
                                 double rowHeight = GetExactSlotElementHeight(newFirstScrollingSlot);
                                 double remainingHeight = height - deltaY;
-                                if (DoubleUtil.LessThanOrClose(rowHeight + remainingHeight, 0))
+                                if (MathUtilities.LessThanOrClose(rowHeight + remainingHeight, 0))
                                 {
                                     deltaY -= rowHeight;
                                 }
@@ -1809,7 +1809,7 @@ namespace Avalonia.Controls
                             }
                         }
                     }
-                    if (DoubleUtil.GreaterThanOrClose(0, newVerticalOffset) && newFirstScrollingSlot != 0)
+                    if (MathUtilities.GreaterThanOrClose(0, newVerticalOffset) && newFirstScrollingSlot != 0)
                     {
                         // We've scrolled to the top of the ScrollBar, automatically place the user at the very top
                         // of the DataGrid.  If this produces very odd behavior, evaluate the RowHeight estimate.  
@@ -1822,7 +1822,7 @@ namespace Avalonia.Controls
                 }
 
                 double firstRowHeight = GetExactSlotElementHeight(newFirstScrollingSlot);
-                if (DoubleUtil.LessThan(firstRowHeight, NegVerticalOffset))
+                if (MathUtilities.LessThan(firstRowHeight, NegVerticalOffset))
                 {
                     // We've scrolled off more of the first row than what's possible.  This can happen
                     // if the first row got shorter (Ex: Collpasing RowDetails) or if the user has a recycling
@@ -1838,11 +1838,11 @@ namespace Avalonia.Controls
                 UpdateDisplayedRows(newFirstScrollingSlot, CellsHeight);
 
                 double firstElementHeight = GetExactSlotElementHeight(DisplayData.FirstScrollingSlot);
-                if (DoubleUtil.GreaterThan(NegVerticalOffset, firstElementHeight))
+                if (MathUtilities.GreaterThan(NegVerticalOffset, firstElementHeight))
                 {
                     int firstElementSlot = DisplayData.FirstScrollingSlot;
                     // We filled in some rows at the top and now we have a NegVerticalOffset that's greater than the first element
-                    while (newFirstScrollingSlot > 0 && DoubleUtil.GreaterThan(NegVerticalOffset, firstElementHeight))
+                    while (newFirstScrollingSlot > 0 && MathUtilities.GreaterThan(NegVerticalOffset, firstElementHeight))
                     {
                         int previousSlot = GetPreviousVisibleSlot(firstElementSlot);
                         if (previousSlot == -1)
@@ -1872,7 +1872,7 @@ namespace Avalonia.Controls
                 {
                     _verticalOffset = NegVerticalOffset;
                 }
-                else if (DoubleUtil.GreaterThan(NegVerticalOffset, newVerticalOffset))
+                else if (MathUtilities.GreaterThan(NegVerticalOffset, newVerticalOffset))
                 {
                     // The scrolled-in row was larger than anticipated. Adjust the DataGrid so the ScrollBar thumb
                     // can stay in the same place
@@ -1890,8 +1890,8 @@ namespace Avalonia.Controls
 
                 DisplayData.FullyRecycleElements();
 
-                Debug.Assert(DoubleUtil.GreaterThanOrClose(NegVerticalOffset, 0));
-                Debug.Assert(DoubleUtil.GreaterThanOrClose(_verticalOffset, NegVerticalOffset));
+                Debug.Assert(MathUtilities.GreaterThanOrClose(NegVerticalOffset, 0));
+                Debug.Assert(MathUtilities.GreaterThanOrClose(_verticalOffset, NegVerticalOffset));
             }
             finally
             {
@@ -1912,7 +1912,7 @@ namespace Avalonia.Controls
             {
                 // Assume it's a RowGroupHeader
                 DataGridRowGroupHeader groupHeader = element as DataGridRowGroupHeader;
-                groupHeader.ApplyState(useTransitions: true);
+                groupHeader.UpdatePseudoClasses();
             }
         }
 
@@ -2032,7 +2032,7 @@ namespace Avalonia.Controls
             double deltaY = -NegVerticalOffset;
             int visibleScrollingRows = 0;
 
-            if (DoubleUtil.LessThanOrClose(displayHeight, 0) || SlotCount == 0 || ColumnsItemsInternal.Count == 0)
+            if (MathUtilities.LessThanOrClose(displayHeight, 0) || SlotCount == 0 || ColumnsItemsInternal.Count == 0)
             {
                 return;
             }
@@ -2044,7 +2044,7 @@ namespace Avalonia.Controls
             }
 
             int slot = firstDisplayedScrollingSlot;
-            while (slot < SlotCount && !DoubleUtil.GreaterThanOrClose(deltaY, displayHeight))
+            while (slot < SlotCount && !MathUtilities.GreaterThanOrClose(deltaY, displayHeight))
             {
                 deltaY += GetExactSlotElementHeight(slot);
                 visibleScrollingRows++;
@@ -2052,7 +2052,7 @@ namespace Avalonia.Controls
                 slot = GetNextVisibleSlot(slot);
             }
 
-            while (DoubleUtil.LessThan(deltaY, displayHeight) && slot >= 0)
+            while (MathUtilities.LessThan(deltaY, displayHeight) && slot >= 0)
             {
                 slot = GetPreviousVisibleSlot(firstDisplayedScrollingSlot);
                 if (slot >= 0)
@@ -2063,14 +2063,14 @@ namespace Avalonia.Controls
                 }
             }
             // If we're up to the first row, and we still have room left, uncover as much of the first row as we can
-            if (firstDisplayedScrollingSlot == 0 && DoubleUtil.LessThan(deltaY, displayHeight))
+            if (firstDisplayedScrollingSlot == 0 && MathUtilities.LessThan(deltaY, displayHeight))
             {
                 double newNegVerticalOffset = Math.Max(0, NegVerticalOffset - displayHeight + deltaY);
                 deltaY += NegVerticalOffset - newNegVerticalOffset;
                 NegVerticalOffset = newNegVerticalOffset;
             }
 
-            if (DoubleUtil.GreaterThan(deltaY, displayHeight) || (DoubleUtil.AreClose(deltaY, displayHeight) && DoubleUtil.GreaterThan(NegVerticalOffset, 0)))
+            if (MathUtilities.GreaterThan(deltaY, displayHeight) || (MathUtilities.AreClose(deltaY, displayHeight) && MathUtilities.GreaterThan(NegVerticalOffset, 0)))
             {
                 DisplayData.NumTotallyDisplayedScrollingElements = visibleScrollingRows - 1;
             }
@@ -2108,7 +2108,7 @@ namespace Avalonia.Controls
             double deltaY = 0;
             int visibleScrollingRows = 0;
 
-            if (DoubleUtil.LessThanOrClose(displayHeight, 0) || SlotCount == 0 || ColumnsItemsInternal.Count == 0)
+            if (MathUtilities.LessThanOrClose(displayHeight, 0) || SlotCount == 0 || ColumnsItemsInternal.Count == 0)
             {
                 ResetDisplayedRows();
                 return;
@@ -2120,7 +2120,7 @@ namespace Avalonia.Controls
             }
 
             int slot = lastDisplayedScrollingRow;
-            while (DoubleUtil.LessThan(deltaY, displayHeight) && slot >= 0)
+            while (MathUtilities.LessThan(deltaY, displayHeight) && slot >= 0)
             {
                 deltaY += GetExactSlotElementHeight(slot);
                 visibleScrollingRows++;
@@ -2542,7 +2542,7 @@ namespace Avalonia.Controls
                             double heightChange = UpdateRowGroupVisibility(rowGroupInfo, isVisible, isDisplayed: false);
                             // Use epsilon instead of 0 here so that in the off chance that our estimates put the vertical offset negative
                             // the user can still scroll to the top since the offset is non-zero
-                            SetVerticalOffset(Math.Max(DoubleUtil.DBL_EPSILON, _verticalOffset + heightChange));
+                            SetVerticalOffset(Math.Max(MathUtilities.DoubleEpsilon, _verticalOffset + heightChange));
                         }
                         else
                         {
@@ -3024,4 +3024,4 @@ namespace Avalonia.Controls
         }
 #endif
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Controls.DataGrid/DataGridTextColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridTextColumn.cs
index 589cdc253c..1cf6ab68ac 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridTextColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridTextColumn.cs
@@ -9,6 +9,7 @@ using Avalonia.Media;
 using System;
 using System.ComponentModel;
 using Avalonia.Layout;
+using Avalonia.Markup.Xaml.MarkupExtensions;
 
 namespace Avalonia.Controls
 {
@@ -17,11 +18,7 @@ namespace Avalonia.Controls
     /// </summary>
     public class DataGridTextColumn : DataGridBoundColumn
     {
-
-        private double? _fontSize;
-        private FontStyle? _fontStyle;
-        private FontWeight? _fontWeight;
-        private IBrush _foreground;
+        private const string DATAGRID_TextColumnCellTextBlockMarginKey = "DataGridTextColumnCellTextBlockMargin";
 
         /// <summary>
         /// Initializes a new instance of the <see cref="T:Avalonia.Controls.DataGridTextColumn" /> class.
@@ -34,18 +31,24 @@ namespace Avalonia.Controls
         /// <summary>
         /// Identifies the FontFamily dependency property.
         /// </summary>
-        public static readonly StyledProperty<string> FontFamilyProperty =
-            AvaloniaProperty.Register<DataGridTextColumn, string>(nameof(FontFamily));
+        public static readonly AttachedProperty<FontFamily> FontFamilyProperty =
+            TextBlock.FontFamilyProperty.AddOwner<DataGridTextColumn>();
 
         /// <summary>
         /// Gets or sets the font name.
         /// </summary>
-        public string FontFamily
+        public FontFamily FontFamily
         {
-            get { return GetValue(FontFamilyProperty); }
-            set { SetValue(FontFamilyProperty, value); }
+            get => GetValue(FontFamilyProperty);
+            set => SetValue(FontFamilyProperty, value);
         }
 
+        /// <summary>
+        /// Identifies the FontSize dependency property.
+        /// </summary>
+        public static readonly AttachedProperty<double> FontSizeProperty =
+            TextBlock.FontSizeProperty.AddOwner<DataGridTextColumn>();
+
         /// <summary>
         /// Gets or sets the font size.
         /// </summary>
@@ -53,74 +56,66 @@ namespace Avalonia.Controls
         [DefaultValue(double.NaN)]
         public double FontSize
         {
-            get
-            {
-                return _fontSize ?? Double.NaN;
-            }
-            set
-            {
-                if (_fontSize != value)
-                {
-                    _fontSize = value;
-                    NotifyPropertyChanged(nameof(FontSize));
-                }
-            }
+            get => GetValue(FontSizeProperty);
+            set => SetValue(FontSizeProperty, value);
         }
 
+        /// <summary>
+        /// Identifies the FontStyle dependency property.
+        /// </summary>
+        public static readonly AttachedProperty<FontStyle> FontStyleProperty =
+            TextBlock.FontStyleProperty.AddOwner<DataGridTextColumn>();
+
         /// <summary>
         /// Gets or sets the font style.
         /// </summary>
         public FontStyle FontStyle
         {
-            get
-            {
-                return _fontStyle ?? FontStyle.Normal;
-            }
-            set
-            {
-                if (_fontStyle != value)
-                {
-                    _fontStyle = value;
-                    NotifyPropertyChanged(nameof(FontStyle));
-                }
-            }
+            get => GetValue(FontStyleProperty);
+            set => SetValue(FontStyleProperty, value);
         }
 
+        /// <summary>
+        /// Identifies the FontWeight dependency property.
+        /// </summary>
+        public static readonly AttachedProperty<FontWeight> FontWeightProperty =
+            TextBlock.FontWeightProperty.AddOwner<DataGridTextColumn>();
+
         /// <summary>
         /// Gets or sets the font weight or thickness.
         /// </summary>
         public FontWeight FontWeight
         {
-            get
-            {
-                return _fontWeight ?? FontWeight.Normal;
-            }
-            set
-            {
-                if (_fontWeight != value)
-                {
-                    _fontWeight = value;
-                    NotifyPropertyChanged(nameof(FontWeight));
-                }
-            }
+            get => GetValue(FontWeightProperty);
+            set => SetValue(FontWeightProperty, value);
         }
 
+        /// <summary>
+        /// Identifies the Foreground dependency property.
+        /// </summary>
+        public static readonly AttachedProperty<IBrush> ForegroundProperty =
+            TextBlock.ForegroundProperty.AddOwner<DataGridTextColumn>();
+
         /// <summary>
         /// Gets or sets a brush that describes the foreground of the column cells.
         /// </summary>
         public IBrush Foreground
         {
-            get
-            {
-                return _foreground;
-            }
-            set
+            get => GetValue(ForegroundProperty);
+            set => SetValue(ForegroundProperty, value);
+        }
+
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == FontFamilyProperty
+                || change.Property == FontSizeProperty
+                || change.Property == FontStyleProperty
+                || change.Property == FontWeightProperty
+                || change.Property == ForegroundProperty)
             {
-                if (_foreground != value)
-                {
-                    _foreground = value;
-                    NotifyPropertyChanged(nameof(Foreground));
-                }
+                NotifyPropertyChanged(change.Property.Name);
             }
         }
 
@@ -152,26 +147,7 @@ namespace Avalonia.Controls
                 Background = new SolidColorBrush(Colors.Transparent)
             };
 
-            if (IsSet(FontFamilyProperty))
-            {
-                textBox.FontFamily = FontFamily;
-            }
-            if (_fontSize.HasValue)
-            {
-                textBox.FontSize = _fontSize.Value;
-            }
-            if (_fontStyle.HasValue)
-            {
-                textBox.FontStyle = _fontStyle.Value;
-            }
-            if (_fontWeight.HasValue)
-            {
-                textBox.FontWeight = _fontWeight.Value;
-            }
-            if (_foreground != null)
-            {
-                textBox.Foreground = _foreground;
-            }
+            SyncProperties(textBox);
 
             return textBox;
         }
@@ -186,30 +162,12 @@ namespace Avalonia.Controls
         {
             TextBlock textBlockElement = new TextBlock
             {
-                Margin = new Thickness(4),
+                [!Layoutable.MarginProperty] = new DynamicResourceExtension(DATAGRID_TextColumnCellTextBlockMarginKey),
                 VerticalAlignment = VerticalAlignment.Center
             };
 
-            if (IsSet(FontFamilyProperty))
-            {
-                textBlockElement.FontFamily = FontFamily;
-            }
-            if (_fontSize.HasValue)
-            {
-                textBlockElement.FontSize = _fontSize.Value;
-            }
-            if (_fontStyle.HasValue)
-            {
-                textBlockElement.FontStyle = _fontStyle.Value;
-            }
-            if (_fontWeight.HasValue)
-            {
-                textBlockElement.FontWeight = _fontWeight.Value;
-            }
-            if (_foreground != null)
-            {
-                textBlockElement.Foreground = _foreground;
-            }
+            SyncProperties(textBlockElement);
+
             if (Binding != null)
             {
                 textBlockElement.Bind(TextBlock.TextProperty, Binding);
@@ -259,99 +217,42 @@ namespace Avalonia.Controls
                 throw new ArgumentNullException("element");
             }
 
-            if(element is TextBox textBox)
+            if (element is AvaloniaObject content)
             {
                 if (propertyName == nameof(FontFamily))
                 {
-                    textBox.FontFamily = FontFamily;
+                    DataGridHelper.SyncColumnProperty(this, content, FontFamilyProperty);
                 }
                 else if (propertyName == nameof(FontSize))
                 {
-                    SetTextFontSize(textBox, TextBox.FontSizeProperty);
+                    DataGridHelper.SyncColumnProperty(this, content, FontSizeProperty);
                 }
                 else if (propertyName == nameof(FontStyle))
                 {
-                    textBox.FontStyle = FontStyle;
+                    DataGridHelper.SyncColumnProperty(this, content, FontStyleProperty);
                 }
                 else if (propertyName == nameof(FontWeight))
                 {
-                    textBox.FontWeight = FontWeight;
+                    DataGridHelper.SyncColumnProperty(this, content, FontWeightProperty);
                 }
                 else if (propertyName == nameof(Foreground))
                 {
-                    textBox.Foreground = Foreground;
-                }
-                else
-                {
-                    if (FontFamily != null)
-                    {
-                        textBox.FontFamily = FontFamily;
-                    }
-                    SetTextFontSize(textBox, TextBox.FontSizeProperty);
-                    textBox.FontStyle = FontStyle;
-                    textBox.FontWeight = FontWeight;
-                    if (Foreground != null)
-                    {
-                        textBox.Foreground = Foreground;
-                    }
-                }
-
-            }
-            else if (element is TextBlock textBlock)
-            {
-                if (propertyName == nameof(FontFamily))
-                {
-                    textBlock.FontFamily = FontFamily;
-                }
-                else if (propertyName == nameof(FontSize))
-                {
-                    SetTextFontSize(textBlock, TextBlock.FontSizeProperty);
-                }
-                else if (propertyName == nameof(FontStyle))
-                {
-                    textBlock.FontStyle = FontStyle;
-                }
-                else if (propertyName == nameof(FontWeight))
-                {
-                    textBlock.FontWeight = FontWeight;
-                }
-                else if (propertyName == nameof(Foreground))
-                {
-                    textBlock.Foreground = Foreground;
-                }
-                else
-                {
-                    if (FontFamily != null)
-                    {
-                        textBlock.FontFamily = FontFamily;
-                    }
-                    SetTextFontSize(textBlock, TextBlock.FontSizeProperty);
-                    textBlock.FontStyle = FontStyle;
-                    textBlock.FontWeight = FontWeight;
-                    if (Foreground != null)
-                    {
-                        textBlock.Foreground = Foreground;
-                    }
+                    DataGridHelper.SyncColumnProperty(this, content, ForegroundProperty);
                 }
             }
             else
             {
-                throw DataGridError.DataGrid.ValueIsNotAnInstanceOfEitherOr("element", typeof(TextBox), typeof(TextBlock));
+                throw DataGridError.DataGrid.ValueIsNotAnInstanceOf("element", typeof(AvaloniaObject));
             }
         }
 
-        private void SetTextFontSize(AvaloniaObject textElement, AvaloniaProperty fontSizeProperty)
+        private void SyncProperties(AvaloniaObject content)
         {
-            double newFontSize = FontSize;
-            if (double.IsNaN(newFontSize))
-            {
-                textElement.ClearValue(fontSizeProperty);
-            }
-            else
-            {
-                textElement.SetValue(fontSizeProperty, newFontSize);
-            }
+            DataGridHelper.SyncColumnProperty(this, content, FontFamilyProperty);
+            DataGridHelper.SyncColumnProperty(this, content, FontSizeProperty);
+            DataGridHelper.SyncColumnProperty(this, content, FontStyleProperty);
+            DataGridHelper.SyncColumnProperty(this, content, FontWeightProperty);
+            DataGridHelper.SyncColumnProperty(this, content, ForegroundProperty);
         }
-
     }
 }
diff --git a/src/Avalonia.Controls.DataGrid/EventArgs.cs b/src/Avalonia.Controls.DataGrid/EventArgs.cs
index 10e2be795e..7590a8ed61 100644
--- a/src/Avalonia.Controls.DataGrid/EventArgs.cs
+++ b/src/Avalonia.Controls.DataGrid/EventArgs.cs
@@ -289,7 +289,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// Provides data for <see cref="T:Avalonia.Controls.DataGrid" /> column-related events.
     /// </summary>
-    public class DataGridColumnEventArgs : EventArgs
+    public class DataGridColumnEventArgs : HandledEventArgs
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="T:Avalonia.Controls.DataGridColumnEventArgs" /> class.
@@ -566,4 +566,4 @@ namespace Avalonia.Controls
             private set;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs b/src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs
index b014c699bb..c5fe9f0cb2 100644
--- a/src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs
+++ b/src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs
@@ -269,6 +269,9 @@ namespace Avalonia.Controls.Primitives
                 // Since we didn't know the final widths of the columns until we resized,
                 // we waited until now to measure each cell
                 double leftEdge = 0;
+                if (autoSizeHeight)
+                    DesiredHeight = 0;
+
                 foreach (DataGridColumn column in OwningGrid.ColumnsInternal.GetVisibleColumns())
                 {
                     DataGridCell cell = OwningRow.Cells[column.Index];
@@ -296,6 +299,11 @@ namespace Avalonia.Controls.Primitives
             DesiredHeight = 0;
         }
 
+        internal void InvalidateDesiredHeight()
+        {
+            DesiredHeight = 0;
+        }
+
         private bool ShouldDisplayCell(DataGridColumn column, double frozenLeftEdge, double scrollingLeftEdge)
         {
             if (!column.IsVisible)
@@ -307,9 +315,9 @@ namespace Avalonia.Controls.Primitives
             double leftEdge = column.IsFrozen ? frozenLeftEdge : scrollingLeftEdge;
             double rightEdge = leftEdge + column.ActualWidth;
             return 
-                DoubleUtil.GreaterThan(rightEdge, 0) &&
-                DoubleUtil.LessThanOrClose(leftEdge, OwningGrid.CellsWidth) &&
-                DoubleUtil.GreaterThan(rightEdge, frozenLeftEdge); // scrolling column covered up by frozen column(s)
+                MathUtilities.GreaterThan(rightEdge, 0) &&
+                MathUtilities.LessThanOrClose(leftEdge, OwningGrid.CellsWidth) &&
+                MathUtilities.GreaterThan(rightEdge, frozenLeftEdge); // scrolling column covered up by frozen column(s)
         }
     }
 }
diff --git a/src/Avalonia.Controls.DataGrid/Primitives/DataGridFrozenGrid.cs b/src/Avalonia.Controls.DataGrid/Primitives/DataGridFrozenGrid.cs
index 060922238d..9feca71cda 100644
--- a/src/Avalonia.Controls.DataGrid/Primitives/DataGridFrozenGrid.cs
+++ b/src/Avalonia.Controls.DataGrid/Primitives/DataGridFrozenGrid.cs
@@ -14,7 +14,7 @@ namespace Avalonia.Controls.Primitives
     /// </summary>
     public class DataGridFrozenGrid : Grid
     {
-        public static readonly AvaloniaProperty<bool> IsFrozenProperty =
+        public static readonly StyledProperty<bool> IsFrozenProperty =
             AvaloniaProperty.RegisterAttached<DataGridFrozenGrid, Control, bool>("IsFrozen");
 
         /// <summary>
diff --git a/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs b/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs
index 6ad58bf250..76e5427fa4 100644
--- a/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs
+++ b/src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs
@@ -22,6 +22,22 @@ namespace Avalonia.Controls.Primitives
         }
 
         private double _measureHeightOffset = 0;
+        private double _effectiveViewPortHeight = 0;
+
+        public DataGridRowsPresenter()
+        {
+            EffectiveViewportChanged += OnEffectiveViewportChanged;
+        }
+
+        private void OnEffectiveViewportChanged(object sender, Layout.EffectiveViewportChangedEventArgs e)
+        {
+            if (_effectiveViewPortHeight != e.EffectiveViewport.Height)
+            {
+                _effectiveViewPortHeight = e.EffectiveViewport.Height;
+                InvalidateMeasure();
+            }
+        }
+
         private double CalculateEstimatedAvailableHeight(Size availableSize)
         {
             if(!Double.IsPositiveInfinity(availableSize.Height))
@@ -108,6 +124,11 @@ namespace Avalonia.Controls.Primitives
         /// </returns>
         protected override Size MeasureOverride(Size availableSize)
         {
+            if (double.IsInfinity(availableSize.Height))
+            {
+                availableSize = availableSize.WithHeight(_effectiveViewPortHeight);
+            }
+
             if (availableSize.Height == 0 || OwningGrid == null)
             {
                 return base.MeasureOverride(availableSize);
diff --git a/src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs b/src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs
index f15442addf..1b122996d2 100644
--- a/src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs
@@ -1,13 +1,13 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// 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: InternalsVisibleTo("Avalonia.Controls.UnitTests")]
+#if SIGNED_BUILD
+[assembly: InternalsVisibleTo("Avalonia.Controls.DataGrid.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.DesignerSupport, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+#else
+[assembly: InternalsVisibleTo("Avalonia.Controls.DataGrid.UnitTests")]
 [assembly: InternalsVisibleTo("Avalonia.DesignerSupport")]
-
+#endif
 [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
index 7b6870fec3..09d19c8e43 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Default.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Default.xaml
@@ -1,5 +1,11 @@
-<Styles xmlns="https://github.com/avaloniaui">
+<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" />
@@ -28,7 +34,7 @@
     <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
     <Setter Property="HorizontalContentAlignment" Value="Left" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="SeparatorBrush" Value="{DynamicResource ThemeControlDarkBrush}" />
+    <Setter Property="SeparatorBrush" Value="{DynamicResource ThemeControlLowColor}" />
     <Setter Property="Padding" Value="4" />
     <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}"/>
 
@@ -45,7 +51,7 @@
 
             <Path Name="SortIcon"
                   Grid.Column="1"
-                  Fill="#FF444444"
+                  Fill="{TemplateBinding Foreground}"
                   HorizontalAlignment="Left"
                   VerticalAlignment="Center"
                   Stretch="Uniform"
@@ -113,7 +119,7 @@
 
   <Style Selector="DataGridRow /template/ Rectangle#BackgroundRectangle">
     <Setter Property="IsVisible" Value="False"/>
-    <Setter Property="Fill" Value="#FFBADDE9" />
+    <Setter Property="Fill" Value="{DynamicResource HighlightBrush}" />
   </Style>
 
   <Style Selector="DataGridRow:pointerover /template/ Rectangle#BackgroundRectangle">
@@ -126,20 +132,49 @@
     <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
-        RowDefinitions="*,*,Auto"
-        ColumnDefinitions="Auto,*">
+        <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="#FFE4E8EA" />
+    <Setter Property="Background" Value="{DynamicResource ThemeControlMidHighBrush}" />
     <Setter Property="Height" Value="20"/>
     <Setter Property="Template">
       <ControlTemplate>
@@ -148,7 +183,6 @@
                                  ColumnDefinitions="Auto,Auto,Auto,Auto"
                                  RowDefinitions="Auto,*,Auto">
 
-          <Rectangle Grid.Column="1" Grid.ColumnSpan="5" Fill="#FFFFFFFF" Height="1"/>
           <Rectangle Grid.Column="1" Grid.Row="1" Name="IndentSpacer" />
           <ToggleButton Grid.Column="2" Grid.Row="1" Name="ExpanderButton" Margin="2,0,0,0"/>
 
@@ -169,7 +203,7 @@
     <Setter Property="Template">
       <ControlTemplate>
         <Border Grid.Column="0" Width="20" Height="20" Background="Transparent" HorizontalAlignment="Center" VerticalAlignment="Center">
-          <Path Fill="Black"
+          <Path Fill="{TemplateBinding Foreground}"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
                 Data="M 0 2 L 4 6 L 0 10 Z" />
@@ -192,37 +226,36 @@
     <Setter Property="HorizontalScrollBarVisibility" Value="Auto" />
     <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
     <Setter Property="SelectionMode" Value="Extended" />
-    <Setter Property="GridLinesVisibility" Value="Vertical" />
-    <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource ThemeBorderLightBrush}" />
-    <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource ThemeBorderLightBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderDarkBrush}"/>
+    <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="#FF3F4346" Width="2"/>
+        <Rectangle Fill="{DynamicResource ThemeBorderHighColor}" Width="2"/>
       </Template>
     </Setter>
     <Setter Property="Template">
       <ControlTemplate>
-        <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-          <Grid
-          RowDefinitions="Auto,*,Auto,Auto"
-          ColumnDefinitions="Auto,*,Auto">
+        <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="#FFC9CACA"/>
+            <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" />
-            <Rectangle Name="BottomRightCorner" Fill="#FFE9EEF4" Grid.Column="2" Grid.Row="2" />
-            <Rectangle Name="BottomLeftCorner" Fill="#FFE9EEF4" Grid.Row="2" Grid.ColumnSpan="2" />
-            <ScrollBar Name="PART_VerticalScrollbar" Orientation="Vertical" Grid.Column="2" Grid.Row="1" Width="{DynamicResource ScrollBarThickness}" Margin="0,-1,-1,-1"/>
+            <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}" Margin="-1,0,-1,-1"/>
+              <ScrollBar Name="PART_HorizontalScrollbar" Grid.Column="1" Orientation="Horizontal" Height="{DynamicResource ScrollBarThickness}"/>
             </Grid>
           </Grid>
         </Border>
diff --git a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
new file mode 100644
index 0000000000..998198cc1c
--- /dev/null
+++ b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
@@ -0,0 +1,648 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <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="DataGridSortIconAscendingPath">M1875 1011l-787 787v-1798h-128v1798l-787 -787l-90 90l941 941l941 -941z</StreamGeometry>
+    <StreamGeometry x:Key="DataGridSortIconDescendingPath">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>
+
+    <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>
+
+  <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"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       Fill="Transparent"
+                       IsHitTestVisible="False"
+                       Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                       StrokeThickness="1" />
+          </Grid>
+
+          <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="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}" />
+
+            <Path Name="SortIcon"
+                  Grid.Column="1"
+                  Fill="{TemplateBinding Foreground}"
+                  HorizontalAlignment="Center"
+                  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>
+          </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"
+                       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}" />
+
+            <DataGridRowsPresenter Name="PART_RowsPresenter"
+                                   Grid.Row="1"
+                                   Grid.RowSpan="2"
+                                   Grid.ColumnSpan="3" />
+            <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"
+                       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.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>
+</Styles>
diff --git a/src/Avalonia.Controls.DataGrid/Utils/DataGridHelper.cs b/src/Avalonia.Controls.DataGrid/Utils/DataGridHelper.cs
new file mode 100644
index 0000000000..2cf41082ca
--- /dev/null
+++ b/src/Avalonia.Controls.DataGrid/Utils/DataGridHelper.cs
@@ -0,0 +1,22 @@
+namespace Avalonia.Controls
+{
+    internal static class DataGridHelper
+    {
+        internal static void SyncColumnProperty<T>(AvaloniaObject column, AvaloniaObject content, AvaloniaProperty<T> property)
+        {
+            SyncColumnProperty(column, content, property, property);
+        }
+
+        internal static void SyncColumnProperty<T>(AvaloniaObject column, AvaloniaObject content, AvaloniaProperty<T> contentProperty, AvaloniaProperty<T> columnProperty)
+        {
+            if (!column.IsSet(columnProperty))
+            {
+                content.ClearValue(contentProperty);
+            }
+            else
+            {
+                content.SetValue(contentProperty, column.GetValue(columnProperty));
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls.DataGrid/Utils/DoubleUtil.cs b/src/Avalonia.Controls.DataGrid/Utils/DoubleUtil.cs
deleted file mode 100644
index ec0e8836d7..0000000000
--- a/src/Avalonia.Controls.DataGrid/Utils/DoubleUtil.cs
+++ /dev/null
@@ -1,136 +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;
-
-namespace Avalonia.Controls.Utils
-{
-    internal static class DoubleUtil
-    {
-        internal const double DBL_EPSILON = 1e-6;
-
-        /// <summary>
-        /// AreClose - Returns whether or not two doubles are "close".  That is, whether or 
-        /// not they are within epsilon of each other.  Note that this epsilon is proportional
-        /// to the numbers themselves to that AreClose survives scalar multiplication.
-        /// There are plenty of ways for this to return false even for numbers which
-        /// are theoretically identical, so no code calling this should fail to work if this 
-        /// returns false.  This is important enough to repeat:
-        /// NB: NO CODE CALLING THIS FUNCTION SHOULD DEPEND ON ACCURATE RESULTS - this should be
-        /// used for optimizations *only*.
-        /// </summary>
-        /// <returns>
-        /// bool - the result of the AreClose comparison.
-        /// </returns>
-        /// <param name="value1"> The first double to compare. </param>
-        /// <param name="value2"> The second double to compare. </param>
-        public static bool AreClose(double value1, double value2)
-        {
-            //in case they are Infinities (then epsilon check does not work)
-            if (value1 == value2) return true;
-            // This computes (|value1-value2| / (|value1| + |value2| + 10.0)) < DBL_EPSILON
-            double eps = (Math.Abs(value1) + Math.Abs(value2) + 10.0) * DBL_EPSILON;
-            double delta = value1 - value2;
-            return (-eps < delta) && (eps > delta);
-        }
-
-        /// <summary>
-        /// GreaterThan - Returns whether or not the first double is greater than the second double.
-        /// That is, whether or not the first is strictly greater than *and* not within epsilon of
-        /// the other number.  Note that this epsilon is proportional to the numbers themselves
-        /// to that AreClose survives scalar multiplication.  Note,
-        /// There are plenty of ways for this to return false even for numbers which
-        /// are theoretically identical, so no code calling this should fail to work if this 
-        /// returns false.  This is important enough to repeat:
-        /// NB: NO CODE CALLING THIS FUNCTION SHOULD DEPEND ON ACCURATE RESULTS - this should be
-        /// used for optimizations *only*.
-        /// </summary>
-        /// <returns>
-        /// bool - the result of the GreaterThan comparison.
-        /// </returns>
-        /// <param name="value1"> The first double to compare. </param>
-        /// <param name="value2"> The second double to compare. </param>
-        public static bool GreaterThan(double value1, double value2)
-        {
-            return (value1 > value2) && !AreClose(value1, value2);
-        }
-
-        /// <summary>
-        /// GreaterThanOrClose - Returns whether or not the first double is greater than or close to
-        /// the second double.  That is, whether or not the first is strictly greater than or within
-        /// epsilon of the other number.  Note that this epsilon is proportional to the numbers 
-        /// themselves to that AreClose survives scalar multiplication.  Note,
-        /// There are plenty of ways for this to return false even for numbers which
-        /// are theoretically identical, so no code calling this should fail to work if this 
-        /// returns false.  This is important enough to repeat:
-        /// NB: NO CODE CALLING THIS FUNCTION SHOULD DEPEND ON ACCURATE RESULTS - this should be
-        /// used for optimizations *only*.
-        /// </summary>
-        /// <returns>
-        /// bool - the result of the GreaterThanOrClose comparison.
-        /// </returns>
-        /// <param name="value1"> The first double to compare. </param>
-        /// <param name="value2"> The second double to compare. </param>
-        public static bool GreaterThanOrClose(double value1, double value2)
-        {
-            return (value1 > value2) || AreClose(value1, value2);
-        }
-
-        /// <summary>
-        /// IsZero - Returns whether or not the double is "close" to 0.  Same as AreClose(double, 0),
-        /// but this is faster.
-        /// </summary>
-        /// <returns>
-        /// bool - the result of the IsZero comparison.
-        /// </returns>
-        /// <param name="value"> The double to compare to 0. </param>
-        public static bool IsZero(double value)
-        {
-            return Math.Abs(value) < 10.0 * DBL_EPSILON;
-        }
-
-        /// <summary>
-        /// LessThan - Returns whether or not the first double is less than the second double.
-        /// That is, whether or not the first is strictly less than *and* not within epsilon of
-        /// the other number.  Note that this epsilon is proportional to the numbers themselves
-        /// to that AreClose survives scalar multiplication.  Note,
-        /// There are plenty of ways for this to return false even for numbers which
-        /// are theoretically identical, so no code calling this should fail to work if this 
-        /// returns false.  This is important enough to repeat:
-        /// NB: NO CODE CALLING THIS FUNCTION SHOULD DEPEND ON ACCURATE RESULTS - this should be
-        /// used for optimizations *only*.
-        /// </summary>
-        /// <returns>
-        /// bool - the result of the LessThan comparison.
-        /// </returns>
-        /// <param name="value1"> The first double to compare. </param>
-        /// <param name="value2"> The second double to compare. </param>
-        public static bool LessThan(double value1, double value2)
-        {
-            return (value1 < value2) && !AreClose(value1, value2);
-        }
-
-        /// <summary>
-        /// LessThanOrClose - Returns whether or not the first double is less than or close to
-        /// the second double.  That is, whether or not the first is strictly less than or within
-        /// epsilon of the other number.  Note that this epsilon is proportional to the numbers 
-        /// themselves to that AreClose survives scalar multiplication.  Note,
-        /// There are plenty of ways for this to return false even for numbers which
-        /// are theoretically identical, so no code calling this should fail to work if this 
-        /// returns false.  This is important enough to repeat:
-        /// NB: NO CODE CALLING THIS FUNCTION SHOULD DEPEND ON ACCURATE RESULTS - this should be
-        /// used for optimizations *only*.
-        /// </summary>
-        /// <returns>
-        /// bool - the result of the LessThanOrClose comparison.
-        /// </returns>
-        /// <param name="value1"> The first double to compare. </param>
-        /// <param name="value2"> The second double to compare. </param>
-        public static bool LessThanOrClose(double value1, double value2)
-        {
-            return (value1 < value2) || AreClose(value1, value2);
-        }
-    }
-}
diff --git a/src/Avalonia.Controls.DataGrid/Utils/KeyboardHelper.cs b/src/Avalonia.Controls.DataGrid/Utils/KeyboardHelper.cs
index 473ddce3ad..351deceb48 100644
--- a/src/Avalonia.Controls.DataGrid/Utils/KeyboardHelper.cs
+++ b/src/Avalonia.Controls.DataGrid/Utils/KeyboardHelper.cs
@@ -9,16 +9,17 @@ namespace Avalonia.Controls.Utils
 {
     internal static class KeyboardHelper
     {
-        public static void GetMetaKeyState(InputModifiers modifiers, out bool ctrl, out bool shift)
+        public static void GetMetaKeyState(KeyModifiers modifiers, out bool ctrl, out bool shift)
         {
-            ctrl = (modifiers & InputModifiers.Control) == InputModifiers.Control;
-            shift = (modifiers & InputModifiers.Shift) == InputModifiers.Shift;
+            ctrl = (modifiers & KeyModifiers.Control) == KeyModifiers.Control;
+            shift = (modifiers & KeyModifiers.Shift) == KeyModifiers.Shift;
         }
-        public static void GetMetaKeyState(InputModifiers modifiers, out bool ctrl, out bool shift, out bool alt)
+
+        public static void GetMetaKeyState(KeyModifiers modifiers, out bool ctrl, out bool shift, out bool alt)
         {
-            ctrl = (modifiers & InputModifiers.Control) == InputModifiers.Control;
-            shift = (modifiers & InputModifiers.Shift) == InputModifiers.Shift;
-            alt = (modifiers & InputModifiers.Alt) == InputModifiers.Alt;
+            ctrl = (modifiers & KeyModifiers.Control) == KeyModifiers.Control;
+            shift = (modifiers & KeyModifiers.Shift) == KeyModifiers.Shift;
+            alt = (modifiers & KeyModifiers.Alt) == KeyModifiers.Alt;
         }
     }
 }
diff --git a/src/Avalonia.Controls.DataGrid/Utils/ReflectionHelper.cs b/src/Avalonia.Controls.DataGrid/Utils/ReflectionHelper.cs
index 31c42db076..47d1ac1c0b 100644
--- a/src/Avalonia.Controls.DataGrid/Utils/ReflectionHelper.cs
+++ b/src/Avalonia.Controls.DataGrid/Utils/ReflectionHelper.cs
@@ -352,19 +352,37 @@ namespace Avalonia.Controls.Utils
                 return null;
             }
 
-            PropertyInfo indexer = null;
             string stringIndex = propertyPath.Substring(1, propertyPath.Length - 2);
-            indexer = FindIndexerInMembers(type.GetDefaultMembers(), stringIndex, out index);
+            var indexer = FindIndexerInMembers(type.GetDefaultMembers(), stringIndex, out index);
             if (indexer != null)
             {
                 // We found the indexer, so return it.
                 return indexer;
             }
 
-            if (typeof(IList).IsAssignableFrom(type))
+            var elementType = type.GetElementType();
+            if (elementType == null)
+            {
+                var genericArguments = type.GetGenericArguments();
+                if (genericArguments.Length == 1)
+                {
+                    elementType = genericArguments[0];
+                }
+            }
+
+            if (elementType != null)
             {
                 // If the object is of type IList, try to use its default indexer.
-                indexer = FindIndexerInMembers(typeof(IList).GetDefaultMembers(), stringIndex, out index);
+                if (typeof(IList<>).MakeGenericType(elementType) is Type genericList
+                    && genericList.IsAssignableFrom(type))
+                {
+                    indexer = FindIndexerInMembers(genericList.GetDefaultMembers(), stringIndex, out index);
+                }
+                if (typeof(IReadOnlyList<>).MakeGenericType(elementType) is Type genericReadOnlyList
+                   && genericReadOnlyList.IsAssignableFrom(type))
+                {
+                    indexer = FindIndexerInMembers(genericReadOnlyList.GetDefaultMembers(), stringIndex, out index);
+                }
             }
 
             return indexer;
diff --git a/src/Avalonia.Controls/AcrylicPlatformCompensationLevels.cs b/src/Avalonia.Controls/AcrylicPlatformCompensationLevels.cs
new file mode 100644
index 0000000000..e1f1c4029e
--- /dev/null
+++ b/src/Avalonia.Controls/AcrylicPlatformCompensationLevels.cs
@@ -0,0 +1,23 @@
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines compensation levels for the platform depending on the transparency level.
+    /// It controls the base opacity level of the 'tracing paper' layer that compensates
+    /// for low blur radius.
+    /// </summary>
+    public struct AcrylicPlatformCompensationLevels
+    {
+        public AcrylicPlatformCompensationLevels(double transparent, double blurred, double acrylic)
+        {
+            TransparentLevel = transparent;
+            BlurLevel = blurred;
+            AcrylicBlurLevel = acrylic;
+        }
+
+        public double TransparentLevel { get; }
+
+        public double BlurLevel { get; }
+
+        public double AcrylicBlurLevel { get; }
+    }
+}
diff --git a/src/Avalonia.Controls/AppBuilderBase.cs b/src/Avalonia.Controls/AppBuilderBase.cs
index 3b644191c2..f616a42cac 100644
--- a/src/Avalonia.Controls/AppBuilderBase.cs
+++ b/src/Avalonia.Controls/AppBuilderBase.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Linq;
@@ -91,6 +88,23 @@ namespace Avalonia.Controls
             };
         }
 
+        /// <summary>
+        /// Begin configuring an <see cref="Application"/>.
+        /// </summary>
+        /// <param name="appFactory">Factory function for <typeparamref name="TApp"/>.</param>
+        /// <typeparam name="TApp">The subclass of <see cref="Application"/> to configure.</typeparam>
+        /// <remarks><paramref name="appFactory"/> is useful for passing of dependencies to <typeparamref name="TApp"/>.</remarks>
+        /// <returns>An <typeparamref name="TAppBuilder"/> instance.</returns>
+        public static TAppBuilder Configure<TApp>(Func<TApp> appFactory)
+            where TApp : Application
+        {
+            return new TAppBuilder()
+            {
+                ApplicationType = typeof(TApp),
+                _appFactory = appFactory
+            };
+        }
+
         protected TAppBuilder Self => (TAppBuilder)this;
 
         public TAppBuilder AfterSetup(Action<TAppBuilder> callback)
diff --git a/src/Avalonia.Controls/Application.cs b/src/Avalonia.Controls/Application.cs
index 59c6c47ed9..3bf72460df 100644
--- a/src/Avalonia.Controls/Application.cs
+++ b/src/Avalonia.Controls/Application.cs
@@ -1,7 +1,5 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using System.Collections.Generic;
 using System.Reactive.Concurrency;
 using System.Threading;
 using Avalonia.Animation;
@@ -32,7 +30,7 @@ namespace Avalonia
     /// method.
     /// - Tracks the lifetime of the application.
     /// </remarks>
-    public class Application : AvaloniaObject, IGlobalDataTemplates, IGlobalStyles, IStyleRoot, IResourceNode
+    public class Application : AvaloniaObject, IDataContextProvider, IGlobalDataTemplates, IGlobalStyles, IResourceHost
     {
         /// <summary>
         /// The application-global data templates.
@@ -44,6 +42,15 @@ namespace Avalonia
         private readonly Styler _styler = new Styler();
         private Styles _styles;
         private IResourceDictionary _resources;
+        private bool _notifyingResourcesChanged;
+        private Action<IReadOnlyList<IStyle>> _stylesAdded;
+        private Action<IReadOnlyList<IStyle>> _stylesRemoved;
+
+        /// <summary>
+        /// Defines the <see cref="DataContext"/> property.
+        /// </summary>
+        public static readonly StyledProperty<object> DataContextProperty =
+            StyledElement.DataContextProperty.AddOwner<Application>();
 
         /// <inheritdoc/>
         public event EventHandler<ResourcesChangedEventArgs> ResourcesChanged;
@@ -56,6 +63,19 @@ namespace Avalonia
             Name = "Avalonia Application";
         }
 
+        /// <summary>
+        /// Gets or sets the Applications's data context.
+        /// </summary>
+        /// <remarks>
+        /// The data context property 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 the current instance of the <see cref="Application"/> class.
         /// </summary>
@@ -109,26 +129,13 @@ namespace Avalonia
         /// </summary>
         public IResourceDictionary Resources
         {
-            get => _resources ?? (Resources = new ResourceDictionary());
+            get => _resources ??= new ResourceDictionary(this);
             set
             {
-                Contract.Requires<ArgumentNullException>(value != null);
-
-                var hadResources = false;
-
-                if (_resources != null)
-                {
-                    hadResources = _resources.Count > 0;
-                    _resources.ResourcesChanged -= ThisResourcesChanged;
-                }
-
+                value = value ?? throw new ArgumentNullException(nameof(value));
+                _resources?.RemoveOwner(this);
                 _resources = value;
-                _resources.ResourcesChanged += ThisResourcesChanged;
-
-                if (hadResources || _resources.Count > 0)
-                {
-                    ResourcesChanged?.Invoke(this, new ResourcesChangedEventArgs());
-                }
+                _resources.AddOwner(this);
             }
         }
 
@@ -141,11 +148,15 @@ namespace Avalonia
         /// <remarks>
         /// Global styles apply to all windows in the application.
         /// </remarks>
-        public Styles Styles => _styles ?? (_styles = new Styles());
+        public Styles Styles => _styles ??= new Styles(this);
 
         /// <inheritdoc/>
         bool IDataTemplateHost.IsDataTemplatesInitialized => _dataTemplates != null;
 
+        /// <inheritdoc/>
+        bool IResourceNode.HasResources => (_resources?.HasResources ?? false) ||
+            (((IResourceNode?)_styles)?.HasResources ?? false);
+
         /// <summary>
         /// Gets the styling parent of the application, which is null.
         /// </summary>
@@ -153,13 +164,7 @@ namespace Avalonia
 
         /// <inheritdoc/>
         bool IStyleHost.IsStylesInitialized => _styles != null;
-
-        /// <inheritdoc/>
-        bool IResourceProvider.HasResources => _resources?.Count > 0;
-
-        /// <inheritdoc/>
-        IResourceNode IResourceNode.ResourceParent => null;
-        
+       
         /// <summary>
         /// Application lifetime, use it for things like setting the main window and exiting the app from code
         /// Currently supported lifetimes are:
@@ -169,19 +174,46 @@ namespace Avalonia
         /// </summary>
         public IApplicationLifetime ApplicationLifetime { get; set; }
 
+        event Action<IReadOnlyList<IStyle>> IGlobalStyles.GlobalStylesAdded
+        {
+            add => _stylesAdded += value;
+            remove => _stylesAdded -= value;
+        }
+
+        event Action<IReadOnlyList<IStyle>> IGlobalStyles.GlobalStylesRemoved
+        {
+            add => _stylesRemoved += value;
+            remove => _stylesRemoved -= value;
+        }
+
         /// <summary>
         /// Initializes the application by loading XAML etc.
         /// </summary>
         public virtual void Initialize() { }
 
         /// <inheritdoc/>
-        bool IResourceProvider.TryGetResource(object key, out object value)
+        bool IResourceNode.TryGetResource(object key, out object value)
         {
             value = null;
             return (_resources?.TryGetResource(key, out value) ?? false) ||
                    Styles.TryGetResource(key, out value);
         }
 
+        void IResourceHost.NotifyHostedResourcesChanged(ResourcesChangedEventArgs e)
+        {
+            ResourcesChanged?.Invoke(this, e);
+        }
+
+        void IStyleHost.StylesAdded(IReadOnlyList<IStyle> styles)
+        {
+            _stylesAdded?.Invoke(styles);
+        }
+
+        void IStyleHost.StylesRemoved(IReadOnlyList<IStyle> styles)
+        {
+            _stylesRemoved?.Invoke(styles);
+        }
+
         /// <summary>
         /// Register's the services needed by Avalonia.
         /// </summary>
@@ -200,8 +232,12 @@ namespace Avalonia
                 .Bind<IKeyboardNavigationHandler>().ToTransient<KeyboardNavigationHandler>()
                 .Bind<IStyler>().ToConstant(_styler)
                 .Bind<IScheduler>().ToConstant(AvaloniaScheduler.Instance)
-                .Bind<IDragDropDevice>().ToConstant(DragDropDevice.Instance)
-                .Bind<IPlatformDragSource>().ToTransient<InProcessDragSource>();
+                .Bind<IDragDropDevice>().ToConstant(DragDropDevice.Instance);
+            
+            // TODO: Fix this, for now we keep this behavior since someone might be relying on it in 0.9.x
+            if (AvaloniaLocator.Current.GetService<IPlatformDragSource>() == null)
+                AvaloniaLocator.CurrentMutable
+                    .Bind<IPlatformDragSource>().ToTransient<InProcessDragSource>();
 
             var clock = new RenderLoopClock();
             AvaloniaLocator.CurrentMutable
@@ -214,9 +250,27 @@ namespace Avalonia
             
         }
 
+        private void NotifyResourcesChanged(ResourcesChangedEventArgs e)
+        {
+            if (_notifyingResourcesChanged)
+            {
+                return;
+            }
+
+            try
+            {
+                _notifyingResourcesChanged = true;
+                ResourcesChanged?.Invoke(this, ResourcesChangedEventArgs.Empty);
+            }
+            finally
+            {
+                _notifyingResourcesChanged = false;
+            }
+        }
+
         private void ThisResourcesChanged(object sender, ResourcesChangedEventArgs e)
         {
-            ResourcesChanged?.Invoke(this, e);
+            NotifyResourcesChanged(e);
         }
 
         private string _name;
@@ -234,6 +288,5 @@ namespace Avalonia
             get => _name;
             set => SetAndRaise(NameProperty, ref _name, value);
         }
-
     }
 }
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs b/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
index 6dd5b8cc81..e2c8e7e8e2 100644
--- a/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
@@ -47,6 +47,11 @@ namespace Avalonia.Controls.ApplicationLifetimes
         /// <inheritdoc/>
         public event EventHandler<ControlledApplicationLifetimeExitEventArgs> Exit;
 
+        /// <summary>
+        /// Gets the arguments passed to the AppBuilder Start method.
+        /// </summary>
+        public string[] Args { get; set; }
+        
         /// <inheritdoc/>
         public ShutdownMode ShutdownMode { get; set; }
         
@@ -68,9 +73,6 @@ namespace Avalonia.Controls.ApplicationLifetimes
             else if (ShutdownMode == ShutdownMode.OnMainWindowClose && window == MainWindow)
                 Shutdown();
         }
-        
-        
-
 
         public void Shutdown(int exitCode = 0)
         {
@@ -123,7 +125,11 @@ namespace Avalonia
             this T builder, string[] args, ShutdownMode shutdownMode = ShutdownMode.OnLastWindowClose)
             where T : AppBuilderBase<T>, new()
         {
-            var lifetime = new ClassicDesktopStyleApplicationLifetime() {ShutdownMode = shutdownMode};
+            var lifetime = new ClassicDesktopStyleApplicationLifetime()
+            {
+                Args = args,
+                ShutdownMode = shutdownMode
+            };
             builder.SetupWithLifetime(lifetime);
             return lifetime.Start(args);
         }
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/ControlledApplicationLifetimeExitEventArgs.cs b/src/Avalonia.Controls/ApplicationLifetimes/ControlledApplicationLifetimeExitEventArgs.cs
index 2963c019cc..e2ff7784d6 100644
--- a/src/Avalonia.Controls/ApplicationLifetimes/ControlledApplicationLifetimeExitEventArgs.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/ControlledApplicationLifetimeExitEventArgs.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Controls.ApplicationLifetimes
 {
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/IClassicDesktopStyleApplicationLifetime.cs b/src/Avalonia.Controls/ApplicationLifetimes/IClassicDesktopStyleApplicationLifetime.cs
index a1006d907b..212f0b8617 100644
--- a/src/Avalonia.Controls/ApplicationLifetimes/IClassicDesktopStyleApplicationLifetime.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/IClassicDesktopStyleApplicationLifetime.cs
@@ -8,6 +8,13 @@ namespace Avalonia.Controls.ApplicationLifetimes
     /// </summary>
     public interface IClassicDesktopStyleApplicationLifetime : IControlledApplicationLifetime
     {
+        /// <summary>
+        /// Gets the arguments passed to the
+        /// <see cref="ClassicDesktopStyleApplicationLifetimeExtensions.StartWithClassicDesktopLifetime{T}(T, string[], ShutdownMode)"/>
+        /// method.
+        /// </summary>
+        string[] Args { get; }
+        
         /// <summary>
         /// Gets or sets the <see cref="ShutdownMode"/>. This property indicates whether the application is shutdown explicitly or implicitly. 
         /// If <see cref="ShutdownMode"/> is set to OnExplicitShutdown the application is only closes if Shutdown is called.
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/StartupEventArgs.cs b/src/Avalonia.Controls/ApplicationLifetimes/StartupEventArgs.cs
index 423832793e..203be248bb 100644
--- a/src/Avalonia.Controls/ApplicationLifetimes/StartupEventArgs.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/StartupEventArgs.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
diff --git a/src/Avalonia.Controls/AutoCompleteBox.cs b/src/Avalonia.Controls/AutoCompleteBox.cs
index 64db832a81..b59fd7abde 100644
--- a/src/Avalonia.Controls/AutoCompleteBox.cs
+++ b/src/Avalonia.Controls/AutoCompleteBox.cs
@@ -10,9 +10,11 @@ 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;
@@ -29,6 +31,7 @@ namespace Avalonia.Controls
     /// <see cref="E:Avalonia.Controls.AutoCompleteBox.Populated" />
     /// event.
     /// </summary>
+    [PseudoClasses(":dropdownopen")]
     public class PopulatedEventArgs : EventArgs
     {
         /// <summary>
@@ -224,6 +227,27 @@ namespace Avalonia.Controls
         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
@@ -361,6 +385,9 @@ namespace Avalonia.Controls
         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));
 
@@ -378,7 +405,7 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<int> MinimumPrefixLengthProperty =
             AvaloniaProperty.Register<AutoCompleteBox, int>(
                 nameof(MinimumPrefixLength), 1,
-                validate: ValidateMinimumPrefixLength);
+                validate: IsValidMinimumPrefixLength);
 
         /// <summary>
         /// Identifies the
@@ -392,7 +419,7 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<AutoCompleteBox, TimeSpan>(
                 nameof(MinimumPopulateDelay),
                 TimeSpan.Zero,
-                validate: ValidateMinimumPopulateDelay);
+                validate: IsValidMinimumPopulateDelay);
 
         /// <summary>
         /// Identifies the
@@ -406,7 +433,7 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<AutoCompleteBox, double>(
                 nameof(MaxDropDownHeight),
                 double.PositiveInfinity,
-                validate: ValidateMaxDropDownHeight);
+                validate: IsValidMaxDropDownHeight);
 
         /// <summary>
         /// Identifies the
@@ -467,10 +494,11 @@ namespace Avalonia.Controls
         /// <see cref="P:Avalonia.Controls.AutoCompleteBox.Text" />
         /// dependency property.</value>
         public static readonly DirectProperty<AutoCompleteBox, string> TextProperty =
-            AvaloniaProperty.RegisterDirect<AutoCompleteBox, string>(
-                nameof(Text),
+            TextBlock.TextProperty.AddOwnerWithDataValidation<AutoCompleteBox>(
                 o => o.Text,
-                (o, v) => o.Text = v);
+                (o, v) => o.Text = v,
+                defaultBindingMode: BindingMode.TwoWay,
+                enableDataValidation: true);
 
         /// <summary>
         /// Identifies the
@@ -495,7 +523,7 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<AutoCompleteBox, AutoCompleteFilterMode>(
                 nameof(FilterMode),
                 defaultValue: AutoCompleteFilterMode.StartsWith,
-                validate: ValidateFilterMode);
+                validate: IsValidFilterMode);
 
         /// <summary>
         /// Identifies the
@@ -526,6 +554,34 @@ namespace Avalonia.Controls
                 (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" />
@@ -546,26 +602,11 @@ namespace Avalonia.Controls
                 o => o.AsyncPopulator,
                 (o, v) => o.AsyncPopulator = v);
 
-        private static int ValidateMinimumPrefixLength(AutoCompleteBox control, int value)
-        {
-            Contract.Requires<ArgumentOutOfRangeException>(value >= -1);
+        private static bool IsValidMinimumPrefixLength(int value) => value >= -1;
 
-            return value;
-        }
+        private static bool IsValidMinimumPopulateDelay(TimeSpan value) => value.TotalMilliseconds >= 0.0;
 
-        private static TimeSpan ValidateMinimumPopulateDelay(AutoCompleteBox control, TimeSpan value)
-        {
-            Contract.Requires<ArgumentOutOfRangeException>(value.TotalMilliseconds >= 0.0);
-
-            return value;
-        }
-
-        private static double ValidateMaxDropDownHeight(AutoCompleteBox control, double value)
-        {
-            Contract.Requires<ArgumentOutOfRangeException>(value >= 0.0);
-
-            return value;
-        }
+        private static bool IsValidMaxDropDownHeight(double value) => value >= 0.0;
 
         private static bool IsValidFilterMode(AutoCompleteFilterMode mode)
         {
@@ -590,12 +631,6 @@ namespace Avalonia.Controls
                     return false;
             }
         }
-        private static AutoCompleteFilterMode ValidateFilterMode(AutoCompleteBox control, AutoCompleteFilterMode value)
-        {
-            Contract.Requires<ArgumentException>(IsValidFilterMode(value));
-
-            return value;
-        }
 
         /// <summary>
         /// Handle the change of the IsEnabled property.
@@ -704,7 +739,7 @@ namespace Avalonia.Controls
                 added.Add(e.NewValue);
             }
 
-            OnSelectionChanged(new SelectionChangedEventArgs(SelectionChangedEvent, added, removed));
+            OnSelectionChanged(new SelectionChangedEventArgs(SelectionChangedEvent, removed, added));
         }
 
         /// <summary>
@@ -1080,6 +1115,40 @@ namespace Avalonia.Controls
             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; }
@@ -1121,6 +1190,7 @@ namespace Avalonia.Controls
                 {
                     _textBoxSubscriptions =
                         _textBox.GetObservable(TextBox.TextProperty)
+                                .Skip(1)
                                 .Subscribe(_ => OnTextBoxTextChanged());
 
                     if (Text != null)
@@ -1233,7 +1303,7 @@ namespace Avalonia.Controls
         /// <see cref="T:Avalonia.Controls.AutoCompleteBox" /> control
         /// when a new template is applied.
         /// </summary>
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
 
             if (DropDownPopup != null)
@@ -1261,7 +1331,21 @@ namespace Avalonia.Controls
                 OpeningDropDown(false);
             }
 
-            base.OnTemplateApplied(e);
+            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)
+            {
+                DataValidationErrors.SetError(this, value.Error);
+            }
         }
 
         /// <summary>
@@ -1321,8 +1405,11 @@ namespace Avalonia.Controls
                     break;
 
                 case Key.Enter:
-                    OnAdapterSelectionComplete(this, new RoutedEventArgs());
-                    e.Handled = true;
+                    if (IsDropDownOpen)
+                    {
+                        OnAdapterSelectionComplete(this, new RoutedEventArgs());
+                        e.Handled = true;
+                    }
                     break;
 
                 default:
@@ -2333,6 +2420,14 @@ namespace Avalonia.Controls
             {
                 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);
diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj
index 32331d29ab..7f1f4bc8f3 100644
--- a/src/Avalonia.Controls/Avalonia.Controls.csproj
+++ b/src/Avalonia.Controls/Avalonia.Controls.csproj
@@ -1,7 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>    
   </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" />
@@ -14,4 +17,5 @@
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\JetBrains.Annotations.props" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>
diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index 0edb272015..c8337df99c 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -1,16 +1,14 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Utils;
 using Avalonia.Layout;
 using Avalonia.Media;
+using Avalonia.VisualTree;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// A control which decorates a child with a border and background.
     /// </summary>
-    public partial class Border : Decorator
+    public partial class Border : Decorator, IVisualWithRoundRectClip
     {
         /// <summary>
         /// Defines the <see cref="Background"/> property.
@@ -36,6 +34,12 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<CornerRadius> CornerRadiusProperty =
             AvaloniaProperty.Register<Border, CornerRadius>(nameof(CornerRadius));
 
+        /// <summary>
+        /// Defines the <see cref="BoxShadow"/> property.
+        /// </summary>
+        public static readonly StyledProperty<BoxShadows> BoxShadowProperty =
+            AvaloniaProperty.Register<Border, BoxShadows>(nameof(BoxShadow));
+        
         private readonly BorderRenderHelper _borderRenderHelper = new BorderRenderHelper();
 
         /// <summary>
@@ -47,7 +51,8 @@ namespace Avalonia.Controls
                 BackgroundProperty,
                 BorderBrushProperty,
                 BorderThicknessProperty,
-                CornerRadiusProperty);
+                CornerRadiusProperty,
+                BoxShadowProperty);
             AffectsMeasure<Border>(BorderThicknessProperty);
         }
 
@@ -86,14 +91,24 @@ namespace Avalonia.Controls
             get { return GetValue(CornerRadiusProperty); }
             set { SetValue(CornerRadiusProperty, value); }
         }
-
+        
+        /// <summary>
+        /// Gets or sets the box shadow effect parameters
+        /// </summary>
+        public BoxShadows BoxShadow
+        {
+            get => GetValue(BoxShadowProperty);
+            set => SetValue(BoxShadowProperty, value);
+        }
+        
         /// <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, BorderThickness, CornerRadius, Background, BorderBrush,
+                BoxShadow);
         }
 
         /// <summary>
@@ -113,9 +128,9 @@ namespace Avalonia.Controls
         /// <returns>The space taken.</returns>
         protected override Size ArrangeOverride(Size finalSize)
         {
-            _borderRenderHelper.Update(finalSize, BorderThickness, CornerRadius);
-
             return LayoutHelper.ArrangeChild(Child, finalSize, Padding, BorderThickness);
         }
+
+        public CornerRadius ClipToBoundsRadius => CornerRadius;
     }
 }
diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index 78d02e200f..91eef3947b 100644
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@@ -1,9 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Linq;
 using System.Windows.Input;
+using Avalonia.Controls.Metadata;
 using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -31,7 +29,8 @@ namespace Avalonia.Controls
     /// <summary>
     /// A button control.
     /// </summary>
-    public class Button : ContentControl
+    [PseudoClasses(":pressed")]
+    public class Button : ContentControl, ICommandSource
     {
         /// <summary>
         /// Defines the <see cref="ClickMode"/> property.
@@ -91,7 +90,11 @@ namespace Avalonia.Controls
             CommandProperty.Changed.Subscribe(CommandChanged);
             IsDefaultProperty.Changed.Subscribe(IsDefaultChanged);
             IsCancelProperty.Changed.Subscribe(IsCancelChanged);
-            PseudoClass<Button>(IsPressedProperty, ":pressed");
+        }
+
+        public Button()
+        {
+            UpdatePseudoClasses(IsPressed);
         }
 
         /// <summary>
@@ -277,7 +280,7 @@ namespace Avalonia.Controls
         {
             base.OnPointerPressed(e);
 
-            if (e.MouseButton == MouseButton.Left)
+            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
             {
                 IsPressed = true;
                 e.Handled = true;
@@ -306,18 +309,28 @@ namespace Avalonia.Controls
                 }
             }
         }
-
+        
         protected override void OnPointerCaptureLost(PointerCaptureLostEventArgs e)
         {
             IsPressed = false;
         }
 
-        protected override void UpdateDataValidation(AvaloniaProperty property, BindingNotification status)
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
         {
-            base.UpdateDataValidation(property, status);
+            base.OnPropertyChanged(change);
+
+            if (change.Property == IsPressedProperty)
+            {
+                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<bool>());
+            }
+        }
+
+        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
+        {
+            base.UpdateDataValidation(property, value);
             if (property == CommandProperty)
             {
-                if (status?.ErrorType == BindingErrorType.Error)
+                if (value.Type == BindingValueType.BindingError)
                 {
                     if (_commandCanExecute)
                     {
@@ -474,5 +487,12 @@ namespace Avalonia.Controls
                 OnClick();
             }
         }
+
+        private void UpdatePseudoClasses(bool isPressed)
+        {
+            PseudoClasses.Set(":pressed", isPressed);
+        }
+
+        void ICommandSource.CanExecuteChanged(object sender, EventArgs e) => this.CanExecuteChanged(sender, e);
     }
 }
diff --git a/src/Avalonia.Controls/ButtonSpinner.cs b/src/Avalonia.Controls/ButtonSpinner.cs
index d8ea520a56..5fe2cf3704 100644
--- a/src/Avalonia.Controls/ButtonSpinner.cs
+++ b/src/Avalonia.Controls/ButtonSpinner.cs
@@ -1,5 +1,7 @@
 using System;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
+using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 
@@ -14,6 +16,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// Represents a spinner control that includes two Buttons.
     /// </summary>
+    [PseudoClasses(":left", ":right")]
     public class ButtonSpinner : Spinner
     {
         /// <summary>
@@ -34,6 +37,11 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<Location> ButtonSpinnerLocationProperty =
             AvaloniaProperty.Register<ButtonSpinner, Location>(nameof(ButtonSpinnerLocation), Location.Right);
 
+        public ButtonSpinner()
+        {
+            UpdatePseudoClasses(ButtonSpinnerLocation);
+        }
+
         private Button _decreaseButton;
         /// <summary>
         /// Gets or sets the DecreaseButton template part.
@@ -85,8 +93,6 @@ namespace Avalonia.Controls
         static ButtonSpinner()
         {
             AllowSpinProperty.Changed.Subscribe(AllowSpinChanged);
-            PseudoClass<ButtonSpinner, Location>(ButtonSpinnerLocationProperty, location => location == Location.Left, ":left");
-            PseudoClass<ButtonSpinner, Location>(ButtonSpinnerLocationProperty, location => location == Location.Right, ":right");
         }
 
         /// <summary>
@@ -117,7 +123,7 @@ namespace Avalonia.Controls
         }
 
         /// <inheritdoc />
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             IncreaseButton = e.NameScope.Find<Button>("PART_IncreaseButton");
             DecreaseButton = e.NameScope.Find<Button>("PART_DecreaseButton");
@@ -201,6 +207,16 @@ namespace Avalonia.Controls
             }
         }
 
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == ButtonSpinnerLocationProperty)
+            {
+                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<Location>());
+            }
+        }
+
         protected override void OnValidSpinDirectionChanged(ValidSpinDirections oldValue, ValidSpinDirections newValue)
         {
             SetButtonUsage();
@@ -259,5 +275,11 @@ namespace Avalonia.Controls
                 OnSpin(new SpinEventArgs(SpinEvent, direction));
             }
         }
+
+        private void UpdatePseudoClasses(Location location)
+        {
+            PseudoClasses.Set(":left", location == Location.Left);
+            PseudoClasses.Set(":right", location == Location.Right);
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Calendar/Calendar.cs b/src/Avalonia.Controls/Calendar/Calendar.cs
index beafab3edf..4cf7db74d9 100644
--- a/src/Avalonia.Controls/Calendar/Calendar.cs
+++ b/src/Avalonia.Controls/Calendar/Calendar.cs
@@ -352,7 +352,8 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<CalendarMode> DisplayModeProperty =
             AvaloniaProperty.Register<Calendar, CalendarMode>(
                 nameof(DisplayMode),
-                validate: ValidateDisplayMode);
+                validate: IsValidDisplayMode);
+
         /// <summary>
         /// Gets or sets a value indicating whether the calendar is displayed in
         /// months, years, or decades.
@@ -417,17 +418,6 @@ namespace Avalonia.Controls
             }
             OnDisplayModeChanged(new CalendarModeChangedEventArgs((CalendarMode)e.OldValue, mode));
         }
-        private static CalendarMode ValidateDisplayMode(Calendar o, CalendarMode mode)
-        {
-            if(IsValidDisplayMode(mode))
-            {
-                return mode;
-            }
-            else
-            {
-                throw new ArgumentOutOfRangeException(nameof(mode), "Invalid DisplayMode");
-            }
-        }
         private static bool IsValidDisplayMode(CalendarMode mode)
         {
             return mode == CalendarMode.Month
@@ -1008,10 +998,10 @@ namespace Avalonia.Controls
 
 
         /// <summary>
-        /// Gets or sets a value indicating whether DatePicker should change its 
+        /// Gets or sets a value indicating whether CalendarDatePicker should change its 
         /// DisplayDate because of a SelectedDate change on its Calendar.
         /// </summary>
-        internal bool DatePickerDisplayDateFlag { get; set; }
+        internal bool CalendarDatePickerDisplayDateFlag { get; set; }
 
         internal CalendarDayButton FindDayButtonFromDay(DateTime day)
         {
@@ -1585,7 +1575,7 @@ namespace Avalonia.Controls
             base.OnPointerWheelChanged(e);
             if (!e.Handled)
             {
-                CalendarExtensions.GetMetaKeyState(e.InputModifiers, out bool ctrl, out bool shift);
+                CalendarExtensions.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift);
 
                 if (!ctrl)
                 {
@@ -1641,7 +1631,7 @@ namespace Avalonia.Controls
             // Some keys (e.g. Left/Right) need to be translated in RightToLeft mode
             Key invariantKey = e.Key;  //InteractionHelper.GetLogicalKey(FlowDirection, e.Key);
 
-            CalendarExtensions.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift);
+            CalendarExtensions.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift);
 
             switch (invariantKey)
             {
@@ -2089,10 +2079,8 @@ namespace Avalonia.Controls
         /// <see cref="T:System.Windows.Controls.Calendar" /> when a new
         /// template is applied.
         /// </summary>
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
-            base.OnTemplateApplied(e);
-
             Root = e.NameScope.Find<Panel>(PART_ElementRoot);
 
             SelectedMonth = DisplayDate;
diff --git a/src/Avalonia.Controls/Calendar/CalendarButton.cs b/src/Avalonia.Controls/Calendar/CalendarButton.cs
index a273e68d56..76af933b55 100644
--- a/src/Avalonia.Controls/Calendar/CalendarButton.cs
+++ b/src/Avalonia.Controls/Calendar/CalendarButton.cs
@@ -3,6 +3,7 @@
 // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
+using Avalonia.Controls.Metadata;
 using Avalonia.Input;
 using System;
 
@@ -12,6 +13,7 @@ namespace Avalonia.Controls.Primitives
     /// Represents a button on a
     /// <see cref="T:Avalonia.Controls.Calendar" />.
     /// </summary>
+    [PseudoClasses(":selected", ":inactive", ":btnfocused")]
     public sealed class CalendarButton : Button
     {
         /// <summary>
@@ -98,9 +100,8 @@ namespace Avalonia.Controls.Primitives
         /// <see cref="T:System.Windows.Controls.Primitives.CalendarButton" />
         /// when a new template is applied.
         /// </summary>
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
-            base.OnTemplateApplied(e);
             SetPseudoClasses();
         }
         
@@ -149,7 +150,8 @@ namespace Avalonia.Controls.Primitives
         protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
             base.OnPointerPressed(e);
-            if (e.MouseButton == MouseButton.Left)
+
+            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
                 CalendarLeftMouseButtonDown?.Invoke(this, e);
         }
 
diff --git a/src/Avalonia.Controls/Calendar/DatePicker.cs b/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
similarity index 84%
rename from src/Avalonia.Controls/Calendar/DatePicker.cs
rename to src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
index 841b73cd92..7c259f0a09 100644
--- a/src/Avalonia.Controls/Calendar/DatePicker.cs
+++ b/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
@@ -16,29 +16,29 @@ namespace Avalonia.Controls
 {
     /// <summary>
     /// Provides data for the
-    /// <see cref="E:Avalonia.Controls.DatePicker.DateValidationError" />
+    /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
     /// event.
     /// </summary>
-    public class DatePickerDateValidationErrorEventArgs : EventArgs
+    public class CalendarDatePickerDateValidationErrorEventArgs : EventArgs
     {
         private bool _throwException;
 
         /// <summary>
         /// Initializes a new instance of the
-        /// <see cref="T:Avalonia.Controls.DatePickerDateValidationErrorEventArgs" />
+        /// <see cref="T:Avalonia.Controls.CalendarDatePickerDateValidationErrorEventArgs" />
         /// class.
         /// </summary>
         /// <param name="exception">
         /// The initial exception from the
-        /// <see cref="E:Avalonia.Controls.DatePicker.DateValidationError" />
+        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
         /// event.
         /// </param>
         /// <param name="text">
         /// The text that caused the
-        /// <see cref="E:Avalonia.Controls.DatePicker.DateValidationError" />
+        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
         /// event.
         /// </param>
-        public DatePickerDateValidationErrorEventArgs(Exception exception, string text)
+        public CalendarDatePickerDateValidationErrorEventArgs(Exception exception, string text)
         {
             this.Text = text;
             this.Exception = exception;
@@ -46,7 +46,7 @@ namespace Avalonia.Controls
 
         /// <summary>
         /// Gets the initial exception associated with the
-        /// <see cref="E:Avalonia.Controls.DatePicker.DateValidationError" />
+        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
         /// event.
         /// </summary>
         /// <value>
@@ -56,7 +56,7 @@ namespace Avalonia.Controls
 
         /// <summary>
         /// Gets the text that caused the
-        /// <see cref="E:Avalonia.Controls.DatePicker.DateValidationError" />
+        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
         /// event.
         /// </summary>
         /// <value>
@@ -66,7 +66,7 @@ namespace Avalonia.Controls
 
         /// <summary>
         /// Gets or sets a value indicating whether
-        /// <see cref="P:Avalonia.Controls.DatePickerDateValidationErrorEventArgs.Exception" />
+        /// <see cref="P:Avalonia.Controls.CalendarDatePickerDateValidationErrorEventArgs.Exception" />
         /// should be thrown.
         /// </summary>
         /// <value>
@@ -74,7 +74,7 @@ namespace Avalonia.Controls
         /// </value>
         /// <exception cref="T:System.ArgumentException">
         /// If set to true and
-        /// <see cref="P:Avalonia.Controls.DatePickerDateValidationErrorEventArgs.Exception" />
+        /// <see cref="P:Avalonia.Controls.CalendarDatePickerDateValidationErrorEventArgs.Exception" />
         /// is null.
         /// </exception>
         public bool ThrowException
@@ -93,9 +93,9 @@ namespace Avalonia.Controls
 
     /// <summary>
     /// Specifies date formats for a
-    /// <see cref="T:Avalonia.Controls.DatePicker" />.
+    /// <see cref="T:Avalonia.Controls.CalendarDatePicker" />.
     /// </summary>
-    public enum DatePickerFormat
+    public enum CalendarDatePickerFormat
     {
         /// <summary>
         /// Specifies that the date should be displayed using unabbreviated days
@@ -115,7 +115,7 @@ namespace Avalonia.Controls
         Custom = 2
     }
 
-    public class DatePicker : TemplatedControl
+    public class CalendarDatePicker : TemplatedControl
     {
         private const string ElementTextBox = "PART_TextBox";
         private const string ElementButton = "PART_Button";
@@ -154,59 +154,59 @@ namespace Avalonia.Controls
         /// </value>
         public CalendarBlackoutDatesCollection BlackoutDates { get; private set; }
 
-        public static readonly DirectProperty<DatePicker, DateTime> DisplayDateProperty =
-            AvaloniaProperty.RegisterDirect<DatePicker, DateTime>(
+        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<DatePicker, DateTime?> DisplayDateStartProperty =
-            AvaloniaProperty.RegisterDirect<DatePicker, DateTime?>(
+        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<DatePicker, DateTime?> DisplayDateEndProperty =
-            AvaloniaProperty.RegisterDirect<DatePicker, DateTime?>(
+        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<DatePicker, DayOfWeek>(nameof(FirstDayOfWeek));
+            AvaloniaProperty.Register<CalendarDatePicker, DayOfWeek>(nameof(FirstDayOfWeek));
 
-        public static readonly DirectProperty<DatePicker, bool> IsDropDownOpenProperty =
-            AvaloniaProperty.RegisterDirect<DatePicker, bool>(
+        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<DatePicker, bool>(nameof(IsTodayHighlighted));
-        public static readonly DirectProperty<DatePicker, DateTime?> SelectedDateProperty =
-            AvaloniaProperty.RegisterDirect<DatePicker, DateTime?>(
+            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);
 
-        public static readonly StyledProperty<DatePickerFormat> SelectedDateFormatProperty =
-            AvaloniaProperty.Register<DatePicker, DatePickerFormat>(
+        public static readonly StyledProperty<CalendarDatePickerFormat> SelectedDateFormatProperty =
+            AvaloniaProperty.Register<CalendarDatePicker, CalendarDatePickerFormat>(
                 nameof(SelectedDateFormat),
-                defaultValue: DatePickerFormat.Short,
-                validate: ValidateSelectedDateFormat);
+                defaultValue: CalendarDatePickerFormat.Short,
+                validate: IsValidSelectedDateFormat);
 
         public static readonly StyledProperty<string> CustomDateFormatStringProperty =
-            AvaloniaProperty.Register<DatePicker, string>(
+            AvaloniaProperty.Register<CalendarDatePicker, string>(
                 nameof(CustomDateFormatString),
                 defaultValue: "d",
-                validate: ValidateDateFormatString);
+                validate: IsValidDateFormatString);
 
-        public static readonly DirectProperty<DatePicker, string> TextProperty =
-            AvaloniaProperty.RegisterDirect<DatePicker, string>(
+        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<DatePicker>();
+            TextBox.WatermarkProperty.AddOwner<CalendarDatePicker>();
         public static readonly StyledProperty<bool> UseFloatingWatermarkProperty =
-            TextBox.UseFloatingWatermarkProperty.AddOwner<DatePicker>();
+            TextBox.UseFloatingWatermarkProperty.AddOwner<CalendarDatePicker>();
 
 
         /// <summary>
@@ -218,9 +218,9 @@ namespace Avalonia.Controls
         /// </value>
         /// <exception cref="T:System.ArgumentOutOfRangeException">
         /// The specified date is not in the range defined by
-        /// <see cref="P:Avalonia.Controls.DatePicker.DisplayDateStart" />
+        /// <see cref="P:Avalonia.Controls.CalendarDatePicker.DisplayDateStart" />
         /// and
-        /// <see cref="P:Avalonia.Controls.DatePicker.DisplayDateEnd" />.
+        /// <see cref="P:Avalonia.Controls.CalendarDatePicker.DisplayDateEnd" />.
         /// </exception>
         public DateTime DisplayDate
         {
@@ -320,7 +320,7 @@ namespace Avalonia.Controls
         /// <exception cref="T:System.ArgumentOutOfRangeException">
         /// An specified format is not valid.
         /// </exception>
-        public DatePickerFormat SelectedDateFormat
+        public CalendarDatePickerFormat SelectedDateFormat
         {
             get { return GetValue(SelectedDateFormatProperty); }
             set { SetValue(SelectedDateFormatProperty, value); }
@@ -380,47 +380,47 @@ namespace Avalonia.Controls
         /// Occurs when <see cref="P:Avalonia.Controls.DatePicker.Text" />
         /// is assigned a value that cannot be interpreted as a date.
         /// </summary>
-        public event EventHandler<DatePickerDateValidationErrorEventArgs> DateValidationError;
+        public event EventHandler<CalendarDatePickerDateValidationErrorEventArgs> DateValidationError;
 
         /// <summary>
         /// Occurs when the
-        /// <see cref="P:Avalonia.Controls.DatePicker.SelectedDate" />
+        /// <see cref="P:Avalonia.Controls.CalendarDatePicker.SelectedDate" />
         /// property is changed.
         /// </summary>
         public event EventHandler<SelectionChangedEventArgs> SelectedDateChanged;
 
-        static DatePicker()
+        static CalendarDatePicker()
         {
-            FocusableProperty.OverrideDefaultValue<DatePicker>(true);
-
-            DisplayDateProperty.Changed.AddClassHandler<DatePicker>((x,e) => x.OnDisplayDateChanged(e));
-            DisplayDateStartProperty.Changed.AddClassHandler<DatePicker>((x,e) => x.OnDisplayDateStartChanged(e));
-            DisplayDateEndProperty.Changed.AddClassHandler<DatePicker>((x,e) => x.OnDisplayDateEndChanged(e));
-            IsDropDownOpenProperty.Changed.AddClassHandler<DatePicker>((x,e) => x.OnIsDropDownOpenChanged(e));
-            SelectedDateProperty.Changed.AddClassHandler<DatePicker>((x,e) => x.OnSelectedDateChanged(e));
-            SelectedDateFormatProperty.Changed.AddClassHandler<DatePicker>((x,e) => x.OnSelectedDateFormatChanged(e));
-            CustomDateFormatStringProperty.Changed.AddClassHandler<DatePicker>((x,e) => x.OnCustomDateFormatStringChanged(e));
-            TextProperty.Changed.AddClassHandler<DatePicker>((x,e) => x.OnTextChanged(e));
+            FocusableProperty.OverrideDefaultValue<CalendarDatePicker>(true);
+
+            DisplayDateProperty.Changed.AddClassHandler<CalendarDatePicker>((x,e) => x.OnDisplayDateChanged(e));
+            DisplayDateStartProperty.Changed.AddClassHandler<CalendarDatePicker>((x,e) => x.OnDisplayDateStartChanged(e));
+            DisplayDateEndProperty.Changed.AddClassHandler<CalendarDatePicker>((x,e) => x.OnDisplayDateEndChanged(e));
+            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 DatePicker()
+        public CalendarDatePicker()
         {
             FirstDayOfWeek = DateTimeHelper.GetCurrentDateFormat().FirstDayOfWeek;
             _defaultText = string.Empty;
             DisplayDate = DateTime.Today;
         }
 
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             if (_calendar != null)
             {
                 _calendar.DayButtonMouseUp -= Calendar_DayButtonMouseUp;
                 _calendar.DisplayDateChanged -= Calendar_DisplayDateChanged;
                 _calendar.SelectedDatesChanged -= Calendar_SelectedDatesChanged;
-                _calendar.PointerPressed -= Calendar_PointerPressed;
+                _calendar.PointerReleased -= Calendar_PointerReleased;
                 _calendar.KeyDown -= Calendar_KeyDown;
             }
             _calendar = e.NameScope.Find<Calendar>(ElementCalendar);
@@ -435,7 +435,7 @@ namespace Avalonia.Controls
                 _calendar.DayButtonMouseUp += Calendar_DayButtonMouseUp;
                 _calendar.DisplayDateChanged += Calendar_DisplayDateChanged;
                 _calendar.SelectedDatesChanged += Calendar_SelectedDatesChanged;
-                _calendar.PointerPressed += Calendar_PointerPressed;
+                _calendar.PointerReleased += Calendar_PointerReleased;
                 _calendar.KeyDown += Calendar_KeyDown;
                 //_calendar.SizeChanged += new SizeChangedEventHandler(Calendar_SizeChanged);
                 //_calendar.IsTabStop = true;
@@ -476,7 +476,7 @@ namespace Avalonia.Controls
             {
                 _dropDownButton.Click += DropDownButton_Click;
                 _buttonPointerPressedSubscription =
-                    _dropDownButton.AddHandler(PointerPressedEvent, DropDownButton_PointerPressed, handledEventsToo: true);
+                    _dropDownButton.AddDisposableHandler(PointerPressedEvent, DropDownButton_PointerPressed, handledEventsToo: true);
             }
 
             if (_textBox != null)
@@ -508,15 +508,15 @@ namespace Avalonia.Controls
                     SetSelectedDate();
                 }
             }
-
-            base.OnTemplateApplied(e);
         }
 
-        protected override void UpdateDataValidation(AvaloniaProperty property, BindingNotification status)
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
         {
-            if (property == SelectedDateProperty)
+            base.OnPropertyChanged(change);
+
+            if (change.Property == SelectedDateProperty)
             {
-                DataValidationErrors.SetError(this, status.Error);
+                DataValidationErrors.SetError(this, change.NewValue.Error);
             }
         }
 
@@ -662,12 +662,12 @@ namespace Avalonia.Controls
                 // 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.DatePickerDisplayDateFlag))
+                if ((day.Month != DisplayDate.Month || day.Year != DisplayDate.Year) && (_calendar == null || !_calendar.CalendarDatePickerDisplayDateFlag))
                 {
                     DisplayDate = day;
                 }
                 if(_calendar != null)
-                    _calendar.DatePickerDisplayDateFlag = false;
+                    _calendar.CalendarDatePickerDisplayDateFlag = false;
             }
             else
             {
@@ -707,7 +707,7 @@ namespace Avalonia.Controls
         }
         private void OnCustomDateFormatStringChanged(AvaloniaPropertyChangedEventArgs e)
         {
-            if(SelectedDateFormat == DatePickerFormat.Custom)
+            if(SelectedDateFormat == CalendarDatePickerFormat.Custom)
             {
                 OnDateFormatChanged();
             }
@@ -752,15 +752,15 @@ namespace Avalonia.Controls
 
         /// <summary>
         /// Raises the
-        /// <see cref="E:Avalonia.Controls.DatePicker.DateValidationError" />
+        /// <see cref="E:Avalonia.Controls.CalendarDatePicker.DateValidationError" />
         /// event.
         /// </summary>
         /// <param name="e">
         /// A
-        /// <see cref="T:Avalonia.Controls.DatePickerDateValidationErrorEventArgs" />
+        /// <see cref="T:Avalonia.Controls.CalendarDatePickerDateValidationErrorEventArgs" />
         /// that contains the event data.
         /// </param>
-        protected virtual void OnDateValidationError(DatePickerDateValidationErrorEventArgs e)
+        protected virtual void OnDateValidationError(CalendarDatePickerDateValidationErrorEventArgs e)
         {
             DateValidationError?.Invoke(this, e);
         }
@@ -782,7 +782,7 @@ namespace Avalonia.Controls
                     removedItems.Add(removedDate.Value);
                 }
 
-                handler(this, new SelectionChangedEventArgs(SelectingItemsControl.SelectionChangedEvent, addedItems, removedItems));
+                handler(this, new SelectionChangedEventArgs(SelectingItemsControl.SelectionChangedEvent, removedItems, addedItems));
             }
         }
         private void OnCalendarClosed(EventArgs e)
@@ -831,9 +831,10 @@ namespace Avalonia.Controls
                 }
             }
         }
-        private void Calendar_PointerPressed(object sender, PointerPressedEventArgs e)
+        private void Calendar_PointerReleased(object sender, PointerReleasedEventArgs e)
         {
-            if (e.MouseButton == MouseButton.Left)
+             
+            if (e.InitialPressMouseButton == MouseButton.Left)
             {
                 e.Handled = true;
             }
@@ -954,7 +955,7 @@ namespace Avalonia.Controls
                 }
                 else
                 {
-                    var dateValidationError = new DatePickerDateValidationErrorEventArgs(new ArgumentOutOfRangeException(nameof(text), "SelectedDate value is not valid."), text);
+                    var dateValidationError = new CalendarDatePickerDateValidationErrorEventArgs(new ArgumentOutOfRangeException(nameof(text), "SelectedDate value is not valid."), text);
                     OnDateValidationError(dateValidationError);
 
                     if (dateValidationError.ThrowException)
@@ -965,7 +966,7 @@ namespace Avalonia.Controls
             }
             catch (FormatException ex)
             {
-                DatePickerDateValidationErrorEventArgs textParseError = new DatePickerDateValidationErrorEventArgs(ex, text);
+                CalendarDatePickerDateValidationErrorEventArgs textParseError = new CalendarDatePickerDateValidationErrorEventArgs(ex, text);
                 OnDateValidationError(textParseError);
 
                 if (textParseError.ThrowException)
@@ -981,11 +982,11 @@ namespace Avalonia.Controls
 
             switch (SelectedDateFormat)
             {
-                case DatePickerFormat.Short:
+                case CalendarDatePickerFormat.Short:
                     return string.Format(CultureInfo.CurrentCulture, d.ToString(dtfi.ShortDatePattern, dtfi));
-                case DatePickerFormat.Long:
+                case CalendarDatePickerFormat.Long:
                     return string.Format(CultureInfo.CurrentCulture, d.ToString(dtfi.LongDatePattern, dtfi));
-                case DatePickerFormat.Custom:
+                case CalendarDatePickerFormat.Custom:
                     return string.Format(CultureInfo.CurrentCulture, d.ToString(CustomDateFormatString, dtfi));
             }
             return null;
@@ -1002,7 +1003,7 @@ namespace Avalonia.Controls
                     }
                 case Key.Down:
                     { 
-                        if ((e.Modifiers & InputModifiers.Control) == InputModifiers.Control)
+                        if ((e.KeyModifiers & KeyModifiers.Control) == KeyModifiers.Control)
                         {
                             HandlePopUp();
                             return true;
@@ -1113,12 +1114,12 @@ namespace Avalonia.Controls
 
                     switch (SelectedDateFormat)
                     {
-                        case DatePickerFormat.Long:
+                        case CalendarDatePickerFormat.Long:
                             {
                                 watermarkText = string.Format(CultureInfo.CurrentCulture, watermarkFormat, dtfi.LongDatePattern.ToString());
                                 break;
                             }
-                        case DatePickerFormat.Short:
+                        case CalendarDatePickerFormat.Short:
                         default:
                             {
                                 watermarkText = string.Format(CultureInfo.CurrentCulture, watermarkFormat, dtfi.ShortDatePattern.ToString());
@@ -1134,33 +1135,15 @@ namespace Avalonia.Controls
             }
         }
 
-        private static bool IsValidSelectedDateFormat(DatePickerFormat value)
+        private static bool IsValidSelectedDateFormat(CalendarDatePickerFormat value)
         {
-            return value == DatePickerFormat.Long
-                || value == DatePickerFormat.Short
-                || value == DatePickerFormat.Custom;
+            return value == CalendarDatePickerFormat.Long
+                || value == CalendarDatePickerFormat.Short
+                || value == CalendarDatePickerFormat.Custom;
         }
-        private static DatePickerFormat ValidateSelectedDateFormat(DatePicker dp, DatePickerFormat format)
+        private static bool IsValidDateFormatString(string formatString)
         {
-            if(IsValidSelectedDateFormat(format))
-            {
-                return format;
-            }
-            else
-            {
-                throw new ArgumentOutOfRangeException(nameof(format), "DatePickerFormat value is not valid.");
-            }
-        }
-        private static string ValidateDateFormatString(DatePicker dp, string formatString)
-        {
-            if(string.IsNullOrWhiteSpace(formatString))
-            {
-                throw new ArgumentException("DateFormatString value is not valid.", nameof(formatString));
-            }
-            else
-            {
-                return formatString;
-            }
+            return !string.IsNullOrWhiteSpace(formatString);
         }
         private static DateTime DiscardDayTime(DateTime d)
         {
diff --git a/src/Avalonia.Controls/Calendar/CalendarDayButton.cs b/src/Avalonia.Controls/Calendar/CalendarDayButton.cs
index e62a1ce1f4..d5748bb9e4 100644
--- a/src/Avalonia.Controls/Calendar/CalendarDayButton.cs
+++ b/src/Avalonia.Controls/Calendar/CalendarDayButton.cs
@@ -5,10 +5,12 @@
 
 using System;
 using System.Globalization;
+using Avalonia.Controls.Metadata;
 using Avalonia.Input;
 
 namespace Avalonia.Controls.Primitives
 {
+    [PseudoClasses(":pressed", ":disabled", ":selected", ":inactive", ":today", ":blackout", ":dayfocused")]
     public sealed class CalendarDayButton : Button
     {
         /// <summary>
@@ -150,11 +152,11 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
-            base.OnTemplateApplied(e);
             SetPseudoClasses();
         }
+
         private void SetPseudoClasses()
         {
             if (_ignoringMouseOverState)
@@ -206,7 +208,7 @@ namespace Avalonia.Controls.Primitives
         {
             base.OnPointerPressed(e);
 
-            if (e.MouseButton == MouseButton.Left)
+            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
                 CalendarDayButtonMouseDown?.Invoke(this, e);
         }
 
diff --git a/src/Avalonia.Controls/Calendar/CalendarExtensions.cs b/src/Avalonia.Controls/Calendar/CalendarExtensions.cs
index 73de1c38f3..00b5ce10bc 100644
--- a/src/Avalonia.Controls/Calendar/CalendarExtensions.cs
+++ b/src/Avalonia.Controls/Calendar/CalendarExtensions.cs
@@ -9,10 +9,10 @@ namespace Avalonia.Controls.Primitives
 {
     internal static class CalendarExtensions
     {
-        public static void GetMetaKeyState(InputModifiers modifiers, out bool ctrl, out bool shift)
+        public static void GetMetaKeyState(KeyModifiers modifiers, out bool ctrl, out bool shift)
         {
-            ctrl = (modifiers & InputModifiers.Control) == InputModifiers.Control;
-            shift = (modifiers & InputModifiers.Shift) == InputModifiers.Shift;
+            ctrl = (modifiers & KeyModifiers.Control) == KeyModifiers.Control;
+            shift = (modifiers & KeyModifiers.Shift) == KeyModifiers.Shift;
         }
     }
 }
diff --git a/src/Avalonia.Controls/Calendar/CalendarItem.cs b/src/Avalonia.Controls/Calendar/CalendarItem.cs
index 395196d926..e830717b95 100644
--- a/src/Avalonia.Controls/Calendar/CalendarItem.cs
+++ b/src/Avalonia.Controls/Calendar/CalendarItem.cs
@@ -7,6 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
+using Avalonia.Controls.Metadata;
 using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -18,6 +19,7 @@ namespace Avalonia.Controls.Primitives
     /// Represents the currently displayed month or year on a
     /// <see cref="T:Avalonia.Controls.Calendar" />.
     /// </summary>
+    [PseudoClasses(":calendardisabled")]
     public sealed class CalendarItem : TemplatedControl
     {
         /// <summary>
@@ -34,11 +36,7 @@ namespace Avalonia.Controls.Primitives
         private Button _headerButton;
         private Button _nextButton;
         private Button _previousButton;
-        private Grid _monthView;
-        private Grid _yearView;
         private ITemplate<IControl> _dayTitleTemplate;
-        private CalendarButton _lastCalendarButton;
-        private CalendarDayButton _lastCalendarDayButton;
         
         private DateTime _currentMonth;
         private bool _isMouseLeftButtonDown = false;
@@ -158,38 +156,12 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Gets the Grid that hosts the content when in month mode.
         /// </summary>
-        internal Grid MonthView
-        {
-            get { return _monthView; }
-            private set
-            {
-                if (_monthView != null)
-                    _monthView.PointerLeave -= MonthView_MouseLeave;
-
-                _monthView = value;
-
-                if (_monthView != null)
-                    _monthView.PointerLeave += MonthView_MouseLeave;
-            }
-        }
+        internal Grid MonthView { get; set; }
         /// <summary>
         /// Gets the Grid that hosts the content when in year or decade mode.
         /// </summary>
-        internal Grid YearView
-        {
-            get { return _yearView; }
-            private set
-            {
-                if (_yearView != null)
-                    _yearView.PointerLeave -= YearView_MouseLeave;
-
-                _yearView = value;
-
-                if (_yearView != null)
-                    _yearView.PointerLeave += YearView_MouseLeave;
-            }
-        }
-
+        internal Grid YearView { get; set; }
+        
         private void PopulateGrids()
         {
             if (MonthView != null)
@@ -224,7 +196,6 @@ namespace Avalonia.Controls.Primitives
                         cell.CalendarDayButtonMouseDown += Cell_MouseLeftButtonDown;
                         cell.CalendarDayButtonMouseUp += Cell_MouseLeftButtonUp;
                         cell.PointerEnter += Cell_MouseEnter;
-                        cell.PointerLeave += Cell_MouseLeave;
                         cell.Click += Cell_Click;
                         children.Add(cell);
                     }
@@ -254,7 +225,6 @@ namespace Avalonia.Controls.Primitives
                         month.CalendarLeftMouseButtonDown += Month_CalendarButtonMouseDown;
                         month.CalendarLeftMouseButtonUp += Month_CalendarButtonMouseUp;
                         month.PointerEnter += Month_MouseEnter;
-                        month.PointerLeave += Month_MouseLeave;
                         children.Add(month);
                     }
                 }
@@ -268,10 +238,8 @@ namespace Avalonia.Controls.Primitives
         /// <see cref="T:System.Windows.Controls.Primitives.CalendarItem" />
         /// when a new template is applied.
         /// </summary>
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
-            base.OnTemplateApplied(e);
-            
             HeaderButton = e.NameScope.Find<Button>(PART_ElementHeaderButton);
             PreviousButton = e.NameScope.Find<Button>(PART_ElementPreviousButton);
             NextButton = e.NameScope.Find<Button>(PART_ElementNextButton);
@@ -911,7 +879,7 @@ namespace Avalonia.Controls.Primitives
                         case CalendarSelectionMode.SingleDate:
                             {
                                 DateTime selectedDate = (DateTime)b.DataContext;
-                                Owner.DatePickerDisplayDateFlag = true;
+                                Owner.CalendarDatePickerDisplayDateFlag = true;
                                 if (Owner.SelectedDates.Count == 0)
                                 {
                                     Owner.SelectedDates.Add(selectedDate);
@@ -937,17 +905,7 @@ namespace Avalonia.Controls.Primitives
                 }
             }
         }
-        internal void Cell_MouseLeave(object sender, PointerEventArgs e)
-        {
-            if (_isMouseLeftButtonDown)
-            {
-                CalendarDayButton b = (CalendarDayButton)sender;
-                // The button is in Pressed state. Change the state to normal.
-                if (e.Device.Captured == b)
-                    e.Device.Capture(null);
-                _lastCalendarDayButton = b;
-            }
-        }
+        
         internal void Cell_MouseLeftButtonDown(object sender, PointerPressedEventArgs e)
         {
             if (Owner != null)
@@ -958,7 +916,7 @@ namespace Avalonia.Controls.Primitives
                 }
 
                 bool ctrl, shift;
-                CalendarExtensions.GetMetaKeyState(e.InputModifiers, out ctrl, out shift);
+                CalendarExtensions.GetMetaKeyState(e.KeyModifiers, out ctrl, out shift);
                 CalendarDayButton b = sender as CalendarDayButton;
 
                 if (b != null)
@@ -983,7 +941,7 @@ namespace Avalonia.Controls.Primitives
                                 }
                             case CalendarSelectionMode.SingleDate:
                                 {
-                                    Owner.DatePickerDisplayDateFlag = true;
+                                    Owner.CalendarDatePickerDisplayDateFlag = true;
                                     if (Owner.SelectedDates.Count == 0)
                                     {
                                         Owner.SelectedDates.Add(selectedDate);
@@ -1207,35 +1165,6 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        private void Month_MouseLeave(object sender, PointerEventArgs e)
-        {
-            if (_isMouseLeftButtonDownYearView)
-            {
-                CalendarButton b = (CalendarButton)sender;
-                // The button is in Pressed state. Change the state to normal.
-                if (e.Device.Captured == b)
-                    e.Device.Capture(null);
-                //b.ReleaseMouseCapture();
-
-                _lastCalendarButton = b;
-            }
-        }
-        private void MonthView_MouseLeave(object sender, PointerEventArgs e)
-        {
-            if (_lastCalendarDayButton != null)
-            {
-                e.Device.Capture(_lastCalendarDayButton);
-            }
-        }
-
-        private void YearView_MouseLeave(object sender, PointerEventArgs e)
-        {
-            if (_lastCalendarButton != null)
-            {
-                e.Device.Capture(_lastCalendarButton);
-            }
-        }
-        
         internal void UpdateDisabled(bool isEnabled)
         {
             PseudoClasses.Set(":calendardisabled", !isEnabled);
diff --git a/src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs b/src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs
index e6e0cf7c4f..3573c67057 100644
--- a/src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs
+++ b/src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs
@@ -49,7 +49,7 @@ namespace Avalonia.Controls.Primitives
 
         private void InvokeCollectionChanged(System.Collections.IList removedItems, System.Collections.IList addedItems)
         {
-            _owner.OnSelectedDatesCollectionChanged(new SelectionChangedEventArgs(null, addedItems, removedItems));
+            _owner.OnSelectedDatesCollectionChanged(new SelectionChangedEventArgs(null, removedItems, addedItems));
         }
 
         /// <summary>
@@ -119,7 +119,7 @@ namespace Avalonia.Controls.Primitives
                 }
             }
 
-            _owner.OnSelectedDatesCollectionChanged(new SelectionChangedEventArgs(null, _addedItems, _owner.RemovedItems));
+            _owner.OnSelectedDatesCollectionChanged(new SelectionChangedEventArgs(null, _owner.RemovedItems, _addedItems));
             _owner.RemovedItems.Clear();
             _owner.UpdateMonths();
             _isRangeAdded = false;
diff --git a/src/Avalonia.Controls/Canvas.cs b/src/Avalonia.Controls/Canvas.cs
index e16a0b074b..5cc823a6af 100644
--- a/src/Avalonia.Controls/Canvas.cs
+++ b/src/Avalonia.Controls/Canvas.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Input;
 using Avalonia.Layout;
diff --git a/src/Avalonia.Controls/Carousel.cs b/src/Avalonia.Controls/Carousel.cs
index ebc8890721..4cacf51fa1 100644
--- a/src/Avalonia.Controls/Carousel.cs
+++ b/src/Avalonia.Controls/Carousel.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Animation;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
diff --git a/src/Avalonia.Controls/CheckBox.cs b/src/Avalonia.Controls/CheckBox.cs
index 13903ec378..05d49a44b1 100644
--- a/src/Avalonia.Controls/CheckBox.cs
+++ b/src/Avalonia.Controls/CheckBox.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Primitives;
 
 namespace Avalonia.Controls
diff --git a/src/Avalonia.Controls/Chrome/CaptionButtons.cs b/src/Avalonia.Controls/Chrome/CaptionButtons.cs
new file mode 100644
index 0000000000..cd60130c5b
--- /dev/null
+++ b/src/Avalonia.Controls/Chrome/CaptionButtons.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Reactive.Disposables;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
+
+#nullable enable
+
+namespace Avalonia.Controls.Chrome
+{
+    /// <summary>
+    /// Draws window minimize / maximize / close buttons in a <see cref="TitleBar"/> when managed client decorations are enabled.
+    /// </summary>
+    [PseudoClasses(":minimized", ":normal", ":maximized", ":fullscreen")]
+    public class CaptionButtons : TemplatedControl
+    {
+        private CompositeDisposable? _disposables;
+        private Window? _hostWindow;
+
+        public void Attach(Window hostWindow)
+        {
+            if (_disposables == null)
+            {
+                _hostWindow = hostWindow;
+
+                _disposables = new CompositeDisposable
+                {
+                    _hostWindow.GetObservable(Window.WindowStateProperty)
+                    .Subscribe(x =>
+                    {
+                        PseudoClasses.Set(":minimized", x == WindowState.Minimized);
+                        PseudoClasses.Set(":normal", x == WindowState.Normal);
+                        PseudoClasses.Set(":maximized", x == WindowState.Maximized);
+                        PseudoClasses.Set(":fullscreen", x == WindowState.FullScreen);
+                    })
+                };
+            }
+        }
+
+        public void Detach()
+        {
+            if (_disposables != null)
+            {
+                _disposables.Dispose();
+                _disposables = null;
+
+                _hostWindow = null;
+            }
+        }
+
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            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");
+
+            closeButton.PointerReleased += (sender, e) => _hostWindow?.Close();
+
+            restoreButton.PointerReleased += (sender, e) =>
+            {
+                if (_hostWindow != null)
+                {
+                    _hostWindow.WindowState = _hostWindow.WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized;
+                }
+            };
+
+            minimiseButton.PointerReleased += (sender, e) =>
+            {
+                if (_hostWindow != null)
+                {
+                    _hostWindow.WindowState = WindowState.Minimized;
+                }
+            };
+
+            fullScreenButton.PointerReleased += (sender, e) =>
+            {
+                if (_hostWindow != null)
+                {
+                    _hostWindow.WindowState = _hostWindow.WindowState == WindowState.FullScreen ? WindowState.Normal : WindowState.FullScreen;
+                }
+            };
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Chrome/TitleBar.cs b/src/Avalonia.Controls/Chrome/TitleBar.cs
new file mode 100644
index 0000000000..fbddb06952
--- /dev/null
+++ b/src/Avalonia.Controls/Chrome/TitleBar.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Reactive.Disposables;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
+
+#nullable enable
+
+namespace Avalonia.Controls.Chrome
+{
+    /// <summary>
+    /// Draws a titlebar when managed client decorations are enabled.
+    /// </summary>
+    [PseudoClasses(":minimized", ":normal", ":maximized", ":fullscreen")]
+    public class TitleBar : TemplatedControl
+    {
+        private CompositeDisposable? _disposables;
+        private CaptionButtons? _captionButtons;
+
+        private void UpdateSize(Window window)
+        {
+            if (window != null)
+            {
+                Margin = new Thickness(
+                    window.OffScreenMargin.Left,
+                    window.OffScreenMargin.Top,
+                    window.OffScreenMargin.Right,
+                    window.OffScreenMargin.Bottom);
+
+                if (window.WindowState != WindowState.FullScreen)
+                {
+                    Height = window.WindowDecorationMargin.Top;
+
+                    if (_captionButtons != null)
+                    {
+                        _captionButtons.Height = Height;
+                    }
+                }
+
+                IsVisible = window.PlatformImpl.NeedsManagedDecorations;
+            }
+        }
+
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            base.OnApplyTemplate(e);
+
+            _captionButtons?.Detach();
+            
+            _captionButtons = e.NameScope.Get<CaptionButtons>("PART_CaptionButtons");
+
+            if (VisualRoot is Window window)
+            {
+                _captionButtons?.Attach(window);   
+                
+                UpdateSize(window);
+            }
+        }
+
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+
+            if (VisualRoot is Window window)
+            {
+                _disposables = new CompositeDisposable
+                {
+                    window.GetObservable(Window.WindowDecorationMarginProperty)
+                        .Subscribe(x => UpdateSize(window)),
+                    window.GetObservable(Window.ExtendClientAreaTitleBarHeightHintProperty)
+                        .Subscribe(x => UpdateSize(window)),
+                    window.GetObservable(Window.OffScreenMarginProperty)
+                        .Subscribe(x => UpdateSize(window)),
+                    window.GetObservable(Window.ExtendClientAreaChromeHintsProperty)
+                        .Subscribe(x => UpdateSize(window)),
+                    window.GetObservable(Window.WindowStateProperty)
+                        .Subscribe(x =>
+                        {
+                            PseudoClasses.Set(":minimized", x == WindowState.Minimized);
+                            PseudoClasses.Set(":normal", x == WindowState.Normal);
+                            PseudoClasses.Set(":maximized", x == WindowState.Maximized);
+                            PseudoClasses.Set(":fullscreen", x == WindowState.FullScreen);
+                        }),
+                    window.GetObservable(Window.IsExtendedIntoWindowDecorationsProperty)
+                        .Subscribe(x => UpdateSize(window))
+                };
+            }
+        }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnDetachedFromVisualTree(e);
+
+            _disposables?.Dispose();
+            
+            _captionButtons?.Detach();
+            _captionButtons = null;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/ColumnDefinition.cs b/src/Avalonia.Controls/ColumnDefinition.cs
index 293b6326d6..2eb3ae3010 100644
--- a/src/Avalonia.Controls/ColumnDefinition.cs
+++ b/src/Avalonia.Controls/ColumnDefinition.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Controls
 {
     /// <summary>
diff --git a/src/Avalonia.Controls/ColumnDefinitions.cs b/src/Avalonia.Controls/ColumnDefinitions.cs
index d4fc2ee0a1..7e355ab357 100644
--- a/src/Avalonia.Controls/ColumnDefinitions.cs
+++ b/src/Avalonia.Controls/ColumnDefinitions.cs
@@ -1,9 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Specialized;
 using System.Linq;
+using System.Text;
 using Avalonia.Collections;
 
 namespace Avalonia.Controls
@@ -16,7 +14,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Initializes a new instance of the <see cref="ColumnDefinitions"/> class.
         /// </summary>
-        public ColumnDefinitions() : base ()
+        public ColumnDefinitions()
         {
         }
 
@@ -30,6 +28,11 @@ namespace Avalonia.Controls
             AddRange(GridLength.ParseLengths(s).Select(x => new ColumnDefinition(x)));
         }
 
+        public override string ToString()
+        {
+            return string.Join(",", this.Select(x => x.Width));
+        }
+
         /// <summary>
         /// Parses a string representation of column definitions collection.
         /// </summary>
@@ -37,4 +40,4 @@ namespace Avalonia.Controls
         /// <returns>The <see cref="ColumnDefinitions"/>.</returns>
         public static ColumnDefinitions Parse(string s) => new ColumnDefinitions(s);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Controls/ComboBox.cs b/src/Avalonia.Controls/ComboBox.cs
index c2cf20b32d..7f2acb58fe 100644
--- a/src/Avalonia.Controls/ComboBox.cs
+++ b/src/Avalonia.Controls/ComboBox.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Linq;
 using Avalonia.Controls.Generators;
@@ -9,6 +6,8 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Shapes;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.VisualTree;
@@ -53,6 +52,30 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<ItemVirtualizationMode> VirtualizationModeProperty =
             ItemsPresenter.VirtualizationModeProperty.AddOwner<ComboBox>();
 
+        /// <summary>
+        /// Defines the <see cref="PlaceholderText"/> property.
+        /// </summary>
+        public static readonly StyledProperty<string> PlaceholderTextProperty =
+            AvaloniaProperty.Register<ComboBox, string>(nameof(PlaceholderText));
+
+        /// <summary>
+        /// Defines the <see cref="PlaceholderForeground"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush> PlaceholderForegroundProperty =
+            AvaloniaProperty.Register<ComboBox, IBrush>(nameof(PlaceholderForeground));
+
+        /// <summary>
+        /// Defines the <see cref="HorizontalContentAlignment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<HorizontalAlignment> HorizontalContentAlignmentProperty =
+            ContentControl.HorizontalContentAlignmentProperty.AddOwner<ComboBox>();
+
+        /// <summary>
+        /// Defines the <see cref="VerticalContentAlignment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<VerticalAlignment> VerticalContentAlignmentProperty =
+            ContentControl.VerticalContentAlignmentProperty.AddOwner<ComboBox>();
+
         private bool _isDropDownOpen;
         private Popup _popup;
         private object _selectionBoxItem;
@@ -96,6 +119,24 @@ namespace Avalonia.Controls
             set { SetAndRaise(SelectionBoxItemProperty, ref _selectionBoxItem, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the PlaceHolder text.
+        /// </summary>
+        public string PlaceholderText
+        {
+            get { return GetValue(PlaceholderTextProperty); }
+            set { SetValue(PlaceholderTextProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the Brush that renders the placeholder text.
+        /// </summary>
+        public IBrush PlaceholderForeground
+        {
+            get { return GetValue(PlaceholderForegroundProperty); }
+            set { SetValue(PlaceholderForegroundProperty, value); }
+        }
+
         /// <summary>
         /// Gets or sets the virtualization mode for the items.
         /// </summary>
@@ -105,6 +146,24 @@ namespace Avalonia.Controls
             set { SetValue(VirtualizationModeProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the horizontal alignment of the content within the control.
+        /// </summary>
+        public HorizontalAlignment HorizontalContentAlignment
+        {
+            get { return GetValue(HorizontalContentAlignmentProperty); }
+            set { SetValue(HorizontalContentAlignmentProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the vertical alignment of the content within the control.
+        /// </summary>
+        public VerticalAlignment VerticalContentAlignment
+        {
+            get { return GetValue(VerticalContentAlignmentProperty); }
+            set { SetValue(VerticalContentAlignmentProperty, value); }
+        }
+
         /// <inheritdoc/>
         protected override IItemContainerGenerator CreateItemContainerGenerator()
         {
@@ -114,11 +173,10 @@ namespace Avalonia.Controls
                 ComboBoxItem.ContentTemplateProperty);
         }
 
-        /// <inheritdoc/>
-        protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
-            base.OnAttachedToLogicalTree(e);
-            this.UpdateSelectionBoxItem(this.SelectedItem);
+            base.OnAttachedToVisualTree(e);
+            this.UpdateSelectionBoxItem(SelectedItem);
         }
 
         /// <inheritdoc/>
@@ -130,7 +188,7 @@ namespace Avalonia.Controls
                 return;
 
             if (e.Key == Key.F4 ||
-                ((e.Key == Key.Down || e.Key == Key.Up) && ((e.Modifiers & InputModifiers.Alt) != 0)))
+                ((e.Key == Key.Down || e.Key == Key.Up) && ((e.KeyModifiers & KeyModifiers.Alt) != 0)))
             {
                 IsDropDownOpen = !IsDropDownOpen;
                 e.Handled = true;
@@ -198,7 +256,7 @@ namespace Avalonia.Controls
         }
 
         /// <inheritdoc/>
-        protected override void OnPointerPressed(PointerPressedEventArgs e)
+        protected override void OnPointerReleased(PointerReleasedEventArgs e)
         {
             if (!e.Handled)
             {
@@ -217,11 +275,11 @@ namespace Avalonia.Controls
                 }
             }
 
-            base.OnPointerPressed(e);
+            base.OnPointerReleased(e);
         }
 
         /// <inheritdoc/>
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             if (_popup != null)
             {
@@ -231,9 +289,6 @@ namespace Avalonia.Controls
 
             _popup = e.NameScope.Get<Popup>("PART_Popup");
             _popup.Opened += PopupOpened;
-            _popup.Closed += PopupClosed;
-
-            base.OnTemplateApplied(e);
         }
 
         internal void ItemFocused(ComboBoxItem dropDownItem)
@@ -265,7 +320,7 @@ namespace Avalonia.Controls
             var toplevel = this.GetVisualRoot() as TopLevel;
             if (toplevel != null)
             {
-                _subscriptionsOnOpen = toplevel.AddHandler(PointerWheelChangedEvent, (s, ev) =>
+                _subscriptionsOnOpen = toplevel.AddDisposableHandler(PointerWheelChangedEvent, (s, ev) =>
                 {
                     //eat wheel scroll event outside dropdown popup while it's open
                     if (IsDropDownOpen && (ev.Source as IVisual).GetVisualRoot() == toplevel)
@@ -289,9 +344,9 @@ namespace Avalonia.Controls
             {
                 var container = ItemContainerGenerator.ContainerFromIndex(selectedIndex);
 
-                if (container == null && SelectedItems.Count > 0)
+                if (container == null && SelectedIndex != -1)
                 {
-                    ScrollIntoView(SelectedItems[0]);
+                    ScrollIntoView(Selection.SelectedIndex);
                     container = ItemContainerGenerator.ContainerFromIndex(selectedIndex);
                 }
 
@@ -317,19 +372,22 @@ namespace Avalonia.Controls
 
             if (control != null)
             {
-                control.Measure(Size.Infinity);
-
-                SelectionBoxItem = new Rectangle
+                if (VisualRoot is object)
                 {
-                    Width = control.DesiredSize.Width,
-                    Height = control.DesiredSize.Height,
-                    Fill = new VisualBrush
+                    control.Measure(Size.Infinity);
+
+                    SelectionBoxItem = new Rectangle
                     {
-                        Visual = control,
-                        Stretch = Stretch.None,
-                        AlignmentX = AlignmentX.Left,
-                    }
-                };
+                        Width = control.DesiredSize.Width,
+                        Height = control.DesiredSize.Height,
+                        Fill = new VisualBrush
+                        {
+                            Visual = control,
+                            Stretch = Stretch.None,
+                            AlignmentX = AlignmentX.Left,
+                        }
+                    };
+                }
             }
             else
             {
diff --git a/src/Avalonia.Controls/ComboBoxItem.cs b/src/Avalonia.Controls/ComboBoxItem.cs
index 988ca9e274..a0a1f2a4aa 100644
--- a/src/Avalonia.Controls/ComboBoxItem.cs
+++ b/src/Avalonia.Controls/ComboBoxItem.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
 
diff --git a/src/Avalonia.Controls/ContentControl.cs b/src/Avalonia.Controls/ContentControl.cs
index bb3cc4585b..1329bd91c7 100644
--- a/src/Avalonia.Controls/ContentControl.cs
+++ b/src/Avalonia.Controls/ContentControl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Collections;
 using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Presenters;
diff --git a/src/Avalonia.Controls/ContextMenu.cs b/src/Avalonia.Controls/ContextMenu.cs
index 5dfa5863f5..5e17182f3e 100644
--- a/src/Avalonia.Controls/ContextMenu.cs
+++ b/src/Avalonia.Controls/ContextMenu.cs
@@ -1,25 +1,84 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
 using Avalonia.Controls.Generators;
 using Avalonia.Controls.Platform;
 using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Primitives.PopupPositioning;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
-using Avalonia.LogicalTree;
+using Avalonia.Styling;
+
+#nullable enable
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// A control context menu.
     /// </summary>
-    public class ContextMenu : MenuBase
+    public class ContextMenu : MenuBase, ISetterValue
     {
+        /// <summary>
+        /// Defines the <see cref="HorizontalOffset"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> HorizontalOffsetProperty =
+            Popup.HorizontalOffsetProperty.AddOwner<ContextMenu>();
+
+        /// <summary>
+        /// Defines the <see cref="VerticalOffset"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> VerticalOffsetProperty =
+            Popup.VerticalOffsetProperty.AddOwner<ContextMenu>();
+
+        /// <summary>
+        /// Defines the <see cref="PlacementAnchor"/> property.
+        /// </summary>
+        public static readonly StyledProperty<PopupAnchor> PlacementAnchorProperty =
+            Popup.PlacementAnchorProperty.AddOwner<ContextMenu>();
+
+        /// <summary>
+        /// Defines the <see cref="PlacementConstraintAdjustment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<PopupPositionerConstraintAdjustment> PlacementConstraintAdjustmentProperty =
+            Popup.PlacementConstraintAdjustmentProperty.AddOwner<ContextMenu>();
+
+        /// <summary>
+        /// Defines the <see cref="PlacementGravity"/> property.
+        /// </summary>
+        public static readonly StyledProperty<PopupGravity> PlacementGravityProperty =
+            Popup.PlacementGravityProperty.AddOwner<ContextMenu>();
+
+        /// <summary>
+        /// Defines the <see cref="PlacementMode"/> property.
+        /// </summary>
+        public static readonly StyledProperty<PlacementMode> PlacementModeProperty =
+            Popup.PlacementModeProperty.AddOwner<ContextMenu>();
+
+        /// <summary>
+        /// Defines the <see cref="PlacementRect"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Rect?> PlacementRectProperty =
+            AvaloniaProperty.Register<Popup, Rect?>(nameof(PlacementRect));
+
+        /// <summary>
+        /// Defines the <see cref="WindowManagerAddShadowHint"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> WindowManagerAddShadowHintProperty  =
+            Popup.WindowManagerAddShadowHintProperty.AddOwner<ContextMenu>();
+
+        /// <summary>
+        /// Defines the <see cref="PlacementTarget"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Control?> PlacementTargetProperty =
+            Popup.PlacementTargetProperty.AddOwner<ContextMenu>();
+
         private static readonly ITemplate<IPanel> DefaultPanel =
             new FuncTemplate<IPanel>(() => new StackPanel { Orientation = Orientation.Vertical });
-        private Popup _popup;
+        private Popup? _popup;
+        private List<Control>? _attachedControls;
+        private IInputElement? _previousFocus;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ContextMenu"/> class.
@@ -43,23 +102,113 @@ namespace Avalonia.Controls
         /// </summary>
         static ContextMenu()
         {
-            ItemsPanelProperty.OverrideDefaultValue(typeof(ContextMenu), DefaultPanel);
+            ItemsPanelProperty.OverrideDefaultValue<ContextMenu>(DefaultPanel);
+            PlacementModeProperty.OverrideDefaultValue<ContextMenu>(PlacementMode.Pointer);
             ContextMenuProperty.Changed.Subscribe(ContextMenuChanged);
         }
 
+        /// <summary>
+        /// Gets or sets the Horizontal offset of the context menu in relation to the <see cref="PlacementTarget"/>.
+        /// </summary>
+        public double HorizontalOffset
+        {
+            get { return GetValue(HorizontalOffsetProperty); }
+            set { SetValue(HorizontalOffsetProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the Vertical offset of the context menu in relation to the <see cref="PlacementTarget"/>.
+        /// </summary>
+        public double VerticalOffset
+        {
+            get { return GetValue(VerticalOffsetProperty); }
+            set { SetValue(VerticalOffsetProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the anchor point on the <see cref="PlacementRect"/> when <see cref="PlacementMode"/>
+        /// is <see cref="PlacementMode.AnchorAndGravity"/>.
+        /// </summary>
+        public PopupAnchor PlacementAnchor
+        {
+            get { return GetValue(PlacementAnchorProperty); }
+            set { SetValue(PlacementAnchorProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value describing how the context menu position will be adjusted if the
+        /// unadjusted position would result in the context menu being partly constrained.
+        /// </summary>
+        public PopupPositionerConstraintAdjustment PlacementConstraintAdjustment
+        {
+            get { return GetValue(PlacementConstraintAdjustmentProperty); }
+            set { SetValue(PlacementConstraintAdjustmentProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value which defines in what direction the context menu should open
+        /// when <see cref="PlacementMode"/> is <see cref="PlacementMode.AnchorAndGravity"/>.
+        /// </summary>
+        public PopupGravity PlacementGravity
+        {
+            get { return GetValue(PlacementGravityProperty); }
+            set { SetValue(PlacementGravityProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the placement mode of the context menu in relation to the<see cref="PlacementTarget"/>.
+        /// </summary>
+        public PlacementMode PlacementMode
+        {
+            get { return GetValue(PlacementModeProperty); }
+            set { SetValue(PlacementModeProperty, value); }
+        }
+
+        public bool WindowManagerAddShadowHint
+        {
+            get { return GetValue(WindowManagerAddShadowHintProperty); }
+            set { SetValue(WindowManagerAddShadowHintProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the the anchor rectangle within the parent that the context menu will be placed
+        /// relative to when <see cref="PlacementMode"/> is <see cref="PlacementMode.AnchorAndGravity"/>.
+        /// </summary>
+        /// <remarks>
+        /// The placement rect defines a rectangle relative to <see cref="PlacementTarget"/> around
+        /// which the popup will be opened, with <see cref="PlacementAnchor"/> determining which edge
+        /// of the placement target is used.
+        /// 
+        /// If unset, the anchor rectangle will be the bounds of the <see cref="PlacementTarget"/>.
+        /// </remarks>
+        public Rect? PlacementRect
+        {
+            get { return GetValue(PlacementRectProperty); }
+            set { SetValue(PlacementRectProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the control that is used to determine the popup's position.
+        /// </summary>
+        public Control? PlacementTarget
+        {
+            get { return GetValue(PlacementTargetProperty); }
+            set { SetValue(PlacementTargetProperty, value); }
+        }
+
         /// <summary>
         /// Occurs when the value of the
         /// <see cref="P:Avalonia.Controls.ContextMenu.IsOpen" />
         /// property is changing from false to true.
         /// </summary>
-        public event CancelEventHandler ContextMenuOpening;
+        public event CancelEventHandler? ContextMenuOpening;
 
         /// <summary>
         /// Occurs when the value of the
         /// <see cref="P:Avalonia.Controls.ContextMenu.IsOpen" />
         /// property is changing from true to false.
         /// </summary>
-        public event CancelEventHandler ContextMenuClosing;
+        public event CancelEventHandler? ContextMenuClosing;
 
         /// <summary>
         /// Called when the <see cref="Control.ContextMenu"/> property changes on a control.
@@ -69,30 +218,58 @@ namespace Avalonia.Controls
         {
             var control = (Control)e.Sender;
 
-            if (e.OldValue != null)
+            if (e.OldValue is ContextMenu oldMenu)
             {
                 control.PointerReleased -= ControlPointerReleased;
+                oldMenu._attachedControls?.Remove(control);
+                ((ISetLogicalParent?)oldMenu._popup)?.SetParent(null);
             }
 
-            if (e.NewValue != null)
+            if (e.NewValue is ContextMenu newMenu)
             {
+                newMenu._attachedControls ??= new List<Control>();
+                newMenu._attachedControls.Add(control);
                 control.PointerReleased += ControlPointerReleased;
             }
         }
 
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == WindowManagerAddShadowHintProperty && _popup != null)
+            {
+                _popup.WindowManagerAddShadowHint = change.NewValue.GetValueOrDefault<bool>();
+            }
+        }
+
         /// <summary>
         /// Opens the menu.
         /// </summary>
-        public override void Open() => Open(null);
+        public override void Open() => throw new NotSupportedException();
 
         /// <summary>
         /// Opens a context menu on the specified control.
         /// </summary>
         /// <param name="control">The control.</param>
-        public void Open(Control control)
+        public void Open(Control? control)
         {
-            if (control == null)
+            if (control is null && (_attachedControls is null || _attachedControls.Count == 0))
+            {
                 throw new ArgumentNullException(nameof(control));
+            }
+
+            if (control is object &&
+                _attachedControls is object &&
+                !_attachedControls.Contains(control))
+            {
+                throw new ArgumentException(
+                    "Cannot show ContentMenu on a different control to the one it is attached to.",
+                    nameof(control));
+            }
+
+            control ??= _attachedControls![0];
+
             if (IsOpen)
             {
                 return;
@@ -102,21 +279,37 @@ namespace Avalonia.Controls
             {
                 _popup = new Popup
                 {
-                    PlacementMode = PlacementMode.Pointer,
-                    PlacementTarget = control,
-                    StaysOpen = false,
-                    ObeyScreenEdges = true
+                    HorizontalOffset = HorizontalOffset,
+                    VerticalOffset = VerticalOffset,
+                    PlacementAnchor = PlacementAnchor,
+                    PlacementConstraintAdjustment = PlacementConstraintAdjustment,
+                    PlacementGravity = PlacementGravity,
+                    PlacementMode = PlacementMode,
+                    PlacementRect = PlacementRect,
+                    PlacementTarget = PlacementTarget ?? control,
+                    IsLightDismissEnabled = true,
+                    OverlayDismissEventPassThrough = true,
+                    WindowManagerAddShadowHint = WindowManagerAddShadowHint,
                 };
 
                 _popup.Opened += PopupOpened;
                 _popup.Closed += PopupClosed;
             }
 
-            ((ISetLogicalParent)_popup).SetParent(control);
-            _popup.Child = this;
-            _popup.IsOpen = true;
+            if (_popup.Parent != control)
+            {
+                ((ISetLogicalParent)_popup).SetParent(null);
+                ((ISetLogicalParent)_popup).SetParent(control);
+            }
+
+            if (PlacementTarget is null && _popup.PlacementTarget != control)
+            {
+                _popup.PlacementTarget = control;
+            }
 
+            _popup.Child = this;
             IsOpen = true;
+            _popup.IsOpen = true;
 
             RaiseEvent(new RoutedEventArgs
             {
@@ -141,41 +334,54 @@ namespace Avalonia.Controls
             }
         }
 
-        protected override IItemContainerGenerator CreateItemContainerGenerator()
+        void ISetterValue.Initialize(ISetter setter)
         {
-            return new MenuItemContainerGenerator(this);
+            // ContextMenu can be assigned to the ContextMenu property in a setter. This overrides
+            // the behavior defined in Control which requires controls to be wrapped in a <template>.
+            if (!(setter is Setter s && s.Property == ContextMenuProperty))
+            {
+                throw new InvalidOperationException(
+                    "Cannot use a control as a Setter value. Wrap the control in a <Template>.");
+            }
         }
 
-        private void CloseCore()
+        protected override IItemContainerGenerator CreateItemContainerGenerator()
         {
-            SelectedIndex = -1;
-            IsOpen = false;
-
-            RaiseEvent(new RoutedEventArgs
-            {
-                RoutedEvent = MenuClosedEvent,
-                Source = this,
-            });
+            return new MenuItemContainerGenerator(this);
         }
 
         private void PopupOpened(object sender, EventArgs e)
         {
+            _previousFocus = FocusManager.Instance?.Current;
             Focus();
         }
 
         private void PopupClosed(object sender, EventArgs e)
         {
-            var contextMenu = (sender as Popup)?.Child as ContextMenu;
-
-            if (contextMenu != null)
+            foreach (var i in LogicalChildren)
             {
-                foreach (var i in contextMenu.GetLogicalChildren().OfType<MenuItem>())
+                if (i is MenuItem menuItem)
                 {
-                    i.IsSubMenuOpen = false;
+                    menuItem.IsSubMenuOpen = false;
                 }
+            }
 
-                contextMenu.CloseCore();
+            SelectedIndex = -1;
+            IsOpen = false;
+
+            if (_attachedControls is null || _attachedControls.Count == 0)
+            {
+                ((ISetLogicalParent)_popup!).SetParent(null);
             }
+
+            // HACK: Reset the focus when the popup is closed. We need to fix this so it's automatic.
+            FocusManager.Instance?.Focus(_previousFocus);
+
+            RaiseEvent(new RoutedEventArgs
+            {
+                RoutedEvent = MenuClosedEvent,
+                Source = this,
+            });
         }
 
         private static void ControlPointerReleased(object sender, PointerReleasedEventArgs e)
diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index ca5edae4a9..41370d8464 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.ComponentModel;
 using Avalonia.Controls.Primitives;
diff --git a/src/Avalonia.Controls/ControlExtensions.cs b/src/Avalonia.Controls/ControlExtensions.cs
index 3bd222d132..c3cab0a729 100644
--- a/src/Avalonia.Controls/ControlExtensions.cs
+++ b/src/Avalonia.Controls/ControlExtensions.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Linq;
 using Avalonia.Data;
@@ -69,26 +66,6 @@ namespace Avalonia.Controls
             return nameScope.Find<T>(name);
         }
 
-        /// <summary>
-        /// Adds or removes a pseudoclass depending on a boolean value.
-        /// </summary>
-        /// <param name="classes">The pseudoclasses collection.</param>
-        /// <param name="name">The name of the pseudoclass to set.</param>
-        /// <param name="value">True to add the pseudoclass or false to remove.</param>
-        public static void Set(this IPseudoClasses classes, string name, bool value)
-        {
-            Contract.Requires<ArgumentNullException>(classes != null);
-
-            if (value)
-            {
-                classes.Add(name);
-            }
-            else
-            {
-                classes.Remove(name);
-            }
-        }
-
         /// <summary>
         /// Sets a pseudoclass depending on an observable trigger.
         /// </summary>
diff --git a/src/Avalonia.Controls/Controls.cs b/src/Avalonia.Controls/Controls.cs
index 02b745ddf6..a504b39196 100644
--- a/src/Avalonia.Controls/Controls.cs
+++ b/src/Avalonia.Controls/Controls.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Generic;
 using Avalonia.Collections;
 
diff --git a/src/Avalonia.Controls/Converters/MarginMultiplierConverter.cs b/src/Avalonia.Controls/Converters/MarginMultiplierConverter.cs
index 54bd6bcf39..9f3a6da9da 100644
--- a/src/Avalonia.Controls/Converters/MarginMultiplierConverter.cs
+++ b/src/Avalonia.Controls/Converters/MarginMultiplierConverter.cs
@@ -18,10 +18,24 @@ namespace Avalonia.Controls.Converters
 
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (!(value is int depth))
-                return new Thickness(0);
-
-            return new Thickness(Left ? Indent * depth : 0, Top ? Indent * depth : 0, Right ? Indent * depth : 0, Bottom ? Indent * depth : 0);
+            if (value is int scalarDepth)
+            {
+                return new Thickness(
+                    Left ? Indent * scalarDepth : 0,
+                    Top ? Indent * scalarDepth : 0,
+                    Right ? Indent * scalarDepth : 0,
+                    Bottom ? Indent * scalarDepth : 0);
+            }
+            else if (value is Thickness thinknessDepth)
+            {
+                return new Thickness(
+                    Left ? Indent * thinknessDepth.Left : 0,
+                    Top ? Indent * thinknessDepth.Top : 0,
+                    Right ? Indent * thinknessDepth.Right : 0,
+                    Bottom ? Indent * thinknessDepth.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
new file mode 100644
index 0000000000..e6420fe342
--- /dev/null
+++ b/src/Avalonia.Controls/Converters/MenuScrollingVisibilityConverter.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data.Converters;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls.Converters
+{
+    public class MenuScrollingVisibilityConverter : IMultiValueConverter
+    {
+        public static readonly MenuScrollingVisibilityConverter Instance = new MenuScrollingVisibilityConverter();
+
+        public object Convert(IList<object> values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (parameter == null ||
+                values == null ||
+                values.Count != 4 ||
+                !(values[0] is ScrollBarVisibility visiblity) ||
+                !(values[1] is double offset) ||
+                !(values[2] is double extent) ||
+                !(values[3] is double viewport))
+            {
+                return AvaloniaProperty.UnsetValue;
+            }
+
+            if (visiblity == ScrollBarVisibility.Auto)
+            {
+                if (extent == viewport)
+                {
+                    return false;
+                }
+
+                double target;
+
+                if (parameter is double d)
+                {
+                    target = d;
+                }
+                else if (parameter is string s)
+                {
+                    target = double.Parse(s, NumberFormatInfo.InvariantInfo);
+                }
+                else
+                {
+                    return AvaloniaProperty.UnsetValue;
+                }
+
+                // Calculate the percent so that we can see if we are near the edge of the range
+                double percent = MathUtilities.Clamp(offset * 100.0 / (extent - viewport), 0, 100);
+
+                if (MathUtilities.AreClose(percent, target))
+                {
+                    // We are at the end of the range, so no need for this button to be shown
+                    return false;
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Converters/PlatformKeyGestureConverter.cs b/src/Avalonia.Controls/Converters/PlatformKeyGestureConverter.cs
new file mode 100644
index 0000000000..603a470a93
--- /dev/null
+++ b/src/Avalonia.Controls/Converters/PlatformKeyGestureConverter.cs
@@ -0,0 +1,195 @@
+using System;
+using System.Globalization;
+using System.Runtime.InteropServices;
+using System.Text;
+using Avalonia.Data.Converters;
+using Avalonia.Input;
+
+namespace Avalonia.Controls.Converters
+{
+    /// <summary>
+    /// Converts a <see cref="KeyGesture"/> to a string, formatting it according to the current
+    /// platform's style guidelines.
+    /// </summary>
+    public class PlatformKeyGestureConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is null)
+            {
+                return null;
+            }
+            else if (value is KeyGesture gesture && targetType == typeof(string))
+            {
+                return ToPlatformString(gesture);
+            }
+            else
+            {
+                throw new NotSupportedException();
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Converts a <see cref="KeyGesture"/> to a string, formatting it according to the current
+        /// platform's style guidelines.
+        /// </summary>
+        /// <param name="gesture">The gesture.</param>
+        /// <returns>The gesture formatted according to the current platform.</returns>
+        public static string ToPlatformString(KeyGesture gesture)
+        {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                return ToString(gesture, "Win");
+            }
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            {
+                return ToString(gesture, "Super");
+            }
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                return ToOSXString(gesture);
+            }
+            else
+            {
+                return gesture.ToString();
+            }
+        }
+
+        private static string ToString(KeyGesture gesture, string meta)
+        {
+            var s = new StringBuilder();
+
+            static void Plus(StringBuilder s)
+            {
+                if (s.Length > 0)
+                {
+                    s.Append("+");
+                }
+            }
+
+            if (gesture.KeyModifiers.HasFlagCustom(KeyModifiers.Control))
+            {
+                s.Append("Ctrl");
+            }
+
+            if (gesture.KeyModifiers.HasFlagCustom(KeyModifiers.Shift))
+            {
+                Plus(s);
+                s.Append("Shift");
+            }
+
+            if (gesture.KeyModifiers.HasFlagCustom(KeyModifiers.Alt))
+            {
+                Plus(s);
+                s.Append("Alt");
+            }
+
+            if (gesture.KeyModifiers.HasFlagCustom(KeyModifiers.Meta))
+            {
+                Plus(s);
+                s.Append(meta);
+            }
+
+            Plus(s);
+            s.Append(ToString(gesture.Key));
+
+            return s.ToString();
+        }
+
+        private static string ToOSXString(KeyGesture gesture)
+        {
+            var s = new StringBuilder();
+
+            if (gesture.KeyModifiers.HasFlagCustom(KeyModifiers.Control))
+            {
+                s.Append('⌃');
+            }
+
+            if (gesture.KeyModifiers.HasFlagCustom(KeyModifiers.Alt))
+            {
+                s.Append('⌥');
+            }
+
+            if (gesture.KeyModifiers.HasFlagCustom(KeyModifiers.Shift))
+            {
+                s.Append('⇧');
+            }
+
+            if (gesture.KeyModifiers.HasFlagCustom(KeyModifiers.Meta))
+            {
+                s.Append('⌘');
+            }
+
+            s.Append(ToOSXString(gesture.Key));
+
+            return s.ToString();
+        }
+
+        private static string ToString(Key key)
+        {
+            return key switch
+            {
+                Key.Add => "+",
+                Key.Back => "Backspace",
+                Key.D0 => "0",
+                Key.D1 => "1",
+                Key.D2 => "2",
+                Key.D3 => "3",
+                Key.D4 => "4",
+                Key.D5 => "5",
+                Key.D6 => "6",
+                Key.D7 => "7",
+                Key.D8 => "8",
+                Key.D9 => "9",
+                Key.Decimal => ".",
+                Key.Divide => "/",
+                Key.Down => "Down Arrow",
+                Key.Left => "Left Arrow",
+                Key.Multiply => "*",
+                Key.OemBackslash => "\\",
+                Key.OemCloseBrackets => "]",
+                Key.OemComma => ",",
+                Key.OemMinus => "-",
+                Key.OemOpenBrackets => "[",
+                Key.OemPeriod=> ".",
+                Key.OemPipe => "|",
+                Key.OemPlus => "+",
+                Key.OemQuestion => "/",
+                Key.OemQuotes => "\"",
+                Key.OemSemicolon => ";",
+                Key.OemTilde => "`",
+                Key.Right => "Right Arrow",
+                Key.Separator => "/",
+                Key.Subtract => "-",
+                Key.Up => "Up Arrow",
+                _ => key.ToString(),
+            };
+        }
+
+        private static string ToOSXString(Key key)
+        {
+            return key switch
+            {
+                Key.Back => "⌫",
+                Key.Down => "↓",
+                Key.End => "↘",
+                Key.Escape => "⎋",
+                Key.Home => "↖",
+                Key.Left => "←",
+                Key.Return => "↩",
+                Key.PageDown => "⇞",
+                Key.PageUp => "⇟",
+                Key.Right => "→",
+                Key.Space => "␣",
+                Key.Tab => "⇥",
+                Key.Up => "↑",
+                _ => ToString(key),
+            };
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/DataValidationErrors.cs b/src/Avalonia.Controls/DataValidationErrors.cs
index 2588b7cc11..3c64691816 100644
--- a/src/Avalonia.Controls/DataValidationErrors.cs
+++ b/src/Avalonia.Controls/DataValidationErrors.cs
@@ -1,10 +1,8 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 
@@ -17,6 +15,7 @@ namespace Avalonia.Controls
     /// <remarks>
     /// You will probably only want to create instances inside of control templates.
     /// </remarks>
+    [PseudoClasses(":error")]
     public class DataValidationErrors : ContentControl
     {
         /// <summary>
diff --git a/src/Avalonia.Controls/DateTimePickers/DatePicker.cs b/src/Avalonia.Controls/DateTimePickers/DatePicker.cs
new file mode 100644
index 0000000000..8d893154eb
--- /dev/null
+++ b/src/Avalonia.Controls/DateTimePickers/DatePicker.cs
@@ -0,0 +1,418 @@
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Shapes;
+using Avalonia.Controls.Templates;
+using Avalonia.Interactivity;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// A control to allow the user to select a date
+    /// </summary>
+    [PseudoClasses(":hasnodate")]
+    public class DatePicker : TemplatedControl
+    {
+        /// <summary>
+        /// Define the <see cref="DayFormat"/> Property
+        /// </summary>
+        public static readonly DirectProperty<DatePicker, string> DayFormatProperty =
+            AvaloniaProperty.RegisterDirect<DatePicker, string>(nameof(DayFormat),
+                x => x.DayFormat, (x, v) => x.DayFormat = v);
+
+        /// <summary>
+        /// Defines the <see cref="DayVisible"/> Property
+        /// </summary>
+        public static readonly DirectProperty<DatePicker, bool> DayVisibleProperty =
+            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>
+        public static readonly DirectProperty<DatePicker, DateTimeOffset> MaxYearProperty =
+            AvaloniaProperty.RegisterDirect<DatePicker, DateTimeOffset>(nameof(MaxYear), 
+                x => x.MaxYear, (x, v) => x.MaxYear = v);
+
+        /// <summary>
+        /// Defines the <see cref="MinYear"/> Property
+        /// </summary>
+        public static readonly DirectProperty<DatePicker, DateTimeOffset> MinYearProperty =
+            AvaloniaProperty.RegisterDirect<DatePicker, DateTimeOffset>(nameof(MinYear), 
+                x => x.MinYear, (x, v) => x.MinYear = v);
+
+        /// <summary>
+        /// Defines the <see cref="MonthFormat"/> Property
+        /// </summary>
+        public static readonly DirectProperty<DatePicker, string> MonthFormatProperty =
+            AvaloniaProperty.RegisterDirect<DatePicker, string>(nameof(MonthFormat), 
+                x => x.MonthFormat, (x, v) => x.MonthFormat = v);
+
+        /// <summary>
+        /// Defines the <see cref="MonthVisible"/> Property
+        /// </summary>
+        public static readonly DirectProperty<DatePicker, bool> MonthVisibleProperty =
+            AvaloniaProperty.RegisterDirect<DatePicker, bool>(nameof(MonthVisible), 
+                x => x.MonthVisible, (x, v) => x.MonthVisible = v);
+
+        /// <summary>
+        /// Defiens the <see cref="YearFormat"/> Property
+        /// </summary>
+        public static readonly DirectProperty<DatePicker, string> YearFormatProperty =
+            AvaloniaProperty.RegisterDirect<DatePicker, string>(nameof(YearFormat), 
+                x => x.YearFormat, (x, v) => x.YearFormat = v);
+
+        /// <summary>
+        /// Defines the <see cref="YearVisible"/> Property
+        /// </summary>
+        public static readonly DirectProperty<DatePicker, bool> YearVisibleProperty =
+            AvaloniaProperty.RegisterDirect<DatePicker, bool>(nameof(YearVisible), 
+                x => x.YearVisible, (x, v) => x.YearVisible = v);
+
+        /// <summary>
+        /// Defines the <see cref="SelectedDate"/> Property
+        /// </summary>
+        public static readonly DirectProperty<DatePicker, DateTimeOffset?> SelectedDateProperty =
+            AvaloniaProperty.RegisterDirect<DatePicker, DateTimeOffset?>(nameof(SelectedDate), 
+                x => x.SelectedDate, (x, v) => x.SelectedDate = v);
+
+        // Template Items
+        private Button _flyoutButton;
+        private TextBlock _dayText;
+        private TextBlock _monthText;
+        private TextBlock _yearText;
+        private Grid _container;
+        private Rectangle _spacer1;
+        private Rectangle _spacer2;
+        private Popup _popup;
+        private DatePickerPresenter _presenter;
+
+        private bool _areControlsAvailable;
+
+        private string _dayFormat = "%d";
+        private bool _dayVisible = true;
+        private DateTimeOffset _maxYear;
+        private DateTimeOffset _minYear;
+        private string _monthFormat = "MMMM";
+        private bool _monthVisible = true;
+        private string _yearFormat = "yyyy";
+        private bool _yearVisible = true;
+        private DateTimeOffset? _selectedDate;
+
+        public DatePicker()
+        {
+            PseudoClasses.Set(":hasnodate", true);
+            var now = DateTimeOffset.Now;
+            _minYear = new DateTimeOffset(now.Date.Year - 100, 1, 1, 0, 0, 0, now.Offset);
+            _maxYear = new DateTimeOffset(now.Date.Year + 100, 12, 31, 0, 0, 0, now.Offset);
+        }
+
+        public string DayFormat
+        {
+            get => _dayFormat;
+            set => SetAndRaise(DayFormatProperty, ref _dayFormat, value);
+        }
+
+        /// <summary>
+        /// Gets or sets whether the day is visible
+        /// </summary>
+        public bool DayVisible
+        {
+            get => _dayVisible;
+            set
+            {
+                SetAndRaise(DayVisibleProperty, ref _dayVisible, value);
+                SetGrid();
+            }
+        }
+
+        /// <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>
+        public DateTimeOffset MaxYear
+        {
+            get => _maxYear;
+            set
+            {
+                if (value < MinYear)
+                    throw new InvalidOperationException("MaxDate cannot be less than MinDate");
+                SetAndRaise(MaxYearProperty, ref _maxYear, value);
+
+                if (SelectedDate.HasValue && SelectedDate.Value > value)
+                    SelectedDate = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum year for the picker
+        /// </summary>
+        public DateTimeOffset MinYear
+        {
+            get => _minYear;
+            set
+            {
+                if (value > MaxYear)
+                    throw new InvalidOperationException("MinDate cannot be greater than MaxDate");
+                SetAndRaise(MinYearProperty, ref _minYear, value);
+
+                if (SelectedDate.HasValue && SelectedDate.Value < value)
+                    SelectedDate = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the month format
+        /// </summary>
+        public string MonthFormat
+        {
+            get => _monthFormat;
+            set => SetAndRaise(MonthFormatProperty, ref _monthFormat, value);
+        }
+
+        /// <summary>
+        /// Gets or sets whether the month is visible
+        /// </summary>
+        public bool MonthVisible
+        {
+            get => _monthVisible;
+            set
+            {
+                SetAndRaise(MonthVisibleProperty, ref _monthVisible, value);
+                SetGrid();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the year format
+        /// </summary>
+        public string YearFormat
+        {
+            get => _yearFormat;
+            set => SetAndRaise(YearFormatProperty, ref _yearFormat, value);
+        }
+
+        /// <summary>
+        /// Gets or sets whether the year is visible
+        /// </summary>
+        public bool YearVisible
+        {
+            get => _yearVisible;
+            set
+            {
+                SetAndRaise(YearVisibleProperty, ref _yearVisible, value);
+                SetGrid();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Selected Date for the picker, can be null
+        /// </summary>
+        public DateTimeOffset? SelectedDate
+        {
+            get => _selectedDate;
+            set
+            {
+                var old = _selectedDate;
+                SetAndRaise(SelectedDateProperty, ref _selectedDate, value);
+                SetSelectedDateText();
+                OnSelectedDateChanged(this, new DatePickerSelectedValueChangedEventArgs(old, value));
+            }
+        }
+
+        /// <summary>
+        /// Raised when the <see cref="SelectedDate"/> changes
+        /// </summary>
+        public event EventHandler<DatePickerSelectedValueChangedEventArgs> SelectedDateChanged;
+
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            _areControlsAvailable = false;
+            if (_flyoutButton != null)
+                _flyoutButton.Click -= OnFlyoutButtonClicked;
+            if (_presenter != null)
+            {
+                _presenter.Confirmed -= OnConfirmed;
+                _presenter.Dismissed -= OnDismissPicker;
+            }
+
+            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");
+
+            _areControlsAvailable = true;
+
+            SetGrid();
+            SetSelectedDateText();
+
+            if (_flyoutButton != null)
+                _flyoutButton.Click += OnFlyoutButtonClicked;
+
+            if (_presenter != null)
+            {
+                _presenter.Confirmed += OnConfirmed;
+                _presenter.Dismissed += OnDismissPicker;
+
+                _presenter[!DatePickerPresenter.MaxYearProperty] = this[!MaxYearProperty];
+                _presenter[!DatePickerPresenter.MinYearProperty] = this[!MinYearProperty];
+
+                _presenter[!DatePickerPresenter.MonthVisibleProperty] = this[!MonthVisibleProperty];
+                _presenter[!DatePickerPresenter.MonthFormatProperty] = this[!MonthFormatProperty];
+
+                _presenter[!DatePickerPresenter.DayVisibleProperty] = this[!DayVisibleProperty];
+                _presenter[!DatePickerPresenter.DayFormatProperty] = this[!DayFormatProperty];
+
+                _presenter[!DatePickerPresenter.YearVisibleProperty] = this[!YearVisibleProperty];
+                _presenter[!DatePickerPresenter.YearFormatProperty] = this[!YearFormatProperty];
+            }
+        }
+
+        private void OnDismissPicker(object sender, EventArgs e)
+        {
+            _popup.Close();
+            Focus();
+        }
+
+        private void OnConfirmed(object sender, EventArgs e)
+        {
+            _popup.Close();
+            SelectedDate = _presenter.Date;
+        }
+
+        private void SetGrid()
+        {
+            if (_container == null)
+                return;
+
+            var fmt = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern;
+            var columns = new List<(TextBlock, int)>
+            {
+                (_monthText, MonthVisible ? fmt.IndexOf("m", StringComparison.OrdinalIgnoreCase) : -1),
+                (_yearText, YearVisible ? fmt.IndexOf("y", StringComparison.OrdinalIgnoreCase) : -1),
+                (_dayText, DayVisible ? fmt.IndexOf("d", StringComparison.OrdinalIgnoreCase) : -1),
+            };
+
+            columns.Sort((x, y) => x.Item2 - y.Item2);
+            _container.ColumnDefinitions.Clear();
+
+            var columnIndex = 0;
+
+            foreach (var column in columns)
+            {
+                if (column.Item1 is null)
+                    continue;
+
+                column.Item1.IsVisible = column.Item2 != -1;
+
+                if (column.Item2 != -1)
+                {
+                    if (columnIndex > 0)
+                    {
+                        _container.ColumnDefinitions.Add(new ColumnDefinition(0, GridUnitType.Auto));
+                    }
+
+                    _container.ColumnDefinitions.Add(
+                        new ColumnDefinition(column.Item1 == _monthText ? 138 : 78, GridUnitType.Star));
+
+                    if (column.Item1.Parent is null)
+                    {
+                        _container.Children.Add(column.Item1);
+                    }
+
+                    Grid.SetColumn(column.Item1, (columnIndex++ * 2));
+                }
+            }
+
+            var isSpacer1Visible = columnIndex > 1;
+            var isSpacer2Visible = columnIndex > 2;
+            // ternary conditional operator is used to make sure grid cells will be validated
+            Grid.SetColumn(_spacer1, isSpacer1Visible ? 1 : 0);
+            Grid.SetColumn(_spacer2, isSpacer2Visible ? 3 : 0);
+
+            _spacer1.IsVisible = isSpacer1Visible;
+            _spacer2.IsVisible = isSpacer2Visible;
+        }
+
+        private void SetSelectedDateText()
+        {
+            if (!_areControlsAvailable)
+                return;
+
+            if (SelectedDate.HasValue)
+            {
+                PseudoClasses.Set(":hasnodate", false);
+                var selDate = SelectedDate.Value;
+                _monthText.Text = selDate.ToString(MonthFormat);
+                _yearText.Text = selDate.ToString(YearFormat);
+                _dayText.Text = selDate.ToString(DayFormat);
+            }
+            else
+            {
+                PseudoClasses.Set(":hasnodate", true);
+                _monthText.Text = "month";
+                _yearText.Text = "year";
+                _dayText.Text = "day";
+            }
+        }
+
+        private void OnFlyoutButtonClicked(object sender, RoutedEventArgs e)
+        {
+            if (_presenter == null)
+                throw new InvalidOperationException("No DatePickerPresenter found");
+
+            _presenter.Date = SelectedDate ?? DateTimeOffset.Now;
+
+            _popup.IsOpen = true;
+
+            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);
+        }
+
+        protected virtual void OnSelectedDateChanged(object sender, DatePickerSelectedValueChangedEventArgs e)
+        {
+            SelectedDateChanged?.Invoke(sender, e);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/DateTimePickers/DatePickerPresenter.cs b/src/Avalonia.Controls/DateTimePickers/DatePickerPresenter.cs
new file mode 100644
index 0000000000..eec4615736
--- /dev/null
+++ b/src/Avalonia.Controls/DateTimePickers/DatePickerPresenter.cs
@@ -0,0 +1,541 @@
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Shapes;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines the presenter used for selecting a date for a 
+    /// <see cref="DatePicker"/>
+    /// </summary>
+    public class DatePickerPresenter : PickerPresenterBase
+    {
+        /// <summary>
+        /// Defines the <see cref="Date"/> Property
+        /// </summary>
+        public static readonly DirectProperty<DatePickerPresenter, DateTimeOffset> DateProperty =
+            AvaloniaProperty.RegisterDirect<DatePickerPresenter, DateTimeOffset>(nameof(Date), 
+                x => x.Date, (x, v) => x.Date = v);
+
+        /// <summary>
+        /// Defines the <see cref="DayFormat"/> Property
+        /// </summary>
+        public static readonly DirectProperty<DatePickerPresenter, string> DayFormatProperty =
+            DatePicker.DayFormatProperty.AddOwner<DatePickerPresenter>(x => 
+            x.DayFormat, (x, v) => x.DayFormat = v);
+
+        /// <summary>
+        /// Defines the <see cref="DayVisible"/> Property
+        /// </summary>
+        public static readonly DirectProperty<DatePickerPresenter, bool> DayVisibleProperty =
+            DatePicker.DayVisibleProperty.AddOwner<DatePickerPresenter>(x => 
+            x.DayVisible, (x, v) => x.DayVisible = v);
+
+        /// <summary>
+        /// Defines the <see cref="MaxYear"/> Property
+        /// </summary>
+        public static readonly DirectProperty<DatePickerPresenter, DateTimeOffset> MaxYearProperty =
+            DatePicker.MaxYearProperty.AddOwner<DatePickerPresenter>(x => 
+            x.MaxYear, (x, v) => x.MaxYear = v);
+
+        /// <summary>
+        /// Defines the <see cref="MinYear"/> Property
+        /// </summary>
+        public static readonly DirectProperty<DatePickerPresenter, DateTimeOffset> MinYearProperty =
+            DatePicker.MinYearProperty.AddOwner<DatePickerPresenter>(x => 
+            x.MinYear, (x, v) => x.MinYear = v);
+
+        /// <summary>
+        /// Defines the <see cref="MonthFormat"/> Property
+        /// </summary>
+        public static readonly DirectProperty<DatePickerPresenter, string> MonthFormatProperty =
+            DatePicker.MonthFormatProperty.AddOwner<DatePickerPresenter>(x => 
+            x.MonthFormat, (x, v) => x.MonthFormat = v);
+
+        /// <summary>
+        /// Defines the <see cref="MonthVisible"/> Property
+        /// </summary>
+        public static readonly DirectProperty<DatePickerPresenter, bool> MonthVisibleProperty =
+            DatePicker.MonthVisibleProperty.AddOwner<DatePickerPresenter>(x => 
+            x.MonthVisible, (x, v) => x.MonthVisible = v);
+
+        /// <summary>
+        /// Defines the <see cref="YearFormat"/> Property
+        /// </summary>
+        public static readonly DirectProperty<DatePickerPresenter, string> YearFormatProperty =
+            DatePicker.YearFormatProperty.AddOwner<DatePickerPresenter>(x => 
+            x.YearFormat, (x, v) => x.YearFormat = v);
+
+        /// <summary>
+        /// Defines the <see cref="YearVisible"/> Property
+        /// </summary>
+        public static readonly DirectProperty<DatePickerPresenter, bool> YearVisibleProperty =
+            DatePicker.YearVisibleProperty.AddOwner<DatePickerPresenter>(x => 
+            x.YearVisible, (x, v) => x.YearVisible = v);
+
+        // Template Items
+        private Grid _pickerContainer;
+        private Button _acceptButton;
+        private Button _dismissButton;
+        private Rectangle _spacer1;
+        private Rectangle _spacer2;
+        private Panel _monthHost;
+        private Panel _yearHost;
+        private Panel _dayHost;
+        private DateTimePickerPanel _monthSelector;
+        private DateTimePickerPanel _yearSelector;
+        private DateTimePickerPanel _daySelector;
+        private Button _monthUpButton;
+        private Button _dayUpButton;
+        private Button _yearUpButton;
+        private Button _monthDownButton;
+        private Button _dayDownButton;
+        private Button _yearDownButton;
+
+        private DateTimeOffset _date;
+        private string _dayFormat = "%d";
+        private bool _dayVisible = true;
+        private DateTimeOffset _maxYear;
+        private DateTimeOffset _minYear;
+        private string _monthFormat = "MMMM";
+        private bool _monthVisible = true;
+        private string _yearFormat = "yyyy";
+        private bool _yearVisible = true;
+        private DateTimeOffset _syncDate;
+
+        private readonly GregorianCalendar _calendar;
+        private bool _suppressUpdateSelection;
+
+        public DatePickerPresenter()
+        {
+            var now = DateTimeOffset.Now;
+            _minYear = new DateTimeOffset(now.Year - 100, 1, 1, 0, 0, 0, now.Offset);
+            _maxYear = new DateTimeOffset(now.Year + 100, 12, 31, 0, 0, 0, now.Offset);
+            _date = now;
+            _calendar = new GregorianCalendar();
+            KeyboardNavigation.SetTabNavigation(this, KeyboardNavigationMode.Cycle);
+        }
+
+        /// <summary>
+        /// Gets or sets the current Date for the picker
+        /// </summary>
+        public DateTimeOffset Date
+        {
+            get => _date;
+            set
+            {
+                SetAndRaise(DateProperty, ref _date, value);
+                _syncDate = Date;
+                InitPicker();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the DayFormat
+        /// </summary>
+        public string DayFormat
+        {
+            get => _dayFormat;
+            set => SetAndRaise(DayFormatProperty, ref _dayFormat, value);
+        }
+
+        /// <summary>
+        /// Get or sets whether the Day selector is visible
+        /// </summary>
+        public bool DayVisible
+        {
+            get => _dayVisible;
+            set
+            {
+                SetAndRaise(DayVisibleProperty, ref _dayVisible, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum pickable year
+        /// </summary>
+        public DateTimeOffset MaxYear
+        {
+            get => _maxYear;
+            set
+            {
+                if (value < MinYear)
+                    throw new InvalidOperationException("MaxDate cannot be less than MinDate");
+                SetAndRaise(MaxYearProperty, ref _maxYear, value);
+
+                if (Date > value)
+                    Date = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum pickable year
+        /// </summary>
+        public DateTimeOffset MinYear
+        {
+            get => _minYear;
+            set
+            {
+                if (value > MaxYear)
+                    throw new InvalidOperationException("MinDate cannot be greater than MaxDate");
+                SetAndRaise(MinYearProperty, ref _minYear, value);
+
+                if (Date < value)
+                    Date = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the month format
+        /// </summary>
+        public string MonthFormat
+        {
+            get => _monthFormat;
+            set => SetAndRaise(MonthFormatProperty, ref _monthFormat, value);
+        }
+
+        /// <summary>
+        /// Gets or sets whether the month selector is visible
+        /// </summary>
+        public bool MonthVisible
+        {
+            get => _monthVisible;
+            set
+            {
+                SetAndRaise(MonthVisibleProperty, ref _monthVisible, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the year format
+        /// </summary>
+        public string YearFormat
+        {
+            get => _yearFormat;
+            set => SetAndRaise(YearFormatProperty, ref _yearFormat, value);
+        }
+
+        /// <summary>
+        /// Gets or sets whether the year selector is visible
+        /// </summary>
+        public bool YearVisible
+        {
+            get => _yearVisible;
+            set
+            {
+                SetAndRaise(YearVisibleProperty, ref _yearVisible, value);
+            }
+        }
+
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            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");
+
+            _monthSelector = e.NameScope.Get<DateTimePickerPanel>("MonthSelector");
+            _monthSelector.SelectionChanged += OnMonthChanged;
+
+            _daySelector = e.NameScope.Get<DateTimePickerPanel>("DaySelector");
+            _daySelector.SelectionChanged += OnDayChanged;
+
+            _yearSelector = e.NameScope.Get<DateTimePickerPanel>("YearSelector");
+            _yearSelector.SelectionChanged += OnYearChanged;
+
+            _acceptButton = e.NameScope.Get<Button>("AcceptButton");
+
+            _monthUpButton = e.NameScope.Find<RepeatButton>("MonthUpButton");
+            if (_monthUpButton != null)
+            {
+                _monthUpButton.Click += OnSelectorButtonClick;
+            }
+            _monthDownButton = e.NameScope.Find<RepeatButton>("MonthDownButton");
+            if (_monthDownButton != null)
+            {
+                _monthDownButton.Click += OnSelectorButtonClick;
+            }
+
+            _dayUpButton = e.NameScope.Find<RepeatButton>("DayUpButton");
+            if (_dayUpButton != null)
+            {
+                _dayUpButton.Click += OnSelectorButtonClick;
+            }
+            _dayDownButton = e.NameScope.Find<RepeatButton>("DayDownButton");
+            if (_dayDownButton != null)
+            {
+                _dayDownButton.Click += OnSelectorButtonClick;
+            }
+
+            _yearUpButton = e.NameScope.Find<RepeatButton>("YearUpButton");
+            if (_yearUpButton != null)
+            {
+                _yearUpButton.Click += OnSelectorButtonClick;
+            }
+            _yearDownButton = e.NameScope.Find<RepeatButton>("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");
+
+            if (_acceptButton != null)
+            {
+                _acceptButton.Click += OnAcceptButtonClicked;
+            }
+            if (_dismissButton != null)
+            {
+                _dismissButton.Click += OnDismissButtonClicked;
+            }
+            InitPicker();
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            switch (e.Key)
+            {
+                case Key.Escape:
+                    OnDismiss();
+                    e.Handled = true;
+                    break;
+                case Key.Tab:
+                    var nextFocus = KeyboardNavigationHandler.GetNext(FocusManager.Instance.Current, NavigationDirection.Next);
+                    KeyboardDevice.Instance?.SetFocusedElement(nextFocus, NavigationMethod.Tab, KeyModifiers.None);
+                    e.Handled = true;
+                    break;
+                case Key.Enter:
+                    Date = _syncDate;
+                    OnConfirmed();
+                    e.Handled = true;
+                    break;
+            }
+            base.OnKeyDown(e);
+        }
+
+        /// <summary>
+        /// Initializes the picker selectors.
+        /// </summary>
+        private void InitPicker()
+        {
+            // OnApplyTemplate must've been called before we can init here...
+            if (_pickerContainer == null)
+                return;
+
+            _suppressUpdateSelection = true;
+
+            _monthSelector.MaximumValue = 12;
+            _monthSelector.MinimumValue = 1;
+            _monthSelector.ItemFormat = MonthFormat;
+
+            _daySelector.ItemFormat = DayFormat;
+
+            _yearSelector.MaximumValue = MaxYear.Year;
+            _yearSelector.MinimumValue = MinYear.Year;
+            _yearSelector.ItemFormat = YearFormat;
+
+            SetGrid();
+
+            // Date should've been set when we reach this point
+            var dt = Date;
+            if (DayVisible)
+            {
+                var maxDays = _calendar.GetDaysInMonth(dt.Year, dt.Month);
+                _daySelector.MaximumValue = maxDays;
+                _daySelector.MinimumValue = 1;
+                _daySelector.SelectedValue = dt.Day;
+                _daySelector.FormatDate = dt.Date;
+            }
+
+            if (MonthVisible)
+            {
+                _monthSelector.SelectedValue = dt.Month;
+                _monthSelector.FormatDate = dt.Date;
+            }
+               
+            if (YearVisible)
+            {
+                _yearSelector.SelectedValue = dt.Year;
+                _yearSelector.FormatDate = dt.Date;
+            }
+                
+            _suppressUpdateSelection = false;
+
+            SetInitialFocus();
+        }
+
+        private void SetGrid()
+        {
+            var fmt = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern;
+            var columns = new List<(Panel, int)>
+            {
+                (_monthHost, MonthVisible ? fmt.IndexOf("m", StringComparison.OrdinalIgnoreCase) : -1),
+                (_yearHost, YearVisible ? fmt.IndexOf("y", StringComparison.OrdinalIgnoreCase) : -1),
+                (_dayHost, DayVisible ? fmt.IndexOf("d", StringComparison.OrdinalIgnoreCase) : -1),
+            };
+
+            columns.Sort((x, y) => x.Item2 - y.Item2);
+            _pickerContainer.ColumnDefinitions.Clear();
+
+            var columnIndex = 0;
+
+            foreach (var column in columns)
+            {
+                if (column.Item1 is null)
+                    continue;
+
+                column.Item1.IsVisible = column.Item2 != -1;
+
+                if (column.Item2 != -1)
+                {
+                    if (columnIndex > 0)
+                    {
+                        _pickerContainer.ColumnDefinitions.Add(new ColumnDefinition(0, GridUnitType.Auto));
+                    }
+
+                    _pickerContainer.ColumnDefinitions.Add(
+                        new ColumnDefinition(column.Item1 == _monthHost ? 138 : 78, GridUnitType.Star));
+
+                    if (column.Item1.Parent is null)
+                    {
+                        _pickerContainer.Children.Add(column.Item1);
+                    }
+
+                    Grid.SetColumn(column.Item1, (columnIndex++ * 2));
+                }
+            }
+
+            var isSpacer1Visible = columnIndex > 1;
+            var isSpacer2Visible = columnIndex > 2;
+            // ternary conditional operator is used to make sure grid cells will be validated
+            Grid.SetColumn(_spacer1, isSpacer1Visible ? 1 : 0);
+            Grid.SetColumn(_spacer2, isSpacer2Visible ? 3 : 0);
+
+            _spacer1.IsVisible = isSpacer1Visible;
+            _spacer2.IsVisible = isSpacer2Visible;
+        }
+
+        private void SetInitialFocus()
+        {
+            int monthCol = MonthVisible ? Grid.GetColumn(_monthHost) : int.MaxValue;
+            int dayCol = DayVisible ? Grid.GetColumn(_dayHost) : int.MaxValue;
+            int yearCol = YearVisible ? Grid.GetColumn(_yearHost) : int.MaxValue;
+
+            if (monthCol < dayCol && monthCol < yearCol)
+            {
+                KeyboardDevice.Instance?.SetFocusedElement(_monthSelector, NavigationMethod.Pointer, KeyModifiers.None);
+            }
+            else if (dayCol < monthCol && dayCol < yearCol)
+            {
+                KeyboardDevice.Instance?.SetFocusedElement(_daySelector, NavigationMethod.Pointer, KeyModifiers.None);
+            }
+            else if (yearCol < monthCol && yearCol < dayCol)
+            {
+                KeyboardDevice.Instance?.SetFocusedElement(_yearSelector, NavigationMethod.Pointer, KeyModifiers.None);
+            }
+        }
+
+        private void OnDismissButtonClicked(object sender, RoutedEventArgs e)
+        {
+            OnDismiss();
+        }
+
+        private void OnAcceptButtonClicked(object sender, RoutedEventArgs e)
+        {
+            Date = _syncDate;
+            OnConfirmed();
+        }
+
+        private void OnSelectorButtonClick(object sender, RoutedEventArgs e)
+        {
+            if (sender == _monthUpButton)
+                _monthSelector.ScrollUp();
+            else if (sender == _monthDownButton)
+                _monthSelector.ScrollDown();
+            else if (sender == _yearUpButton)
+                _yearSelector.ScrollUp();
+            else if (sender == _yearDownButton)
+                _yearSelector.ScrollDown();
+            else if (sender == _dayUpButton)
+                _daySelector.ScrollUp();
+            else if (sender == _dayDownButton)
+                _daySelector.ScrollDown();
+        }
+
+        private void OnYearChanged(object sender, EventArgs e)
+        {
+            if (_suppressUpdateSelection)
+                return;
+
+            int maxDays = _calendar.GetDaysInMonth(_yearSelector.SelectedValue, _syncDate.Month);
+            var newDate = new DateTimeOffset(_yearSelector.SelectedValue, _syncDate.Month,
+                _syncDate.Day > maxDays ? maxDays : _syncDate.Day, 0, 0, 0, _syncDate.Offset);
+
+            _syncDate = newDate;
+
+            // We don't need to update the days if not displaying day, not february
+            if (!DayVisible || _syncDate.Month != 2)
+                return;
+
+            _suppressUpdateSelection = true;
+
+            _daySelector.FormatDate = newDate.Date;
+
+            if (_daySelector.MaximumValue != maxDays)
+                _daySelector.MaximumValue = maxDays;
+            else
+                _daySelector.RefreshItems();
+
+            _suppressUpdateSelection = false;
+        }
+
+        private void OnDayChanged(object sender, EventArgs e)
+        {
+            if (_suppressUpdateSelection)
+                return;
+            _syncDate = new DateTimeOffset(_syncDate.Year, _syncDate.Month, _daySelector.SelectedValue, 0, 0, 0, _syncDate.Offset);
+        }
+
+        private void OnMonthChanged(object sender, EventArgs e)
+        {
+            if (_suppressUpdateSelection)
+                return;
+
+            int maxDays = _calendar.GetDaysInMonth(_syncDate.Year, _monthSelector.SelectedValue);
+            var newDate = new DateTimeOffset(_syncDate.Year, _monthSelector.SelectedValue,
+                _syncDate.Day > maxDays ? maxDays : _syncDate.Day, 0, 0, 0, _syncDate.Offset);
+
+            if (!DayVisible)
+            {
+                _syncDate = newDate;
+                return;
+            }
+
+            _suppressUpdateSelection = true;
+
+            _daySelector.FormatDate = newDate.Date;
+            _syncDate = newDate;
+
+            if (_daySelector.MaximumValue != maxDays)
+                _daySelector.MaximumValue = maxDays;
+            else
+                _daySelector.RefreshItems();
+
+            _suppressUpdateSelection = false;
+        }
+
+        internal double GetOffsetForPopup()
+        {
+            var acceptDismissButtonHeight = _acceptButton != null ? _acceptButton.Bounds.Height : 41;
+            return -(MaxHeight - acceptDismissButtonHeight) / 2 - (_monthSelector.ItemHeight / 2);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/DateTimePickers/DatePickerSelectedValueChangedEventArgs.cs b/src/Avalonia.Controls/DateTimePickers/DatePickerSelectedValueChangedEventArgs.cs
new file mode 100644
index 0000000000..6c4c53b623
--- /dev/null
+++ b/src/Avalonia.Controls/DateTimePickers/DatePickerSelectedValueChangedEventArgs.cs
@@ -0,0 +1,19 @@
+using System;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines the argument passed when the <see cref="DatePicker"/> SelectedDate changes
+    /// </summary>
+    public class DatePickerSelectedValueChangedEventArgs
+    {
+        public DateTimeOffset? NewDate { get; }
+        public DateTimeOffset? OldDate { get; }
+
+        public DatePickerSelectedValueChangedEventArgs(DateTimeOffset? oldDate, DateTimeOffset? newDate)
+        {
+            NewDate = newDate;
+            OldDate = oldDate;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
new file mode 100644
index 0000000000..a0e8c03195
--- /dev/null
+++ b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
@@ -0,0 +1,566 @@
+using System;
+using System.Globalization;
+using System.Linq;
+using Avalonia.Input;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Controls.Primitives
+{
+    public enum DateTimePickerPanelType
+    {
+        Year,
+        Month,
+        Day,
+        Hour,
+        Minute,
+        TimePeriod //AM or PM
+    }
+
+    public class DateTimePickerPanel : Panel, ILogicalScrollable
+    {
+        /// <summary>
+        /// Defines the <see cref="ItemHeight"/> property
+        /// </summary>
+        public static readonly StyledProperty<double> ItemHeightProperty =
+            AvaloniaProperty.Register<DateTimePickerPanel, double>(nameof(ItemHeight), 40.0);
+
+        /// <summary>
+        /// Defines the <see cref="PanelType"/> property
+        /// </summary>
+        public static readonly StyledProperty<DateTimePickerPanelType> PanelTypeProperty =
+            AvaloniaProperty.Register<DateTimePickerPanel, DateTimePickerPanelType>(nameof(PanelType));
+
+        /// <summary>
+        /// Defines the <see cref="ItemFormat"/> property
+        /// </summary>
+        public static readonly StyledProperty<string> ItemFormatProperty =
+            AvaloniaProperty.Register<DateTimePickerPanel, string>(nameof(ItemFormat), "yyyy");
+
+        /// <summary>
+        /// Defines the <see cref="ShouldLoop"/> property
+        /// </summary>
+        public static readonly StyledProperty<bool> ShouldLoopProperty =
+            AvaloniaProperty.Register<DateTimePickerPanel, bool>(nameof(ShouldLoop));
+
+        //Backing fields for properties
+        private int _minimumValue = 1;
+        private int _maximumValue = 2;
+        private int _selectedValue = 1;
+        private int _increment = 1;
+
+        //Helper fields
+        private int _selectedIndex = 0;
+        private int _totalItems;
+        private int _numItemsAboveBelowSelected;
+        private int _range;
+        private double _extentOne;
+        private Size _extent;
+        private Vector _offset;
+        private bool _hasInit;
+        private bool _suppressUpdateOffset;
+        private ListBoxItem _pressedItem;
+
+        public DateTimePickerPanel()
+        {
+            FormatDate = DateTime.Now;
+            AddHandler(ListBoxItem.PointerPressedEvent, OnItemPointerDown, Avalonia.Interactivity.RoutingStrategies.Bubble);
+            AddHandler(ListBoxItem.PointerReleasedEvent, OnItemPointerUp, Avalonia.Interactivity.RoutingStrategies.Bubble);
+        }
+
+        static DateTimePickerPanel()
+        {
+            FocusableProperty.OverrideDefaultValue<DateTimePickerPanel>(true);
+            AffectsMeasure<DateTimePickerPanel>(ItemHeightProperty);
+        }
+
+        /// <summary>
+        /// Gets or sets what this panel displays in date or time units
+        /// </summary>
+        public DateTimePickerPanelType PanelType
+        {
+            get => GetValue(PanelTypeProperty);
+            set => SetValue(PanelTypeProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the height of each item
+        /// </summary>
+        public double ItemHeight
+        {
+            get => GetValue(ItemHeightProperty);
+            set => SetValue(ItemHeightProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the string format for the items, using standard
+        /// .net DateTime or TimeSpan formatting. Format must match panel type
+        /// </summary>
+        public string ItemFormat
+        {
+            get => GetValue(ItemFormatProperty);
+            set => SetValue(ItemFormatProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets whether the panel should loop
+        /// </summary>
+        public bool ShouldLoop
+        {
+            get => GetValue(ShouldLoopProperty);
+            set => SetValue(ShouldLoopProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum value
+        /// </summary>
+        public int MinimumValue
+        {
+            get => _minimumValue;
+            set
+            {
+                if (value > MaximumValue)
+                    throw new InvalidOperationException("Minimum cannot be greater than Maximum");
+                _minimumValue = value;
+                UpdateHelperInfo();
+                var sel = CoerceSelected(SelectedValue);
+                if (sel != SelectedValue)
+                    SelectedValue = sel;
+                UpdateItems();
+                InvalidateArrange();
+                RaiseScrollInvalidated(EventArgs.Empty);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum value
+        /// </summary>
+        public int MaximumValue
+        {
+            get => _maximumValue;
+            set
+            {
+                if (value < MinimumValue)
+                    throw new InvalidOperationException("Maximum cannot be less than Minimum");
+                _maximumValue = value;
+                UpdateHelperInfo();
+                var sel = CoerceSelected(SelectedValue);
+                if (sel != SelectedValue)
+                    SelectedValue = sel;
+                UpdateItems();
+                InvalidateArrange();
+                RaiseScrollInvalidated(EventArgs.Empty);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the selected value
+        /// </summary>
+        public int SelectedValue
+        {
+            get => _selectedValue;
+            set
+            {
+                if (value > MaximumValue || value < MinimumValue)
+                    throw new ArgumentOutOfRangeException("SelectedValue");
+
+                var sel = CoerceSelected(value);
+                _selectedValue = sel;
+                _selectedIndex = (value - MinimumValue) / Increment;
+
+                if (!ShouldLoop)
+                    CreateOrDestroyItems(Children);
+
+                if (!_suppressUpdateOffset)
+                    _offset = new Vector(0, ShouldLoop ? _selectedIndex * ItemHeight + (_extentOne * 50) :
+                        _selectedIndex * ItemHeight);
+
+                UpdateItems();
+                InvalidateArrange();
+                RaiseScrollInvalidated(EventArgs.Empty);
+
+                SelectionChanged?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the increment
+        /// </summary>
+        public int Increment
+        {
+            get => _increment;
+            set
+            {
+                if (value <= 0 || value > _range)
+                    throw new ArgumentOutOfRangeException("Increment");
+                _increment = value;
+                UpdateHelperInfo();
+                var sel = CoerceSelected(SelectedValue);
+                if (sel != SelectedValue)
+                    SelectedValue = sel;
+                UpdateItems();
+                InvalidateArrange();
+                RaiseScrollInvalidated(EventArgs.Empty);
+            }
+        }
+
+        //Used to help format the date (if applicable), for ex.,
+        //if we're want to display the day of week, we need context
+        //for the month/year, this is our context
+        internal DateTime FormatDate { get; set; }
+
+        public Vector Offset
+        {
+            get => _offset;
+            set
+            {
+                var old = _offset;
+                _offset = value;
+                var dy = _offset.Y - old.Y;
+                var children = Children;
+
+                if (dy > 0) // Scroll Down
+                {
+                    int numContsToMove = 0;
+                    for (int i = 0; i < children.Count; i++)
+                    {
+                        if (children[i].Bounds.Bottom - dy < 0)
+                            numContsToMove++;
+                        else
+                            break;
+                    }
+                    children.MoveRange(0, numContsToMove, children.Count);
+
+                    var scrollHeight = _extent.Height - Viewport.Height;
+                    if (ShouldLoop && value.Y >= scrollHeight - _extentOne)
+                        _offset = new Vector(0, value.Y - (_extentOne * 50));
+                }
+                else if (dy < 0) // Scroll Up
+                {
+                    int numContsToMove = 0;
+                    for (int i = children.Count - 1; i >= 0; i--)
+                    {
+                        if (children[i].Bounds.Top - dy > Bounds.Height)
+                            numContsToMove++;
+                        else
+                            break;
+                    }
+                    children.MoveRange(children.Count - numContsToMove, numContsToMove, 0);
+                    if (ShouldLoop && value.Y < _extentOne)
+                        _offset = new Vector(0, value.Y + (_extentOne * 50));
+                }
+
+                //Setting selection will handle all invalidation
+                var newSel = (Offset.Y / ItemHeight) % _totalItems;
+                _suppressUpdateOffset = true;
+                SelectedValue = (int)newSel * Increment + MinimumValue;
+                _suppressUpdateOffset = false;
+            }
+        }
+
+        public bool CanHorizontallyScroll { get => false; set { } }
+
+        public bool CanVerticallyScroll { get => true; set { } }
+
+        public bool IsLogicalScrollEnabled => true;
+
+        public Size ScrollSize => new Size(0, ItemHeight);
+
+        public Size PageScrollSize => new Size(0, ItemHeight * 4);
+
+        public Size Extent => _extent;
+
+        public Size Viewport => new Size(0, ItemHeight);
+
+        public event EventHandler ScrollInvalidated;
+
+        public event EventHandler SelectionChanged;
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            if (double.IsInfinity(availableSize.Width) ||
+                double.IsInfinity(availableSize.Height))
+                throw new InvalidOperationException("Panel must have finite height");
+
+            if (!_hasInit)
+                UpdateHelperInfo();
+
+            double initY = (availableSize.Height / 2.0) - (ItemHeight / 2.0);
+            _numItemsAboveBelowSelected = (int)Math.Ceiling(initY / ItemHeight) + 1;
+
+            var children = Children;
+
+            CreateOrDestroyItems(children);
+
+            for (int i = 0; i < children.Count; i++)
+                children[i].Measure(availableSize);
+
+            if (!_hasInit)
+            {
+                UpdateItems();
+                RaiseScrollInvalidated(EventArgs.Empty);
+                _hasInit = true;
+            }
+
+            return availableSize;
+        }
+
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            if (Children.Count == 0)
+                return base.ArrangeOverride(finalSize);
+
+            var itemHgt = ItemHeight;
+            var children = Children;
+            Rect rc;
+            double initY = (finalSize.Height / 2.0) - (itemHgt / 2.0);
+
+            if (ShouldLoop)
+            {
+                var currentSet = Math.Truncate(Offset.Y / _extentOne);
+                initY += (_extentOne * currentSet) + (_selectedIndex - _numItemsAboveBelowSelected) * ItemHeight;
+
+                for (int i = 0; i < children.Count; i++)
+                {
+                    rc = new Rect(0, initY - Offset.Y, finalSize.Width, itemHgt);
+                    children[i].Arrange(rc);
+                    initY += itemHgt;
+                }
+            }
+            else
+            {
+                var first = Math.Max(0, (_selectedIndex - _numItemsAboveBelowSelected));
+                for (int i = 0; i < children.Count; i++)
+                {
+                    rc = new Rect(0, (initY + first * itemHgt) - Offset.Y, finalSize.Width, itemHgt);
+                    children[i].Arrange(rc);
+                    initY += itemHgt;
+                }
+            }
+
+            return finalSize;
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            switch (e.Key)
+            {
+                case Key.Up:
+                    ScrollUp();
+                    e.Handled = true;
+                    break;
+                case Key.Down:
+                    ScrollDown();
+                    e.Handled = true;
+                    break;
+                case Key.PageUp:
+                    ScrollUp(4);
+                    e.Handled = true;
+                    break;
+                case Key.PageDown:
+                    ScrollDown(4);
+                    e.Handled = true;
+                    break;
+            }
+            base.OnKeyDown(e);
+        }
+
+        /// <summary>
+        /// Refreshes the content of the visible items
+        /// </summary>
+        public void RefreshItems()
+        {
+            UpdateItems();
+        }
+
+        /// <summary>
+        /// Scrolls up the specified number of items
+        /// </summary>
+        public void ScrollUp(int numItems = 1)
+        {
+            var newY = Math.Max(Offset.Y - (numItems * ItemHeight), 0);
+            Offset = new Vector(0, newY);
+        }
+
+        /// <summary>
+        /// Scrolls down the specified number of items
+        /// </summary>
+        public void ScrollDown(int numItems = 1)
+        {
+            var scrollHeight = _extent.Height - Viewport.Height;
+            var newY = Math.Min(Offset.Y + (numItems * ItemHeight), scrollHeight);
+            Offset = new Vector(0, newY);
+        }
+
+        /// <summary>
+        /// Updates helper fields used in various calculations
+        /// </summary>
+        private void UpdateHelperInfo()
+        {
+            _range = _maximumValue - _minimumValue + 1;
+            _totalItems = (int)Math.Ceiling((double)_range / _increment);
+
+            var itemHgt = ItemHeight;
+            //If looping, measure 100x as many items as we actually have
+            _extent = new Size(0, ShouldLoop ? _totalItems * itemHgt * 100 : _totalItems * itemHgt);
+
+            //Height of 1 "set" of items
+            _extentOne = _totalItems * itemHgt;
+            _offset = new Vector(0, ShouldLoop ? _extentOne * 50 + _selectedIndex * itemHgt : _selectedIndex * itemHgt);
+
+        }
+
+        /// <summary>
+        /// Ensures enough containers are visible in the viewport
+        /// </summary>
+        /// <param name="children"></param>
+        private void CreateOrDestroyItems(Controls children)
+        {
+            int totalItemsInViewport = _numItemsAboveBelowSelected * 2 + 1;
+
+            if (!ShouldLoop)
+            {
+                int numItemAboveSelect = _numItemsAboveBelowSelected;
+                if (_selectedIndex - _numItemsAboveBelowSelected < 0)
+                    numItemAboveSelect = _selectedIndex;
+                int numItemBelowSelect = _numItemsAboveBelowSelected;
+                if (_selectedIndex + _numItemsAboveBelowSelected >= _totalItems)
+                    numItemBelowSelect = _totalItems - _selectedIndex - 1;
+
+                totalItemsInViewport = numItemBelowSelect + numItemAboveSelect + 1;
+            }
+
+            while (children.Count < totalItemsInViewport)
+            {
+                children.Add(new ListBoxItem
+                {
+                    Height = ItemHeight,
+                    Classes = new Classes("DateTimePickerItem", $"{PanelType}Item"),
+                    VerticalContentAlignment = Avalonia.Layout.VerticalAlignment.Center,
+                    Focusable = false
+                });
+            }
+            if (children.Count > totalItemsInViewport)
+            {
+                var numToRemove = children.Count - totalItemsInViewport;
+                children.RemoveRange(children.Count - numToRemove, numToRemove);
+            }
+        }
+
+        /// <summary>
+        /// Updates item content based on the current selection 
+        /// and the panel type
+        /// </summary>
+        private void UpdateItems()
+        {
+            var children = Children;
+            var min = MinimumValue;
+            var panelType = PanelType;
+            var selected = SelectedValue;
+            var max = MaximumValue;
+
+            int first;
+            if (ShouldLoop)
+            {
+                first = (_selectedIndex - _numItemsAboveBelowSelected) % _totalItems;
+                first = first < 0 ? min + (first + _totalItems) * Increment : min + first * Increment;
+            }
+            else
+            {
+                first = min + Math.Max(0, _selectedIndex - _numItemsAboveBelowSelected) * Increment;
+            }
+
+            for (int i = 0; i < children.Count; i++)
+            {
+                ListBoxItem item = (ListBoxItem)children[i];
+                item.Content = FormatContent(first, panelType);
+                item.Tag = first;
+                item.IsSelected = first == selected;
+                first += Increment;
+                if (first > max)
+                    first = min;
+            }
+        }
+
+        private string FormatContent(int value, DateTimePickerPanelType panelType)
+        {
+            switch (panelType)
+            {
+                case DateTimePickerPanelType.Year:
+                    return new DateTime(value, 1, 1).ToString(ItemFormat);
+                case DateTimePickerPanelType.Month:
+                    return new DateTime(FormatDate.Year, value, 1).ToString(ItemFormat);
+                case DateTimePickerPanelType.Day:
+                    return new DateTime(FormatDate.Year, FormatDate.Month, value).ToString(ItemFormat);
+                case DateTimePickerPanelType.Hour:
+                    return new TimeSpan(value, 0, 0).ToString(ItemFormat);
+                case DateTimePickerPanelType.Minute:
+                    return new TimeSpan(0, value, 0).ToString(ItemFormat);
+                case DateTimePickerPanelType.TimePeriod:
+                    return value == MinimumValue ? CultureInfo.CurrentCulture.DateTimeFormat.AMDesignator :
+                        CultureInfo.CurrentCulture.DateTimeFormat.PMDesignator;
+                default:
+                        return "";
+            }
+        }
+
+        /// <summary>
+        /// Ensures the <see cref="SelectedValue"/> is within the bounds and
+        /// follows the current Increment
+        /// </summary>
+        private int CoerceSelected(int newValue)
+        {
+            if (newValue < MinimumValue)
+                return MinimumValue;
+            if (newValue > MaximumValue)
+                return MaximumValue;
+
+            if (newValue % Increment != 0)
+            {
+                var items = Enumerable.Range(MinimumValue, MaximumValue + 1).Where(i => i % Increment == 0).ToList();
+                var nearest = items.Aggregate((x, y) => Math.Abs(x - newValue) > Math.Abs(y - newValue) ? y : x);
+                return items.IndexOf(nearest) * Increment;
+            }
+            return newValue;
+        }
+
+        private void OnItemPointerDown(object sender, PointerPressedEventArgs e)
+        {
+            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+            {
+                _pressedItem = GetItemFromSource((IVisual)e.Source);
+                e.Handled = true;
+            }
+        }
+
+        private void OnItemPointerUp(object sender, PointerReleasedEventArgs e)
+        {
+            if (e.GetCurrentPoint(this).Properties.PointerUpdateKind == PointerUpdateKind.LeftButtonReleased &&
+                _pressedItem != null)
+            {
+                SelectedValue = (int)GetItemFromSource((IVisual)e.Source).Tag;
+                _pressedItem = null;
+                e.Handled = true;
+            }
+        }
+
+        //Helper to get ListBoxItem from pointerevent source
+        private ListBoxItem GetItemFromSource(IVisual src)
+        {
+            var item = src;
+            while (item != null && !(item is ListBoxItem))
+            {
+                item = item.VisualParent;
+            }
+            return (ListBoxItem)item;
+        }
+
+        public bool BringIntoView(IControl target, Rect targetRect) { return false; }
+
+        public IControl GetControlInDirection(NavigationDirection direction, IControl from) { return null; }
+
+        public void RaiseScrollInvalidated(EventArgs e)
+        {
+            ScrollInvalidated?.Invoke(this, e);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/DateTimePickers/PickerPresenterBase.cs b/src/Avalonia.Controls/DateTimePickers/PickerPresenterBase.cs
new file mode 100644
index 0000000000..639b187ad8
--- /dev/null
+++ b/src/Avalonia.Controls/DateTimePickers/PickerPresenterBase.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// Defines the base class for Date and Time PickerPresenters
+    /// </summary>
+    public abstract class PickerPresenterBase : TemplatedControl
+    {
+        protected virtual void OnConfirmed()
+        {
+            Confirmed?.Invoke(this, EventArgs.Empty);
+        }
+
+        protected virtual void OnDismiss()
+        {
+            Dismissed.Invoke(this, EventArgs.Empty);
+        }
+
+        public event EventHandler Confirmed;
+        public event EventHandler Dismissed;
+    }
+}
diff --git a/src/Avalonia.Controls/DateTimePickers/TimePicker.cs b/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
new file mode 100644
index 0000000000..e4ff5e9e5b
--- /dev/null
+++ b/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
@@ -0,0 +1,279 @@
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Shapes;
+using Avalonia.Controls.Templates;
+using System;
+using System.Globalization;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// A control to allow the user to select a time
+    /// </summary>
+    [PseudoClasses(":hasnotime")]
+    public class TimePicker : TemplatedControl
+    {
+        /// <summary>
+        /// Defines the <see cref="MinuteIncrement"/> property
+        /// </summary>
+        public static readonly DirectProperty<TimePicker, int> MinuteIncrementProperty =
+            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>
+        public static readonly DirectProperty<TimePicker, string> ClockIdentifierProperty =
+           AvaloniaProperty.RegisterDirect<TimePicker, string>(nameof(ClockIdentifier),
+               x => x.ClockIdentifier, (x, v) => x.ClockIdentifier = v);
+
+        /// <summary>
+        /// Defines the <see cref="SelectedTime"/> property
+        /// </summary>
+        public static readonly DirectProperty<TimePicker, TimeSpan?> SelectedTimeProperty =
+            AvaloniaProperty.RegisterDirect<TimePicker, TimeSpan?>(nameof(SelectedTime),
+                x => x.SelectedTime, (x, v) => x.SelectedTime = v);
+
+        // Template Items
+        private TimePickerPresenter _presenter;
+        private Button _flyoutButton;
+        private Border _firstPickerHost;
+        private Border _secondPickerHost;
+        private Border _thirdPickerHost;
+        private TextBlock _hourText;
+        private TextBlock _minuteText;
+        private TextBlock _periodText;
+        private Rectangle _firstSplitter;
+        private Rectangle _secondSplitter;
+        private Grid _contentGrid;
+        private Popup _popup;
+
+        private TimeSpan? _selectedTime;
+        private int _minuteIncrement = 1;
+        private string _clockIdentifier = "12HourClock";
+
+        public TimePicker()
+        {
+            PseudoClasses.Set(":hasnotime", true);
+
+            var timePattern = CultureInfo.CurrentCulture.DateTimeFormat.ShortTimePattern;
+            if (timePattern.IndexOf("H") != -1)
+                _clockIdentifier = "24HourClock";
+        }
+
+        /// <summary>
+        /// Gets or sets the minute increment in the picker
+        /// </summary>
+        public int MinuteIncrement
+        {
+            get => _minuteIncrement;
+            set
+            {
+                if (value < 1 || value > 59)
+                    throw new ArgumentOutOfRangeException("1 >= MinuteIncrement <= 59");
+                SetAndRaise(MinuteIncrementProperty, ref _minuteIncrement, value);
+                SetSelectedTimeText();
+            }
+        }
+
+        /// <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>
+        public string ClockIdentifier
+        {
+            get => _clockIdentifier;
+            set
+            {
+                if (!(string.IsNullOrEmpty(value) || value == "" || value == "12HourClock" || value == "24HourClock"))
+                    throw new ArgumentException("Invalid ClockIdentifier");
+                SetAndRaise(ClockIdentifierProperty, ref _clockIdentifier, value);
+                SetGrid();
+                SetSelectedTimeText();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the selected time. Can be null.
+        /// </summary>
+        public TimeSpan? SelectedTime
+        {
+            get => _selectedTime;
+            set
+            {
+                var old = _selectedTime;
+                SetAndRaise(SelectedTimeProperty, ref _selectedTime, value);
+                OnSelectedTimeChanged(old, value);
+                SetSelectedTimeText();
+            }
+        }
+
+        /// <summary>
+        /// Raised when the <see cref="SelectedTime"/> property changes
+        /// </summary>
+        public event EventHandler<TimePickerSelectedValueChangedEventArgs> SelectedTimeChanged;
+
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            if (_flyoutButton != null)
+                _flyoutButton.Click -= OnFlyoutButtonClicked;
+
+            if (_presenter != null)
+            {
+                _presenter.Confirmed -= OnConfirmed;
+                _presenter.Dismissed -= OnDismissPicker;
+            }
+            base.OnApplyTemplate(e);
+
+            _flyoutButton = e.NameScope.Find<Button>("FlyoutButton");
+
+            _firstPickerHost = e.NameScope.Find<Border>("FirstPickerHost");
+            _secondPickerHost = e.NameScope.Find<Border>("SecondPickerHost");
+            _thirdPickerHost = e.NameScope.Find<Border>("ThirdPickerHost");
+
+            _hourText = e.NameScope.Find<TextBlock>("HourTextBlock");
+            _minuteText = e.NameScope.Find<TextBlock>("MinuteTextBlock");
+            _periodText = e.NameScope.Find<TextBlock>("PeriodTextBlock");
+
+            _firstSplitter = e.NameScope.Find<Rectangle>("FirstColumnDivider");
+            _secondSplitter = e.NameScope.Find<Rectangle>("SecondColumnDivider");
+
+            _contentGrid = e.NameScope.Find<Grid>("FlyoutButtonContentGrid");
+
+            _popup = e.NameScope.Find<Popup>("Popup");
+            _presenter = e.NameScope.Find<TimePickerPresenter>("PickerPresenter");
+
+            if (_flyoutButton != null)
+                _flyoutButton.Click += OnFlyoutButtonClicked;
+
+            SetGrid();
+            SetSelectedTimeText();
+
+            if (_presenter != null)
+            {
+                _presenter.Confirmed += OnConfirmed;
+                _presenter.Dismissed += OnDismissPicker;
+
+                _presenter[!TimePickerPresenter.MinuteIncrementProperty] = this[!MinuteIncrementProperty];
+                _presenter[!TimePickerPresenter.ClockIdentifierProperty] = this[!ClockIdentifierProperty];
+            }
+        }
+
+        private void SetGrid()
+        {
+            if (_contentGrid == null)
+                return;
+
+            bool use24HourClock = ClockIdentifier == "24HourClock";
+
+            var columnsD = use24HourClock ? "*, Auto, *" : "*, Auto, *, Auto, *";
+            _contentGrid.ColumnDefinitions = new ColumnDefinitions(columnsD);
+
+            _thirdPickerHost.IsVisible = !use24HourClock;
+            _secondSplitter.IsVisible = !use24HourClock;
+
+            Grid.SetColumn(_firstPickerHost, 0);
+            Grid.SetColumn(_secondPickerHost, 2);
+
+            Grid.SetColumn(_thirdPickerHost, use24HourClock ? 0 : 4);
+
+            Grid.SetColumn(_firstSplitter, 1);
+            Grid.SetColumn(_secondSplitter, use24HourClock ? 0 : 3);
+        }
+
+        private void SetSelectedTimeText()
+        {
+            if (_hourText == null || _minuteText == null || _periodText == null)
+                return;
+
+            var time = SelectedTime;
+            if (time.HasValue)
+            {
+                var newTime = SelectedTime.Value;
+
+                if (ClockIdentifier == "12HourClock")
+                {
+                    var hr = newTime.Hours;
+                    hr = hr > 12 ? hr - 12 : hr == 0 ? 12 : hr;
+                    newTime = new TimeSpan(hr, newTime.Minutes, 0);
+                }
+
+                _hourText.Text = newTime.ToString("%h");
+                _minuteText.Text = newTime.ToString("mm");
+                PseudoClasses.Set(":hasnotime", false);
+
+                _periodText.Text = time.Value.Hours >= 12 ? CultureInfo.CurrentCulture.DateTimeFormat.PMDesignator :
+                    CultureInfo.CurrentCulture.DateTimeFormat.AMDesignator;
+            }
+            else
+            {
+                _hourText.Text = "hour";
+                _minuteText.Text = "minute";
+                PseudoClasses.Set(":hasnotime", true);
+
+                _periodText.Text = DateTime.Now.Hour >= 12 ? CultureInfo.CurrentCulture.DateTimeFormat.PMDesignator :
+                    CultureInfo.CurrentCulture.DateTimeFormat.AMDesignator;
+            }
+        }
+
+        protected virtual void OnSelectedTimeChanged(TimeSpan? oldTime, TimeSpan? newTime)
+        {
+            SelectedTimeChanged?.Invoke(this, new TimePickerSelectedValueChangedEventArgs(oldTime, newTime));
+        }
+
+        private void OnFlyoutButtonClicked(object sender, Interactivity.RoutedEventArgs e)
+        {
+            _presenter.Time = SelectedTime ?? DateTime.Now.TimeOfDay;
+
+            _popup.IsOpen = true;
+
+            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);
+        }
+
+        private void OnDismissPicker(object sender, EventArgs e)
+        {
+            _popup.Close();
+            Focus();
+        }
+
+        private void OnConfirmed(object sender, EventArgs e)
+        {
+            _popup.Close();
+            SelectedTime = _presenter.Time;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/DateTimePickers/TimePickerPresenter.cs b/src/Avalonia.Controls/DateTimePickers/TimePickerPresenter.cs
new file mode 100644
index 0000000000..920eeeb406
--- /dev/null
+++ b/src/Avalonia.Controls/DateTimePickers/TimePickerPresenter.cs
@@ -0,0 +1,260 @@
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Shapes;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using System;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines the presenter used for selecting a time. Intended for use with
+    /// <see cref="TimePicker"/> but can be used independently
+    /// </summary>
+    public class TimePickerPresenter : PickerPresenterBase
+    {
+        /// <summary>
+        /// Defines the <see cref="MinuteIncrement"/> property
+        /// </summary>
+        public static readonly DirectProperty<TimePickerPresenter, int> MinuteIncrementProperty =
+            TimePicker.MinuteIncrementProperty.AddOwner<TimePickerPresenter>(x => x.MinuteIncrement,
+                (x, v) => x.MinuteIncrement = v);
+
+        /// <summary>
+        /// Defines the <see cref="ClockIdentifier"/> property
+        /// </summary>
+        public static readonly DirectProperty<TimePickerPresenter, string> ClockIdentifierProperty =
+            TimePicker.ClockIdentifierProperty.AddOwner<TimePickerPresenter>(x => x.ClockIdentifier,
+                (x, v) => x.ClockIdentifier = v);
+
+        /// <summary>
+        /// Defines the <see cref="Time"/> property
+        /// </summary>
+        public static readonly DirectProperty<TimePickerPresenter, TimeSpan> TimeProperty =
+            AvaloniaProperty.RegisterDirect<TimePickerPresenter, TimeSpan>(nameof(Time),
+                x => x.Time, (x, v) => x.Time = v);
+
+        public TimePickerPresenter()
+        {
+            Time = DateTime.Now.TimeOfDay;
+            KeyboardNavigation.SetTabNavigation(this, KeyboardNavigationMode.Cycle);
+        }
+
+        // TemplateItems
+        private Grid _pickerContainer;
+        private Button _acceptButton;
+        private Button _dismissButton;
+        private Rectangle _spacer2;
+        private Panel _periodHost;
+        private DateTimePickerPanel _hourSelector;
+        private DateTimePickerPanel _minuteSelector;
+        private DateTimePickerPanel _periodSelector;
+        private Button _hourUpButton;
+        private Button _minuteUpButton;
+        private Button _periodUpButton;
+        private Button _hourDownButton;
+        private Button _minuteDownButton;
+        private Button _periodDownButton;
+
+        // Backing Fields
+        private TimeSpan _time;
+        private int _minuteIncrement = 1;
+        private string _clockIdentifier = "12HourClock";
+
+        /// <summary>
+        /// Gets or sets the minute increment in the selector
+        /// </summary>
+        public int MinuteIncrement
+        {
+            get => _minuteIncrement;
+            set
+            {
+                if (value < 1 || value > 59)
+                    throw new ArgumentOutOfRangeException("1 >= MinuteIncrement <= 59");
+                SetAndRaise(MinuteIncrementProperty, ref _minuteIncrement, value);
+                InitPicker();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the current clock identifier, either 12HourClock or 24HourClock
+        /// </summary>
+        public string ClockIdentifier
+        {
+            get => _clockIdentifier;
+            set
+            {
+                if (string.IsNullOrEmpty(value) || !(value == "12HourClock" || value == "24HourClock"))
+                    throw new ArgumentException("Invalid ClockIdentifier");
+                SetAndRaise(ClockIdentifierProperty, ref _clockIdentifier, value);
+                InitPicker();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the current time
+        /// </summary>
+        public TimeSpan Time
+        {
+            get => _time;
+            set
+            {
+                SetAndRaise(TimeProperty, ref _time, value);
+                InitPicker();
+            }
+        }
+
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            base.OnApplyTemplate(e);
+
+            _pickerContainer = e.NameScope.Get<Grid>("PickerContainer");
+            _periodHost = e.NameScope.Get<Panel>("PeriodHost");
+
+            _hourSelector = e.NameScope.Get<DateTimePickerPanel>("HourSelector");
+            _minuteSelector = e.NameScope.Get<DateTimePickerPanel>("MinuteSelector");
+            _periodSelector = e.NameScope.Get<DateTimePickerPanel>("PeriodSelector");
+
+            _spacer2 = e.NameScope.Get<Rectangle>("SecondSpacer");
+
+            _acceptButton = e.NameScope.Get<Button>("AcceptButton");
+            _acceptButton.Click += OnAcceptButtonClicked;
+
+            _hourUpButton = e.NameScope.Find<RepeatButton>("HourUpButton");
+            if (_hourUpButton != null)
+                _hourUpButton.Click += OnSelectorButtonClick;
+            _hourDownButton = e.NameScope.Find<RepeatButton>("HourDownButton");
+            if (_hourDownButton != null)
+                _hourDownButton.Click += OnSelectorButtonClick;
+
+            _minuteUpButton = e.NameScope.Find<RepeatButton>("MinuteUpButton");
+            if (_minuteUpButton != null)
+                _minuteUpButton.Click += OnSelectorButtonClick;
+            _minuteDownButton = e.NameScope.Find<RepeatButton>("MinuteDownButton");
+            if (_minuteDownButton != null)
+                _minuteDownButton.Click += OnSelectorButtonClick;
+
+            _periodUpButton = e.NameScope.Find<RepeatButton>("PeriodUpButton");
+            if (_periodUpButton != null)
+                _periodUpButton.Click += OnSelectorButtonClick;
+            _periodDownButton = e.NameScope.Find<RepeatButton>("PeriodDownButton");
+            if (_periodDownButton != null)
+                _periodDownButton.Click += OnSelectorButtonClick;
+
+            _dismissButton = e.NameScope.Find<Button>("DismissButton");
+            if (_dismissButton != null)
+                _dismissButton.Click += OnDismissButtonClicked;
+
+            InitPicker();
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            switch (e.Key)
+            {
+                case Key.Escape:
+                    OnDismiss();
+                    e.Handled = true;
+                    break;
+                case Key.Tab:
+                    var nextFocus = KeyboardNavigationHandler.GetNext(FocusManager.Instance.Current, NavigationDirection.Next);
+                    KeyboardDevice.Instance?.SetFocusedElement(nextFocus, NavigationMethod.Tab, KeyModifiers.None);
+                    e.Handled = true;
+                    break;
+                case Key.Enter:
+                    OnConfirmed();
+                    e.Handled = true;
+                    break;
+            }
+            base.OnKeyDown(e);
+        }
+
+        protected override void OnConfirmed()
+        {
+            var hr = _hourSelector.SelectedValue;
+            var min = _minuteSelector.SelectedValue;
+            var per = _periodSelector.SelectedValue;
+
+            if (ClockIdentifier == "12HourClock")
+            {
+                hr = per == 1 ? hr + 12 : per == 0 && hr == 12 ? 0 : hr;
+            }
+
+            Time = new TimeSpan(hr, min, 0);
+
+            base.OnConfirmed();
+        }
+
+        private void InitPicker()
+        {
+            if (_pickerContainer == null)
+                return;
+
+            bool clock12 = ClockIdentifier == "12HourClock";
+            _hourSelector.MaximumValue = clock12 ? 12 : 23;
+            _hourSelector.MinimumValue = clock12 ? 1 : 0;
+            _hourSelector.ItemFormat = "%h";
+            var hr = Time.Hours;
+            _hourSelector.SelectedValue = !clock12 ? hr :
+                hr > 12 ? hr - 12 : hr == 0 ? 12 : hr;
+
+            _minuteSelector.MaximumValue = 59;
+            _minuteSelector.MinimumValue = 0;
+            _minuteSelector.Increment = MinuteIncrement;
+            _minuteSelector.SelectedValue = Time.Minutes;
+            _minuteSelector.ItemFormat = "mm";
+
+            _periodSelector.MaximumValue = 1;
+            _periodSelector.MinimumValue = 0;
+            _periodSelector.SelectedValue = hr >= 12 ? 1 : 0;
+
+            SetGrid();
+            KeyboardDevice.Instance?.SetFocusedElement(_hourSelector, NavigationMethod.Pointer, KeyModifiers.None);
+        }
+
+        private void SetGrid()
+        {
+            bool use24HourClock = ClockIdentifier == "24HourClock";
+
+            var columnsD = use24HourClock ? "*, Auto, *" : "*, Auto, *, Auto, *";
+            _pickerContainer.ColumnDefinitions = new ColumnDefinitions(columnsD);
+
+            _spacer2.IsVisible = !use24HourClock;
+            _periodHost.IsVisible = !use24HourClock;
+
+            Grid.SetColumn(_spacer2, use24HourClock ? 0 : 3);
+            Grid.SetColumn(_periodHost, use24HourClock ? 0 : 4);
+        }
+
+        private void OnDismissButtonClicked(object sender, RoutedEventArgs e)
+        {
+            OnDismiss();
+        }
+
+        private void OnAcceptButtonClicked(object sender, RoutedEventArgs e)
+        {
+            OnConfirmed();
+        }
+
+        private void OnSelectorButtonClick(object sender, RoutedEventArgs e)
+        {
+            if (sender == _hourUpButton)
+                _hourSelector.ScrollUp();
+            else if (sender == _hourDownButton)
+                _hourSelector.ScrollDown();
+            else if (sender == _minuteUpButton)
+                _minuteSelector.ScrollUp();
+            else if (sender == _minuteDownButton)
+                _minuteSelector.ScrollDown();
+            else if (sender == _periodUpButton)
+                _periodSelector.ScrollUp();
+            else if (sender == _periodDownButton)
+                _periodSelector.ScrollDown();
+        }
+
+        internal double GetOffsetForPopup()
+        {
+            var acceptDismissButtonHeight = _acceptButton != null ? _acceptButton.Bounds.Height : 41;
+            return -(MaxHeight - acceptDismissButtonHeight) / 2 - (_hourSelector.ItemHeight / 2);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/DateTimePickers/TimePickerSelectedValueChangedEventArgs.cs b/src/Avalonia.Controls/DateTimePickers/TimePickerSelectedValueChangedEventArgs.cs
new file mode 100644
index 0000000000..c2954ba449
--- /dev/null
+++ b/src/Avalonia.Controls/DateTimePickers/TimePickerSelectedValueChangedEventArgs.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace Avalonia.Controls
+{
+    public class TimePickerSelectedValueChangedEventArgs
+    {
+        public TimeSpan? OldTime { get; }
+        public TimeSpan? NewTime { get; }
+        public TimePickerSelectedValueChangedEventArgs(TimeSpan? old, TimeSpan? newT)
+        {
+            OldTime = old;
+            NewTime = newT;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Decorator.cs b/src/Avalonia.Controls/Decorator.cs
index 6f16870b9f..8959f0e306 100644
--- a/src/Avalonia.Controls/Decorator.cs
+++ b/src/Avalonia.Controls/Decorator.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Layout;
 using Avalonia.Metadata;
 
diff --git a/src/Avalonia.Controls/DefinitionBase.cs b/src/Avalonia.Controls/DefinitionBase.cs
index e4ae777453..38ebbe5bf9 100644
--- a/src/Avalonia.Controls/DefinitionBase.cs
+++ b/src/Avalonia.Controls/DefinitionBase.cs
@@ -356,9 +356,13 @@ namespace Avalonia.Controls
         /// b) contains only letters, digits and underscore ('_').
         /// c) does not start with a digit.
         /// </remarks>
-        private static string SharedSizeGroupPropertyValueValid(Control _, string value)
+        private static bool SharedSizeGroupPropertyValueValid(string value)
         {
-            Contract.Requires<ArgumentNullException>(value != null);
+            //  null is default value
+            if (value == null)
+            {
+                return true;
+            }
 
             string id = (string)value;
 
@@ -380,11 +384,11 @@ namespace Avalonia.Controls
 
                 if (i == id.Length)
                 {
-                    return value;
+                    return true;
                 }
             }
 
-            throw new ArgumentException("Invalid SharedSizeGroup string.");
+            return false;
         }
 
         /// <remark>
diff --git a/src/Avalonia.Controls/DefinitionList.cs b/src/Avalonia.Controls/DefinitionList.cs
index 97d92bdcb7..ad0e2513c4 100644
--- a/src/Avalonia.Controls/DefinitionList.cs
+++ b/src/Avalonia.Controls/DefinitionList.cs
@@ -1,11 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System.Collections;
 using System.Collections.Specialized;
-using System.Linq;
 using Avalonia.Collections;
 
+#nullable enable
+
 namespace Avalonia.Controls
 {
     public abstract class DefinitionList<T> : AvaloniaList<T> where T : DefinitionBase
@@ -17,44 +15,65 @@ namespace Avalonia.Controls
         }
 
         internal bool IsDirty = true;
-        private Grid _parent;
+        private Grid? _parent;
 
-        internal Grid Parent
+        internal Grid? Parent
         {
             get => _parent;
             set => SetParent(value);
         }
 
-        private void SetParent(Grid value)
+        private void SetParent(Grid? value)
         {
             _parent = value;
 
-            foreach (var pair in this.Select((definitions, index) => (definitions, index)))
+            var idx = 0;
+
+            foreach (T definition in this)
             {
-                pair.definitions.Parent = value;
-                pair.definitions.Index = pair.index;
+                definition.Parent = value;
+                definition.Index = idx++;
             }
         }
 
         internal void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            foreach (var nI in this.Select((d, i) => (d, i)))
-                nI.d._parentIndex = nI.i;
+            var idx = 0;
 
-            foreach (var nD in e.NewItems?.Cast<DefinitionBase>()
-                            ?? Enumerable.Empty<DefinitionBase>())
+            foreach (T definition in this)
             {
-                nD.Parent = this.Parent;
-                nD.OnEnterParentTree();
+                definition.Index = idx++;
             }
+            
+            UpdateDefinitionParent(e.NewItems, false);
+            UpdateDefinitionParent(e.OldItems, true);
+            
+            IsDirty = true;
+        }
 
-            foreach (var oD in e.OldItems?.Cast<DefinitionBase>()
-                            ?? Enumerable.Empty<DefinitionBase>())
+        private void UpdateDefinitionParent(IList? items, bool wasRemoved)
+        {
+            if (items is null)
             {
-                oD.OnExitParentTree();
+                return;
             }
+            
+            var count = items.Count;
 
-            IsDirty = true;
+            for (var i = 0; i < count; i++)
+            {
+                var definition = (DefinitionBase) items[i];
+
+                if (wasRemoved)
+                {
+                    definition.OnExitParentTree();
+                }
+                else
+                {
+                    definition.Parent = Parent;
+                    definition.OnEnterParentTree();                    
+                }
+            }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Controls/DrawingPresenter.cs b/src/Avalonia.Controls/DrawingPresenter.cs
index b30a8668fd..ee27aa7ec1 100644
--- a/src/Avalonia.Controls/DrawingPresenter.cs
+++ b/src/Avalonia.Controls/DrawingPresenter.cs
@@ -1,9 +1,11 @@
-using Avalonia.Controls.Shapes;
+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()
diff --git a/src/Avalonia.Controls/DropDown.cs b/src/Avalonia.Controls/DropDown.cs
index 9da803d16d..4e17f5bff5 100644
--- a/src/Avalonia.Controls/DropDown.cs
+++ b/src/Avalonia.Controls/DropDown.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Controls
     {
         public DropDown()
         {
-            Logger.TryGet(LogEventLevel.Warning)?.Log(LogArea.Control, this, "DropDown is deprecated: Use ComboBox");
+            Logger.TryGet(LogEventLevel.Warning, LogArea.Control)?.Log(this, "DropDown is deprecated: Use ComboBox");
         }
 
         Type IStyleable.StyleKey => typeof(ComboBox);
@@ -20,7 +20,7 @@ namespace Avalonia.Controls
     {
         public DropDownItem()
         {
-            Logger.TryGet(LogEventLevel.Warning)?.Log(LogArea.Control, this, "DropDownItem is deprecated: Use ComboBoxItem");
+            Logger.TryGet(LogEventLevel.Warning, LogArea.Control)?.Log(this, "DropDownItem is deprecated: Use ComboBoxItem");
         }
 
         Type IStyleable.StyleKey => typeof(ComboBoxItem);
diff --git a/src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs b/src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs
index 2d48a7d33b..5ff0fd1feb 100644
--- a/src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs
+++ b/src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs
@@ -10,7 +10,7 @@ namespace Avalonia.Controls.Embedding
 {
     public class EmbeddableControlRoot : TopLevel, IStyleable, IFocusScope, IDisposable
     {
-        public EmbeddableControlRoot(IEmbeddableWindowImpl impl) : base(impl)
+        public EmbeddableControlRoot(ITopLevelImpl impl) : base(impl)
         {
             
         }
@@ -19,16 +19,13 @@ namespace Avalonia.Controls.Embedding
         {
         }
 
-        [CanBeNull]
-        public new IEmbeddableWindowImpl PlatformImpl => (IEmbeddableWindowImpl) base.PlatformImpl;
-
         protected bool EnforceClientSize { get; set; } = true;
 
         public void Prepare()
         {
             EnsureInitialized();
             ApplyTemplate();
-            LayoutManager.ExecuteInitialLayoutPass(this);
+            LayoutManager.ExecuteInitialLayoutPass();
         }
 
         private void EnsureInitialized()
diff --git a/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevel.cs b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevel.cs
index d326ab5734..b037dd9901 100644
--- a/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevel.cs
+++ b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevel.cs
@@ -18,7 +18,7 @@ namespace Avalonia.Controls.Embedding.Offscreen
         {
             EnsureInitialized();
             ApplyTemplate();
-            LayoutManager.ExecuteInitialLayoutPass(this);
+            LayoutManager.ExecuteInitialLayoutPass();
         }
 
         private void EnsureInitialized()
diff --git a/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs
index 29f0374301..522103c7bd 100644
--- a/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs
+++ b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs
@@ -35,7 +35,7 @@ namespace Avalonia.Controls.Embedding.Offscreen
             }
         }
 
-        public double Scaling
+        public double RenderScaling
         {
             get { return _scaling; }
             set
@@ -49,6 +49,12 @@ namespace Avalonia.Controls.Embedding.Offscreen
         public Action<Rect> Paint { get; set; }
         public Action<Size> Resized { get; set; }
         public Action<double> ScalingChanged { get; set; }
+
+        public Action<WindowTransparencyLevel> TransparencyLevelChanged { get; set; }
+
+        /// <inheritdoc/>
+        public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; } = new AcrylicPlatformCompensationLevels(1, 1, 1);
+
         public void SetInputRoot(IInputRoot inputRoot) => InputRoot = inputRoot;
 
         public virtual Point PointToClient(PixelPoint point) => point.ToPoint(1);
@@ -60,7 +66,13 @@ namespace Avalonia.Controls.Embedding.Offscreen
         }
 
         public Action Closed { get; set; }
+        public Action LostFocus { get; set; }
         public abstract IMouseDevice MouseDevice { get; }
+
+        public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel) { }
+
+        public WindowTransparencyLevel TransparencyLevel { get; private set; }
+
         public IPopupImpl CreatePopup() => null;
     }
 }
diff --git a/src/Avalonia.Controls/Expander.cs b/src/Avalonia.Controls/Expander.cs
index b2a442b6cc..9ff2e41fa9 100644
--- a/src/Avalonia.Controls/Expander.cs
+++ b/src/Avalonia.Controls/Expander.cs
@@ -1,4 +1,5 @@
 using Avalonia.Animation;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 
 namespace Avalonia.Controls
@@ -11,6 +12,7 @@ namespace Avalonia.Controls
         Right
     }
 
+    [PseudoClasses(":expanded", ":up", ":down", ":left", ":right")]
     public class Expander : HeaderedContentControl
     {
         public static readonly StyledProperty<IPageTransition> ContentTransitionProperty =
@@ -30,16 +32,14 @@ namespace Avalonia.Controls
 
         static Expander()
         {
-            PseudoClass<Expander, ExpandDirection>(ExpandDirectionProperty, d => d == ExpandDirection.Down, ":down");
-            PseudoClass<Expander, ExpandDirection>(ExpandDirectionProperty, d => d == ExpandDirection.Up, ":up");
-            PseudoClass<Expander, ExpandDirection>(ExpandDirectionProperty, d => d == ExpandDirection.Left, ":left");
-            PseudoClass<Expander, ExpandDirection>(ExpandDirectionProperty, d => d == ExpandDirection.Right, ":right");
-
-            PseudoClass<Expander>(IsExpandedProperty, ":expanded");
-
             IsExpandedProperty.Changed.AddClassHandler<Expander>((x, e) => x.OnIsExpandedChanged(e));
         }
 
+        public Expander()
+        {
+            UpdatePseudoClasses(ExpandDirection);
+        }
+
         public IPageTransition ContentTransition
         {
             get => GetValue(ContentTransitionProperty);
@@ -55,7 +55,11 @@ namespace Avalonia.Controls
         public bool IsExpanded
         {
             get { return _isExpanded; }
-            set { SetAndRaise(IsExpandedProperty, ref _isExpanded, value); }
+            set 
+            { 
+                SetAndRaise(IsExpandedProperty, ref _isExpanded, value);
+                PseudoClasses.Set(":expanded", value);
+            }
         }
 
         protected virtual void OnIsExpandedChanged(AvaloniaPropertyChangedEventArgs e)
@@ -74,5 +78,23 @@ namespace Avalonia.Controls
                 }
             }
         }
+
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == ExpandDirectionProperty)
+            {
+                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<ExpandDirection>());
+            }
+        }
+
+        private void UpdatePseudoClasses(ExpandDirection d)
+        {
+            PseudoClasses.Set(":up", d == ExpandDirection.Up);
+            PseudoClasses.Set(":down", d == ExpandDirection.Down);
+            PseudoClasses.Set(":left", d == ExpandDirection.Left);
+            PseudoClasses.Set(":right", d == ExpandDirection.Right);
+        }
     }
 }
diff --git a/src/Avalonia.Controls/ExperimentalAcrylicBorder.cs b/src/Avalonia.Controls/ExperimentalAcrylicBorder.cs
new file mode 100644
index 0000000000..0a01767a07
--- /dev/null
+++ b/src/Avalonia.Controls/ExperimentalAcrylicBorder.cs
@@ -0,0 +1,117 @@
+using Avalonia.Controls.Utils;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Platform;
+using System;
+
+namespace Avalonia.Controls
+{
+    public class ExperimentalAcrylicBorder : Decorator
+    {
+        public static readonly StyledProperty<CornerRadius> CornerRadiusProperty =
+            Border.CornerRadiusProperty.AddOwner<ExperimentalAcrylicBorder>();
+
+        public static readonly StyledProperty<ExperimentalAcrylicMaterial> MaterialProperty =
+            AvaloniaProperty.Register<ExperimentalAcrylicBorder, ExperimentalAcrylicMaterial>(nameof(Material));
+
+        private readonly BorderRenderHelper _borderRenderHelper = new BorderRenderHelper();
+
+        private IDisposable _subscription;
+
+        static ExperimentalAcrylicBorder()
+        {
+            AffectsRender<ExperimentalAcrylicBorder>(
+                MaterialProperty,
+                CornerRadiusProperty);
+        }
+
+
+        /// <summary>
+        /// Gets or sets the radius of the border rounded corners.
+        /// </summary>
+        public CornerRadius CornerRadius
+        {
+            get { return GetValue(CornerRadiusProperty); }
+            set { SetValue(CornerRadiusProperty, value); }
+        }
+
+        public ExperimentalAcrylicMaterial Material
+        {
+            get => GetValue(MaterialProperty);
+            set => SetValue(MaterialProperty, value);
+        }
+
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+
+            var tl = (e.Root as TopLevel);
+
+            _subscription = tl.GetObservable(TopLevel.ActualTransparencyLevelProperty)
+                .Subscribe(x =>
+                {
+                    switch (x)
+                    {
+                        case WindowTransparencyLevel.Transparent:
+                        case WindowTransparencyLevel.None:
+                            Material.PlatformTransparencyCompensationLevel = tl.PlatformImpl.AcrylicCompensationLevels.TransparentLevel;
+                            break;
+
+                        case WindowTransparencyLevel.Blur:
+                            Material.PlatformTransparencyCompensationLevel = tl.PlatformImpl.AcrylicCompensationLevels.BlurLevel;
+                            break;
+
+                        case WindowTransparencyLevel.AcrylicBlur:
+                            Material.PlatformTransparencyCompensationLevel = tl.PlatformImpl.AcrylicCompensationLevels.AcrylicBlurLevel;
+                            break;
+                    }
+                });
+        }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnDetachedFromVisualTree(e);
+
+            _subscription?.Dispose();
+        }
+
+        public override void Render(DrawingContext context)
+        {
+            if (context.PlatformImpl is IDrawingContextWithAcrylicLikeSupport idc)
+            {
+                var cornerRadius = CornerRadius;
+
+                idc.DrawRectangle(
+                    Material,
+                    new RoundedRect(
+                        new Rect(Bounds.Size),
+                        cornerRadius.TopLeft, cornerRadius.TopRight,
+                        cornerRadius.BottomRight, cornerRadius.BottomLeft));
+            }
+            else
+            {
+                _borderRenderHelper.Render(context, Bounds.Size, new Thickness(), CornerRadius, new SolidColorBrush(Material.FallbackColor), null, default);
+            }
+        }
+
+        /// <summary>
+        /// Measures the control.
+        /// </summary>
+        /// <param name="availableSize">The available size.</param>
+        /// <returns>The desired size of the control.</returns>
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            return LayoutHelper.MeasureChild(Child, availableSize, Padding);
+        }
+
+        /// <summary>
+        /// Arranges the control's child.
+        /// </summary>
+        /// <param name="finalSize">The size allocated to the control.</param>
+        /// <returns>The space taken.</returns>
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            return LayoutHelper.ArrangeChild(Child, finalSize, Padding);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Generators/IItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/IItemContainerGenerator.cs
index 2d6757219d..6220a20a82 100644
--- a/src/Avalonia.Controls/Generators/IItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/IItemContainerGenerator.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using Avalonia.Controls.Templates;
diff --git a/src/Avalonia.Controls/Generators/ITreeItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/ITreeItemContainerGenerator.cs
index e2e591215e..335e0df5f7 100644
--- a/src/Avalonia.Controls/Generators/ITreeItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/ITreeItemContainerGenerator.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Controls.Generators
 {
     /// <summary>
@@ -12,5 +9,10 @@ namespace Avalonia.Controls.Generators
         /// Gets the container index for the tree.
         /// </summary>
         TreeContainerIndex Index { get; }
+
+        /// <summary>
+        /// Updates the index based on the parent <see cref="TreeView"/>.
+        /// </summary>
+        void UpdateIndex();
     }
 }
diff --git a/src/Avalonia.Controls/Generators/ItemContainerEventArgs.cs b/src/Avalonia.Controls/Generators/ItemContainerEventArgs.cs
index d361abfbfc..f65018531e 100644
--- a/src/Avalonia.Controls/Generators/ItemContainerEventArgs.cs
+++ b/src/Avalonia.Controls/Generators/ItemContainerEventArgs.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
index 8d1d69db1c..f16834f6e1 100644
--- a/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs b/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs
index d1d1c2b172..d1fbb25cb1 100644
--- a/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs
+++ b/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
@@ -50,11 +47,7 @@ namespace Avalonia.Controls.Generators
         {
             var container = item as T;
 
-            if (item == null)
-            {
-                return null;
-            }
-            else if (container != null)
+            if (container != null)
             {
                 return container;
             }
diff --git a/src/Avalonia.Controls/Generators/ItemContainerInfo.cs b/src/Avalonia.Controls/Generators/ItemContainerInfo.cs
index b9387f1022..31d9a5c02e 100644
--- a/src/Avalonia.Controls/Generators/ItemContainerInfo.cs
+++ b/src/Avalonia.Controls/Generators/ItemContainerInfo.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Controls.Generators
 {
     /// <summary>
@@ -40,6 +37,6 @@ namespace Avalonia.Controls.Generators
         /// <summary>
         /// Gets the index of the item in the <see cref="ItemsControl.Items"/> collection.
         /// </summary>
-        public int Index { get; internal set; }
+        public int Index { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Controls/Generators/TabItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/TabItemContainerGenerator.cs
index c216037aba..d2e05ee136 100644
--- a/src/Avalonia.Controls/Generators/TabItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/TabItemContainerGenerator.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Primitives;
 
 namespace Avalonia.Controls.Generators
diff --git a/src/Avalonia.Controls/Generators/TreeContainerIndex.cs b/src/Avalonia.Controls/Generators/TreeContainerIndex.cs
index 0da84008f6..f0da370f73 100644
--- a/src/Avalonia.Controls/Generators/TreeContainerIndex.cs
+++ b/src/Avalonia.Controls/Generators/TreeContainerIndex.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -97,9 +94,13 @@ namespace Avalonia.Controls.Generators
         /// <returns>The container, or null of not found.</returns>
         public IControl ContainerFromItem(object item)
         {
-            IControl result;
-            _itemToContainer.TryGetValue(item, out result);
-            return result;
+            if (item != null)
+            {
+                _itemToContainer.TryGetValue(item, out var result);
+                return result;
+            }
+
+            return null;
         }
 
         /// <summary>
@@ -109,9 +110,13 @@ namespace Avalonia.Controls.Generators
         /// <returns>The item, or null of not found.</returns>
         public object ItemFromContainer(IControl container)
         {
-            object result;
-            _containerToItem.TryGetValue(container, out result);
-            return result;
+            if (container != null)
+            {
+                _containerToItem.TryGetValue(container, out var result);
+                return result;
+            }
+
+            return null;
         }
     }
 }
diff --git a/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs
index c06a64443c..9e65ef5f81 100644
--- a/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs
@@ -1,10 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
+using Avalonia.LogicalTree;
 
 namespace Avalonia.Controls.Generators
 {
@@ -15,6 +14,8 @@ namespace Avalonia.Controls.Generators
     public class TreeItemContainerGenerator<T> : ItemContainerGenerator<T>, ITreeItemContainerGenerator
         where T : class, IControl, new()
     {
+        private TreeView _treeView;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="TreeItemContainerGenerator{T}"/> class.
         /// </summary>
@@ -23,31 +24,28 @@ namespace Avalonia.Controls.Generators
         /// <param name="contentTemplateProperty">The container's ContentTemplate property.</param>
         /// <param name="itemsProperty">The container's Items property.</param>
         /// <param name="isExpandedProperty">The container's IsExpanded property.</param>
-        /// <param name="index">The container index for the tree</param>
         public TreeItemContainerGenerator(
             IControl owner,
             AvaloniaProperty contentProperty,
             AvaloniaProperty contentTemplateProperty,
             AvaloniaProperty itemsProperty,
-            AvaloniaProperty isExpandedProperty,
-            TreeContainerIndex index)
+            AvaloniaProperty isExpandedProperty)
             : base(owner, contentProperty, contentTemplateProperty)
         {
             Contract.Requires<ArgumentNullException>(owner != null);
             Contract.Requires<ArgumentNullException>(contentProperty != null);
             Contract.Requires<ArgumentNullException>(itemsProperty != null);
             Contract.Requires<ArgumentNullException>(isExpandedProperty != null);
-            Contract.Requires<ArgumentNullException>(index != null);
 
             ItemsProperty = itemsProperty;
             IsExpandedProperty = isExpandedProperty;
-            Index = index;
+            UpdateIndex();
         }
 
         /// <summary>
         /// Gets the container index for the tree.
         /// </summary>
-        public TreeContainerIndex Index { get; }
+        public TreeContainerIndex Index { get; private set; }
 
         /// <summary>
         /// Gets the item container's Items property.
@@ -70,7 +68,7 @@ namespace Avalonia.Controls.Generators
             }
             else if (container != null)
             {
-                Index.Add(item, container);
+                Index?.Add(item, container);
                 return container;
             }
             else
@@ -92,7 +90,7 @@ namespace Avalonia.Controls.Generators
                     result.DataContext = item;
                 }
 
-                Index.Add(item, result);
+                Index?.Add(item, result);
 
                 return result;
             }
@@ -101,30 +99,49 @@ namespace Avalonia.Controls.Generators
         public override IEnumerable<ItemContainerInfo> Clear()
         {
             var items = base.Clear();
-            Index.Remove(0, items);
+            Index?.Remove(0, items);
             return items;
         }
 
         public override IEnumerable<ItemContainerInfo> Dematerialize(int startingIndex, int count)
         {
-            Index.Remove(startingIndex, GetContainerRange(startingIndex, count));
+            Index?.Remove(startingIndex, GetContainerRange(startingIndex, count));
             return base.Dematerialize(startingIndex, count);
         }
 
         public override IEnumerable<ItemContainerInfo> RemoveRange(int startingIndex, int count)
         {
-            Index.Remove(startingIndex, GetContainerRange(startingIndex, count));
+            Index?.Remove(startingIndex, GetContainerRange(startingIndex, count));
             return base.RemoveRange(startingIndex, count);
         }
 
         public override bool TryRecycle(int oldIndex, int newIndex, object item) => false;
 
+        public void UpdateIndex()
+        {
+            if (Owner is TreeView treeViewOwner && Index == null)
+            {
+                Index = new TreeContainerIndex();
+                _treeView = treeViewOwner;
+            }
+            else
+            {
+                var treeView = Owner.GetSelfAndLogicalAncestors().OfType<TreeView>().FirstOrDefault();
+                
+                if (treeView != _treeView)
+                {
+                    Clear();
+                    Index = treeView?.ItemContainerGenerator?.Index;
+                    _treeView = treeView;
+                }
+            }
+        }
+
         class WrapperTreeDataTemplate : ITreeDataTemplate
         {
             private readonly IDataTemplate _inner;
             public WrapperTreeDataTemplate(IDataTemplate inner) => _inner = inner;
             public IControl Build(object param) => _inner.Build(param);
-            public bool SupportsRecycling => _inner.SupportsRecycling;
             public bool Match(object data) => _inner.Match(data);
             public InstancedBinding ItemsSelector(object item) => null;
         }
diff --git a/src/Avalonia.Controls/Grid.cs b/src/Avalonia.Controls/Grid.cs
index 23c1cd4794..6357ec98a8 100644
--- a/src/Avalonia.Controls/Grid.cs
+++ b/src/Avalonia.Controls/Grid.cs
@@ -8,10 +8,8 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
-using System.Linq;
 using System.Threading;
-using Avalonia;
-using Avalonia.Collections;
+using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Utilities;
 using Avalonia.VisualTree;
@@ -1228,7 +1226,7 @@ namespace Avalonia.Controls
             Debug.Assert(1 < count && 0 <= start && (start + count) <= definitions.Count);
 
             //  avoid processing when asked to distribute "0"
-            if (!_IsZero(requestedSize))
+            if (!MathUtilities.IsZero(requestedSize))
             {
                 DefinitionBase[] tempDefinitions = TempDefinitions; //  temp array used to remember definitions for sorting
                 int end = start + count;
@@ -1306,7 +1304,7 @@ namespace Avalonia.Controls
                         }
 
                         //  sanity check: requested size must all be distributed
-                        Debug.Assert(_IsZero(sizeToDistribute));
+                        Debug.Assert(MathUtilities.IsZero(sizeToDistribute));
                     }
                     else if (requestedSize <= rangeMaxSize)
                     {
@@ -1346,7 +1344,7 @@ namespace Avalonia.Controls
                         }
 
                         //  sanity check: requested size must all be distributed
-                        Debug.Assert(_IsZero(sizeToDistribute));
+                        Debug.Assert(MathUtilities.IsZero(sizeToDistribute));
                     }
                     else
                     {
@@ -1358,7 +1356,7 @@ namespace Avalonia.Controls
                         double equalSize = requestedSize / count;
 
                         if (equalSize < maxMaxSize
-                            && !_AreClose(equalSize, maxMaxSize))
+                            && !MathUtilities.AreClose(equalSize, maxMaxSize))
                         {
                             //  equi-size is less than maximum of maxSizes.
                             //  in this case distribute so that smaller definitions grow faster than
@@ -2103,7 +2101,7 @@ namespace Avalonia.Controls
                 for (int i = 0; i < definitions.Count; ++i)
                 {
                     DefinitionBase def = definitions[i];
-                    double roundedSize = MathUtilities.RoundLayoutValue(def.SizeCache, dpi);
+                    double roundedSize = LayoutHelper.RoundLayoutValue(def.SizeCache, dpi);
                     roundingErrors[i] = (roundedSize - def.SizeCache);
                     def.SizeCache = roundedSize;
                     roundedTakenSize += roundedSize;
@@ -2151,7 +2149,7 @@ namespace Avalonia.Controls
                 // and precision of floating-point computation.  (However, the resulting
                 // display is subject to anti-aliasing problems.   TANSTAAFL.)
 
-                if (!_AreClose(roundedTakenSize, finalSize))
+                if (!MathUtilities.AreClose(roundedTakenSize, finalSize))
                 {
                     // Compute deltas
                     for (int i = 0; i < definitions.Count; ++i)
@@ -2168,7 +2166,7 @@ namespace Avalonia.Controls
                     if (roundedTakenSize > finalSize)
                     {
                         int i = definitions.Count - 1;
-                        while ((adjustedSize > finalSize && !_AreClose(adjustedSize, finalSize)) && i >= 0)
+                        while ((adjustedSize > finalSize && !MathUtilities.AreClose(adjustedSize, finalSize)) && i >= 0)
                         {
                             DefinitionBase definition = definitions[definitionIndices[i]];
                             double final = definition.SizeCache - dpiIncrement;
@@ -2184,7 +2182,7 @@ namespace Avalonia.Controls
                     else if (roundedTakenSize < finalSize)
                     {
                         int i = 0;
-                        while ((adjustedSize < finalSize && !_AreClose(adjustedSize, finalSize)) && i < definitions.Count)
+                        while ((adjustedSize < finalSize && !MathUtilities.AreClose(adjustedSize, finalSize)) && i < definitions.Count)
                         {
                             DefinitionBase definition = definitions[definitionIndices[i]];
                             double final = definition.SizeCache + dpiIncrement;
@@ -2595,27 +2593,6 @@ namespace Avalonia.Controls
             set { SetFlags(value, Flags.HasGroup3CellsInAutoRows); }
         }
 
-        /// <summary>
-        /// fp version of <c>d == 0</c>.
-        /// </summary>
-        /// <param name="d">Value to check.</param>
-        /// <returns><c>true</c> if d == 0.</returns>
-        private static bool _IsZero(double d)
-        {
-            return (Math.Abs(d) < double.Epsilon);
-        }
-
-        /// <summary>
-        /// fp version of <c>d1 == d2</c>
-        /// </summary>
-        /// <param name="d1">First value to compare</param>
-        /// <param name="d2">Second value to compare</param>
-        /// <returns><c>true</c> if d1 == d2</returns>
-        private static bool _AreClose(double d1, double d2)
-        {
-            return (Math.Abs(d1 - d2) < double.Epsilon);
-        }
-
         /// <summary>
         /// Returns reference to extended data bag.
         /// </summary>
@@ -2741,11 +2718,7 @@ namespace Avalonia.Controls
             AvaloniaProperty.RegisterAttached<Grid, Control, int>(
                 "Column",
                 defaultValue: 0,
-                validate: (_, v) =>
-                {
-                    if (v >= 0) return v;
-                    else throw new ArgumentException("Invalid Grid.Column value.");
-                });
+                validate: v => v >= 0);
 
         /// <summary>
         /// Row property. This is an attached property.
@@ -2762,11 +2735,7 @@ namespace Avalonia.Controls
             AvaloniaProperty.RegisterAttached<Grid, Control, int>(
                 "Row",
                 defaultValue: 0,
-                validate: (_, v) =>
-                {
-                    if (v >= 0) return v;
-                    else throw new ArgumentException("Invalid Grid.Row value.");
-                });
+                validate: v => v >= 0);
 
         /// <summary>
         /// ColumnSpan property. This is an attached property.
@@ -2782,11 +2751,7 @@ namespace Avalonia.Controls
             AvaloniaProperty.RegisterAttached<Grid, Control, int>(
                 "ColumnSpan",
                 defaultValue: 1,
-                validate: (_, v) =>
-                {
-                    if (v >= 1) return v;
-                    else throw new ArgumentException("Invalid Grid.ColumnSpan value.");
-                });
+                validate: v => v >= 0);
 
         /// <summary>
         /// RowSpan property. This is an attached property.
@@ -2802,11 +2767,7 @@ namespace Avalonia.Controls
             AvaloniaProperty.RegisterAttached<Grid, Control, int>(
                 "RowSpan",
                 defaultValue: 1,
-                validate: (_, v) =>
-                {
-                    if (v >= 1) return v;
-                    else throw new ArgumentException("Invalid Grid.RowSpan value.");
-                });
+                validate: v => v >= 0);
 
         /// <summary>
         /// IsSharedSizeScope property marks scoping element for shared size.
diff --git a/src/Avalonia.Controls/GridLength.cs b/src/Avalonia.Controls/GridLength.cs
index 02be95b647..b8418949d9 100644
--- a/src/Avalonia.Controls/GridLength.cs
+++ b/src/Avalonia.Controls/GridLength.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -11,7 +8,10 @@ namespace Avalonia.Controls
     /// <summary>
     /// Defines the valid units for a <see cref="GridLength"/>.
     /// </summary>
-    public enum GridUnitType
+#if !BUILDTASK
+    public
+#endif
+    enum GridUnitType
     {
         /// <summary>
         /// The row or column is auto-sized to fit its content.
@@ -32,7 +32,10 @@ namespace Avalonia.Controls
     /// <summary>
     /// Holds the width or height of a <see cref="Grid"/>'s column and row definitions.
     /// </summary>
-    public struct GridLength : IEquatable<GridLength>
+#if !BUILDTASK
+    public
+#endif
+    struct GridLength : IEquatable<GridLength>
     {
         private readonly GridUnitType _type;
 
diff --git a/src/Avalonia.Controls/GridSplitter.cs b/src/Avalonia.Controls/GridSplitter.cs
index a2fefa0548..a2d53f4f06 100644
--- a/src/Avalonia.Controls/GridSplitter.cs
+++ b/src/Avalonia.Controls/GridSplitter.cs
@@ -23,37 +23,37 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="ResizeDirection"/> property.
         /// </summary>
-        public static readonly AvaloniaProperty<GridResizeDirection> ResizeDirectionProperty =
+        public static readonly StyledProperty<GridResizeDirection> ResizeDirectionProperty =
             AvaloniaProperty.Register<GridSplitter, GridResizeDirection>(nameof(ResizeDirection));
 
         /// <summary>
         /// Defines the <see cref="ResizeBehavior"/> property.
         /// </summary>
-        public static readonly AvaloniaProperty<GridResizeBehavior> ResizeBehaviorProperty =
+        public static readonly StyledProperty<GridResizeBehavior> ResizeBehaviorProperty =
             AvaloniaProperty.Register<GridSplitter, GridResizeBehavior>(nameof(ResizeBehavior));
 
         /// <summary>
         /// Defines the <see cref="ShowsPreview"/> property.
         /// </summary>
-        public static readonly AvaloniaProperty<bool> ShowsPreviewProperty =
+        public static readonly StyledProperty<bool> ShowsPreviewProperty =
             AvaloniaProperty.Register<GridSplitter, bool>(nameof(ShowsPreview));
 
         /// <summary>
         /// Defines the <see cref="KeyboardIncrement"/> property.
         /// </summary>
-        public static readonly AvaloniaProperty<double> KeyboardIncrementProperty =
+        public static readonly StyledProperty<double> KeyboardIncrementProperty =
             AvaloniaProperty.Register<GridSplitter, double>(nameof(KeyboardIncrement), 10d);
 
         /// <summary>
         /// Defines the <see cref="DragIncrement"/> property.
         /// </summary>
-        public static readonly AvaloniaProperty<double> DragIncrementProperty =
+        public static readonly StyledProperty<double> DragIncrementProperty =
             AvaloniaProperty.Register<GridSplitter, double>(nameof(DragIncrement), 1d);
 
         /// <summary>
         /// Defines the <see cref="PreviewContent"/> property.
         /// </summary>
-        public static readonly AvaloniaProperty<ITemplate<IControl>> PreviewContentProperty =
+        public static readonly StyledProperty<ITemplate<IControl>> PreviewContentProperty =
             AvaloniaProperty.Register<GridSplitter, ITemplate<IControl>>(nameof(PreviewContent));
 
         private static readonly Cursor s_columnSplitterCursor = new Cursor(StandardCursorType.SizeWestEast);
diff --git a/src/Avalonia.Controls/HotkeyManager.cs b/src/Avalonia.Controls/HotkeyManager.cs
index 95752e7875..b76b7fbed5 100644
--- a/src/Avalonia.Controls/HotkeyManager.cs
+++ b/src/Avalonia.Controls/HotkeyManager.cs
@@ -12,18 +12,21 @@ namespace Avalonia.Controls
 
         class HotkeyCommandWrapper : ICommand
         {
-            public HotkeyCommandWrapper(IControl control)
+            public HotkeyCommandWrapper(ICommandSource control)
             {
-                Control = control;
+                CommandSource = control;
             }
 
-            public readonly IControl Control;
+            public readonly ICommandSource CommandSource;
 
-            private ICommand GetCommand() => Control.GetValue(Button.CommandProperty);
+            private ICommand GetCommand() => CommandSource.Command;
 
-            public bool CanExecute(object parameter) => GetCommand()?.CanExecute(parameter) ?? false;
+            public bool CanExecute(object parameter) =>
+                CommandSource.Command?.CanExecute(CommandSource.CommandParameter) == true
+                && CommandSource.IsEffectivelyEnabled;
 
-            public void Execute(object parameter) => GetCommand()?.Execute(parameter);
+            public void Execute(object parameter) =>
+                GetCommand()?.Execute(CommandSource.CommandParameter);
 
 #pragma warning disable 67 // Event not used
             public event EventHandler CanExecuteChanged;
@@ -44,7 +47,7 @@ namespace Avalonia.Controls
             public Manager(IControl control)
             {
                 _control = control;
-                _wrapper = new HotkeyCommandWrapper(_control);
+                _wrapper = new HotkeyCommandWrapper(_control as ICommandSource);
             }
 
             public void Init()
@@ -84,7 +87,7 @@ namespace Avalonia.Controls
             {
                 if (_root != null && _hotkey != null)
                 {
-                    _binding = new KeyBinding() {Gesture = _hotkey, Command = _wrapper};
+                    _binding = new KeyBinding() { Gesture = _hotkey, Command = _wrapper };
                     _root.KeyBindings.Add(_binding);
                 }
             }
@@ -102,8 +105,13 @@ namespace Avalonia.Controls
             HotKeyProperty.Changed.Subscribe(args =>
             {
                 var control = args.Sender as IControl;
-                if (args.OldValue != null|| control == null)
+                if (args.OldValue != null || control == null || !(control is ICommandSource))
+                {
+                    Logging.Logger.TryGet(Logging.LogEventLevel.Warning, Logging.LogArea.Control)?.
+                        Log(control, $"The element {args.Sender.GetType().Name} does not support binding a HotKey ({args.NewValue}).");
                     return;
+                }
+
                 new Manager(control).Init();
             });
         }
diff --git a/src/Avalonia.Controls/IContentControl.cs b/src/Avalonia.Controls/IContentControl.cs
index 863c132778..889771b355 100644
--- a/src/Avalonia.Controls/IContentControl.cs
+++ b/src/Avalonia.Controls/IContentControl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Templates;
 using Avalonia.Layout;
 
diff --git a/src/Avalonia.Controls/IControl.cs b/src/Avalonia.Controls/IControl.cs
index 87b66d5f81..6298531a16 100644
--- a/src/Avalonia.Controls/IControl.cs
+++ b/src/Avalonia.Controls/IControl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Layout;
diff --git a/src/Avalonia.Controls/IGlobalDataTemplates.cs b/src/Avalonia.Controls/IGlobalDataTemplates.cs
index 248615de0d..92dcd2c189 100644
--- a/src/Avalonia.Controls/IGlobalDataTemplates.cs
+++ b/src/Avalonia.Controls/IGlobalDataTemplates.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Templates;
 
 namespace Avalonia.Controls
diff --git a/src/Avalonia.Controls/IHeadered.cs b/src/Avalonia.Controls/IHeadered.cs
index 99537b6a14..c208e21c97 100644
--- a/src/Avalonia.Controls/IHeadered.cs
+++ b/src/Avalonia.Controls/IHeadered.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Controls
 {
     /// <summary>
diff --git a/src/Avalonia.Controls/IMenuElement.cs b/src/Avalonia.Controls/IMenuElement.cs
index ee9d0fd6b6..426f265084 100644
--- a/src/Avalonia.Controls/IMenuElement.cs
+++ b/src/Avalonia.Controls/IMenuElement.cs
@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using Avalonia.Input;
 
+#nullable enable
+
 namespace Avalonia.Controls
 {
     /// <summary>
@@ -11,7 +13,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets the currently selected submenu item.
         /// </summary>
-        IMenuItem SelectedItem { get; set; }
+        IMenuItem? SelectedItem { get; set; }
 
         /// <summary>
         /// Gets the submenu items.
diff --git a/src/Avalonia.Controls/IMenuItem.cs b/src/Avalonia.Controls/IMenuItem.cs
index 132d565cb7..94d761f725 100644
--- a/src/Avalonia.Controls/IMenuItem.cs
+++ b/src/Avalonia.Controls/IMenuItem.cs
@@ -1,4 +1,6 @@
-namespace Avalonia.Controls
+#nullable enable
+
+namespace Avalonia.Controls
 {
     /// <summary>
     /// Represents a <see cref="MenuItem"/>.
@@ -29,7 +31,7 @@
         /// <summary>
         /// Gets the parent <see cref="IMenuElement"/>.
         /// </summary>
-        new IMenuElement Parent { get; }
+        new IMenuElement? Parent { get; }
 
         /// <summary>
         /// Raises a click event on the menu item.
diff --git a/src/Avalonia.Controls/INativeMenuExporterEventsImplBridge.cs b/src/Avalonia.Controls/INativeMenuExporterEventsImplBridge.cs
new file mode 100644
index 0000000000..672d5c1a13
--- /dev/null
+++ b/src/Avalonia.Controls/INativeMenuExporterEventsImplBridge.cs
@@ -0,0 +1,7 @@
+namespace Avalonia.Controls
+{
+    public interface INativeMenuExporterEventsImplBridge
+    {
+        void RaiseNeedsUpdate ();
+    }
+}
diff --git a/src/Avalonia.Controls/INativeMenuItemExporterEventsImplBridge.cs b/src/Avalonia.Controls/INativeMenuItemExporterEventsImplBridge.cs
new file mode 100644
index 0000000000..6cb68d8ddd
--- /dev/null
+++ b/src/Avalonia.Controls/INativeMenuItemExporterEventsImplBridge.cs
@@ -0,0 +1,7 @@
+namespace Avalonia.Controls
+{
+    public interface INativeMenuItemExporterEventsImplBridge
+    {
+        void RaiseClicked ();
+    }
+}
diff --git a/src/Avalonia.Controls/IPanel.cs b/src/Avalonia.Controls/IPanel.cs
index ce2c63ffc8..7b9e2c2074 100644
--- a/src/Avalonia.Controls/IPanel.cs
+++ b/src/Avalonia.Controls/IPanel.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Controls
 {
     /// <summary>
diff --git a/src/Avalonia.Controls/IScrollAnchorProvider.cs b/src/Avalonia.Controls/IScrollAnchorProvider.cs
index 6b5cb2ee25..7ba02e99ea 100644
--- a/src/Avalonia.Controls/IScrollAnchorProvider.cs
+++ b/src/Avalonia.Controls/IScrollAnchorProvider.cs
@@ -1,9 +1,31 @@
-namespace Avalonia.Controls
+#nullable enable
+
+namespace Avalonia.Controls
 {
+    /// <summary>
+    /// Specifies a contract for a scrolling control that supports scroll anchoring.
+    /// </summary>
     public interface IScrollAnchorProvider
     {
-        IControl CurrentAnchor { get; }
+        /// <summary>
+        /// The currently chosen anchor element to use for scroll anchoring.
+        /// </summary>
+        IControl? CurrentAnchor { get; }
+
+        /// <summary>
+        /// Registers a control as a potential scroll anchor candidate.
+        /// </summary>
+        /// <param name="element">
+        /// A control within the subtree of the <see cref="IScrollAnchorProvider"/>.
+        /// </param>
         void RegisterAnchorCandidate(IControl element);
+
+        /// <summary>
+        /// Unregisters a control as a potential scroll anchor candidate.
+        /// </summary>
+        /// <param name="element">
+        /// A control within the subtree of the <see cref="IScrollAnchorProvider"/>.
+        /// </param>
         void UnregisterAnchorCandidate(IControl element);
     }
 }
diff --git a/src/Avalonia.Controls/IScrollable.cs b/src/Avalonia.Controls/IScrollable.cs
index 204e918d7b..2a98b3910a 100644
--- a/src/Avalonia.Controls/IScrollable.cs
+++ b/src/Avalonia.Controls/IScrollable.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 
 namespace Avalonia.Controls.Primitives
 {
diff --git a/src/Avalonia.Controls/ISelectable.cs b/src/Avalonia.Controls/ISelectable.cs
index e6716c84ca..144adaa2f5 100644
--- a/src/Avalonia.Controls/ISelectable.cs
+++ b/src/Avalonia.Controls/ISelectable.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Primitives;
 
 namespace Avalonia.Controls
diff --git a/src/Avalonia.Controls/IVirtualizingController.cs b/src/Avalonia.Controls/IVirtualizingController.cs
index 0b997f4948..7c87f8abbc 100644
--- a/src/Avalonia.Controls/IVirtualizingController.cs
+++ b/src/Avalonia.Controls/IVirtualizingController.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Controls
+namespace Avalonia.Controls
 {
     /// <summary>
     /// Interface implemented by controls that act as controllers for an
diff --git a/src/Avalonia.Controls/IVirtualizingPanel.cs b/src/Avalonia.Controls/IVirtualizingPanel.cs
index cba196dfa8..8c4dc80934 100644
--- a/src/Avalonia.Controls/IVirtualizingPanel.cs
+++ b/src/Avalonia.Controls/IVirtualizingPanel.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Layout;
+using Avalonia.Layout;
 
 namespace Avalonia.Controls
 {
diff --git a/src/Avalonia.Controls/IconElement.cs b/src/Avalonia.Controls/IconElement.cs
new file mode 100644
index 0000000000..82b7a0660c
--- /dev/null
+++ b/src/Avalonia.Controls/IconElement.cs
@@ -0,0 +1,9 @@
+using Avalonia.Controls.Primitives;
+
+namespace Avalonia.Controls
+{
+    public abstract class IconElement : TemplatedControl
+    {
+
+    }
+}
diff --git a/src/Avalonia.Controls/Image.cs b/src/Avalonia.Controls/Image.cs
index ff6cd482df..5fc7d8b6b6 100644
--- a/src/Avalonia.Controls/Image.cs
+++ b/src/Avalonia.Controls/Image.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
 
@@ -14,8 +11,8 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="Source"/> property.
         /// </summary>
-        public static readonly StyledProperty<IBitmap> SourceProperty =
-            AvaloniaProperty.Register<Image, IBitmap>(nameof(Source));
+        public static readonly StyledProperty<IImage> SourceProperty =
+            AvaloniaProperty.Register<Image, IImage>(nameof(Source));
 
         /// <summary>
         /// Defines the <see cref="Stretch"/> property.
@@ -23,6 +20,14 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<Stretch> StretchProperty =
             AvaloniaProperty.Register<Image, Stretch>(nameof(Stretch), Stretch.Uniform);
 
+        /// <summary>
+        /// Defines the <see cref="StretchDirection"/> property.
+        /// </summary>
+        public static readonly StyledProperty<StretchDirection> StretchDirectionProperty =
+            AvaloniaProperty.Register<Image, StretchDirection>(
+                nameof(StretchDirection),
+                StretchDirection.Both);
+
         static Image()
         {
             AffectsRender<Image>(SourceProperty, StretchProperty);
@@ -30,9 +35,9 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Gets or sets the bitmap image that will be displayed.
+        /// Gets or sets the image that will be displayed.
         /// </summary>
-        public IBitmap Source
+        public IImage Source
         {
             get { return GetValue(SourceProperty); }
             set { SetValue(SourceProperty, value); }
@@ -43,10 +48,19 @@ namespace Avalonia.Controls
         /// </summary>
         public Stretch Stretch
         {
-            get { return (Stretch)GetValue(StretchProperty); }
+            get { return GetValue(StretchProperty); }
             set { SetValue(StretchProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets a value controlling in what direction the image will be stretched.
+        /// </summary>
+        public StretchDirection StretchDirection
+        {
+            get { return GetValue(StretchDirectionProperty); }
+            set { SetValue(StretchDirectionProperty, value); }
+        }
+
         /// <summary>
         /// Renders the control.
         /// </summary>
@@ -55,11 +69,12 @@ namespace Avalonia.Controls
         {
             var source = Source;
 
-            if (source != null)
+            if (source != null && Bounds.Width > 0 && Bounds.Height > 0)
             {
                 Rect viewPort = new Rect(Bounds.Size);
-                Size sourceSize = new Size(source.PixelSize.Width, source.PixelSize.Height);
-                Vector scale = Stretch.CalculateScaling(Bounds.Size, sourceSize);
+                Size sourceSize = source.Size;
+
+                Vector scale = Stretch.CalculateScaling(Bounds.Size, sourceSize, StretchDirection);
                 Size scaledSize = sourceSize * scale;
                 Rect destRect = viewPort
                     .CenterRect(new Rect(scaledSize))
@@ -69,7 +84,7 @@ namespace Avalonia.Controls
 
                 var interpolationMode = RenderOptions.GetBitmapInterpolationMode(this);
 
-                context.DrawImage(source, 1, sourceRect, destRect, interpolationMode);
+                context.DrawImage(source, sourceRect, destRect, interpolationMode);
             }
         }
 
@@ -85,15 +100,7 @@ namespace Avalonia.Controls
 
             if (source != null)
             {
-                Size sourceSize = new Size(source.PixelSize.Width, source.PixelSize.Height);
-                if (double.IsInfinity(availableSize.Width) || double.IsInfinity(availableSize.Height))
-                {
-                    result = sourceSize;
-                }
-                else
-                {
-                    result = Stretch.CalculateSize(availableSize, sourceSize);
-                }
+                result = Stretch.CalculateSize(availableSize, source.Size, StretchDirection);
             }
 
             return result;
@@ -106,7 +113,7 @@ namespace Avalonia.Controls
 
             if (source != null)
             {
-                var sourceSize = new Size(source.PixelSize.Width, source.PixelSize.Height);
+                var sourceSize = source.Size;
                 var result = Stretch.CalculateSize(finalSize, sourceSize);
                 return result;
             }
diff --git a/src/Avalonia.Controls/ItemVirtualizationMode.cs b/src/Avalonia.Controls/ItemVirtualizationMode.cs
index f17e8c07ad..1950bb7f20 100644
--- a/src/Avalonia.Controls/ItemVirtualizationMode.cs
+++ b/src/Avalonia.Controls/ItemVirtualizationMode.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Controls
+namespace Avalonia.Controls
 {
     /// <summary>
     /// Describes the item virtualization method to use for a list.
diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index bf22f0a08a..4dc8aec6f3 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -1,13 +1,10 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
 using Avalonia.Collections;
 using Avalonia.Controls.Generators;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
@@ -22,7 +19,8 @@ namespace Avalonia.Controls
     /// <summary>
     /// Displays a collection of items.
     /// </summary>
-    public class ItemsControl : TemplatedControl, IItemsPresenterHost
+    [PseudoClasses(":empty", ":singleitem")]
+    public class ItemsControl : TemplatedControl, IItemsPresenterHost, ICollectionChangedListener
     {
         /// <summary>
         /// The default value for the <see cref="ItemsPanel"/> property.
@@ -57,7 +55,6 @@ namespace Avalonia.Controls
         private IEnumerable _items = new AvaloniaList<object>();
         private int _itemCount;
         private IItemContainerGenerator _itemContainerGenerator;
-        private IDisposable _itemsCollectionChangedSubscription;
 
         /// <summary>
         /// Initializes static members of the <see cref="ItemsControl"/> class.
@@ -154,12 +151,25 @@ namespace Avalonia.Controls
             ItemContainerGenerator.Clear();
         }
 
+        void ICollectionChangedListener.PreChanged(INotifyCollectionChanged sender, NotifyCollectionChangedEventArgs e)
+        {
+        }
+
+        void ICollectionChangedListener.Changed(INotifyCollectionChanged sender, NotifyCollectionChangedEventArgs e)
+        {
+        }
+
+        void ICollectionChangedListener.PostChanged(INotifyCollectionChanged sender, NotifyCollectionChangedEventArgs e)
+        {
+            ItemsCollectionChanged(sender, e);
+        }
+
         /// <summary>
         /// Gets the item at the specified index in a collection.
         /// </summary>
         /// <param name="items">The collection.</param>
         /// <param name="index">The index.</param>
-        /// <returns>The index of the item or -1 if the item was not found.</returns>
+        /// <returns>The item at the given index or null if the index is out of bounds.</returns>
         protected static object ElementAt(IEnumerable items, int index)
         {
             if (index != -1 && index < items.Count())
@@ -237,25 +247,7 @@ namespace Avalonia.Controls
                 // it was added to the Items collection.
                 if (container.ContainerControl != null && container.ContainerControl != container.Item)
                 {
-                    if (ItemContainerGenerator.ContainerType == null)
-                    {
-                        var containerControl = container.ContainerControl as ContentPresenter;
-
-                        if (containerControl != null)
-                        {
-                            ((ISetLogicalParent)containerControl).SetParent(this);
-                            containerControl.UpdateChild();
-
-                            if (containerControl.Child != null)
-                            {
-                                LogicalChildren.Add(containerControl.Child);
-                            }
-                        }
-                    }
-                    else
-                    {
-                        LogicalChildren.Add(container.ContainerControl);
-                    }
+                    LogicalChildren.Add(container.ContainerControl);
                 }
             }
         }
@@ -273,24 +265,7 @@ namespace Avalonia.Controls
                 // when it is removed from the Items collection.
                 if (container?.ContainerControl != container?.Item)
                 {
-                    if (ItemContainerGenerator.ContainerType == null)
-                    {
-                        var containerControl = container.ContainerControl as ContentPresenter;
-
-                        if (containerControl != null)
-                        {
-                            ((ISetLogicalParent)containerControl).SetParent(null);
-
-                            if (containerControl.Child != null)
-                            {
-                                LogicalChildren.Remove(containerControl.Child);
-                            }
-                        }
-                    }
-                    else
-                    {
-                        LogicalChildren.Remove(container.ContainerControl);
-                    }
+                    LogicalChildren.Remove(container.ContainerControl);
                 }
             }
         }
@@ -324,20 +299,24 @@ namespace Avalonia.Controls
                     return;
                 }
 
-                var current = focus.Current
-                    .GetSelfAndVisualAncestors()
-                    .OfType<IInputElement>()
-                    .FirstOrDefault(x => x.VisualParent == container);
+                IVisual current = focus.Current;
 
-                if (current != null)
+                while (current != null)
                 {
-                    var next = GetNextControl(container, direction.Value, current, false);
-
-                    if (next != null)
+                    if (current.VisualParent == container && current is IInputElement inputElement)
                     {
-                        focus.Focus(next, NavigationMethod.Directional);
-                        e.Handled = true;
+                        IInputElement next = GetNextControl(container, direction.Value, inputElement, false);
+
+                        if (next != null)
+                        {
+                            focus.Focus(next, NavigationMethod.Directional, e.KeyModifiers);
+                            e.Handled = true;
+                        }
+
+                        break;
                     }
+
+                    current = current.VisualParent;
                 }
             }
 
@@ -350,12 +329,14 @@ namespace Avalonia.Controls
         /// <param name="e">The event args.</param>
         protected virtual void ItemsChanged(AvaloniaPropertyChangedEventArgs e)
         {
-            _itemsCollectionChangedSubscription?.Dispose();
-            _itemsCollectionChangedSubscription = null;
-
             var oldValue = e.OldValue as IEnumerable;
             var newValue = e.NewValue as IEnumerable;
 
+            if (oldValue is INotifyCollectionChanged incc)
+            {
+                CollectionChangedEventManager.Instance.RemoveListener(incc, this);
+            }
+
             UpdateItemCount();
             RemoveControlItemsFromLogicalChildren(oldValue);
             AddControlItemsToLogicalChildren(newValue);
@@ -453,11 +434,9 @@ namespace Avalonia.Controls
             PseudoClasses.Set(":empty", items == null || items.Count() == 0);
             PseudoClasses.Set(":singleitem", items != null && items.Count() == 1);
 
-            var incc = items as INotifyCollectionChanged;
-
-            if (incc != null)
+            if (items is INotifyCollectionChanged incc)
             {
-                _itemsCollectionChangedSubscription = incc.WeakSubscribe(ItemsCollectionChanged);
+                CollectionChangedEventManager.Instance.AddListener(incc, this);
             }
         }
 
@@ -504,7 +483,10 @@ namespace Avalonia.Controls
                 result = container.GetControl(direction, c, wrap);
                 from = from ?? result;
 
-                if (result?.Focusable == true)
+                if (result != null &&
+                    result.Focusable &&
+                    result.IsEffectivelyEnabled &&
+                    result.IsEffectivelyVisible)
                 {
                     return result;
                 }
diff --git a/src/Avalonia.Controls/Repeater/ItemsSourceView.cs b/src/Avalonia.Controls/ItemsSourceView.cs
similarity index 52%
rename from src/Avalonia.Controls/Repeater/ItemsSourceView.cs
rename to src/Avalonia.Controls/ItemsSourceView.cs
index 02ead7ef36..b2663f3213 100644
--- a/src/Avalonia.Controls/Repeater/ItemsSourceView.cs
+++ b/src/Avalonia.Controls/ItemsSourceView.cs
@@ -7,7 +7,11 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Avalonia.Controls.Utils;
+
+#nullable enable
 
 namespace Avalonia.Controls
 {
@@ -23,9 +27,13 @@ namespace Avalonia.Controls
     /// </remarks>
     public class ItemsSourceView : INotifyCollectionChanged, IDisposable
     {
-        private readonly IList _inner;
-        private INotifyCollectionChanged _notifyCollectionChanged;
-        private int _cachedSize = -1;
+        /// <summary>
+        ///  Gets an empty <see cref="ItemsSourceView"/>
+        /// </summary>
+        public static ItemsSourceView Empty { get; } = new ItemsSourceView(Array.Empty<object>());
+
+        private protected readonly IList _inner;
+        private INotifyCollectionChanged? _notifyCollectionChanged;
 
         /// <summary>
         /// Initializes a new instance of the ItemsSourceView class for the specified data source.
@@ -33,7 +41,7 @@ namespace Avalonia.Controls
         /// <param name="source">The data source.</param>
         public ItemsSourceView(IEnumerable source)
         {
-            Contract.Requires<ArgumentNullException>(source != null);
+            source = source ?? throw new ArgumentNullException(nameof(source));
 
             if (source is IList list)
             {
@@ -54,18 +62,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets the number of items in the collection.
         /// </summary>
-        public int Count
-        {
-            get
-            {
-                if (_cachedSize == -1)
-                {
-                    _cachedSize = _inner.Count;
-                }
-
-                return _cachedSize;
-            }
-        }
+        public int Count => _inner.Count;
 
         /// <summary>
         /// Gets a value that indicates whether the items source can provide a unique key for each item.
@@ -75,10 +72,17 @@ namespace Avalonia.Controls
         /// </remarks>
         public bool HasKeyIndexMapping => false;
 
+        /// <summary>
+        /// Retrieves the item at the specified index.
+        /// </summary>
+        /// <param name="index">The index.</param>
+        /// <returns>The item.</returns>
+        public object? this[int index] => GetAt(index);
+
         /// <summary>
         /// Occurs when the collection has changed to indicate the reason for the change and which items changed.
         /// </summary>
-        public event NotifyCollectionChangedEventHandler CollectionChanged;
+        public event NotifyCollectionChangedEventHandler? CollectionChanged;
 
         /// <inheritdoc/>
         public void Dispose()
@@ -93,8 +97,26 @@ namespace Avalonia.Controls
         /// Retrieves the item at the specified index.
         /// </summary>
         /// <param name="index">The index.</param>
-        /// <returns>the item.</returns>
-        public object GetAt(int index) => _inner[index];
+        /// <returns>The item.</returns>
+        public object? GetAt(int index) => _inner[index];
+
+        public int IndexOf(object? item) => _inner.IndexOf(item);
+
+        public static ItemsSourceView GetOrCreate(IEnumerable? items)
+        {
+            if (items is ItemsSourceView isv)
+            {
+                return isv;
+            }
+            else if (items is null)
+            {
+                return Empty;
+            }
+            else
+            {
+                return new ItemsSourceView(items);
+            }
+        }
 
         /// <summary>
         /// Retrieves the index of the item that has the specified unique identifier (key).
@@ -122,9 +144,24 @@ namespace Avalonia.Controls
             throw new NotImplementedException();
         }
 
+        internal void AddListener(ICollectionChangedListener listener)
+        {
+            if (_inner is INotifyCollectionChanged incc)
+            {
+                CollectionChangedEventManager.Instance.AddListener(incc, listener);
+            }
+        }
+
+        internal void RemoveListener(ICollectionChangedListener listener)
+        {
+            if (_inner is INotifyCollectionChanged incc)
+            {
+                CollectionChangedEventManager.Instance.RemoveListener(incc, listener);
+            }
+        }
+
         protected void OnItemsSourceChanged(NotifyCollectionChangedEventArgs args)
         {
-            _cachedSize = _inner.Count;
             CollectionChanged?.Invoke(this, args);
         }
 
@@ -142,4 +179,62 @@ namespace Avalonia.Controls
             OnItemsSourceChanged(e);
         }
     }
+
+    public class ItemsSourceView<T> : ItemsSourceView, IReadOnlyList<T>
+    {
+        /// <summary>
+        ///  Gets an empty <see cref="ItemsSourceView"/>
+        /// </summary>
+        public new static ItemsSourceView<T> Empty { get; } = new ItemsSourceView<T>(Array.Empty<T>());
+
+        /// <summary>
+        /// Initializes a new instance of the ItemsSourceView class for the specified data source.
+        /// </summary>
+        /// <param name="source">The data source.</param>
+        public ItemsSourceView(IEnumerable<T> source)
+            : base(source)
+        {
+        }
+
+        private ItemsSourceView(IEnumerable source)
+            : base(source)
+        {
+        }
+
+        /// <summary>
+        /// Retrieves the item at the specified index.
+        /// </summary>
+        /// <param name="index">The index.</param>
+        /// <returns>The item.</returns>
+#pragma warning disable CS8603
+        public new T this[int index] => GetAt(index);
+#pragma warning restore CS8603
+
+        /// <summary>
+        /// Retrieves the item at the specified index.
+        /// </summary>
+        /// <param name="index">The index.</param>
+        /// <returns>The item.</returns>
+        [return: MaybeNull]
+        public new T GetAt(int index) => (T)_inner[index];
+
+        public IEnumerator<T> GetEnumerator() => _inner.Cast<T>().GetEnumerator();
+        IEnumerator IEnumerable.GetEnumerator() => _inner.GetEnumerator();
+
+        public static new ItemsSourceView<T> GetOrCreate(IEnumerable? items)
+        {
+            if (items is ItemsSourceView<T> isv)
+            {
+                return isv;
+            }
+            else if (items is null)
+            {
+                return Empty;
+            }
+            else
+            {
+                return new ItemsSourceView<T>(items);
+            }
+        }
+    }
 }
diff --git a/src/Avalonia.Controls/Label.cs b/src/Avalonia.Controls/Label.cs
new file mode 100644
index 0000000000..9d5eda464f
--- /dev/null
+++ b/src/Avalonia.Controls/Label.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Text;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Label control. Focuses <see cref="Target"/> on pointer click or access key press (Alt + accessKey)
+    /// </summary>
+    public class Label : ContentControl
+    {
+        /// <summary>
+        /// Defines the <see cref="Target"/> Direct property
+        /// </summary>
+        public static readonly DirectProperty<Label, IInputElement> TargetProperty =
+            AvaloniaProperty.RegisterDirect<Label, IInputElement>(nameof(Target), lbl => lbl.Target, (lbl, inp) => lbl.Target = inp);
+
+        /// <summary>
+        /// Label focus target storage field
+        /// </summary>
+        private IInputElement _target;
+
+        /// <summary>
+        /// Label focus Target
+        /// </summary>
+        [ResolveByName]
+        public IInputElement Target
+        {
+            get => _target;
+            set => SetAndRaise(TargetProperty, ref _target, value);
+        }
+
+        static Label()
+        {
+            AccessKeyHandler.AccessKeyPressedEvent.AddClassHandler<Label>((lbl, args) => lbl.LabelActivated(args));
+            // IsTabStopProperty.OverrideDefaultValue<Label>(false)
+            FocusableProperty.OverrideDefaultValue<Label>(false);
+        }
+
+        /// <summary>
+        /// Initializes instance of <see cref="Label"/> control
+        /// </summary>
+        public Label()
+        {
+        }
+
+        /// <summary>
+        /// Method which focuses <see cref="Target"/> input element
+        /// </summary>
+        private void LabelActivated(RoutedEventArgs args)
+        {
+            Target?.Focus();
+            args.Handled = Target != null;
+        }
+
+        /// <summary>
+        /// Handler of <see cref="IInputElement.PointerPressed"/> event
+        /// </summary>
+        /// <param name="e">Event Arguments</param>
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
+        {
+            if (e.GetCurrentPoint(this).Properties.PointerUpdateKind == PointerUpdateKind.LeftButtonPressed)
+            {
+                LabelActivated(e);
+            }
+            base.OnPointerPressed(e);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/LayoutTransformControl.cs b/src/Avalonia.Controls/LayoutTransformControl.cs
index db67a24159..83ad2b3638 100644
--- a/src/Avalonia.Controls/LayoutTransformControl.cs
+++ b/src/Avalonia.Controls/LayoutTransformControl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-//
 // Idea got from and adapted to work in avalonia
 // http://silverlight.codeplex.com/SourceControl/changeset/view/74775#Release/Silverlight4/Source/Controls.Layout.Toolkit/LayoutTransformer/LayoutTransformer.cs
 //
@@ -17,10 +14,10 @@ namespace Avalonia.Controls
     /// </summary>
     public class LayoutTransformControl : Decorator
     {
-        public static readonly AvaloniaProperty<Transform> LayoutTransformProperty =
-            AvaloniaProperty.Register<LayoutTransformControl, Transform>(nameof(LayoutTransform));
+        public static readonly StyledProperty<ITransform> LayoutTransformProperty =
+            AvaloniaProperty.Register<LayoutTransformControl, ITransform>(nameof(LayoutTransform));
 
-        public static readonly AvaloniaProperty<bool> UseRenderTransformProperty =
+        public static readonly StyledProperty<bool> UseRenderTransformProperty =
             AvaloniaProperty.Register<LayoutTransformControl, bool>(nameof(LayoutTransform));
 
         static LayoutTransformControl()
@@ -40,7 +37,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets a graphics transformation that should apply to this element when layout is performed.
         /// </summary>
-        public Transform LayoutTransform
+        public ITransform LayoutTransform
         {
             get { return GetValue(LayoutTransformProperty); }
             set { SetValue(LayoutTransformProperty, value); }
diff --git a/src/Avalonia.Controls/ListBox.cs b/src/Avalonia.Controls/ListBox.cs
index 4966e669ed..d1b8038581 100644
--- a/src/Avalonia.Controls/ListBox.cs
+++ b/src/Avalonia.Controls/ListBox.cs
@@ -1,10 +1,8 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections;
 using Avalonia.Controls.Generators;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Selection;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.VisualTree;
@@ -34,6 +32,12 @@ namespace Avalonia.Controls
         public static readonly new DirectProperty<SelectingItemsControl, IList> SelectedItemsProperty =
             SelectingItemsControl.SelectedItemsProperty;
 
+        /// <summary>
+        /// Defines the <see cref="Selection"/> property.
+        /// </summary>
+        public static readonly new DirectProperty<SelectingItemsControl, ISelectionModel> SelectionProperty =
+            SelectingItemsControl.SelectionProperty;
+
         /// <summary>
         /// Defines the <see cref="SelectionMode"/> property.
         /// </summary>
@@ -73,6 +77,13 @@ namespace Avalonia.Controls
             set => base.SelectedItems = value;
         }
 
+        /// <inheritdoc/>
+        public new ISelectionModel Selection
+        {
+            get => base.Selection;
+            set => base.Selection = value;
+        }
+
         /// <summary>
         /// Gets or sets the selection mode.
         /// </summary>
@@ -98,12 +109,12 @@ namespace Avalonia.Controls
         /// <summary>
         /// Selects all items in the <see cref="ListBox"/>.
         /// </summary>
-        public new void SelectAll() => base.SelectAll();
+        public void SelectAll() => Selection.SelectAll();
 
         /// <summary>
         /// Deselects all items in the <see cref="ListBox"/>.
         /// </summary>
-        public new void UnselectAll() => base.UnselectAll();
+        public void UnselectAll() => Selection.Clear();
 
         /// <inheritdoc/>
         protected override IItemContainerGenerator CreateItemContainerGenerator()
@@ -124,7 +135,8 @@ namespace Avalonia.Controls
                 e.Handled = UpdateSelectionFromEventSource(
                     e.Source,
                     true,
-                    (e.InputModifiers & InputModifiers.Shift) != 0);
+                    (e.KeyModifiers & KeyModifiers.Shift) != 0,
+                    (e.KeyModifiers & KeyModifiers.Control) != 0);
             }
         }
 
@@ -149,10 +161,10 @@ namespace Avalonia.Controls
             }
         }
 
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
+            base.OnApplyTemplate(e);
             Scroll = e.NameScope.Find<IScrollable>("PART_ScrollViewer");
-            base.OnTemplateApplied(e);
         }
     }
 }
diff --git a/src/Avalonia.Controls/ListBoxItem.cs b/src/Avalonia.Controls/ListBoxItem.cs
index 0c55010f43..4fe5f4de40 100644
--- a/src/Avalonia.Controls/ListBoxItem.cs
+++ b/src/Avalonia.Controls/ListBoxItem.cs
@@ -1,13 +1,13 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Mixins;
+using Avalonia.Input;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// A selectable item in a <see cref="ListBox"/>.
     /// </summary>
+    [PseudoClasses(":pressed", ":selected")]
     public class ListBoxItem : ContentControl, ISelectable
     {
         /// <summary>
@@ -22,6 +22,7 @@ namespace Avalonia.Controls
         static ListBoxItem()
         {
             SelectableMixin.Attach<ListBoxItem>(IsSelectedProperty);
+            PressedMixin.Attach<ListBoxItem>();
             FocusableProperty.OverrideDefaultValue<ListBoxItem>(true);
         }
 
diff --git a/src/Avalonia.Controls/LoggingExtensions.cs b/src/Avalonia.Controls/LoggingExtensions.cs
new file mode 100644
index 0000000000..9eb3b140f6
--- /dev/null
+++ b/src/Avalonia.Controls/LoggingExtensions.cs
@@ -0,0 +1,37 @@
+using System;
+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>
+        /// <typeparam name="T">The application class type.</typeparam>
+        /// <param name="builder">The app builder instance.</param>
+        /// <param name="level">The minimum level to log.</param>
+        /// <param name="areas">The areas to log. Valid values are listed in <see cref="LogArea"/>.</param>
+        /// <returns>The app builder instance.</returns>
+        public static T LogToTrace<T>(
+            this T builder,
+            LogEventLevel level = LogEventLevel.Warning,
+            params string[] areas)
+                where T : AppBuilderBase<T>, new()
+        {
+            Logger.Sink = new TraceLogSink(level, areas);
+            return builder;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Menu.cs b/src/Avalonia.Controls/Menu.cs
index 6ec97aa04e..4da044fec1 100644
--- a/src/Avalonia.Controls/Menu.cs
+++ b/src/Avalonia.Controls/Menu.cs
@@ -1,12 +1,12 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Platform;
+using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
 
+#nullable enable
+
 namespace Avalonia.Controls
 {
     /// <summary>
@@ -17,6 +17,8 @@ namespace Avalonia.Controls
         private static readonly ITemplate<IPanel> DefaultPanel =
             new FuncTemplate<IPanel>(() => new StackPanel { Orientation = Orientation.Horizontal });
 
+        private LightDismissOverlayLayer? _overlay;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Menu"/> class.
         /// </summary>
diff --git a/src/Avalonia.Controls/MenuBase.cs b/src/Avalonia.Controls/MenuBase.cs
index be677b5479..0434928280 100644
--- a/src/Avalonia.Controls/MenuBase.cs
+++ b/src/Avalonia.Controls/MenuBase.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,6 +8,8 @@ using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
 
+#nullable enable
+
 namespace Avalonia.Controls
 {
     /// <summary>
@@ -54,9 +53,7 @@ namespace Avalonia.Controls
         /// <param name="interactionHandler">The menu interaction handler.</param>
         public MenuBase(IMenuInteractionHandler interactionHandler)
         {
-            Contract.Requires<ArgumentNullException>(interactionHandler != null);
-
-            InteractionHandler = interactionHandler;
+            InteractionHandler = interactionHandler ?? throw new ArgumentNullException(nameof(interactionHandler));
         }
 
         /// <summary>
@@ -80,7 +77,7 @@ namespace Avalonia.Controls
         IMenuInteractionHandler IMenu.InteractionHandler => InteractionHandler;
 
         /// <inheritdoc/>
-        IMenuItem IMenuElement.SelectedItem
+        IMenuItem? IMenuElement.SelectedItem
         {
             get
             {
diff --git a/src/Avalonia.Controls/MenuItem.cs b/src/Avalonia.Controls/MenuItem.cs
index 3ba0007f6b..d034f54df2 100644
--- a/src/Avalonia.Controls/MenuItem.cs
+++ b/src/Avalonia.Controls/MenuItem.cs
@@ -1,11 +1,10 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reactive.Linq;
 using System.Windows.Input;
 using Avalonia.Controls.Generators;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
@@ -13,21 +12,25 @@ using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
+using Avalonia.VisualTree;
+
+#nullable enable
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// A menu item control.
     /// </summary>
-    public class MenuItem : HeaderedSelectingItemsControl, IMenuItem, ISelectable
+    [PseudoClasses(":separator", ":icon", ":open", ":pressed", ":selected")]
+    public class MenuItem : HeaderedSelectingItemsControl, IMenuItem, ISelectable, ICommandSource
     {
         /// <summary>
         /// Defines the <see cref="Command"/> property.
         /// </summary>
-        public static readonly DirectProperty<MenuItem, ICommand> CommandProperty =
+        public static readonly DirectProperty<MenuItem, ICommand?> CommandProperty =
             Button.CommandProperty.AddOwner<MenuItem>(
-                menuItem => menuItem.Command, 
-                (menuItem, command) => menuItem.Command = command, 
+                menuItem => menuItem.Command,
+                (menuItem, command) => menuItem.Command = command,
                 enableDataValidation: true);
 
         /// <summary>
@@ -48,6 +51,12 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<object> IconProperty =
             AvaloniaProperty.Register<MenuItem, object>(nameof(Icon));
 
+        /// <summary>
+        /// Defines the <see cref="InputGesture"/> property.
+        /// </summary>
+        public static readonly StyledProperty<KeyGesture> InputGestureProperty =
+            AvaloniaProperty.Register<MenuItem, KeyGesture>(nameof(InputGesture));
+
         /// <summary>
         /// Defines the <see cref="IsSelected"/> property.
         /// </summary>
@@ -90,9 +99,9 @@ namespace Avalonia.Controls
         private static readonly ITemplate<IPanel> DefaultPanel =
             new FuncTemplate<IPanel>(() => new StackPanel());
 
-        private ICommand _command;
+        private ICommand? _command;
         private bool _commandCanExecute = true;
-        private Popup _popup;
+        private Popup? _popup;
 
         /// <summary>
         /// Initializes static members of the <see cref="MenuItem"/> class.
@@ -100,6 +109,7 @@ namespace Avalonia.Controls
         static MenuItem()
         {
             SelectableMixin.Attach<MenuItem>(IsSelectedProperty);
+            PressedMixin.Attach<MenuItem>();
             CommandProperty.Changed.Subscribe(CommandChanged);
             FocusableProperty.OverrideDefaultValue<MenuItem>(true);
             HeaderProperty.Changed.AddClassHandler<MenuItem>((x, e) => x.HeaderChanged(e));
@@ -113,6 +123,32 @@ namespace Avalonia.Controls
 
         public MenuItem()
         {
+            // HACK: This nasty but it's all WPF's fault. Grid uses an inherited attached
+            // property to store SharedSizeGroup state, except property inheritance is done
+            // down the logical tree. In this case, the control which is setting
+            // Grid.IsSharedSizeScope="True" is not in the logical tree. Instead of fixing
+            // the way Grid stores shared size state, the developers of WPF just created a
+            // binding of the internal state of the visual parent to the menu item. We don't
+            // have much choice but to do the same for now unless we want to refactor Grid,
+            // which I honestly am not brave enough to do right now. Here's the same hack in
+            // the WPF codebase:
+            //
+            // https://github.com/dotnet/wpf/blob/89537909bdf36bc918e88b37751add46a8980bb0/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/MenuItem.cs#L2126-L2141
+            //
+            // In addition to the hack from WPF, we also make sure to return null when we have
+            // no parent. If we don't do this, inheritance falls back to the logical tree,
+            // causing the shared size scope in the parent MenuItem to be used, breaking
+            // menu layout.
+
+            var parentSharedSizeScope = this.GetObservable(VisualParentProperty)
+                .SelectMany(x =>
+                {
+                    var parent = x as Control;
+                    return parent?.GetObservable(DefinitionBase.PrivateSharedSizeScopeProperty) ??
+                        Observable.Return<DefinitionBase.SharedSizeScope?>(null);
+                });
+
+            this.Bind(DefinitionBase.PrivateSharedSizeScopeProperty, parentSharedSizeScope);
         }
 
         /// <summary>
@@ -160,7 +196,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets the command associated with the menu item.
         /// </summary>
-        public ICommand Command
+        public ICommand? Command
         {
             get { return _command; }
             set { SetAndRaise(CommandProperty, ref _command, value); }
@@ -194,6 +230,19 @@ namespace Avalonia.Controls
             set { SetValue(IconProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the input gesture that will be displayed in the menu item.
+        /// </summary>
+        /// <remarks>
+        /// Setting this property does not cause the input gesture to be handled by the menu item,
+        /// it simply displays the gesture text in the menu.
+        /// </remarks>
+        public KeyGesture InputGesture
+        {
+            get { return GetValue(InputGestureProperty); }
+            set { SetValue(InputGestureProperty, value); }
+        }
+
         /// <summary>
         /// Gets or sets a value indicating whether the <see cref="MenuItem"/> is currently selected.
         /// </summary>
@@ -227,7 +276,7 @@ namespace Avalonia.Controls
         bool IMenuItem.IsPointerOverSubMenu => _popup?.IsPointerOverPopup ?? false; 
 
         /// <inheritdoc/>
-        IMenuElement IMenuItem.Parent => Parent as IMenuElement;
+        IMenuElement? IMenuItem.Parent => Parent as IMenuElement;
 
         protected override bool IsEnabledCore => base.IsEnabledCore && _commandCanExecute;
 
@@ -235,7 +284,7 @@ namespace Avalonia.Controls
         bool IMenuElement.MoveSelection(NavigationDirection direction, bool wrap) => MoveSelection(direction, wrap);
 
         /// <inheritdoc/>
-        IMenuItem IMenuElement.SelectedItem
+        IMenuItem? IMenuElement.SelectedItem
         {
             get
             {
@@ -373,10 +422,8 @@ namespace Avalonia.Controls
         }
 
         /// <inheritdoc/>
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
-            base.OnTemplateApplied(e);
-
             if (_popup != null)
             {
                 _popup.Opened -= PopupOpened;
@@ -394,12 +441,12 @@ namespace Avalonia.Controls
             }
         }
 
-        protected override void UpdateDataValidation(AvaloniaProperty property, BindingNotification status)
+        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
         {
-            base.UpdateDataValidation(property, status);
+            base.UpdateDataValidation(property, value);
             if (property == CommandProperty)
             {
-                if (status?.ErrorType == BindingErrorType.Error)
+                if (value.Type == BindingValueType.BindingError)
                 {
                     if (_commandCanExecute)
                     {
@@ -492,11 +539,13 @@ namespace Avalonia.Controls
             if (oldValue != null)
             {
                 LogicalChildren.Remove(oldValue);
+                PseudoClasses.Remove(":icon");
             }
 
             if (newValue != null)
             {
                 LogicalChildren.Add(newValue);
+                PseudoClasses.Add(":icon");
             }
         }
 
@@ -506,7 +555,7 @@ namespace Avalonia.Controls
         /// <param name="e">The property change event.</param>
         private void IsSelectedChanged(AvaloniaPropertyChangedEventArgs e)
         {
-            if ((bool)e.NewValue)
+            if ((bool)e.NewValue!)
             {
                 Focus();
             }
@@ -518,17 +567,19 @@ namespace Avalonia.Controls
         /// <param name="e">The property change event.</param>
         private void SubMenuOpenChanged(AvaloniaPropertyChangedEventArgs e)
         {
-            var value = (bool)e.NewValue;
+            var value = (bool)e.NewValue!;
 
             if (value)
             {
                 RaiseEvent(new RoutedEventArgs(SubmenuOpenedEvent));
                 IsSelected = true;
+                PseudoClasses.Add(":open");
             }
             else
             {
                 CloseSubmenus();
                 SelectedIndex = -1;
+                PseudoClasses.Remove(":open");
             }
         }
 
@@ -558,6 +609,8 @@ namespace Avalonia.Controls
             SelectedItem = null;
         }
 
+        void ICommandSource.CanExecuteChanged(object sender, EventArgs e) => this.CanExecuteChanged(sender, e);
+
         /// <summary>
         /// A dependency resolver which returns a <see cref="MenuItemAccessKeyHandler"/>.
         /// </summary>
diff --git a/src/Avalonia.Controls/MenuItemAccessKeyHandler.cs b/src/Avalonia.Controls/MenuItemAccessKeyHandler.cs
index 002946bb79..2c3dac8482 100644
--- a/src/Avalonia.Controls/MenuItemAccessKeyHandler.cs
+++ b/src/Avalonia.Controls/MenuItemAccessKeyHandler.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/Avalonia.Controls/Mixins/PressedMixin.cs b/src/Avalonia.Controls/Mixins/PressedMixin.cs
new file mode 100644
index 0000000000..4c5792b4a0
--- /dev/null
+++ b/src/Avalonia.Controls/Mixins/PressedMixin.cs
@@ -0,0 +1,37 @@
+using Avalonia.Interactivity;
+using Avalonia.Input;
+
+namespace Avalonia.Controls.Mixins
+{
+    /// <summary>
+    /// Adds pressed functionality to control classes.
+    /// 
+    /// Adds the ':pressed' class when the item is pressed.
+    /// </summary>
+    public static class PressedMixin
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PressedMixin"/> class.
+        /// </summary>
+        /// <typeparam name="TControl">The control type.</typeparam>
+        public static void Attach<TControl>() where TControl : Control
+        {
+            InputElement.PointerPressedEvent.AddClassHandler<TControl>((x, e) => HandlePointerPressed(x, e), RoutingStrategies.Tunnel);
+            InputElement.PointerReleasedEvent.AddClassHandler<TControl>((x, e) => HandlePointerReleased(x), RoutingStrategies.Tunnel);
+            InputElement.PointerCaptureLostEvent.AddClassHandler<TControl>((x, e) => HandlePointerReleased(x), RoutingStrategies.Tunnel);
+        }
+
+        private static void HandlePointerPressed<TControl>(TControl sender, PointerPressedEventArgs e) where TControl : Control
+        {
+            if (e.GetCurrentPoint(sender).Properties.IsLeftButtonPressed)
+            {
+                ((IPseudoClasses)sender.Classes).Set(":pressed", true);
+            }
+        }
+
+        private static void HandlePointerReleased<TControl>(TControl sender) where TControl : Control
+        {
+            ((IPseudoClasses)sender.Classes).Set(":pressed", false);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Mixins/SelectableMixin.cs b/src/Avalonia.Controls/Mixins/SelectableMixin.cs
index 2369e9f530..c9e2b684cb 100644
--- a/src/Avalonia.Controls/Mixins/SelectableMixin.cs
+++ b/src/Avalonia.Controls/Mixins/SelectableMixin.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Interactivity;
 using Avalonia.Controls.Primitives;
@@ -51,7 +48,7 @@ namespace Avalonia.Controls.Mixins
 
                 if (sender != null)
                 {
-                    ((IPseudoClasses)sender.Classes).Set(":selected", (bool)x.NewValue);
+                    ((IPseudoClasses)sender.Classes).Set(":selected", x.NewValue.GetValueOrDefault());
 
                     sender.RaiseEvent(new RoutedEventArgs
                     {
@@ -61,4 +58,4 @@ namespace Avalonia.Controls.Mixins
             });
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Controls/NativeControlHost.cs b/src/Avalonia.Controls/NativeControlHost.cs
new file mode 100644
index 0000000000..20eac11c2c
--- /dev/null
+++ b/src/Avalonia.Controls/NativeControlHost.cs
@@ -0,0 +1,198 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Controls.Platform;
+using Avalonia.Platform;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Controls
+{
+    public class NativeControlHost : Control
+    {
+        private TopLevel _currentRoot;
+        private INativeControlHostImpl _currentHost;
+        private INativeControlHostControlTopLevelAttachment _attachment;
+        private IPlatformHandle _nativeControlHandle;
+        private bool _queuedForDestruction;
+        private bool _queuedForMoveResize;
+        private readonly List<Visual> _propertyChangedSubscriptions = new List<Visual>();
+        private readonly EventHandler<AvaloniaPropertyChangedEventArgs> _propertyChangedHandler;
+        static NativeControlHost()
+        {
+            IsVisibleProperty.Changed.AddClassHandler<NativeControlHost>(OnVisibleChanged);
+        }
+
+        public NativeControlHost()
+        {
+            _propertyChangedHandler = PropertyChangedHandler;
+        }
+
+        private static void OnVisibleChanged(NativeControlHost host, AvaloniaPropertyChangedEventArgs arg2)
+            => host.UpdateHost();
+
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            _currentRoot = e.Root as TopLevel;
+            var visual = (IVisual)this;
+            while (visual != _currentRoot)
+            {
+
+                if (visual is Visual v)
+                {
+                    v.PropertyChanged += _propertyChangedHandler;
+                    _propertyChangedSubscriptions.Add(v);
+                }
+
+                visual = visual.GetVisualParent();
+            }
+
+            UpdateHost();
+        }
+
+        private void PropertyChangedHandler(object sender, AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.IsEffectiveValueChange && e.Property == BoundsProperty)
+                EnqueueForMoveResize();
+        }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            _currentRoot = null;
+            if (_propertyChangedSubscriptions != null)
+            {
+                foreach (var v in _propertyChangedSubscriptions)
+                    v.PropertyChanged -= _propertyChangedHandler;
+                _propertyChangedSubscriptions.Clear();
+            }
+            UpdateHost();
+        }
+
+
+        private void UpdateHost()
+        {
+            _queuedForMoveResize = false;
+            _currentHost = (_currentRoot?.PlatformImpl as ITopLevelImplWithNativeControlHost)?.NativeControlHost;
+            var needsAttachment = _currentHost != null;
+            
+            if (needsAttachment)
+            {
+                // If there is an existing attachment, ensure that we are attached to the proper host or destroy the attachment
+                if (_attachment != null && _attachment.AttachedTo != _currentHost)
+                {
+                    if (_attachment != null)
+                    {
+                        if (_attachment.IsCompatibleWith(_currentHost))
+                        {
+                            _attachment.AttachedTo = _currentHost;
+                        }
+                        else
+                        {
+                            _attachment.Dispose();
+                            _attachment = null;
+                        }
+                    }
+                }
+
+                // If there is no attachment, but the control exists,
+                // attempt to attach to to the current toplevel or destroy the control if it's incompatible
+                if (_attachment == null && _nativeControlHandle != null)
+                {
+                    if (_currentHost.IsCompatibleWith(_nativeControlHandle))
+                        _attachment = _currentHost.CreateNewAttachment(_nativeControlHandle);
+                    else
+                        DestroyNativeControl();
+                }
+
+                // There is no control handle an no attachment, create both
+                if (_nativeControlHandle == null)
+                {
+                    _attachment = _currentHost.CreateNewAttachment(parent =>
+                        _nativeControlHandle = CreateNativeControlCore(parent));
+                }
+            }
+            else
+            {
+                // Immediately detach the control from the current toplevel if there is an existing attachment
+                if (_attachment != null)
+                    _attachment.AttachedTo = null;
+                
+                // Don't destroy the control immediately, it might be just being reparented to another TopLevel
+                if (_nativeControlHandle != null && !_queuedForDestruction)
+                {
+                    _queuedForDestruction = true;
+                    Dispatcher.UIThread.Post(CheckDestruction, DispatcherPriority.Background);
+                }
+            }
+
+            if (_attachment?.AttachedTo != _currentHost)
+                return;
+
+            TryUpdateNativeControlPosition();
+        }
+
+        
+        private Rect? GetAbsoluteBounds()
+        {
+            var bounds = Bounds;
+            var position = this.TranslatePoint(bounds.Position, _currentRoot);
+            if (position == null)
+                return null;
+            return new Rect(position.Value, bounds.Size);
+        }
+
+        void EnqueueForMoveResize()
+        {
+            if(_queuedForMoveResize)
+                return;
+            _queuedForMoveResize = true;
+            Dispatcher.UIThread.Post(UpdateHost, DispatcherPriority.Render);
+        }
+
+        public bool TryUpdateNativeControlPosition()
+        {
+            if (_currentHost == null)
+                return false;
+            
+            var bounds = GetAbsoluteBounds();
+            var needsShow = IsEffectivelyVisible && bounds.HasValue;
+
+            if (needsShow)
+                _attachment?.ShowInBounds(bounds.Value);
+            else
+                _attachment?.HideWithSize(Bounds.Size);
+            return false;
+        }
+
+        private void CheckDestruction()
+        {
+            _queuedForDestruction = false;
+            if (_currentRoot == null)
+                DestroyNativeControl();
+        }
+        
+        protected virtual IPlatformHandle CreateNativeControlCore(IPlatformHandle parent)
+        {
+            if (_currentHost == null)
+                throw new InvalidOperationException();
+            return _currentHost.CreateDefaultChild(parent);
+        }
+
+        private void DestroyNativeControl()
+        {
+            if (_nativeControlHandle != null)
+            {
+                _attachment?.Dispose();
+                _attachment = null;
+                
+                DestroyNativeControlCore(_nativeControlHandle);
+                _nativeControlHandle = null;
+            }
+        }
+
+        protected virtual void DestroyNativeControlCore(IPlatformHandle control)
+        {
+            ((INativeControlHostDestroyableControlHandle)control).Destroy();
+        }
+        
+    }
+}
diff --git a/src/Avalonia.Controls/NativeMenu.Export.cs b/src/Avalonia.Controls/NativeMenu.Export.cs
index 5d3a4526cc..0349df842b 100644
--- a/src/Avalonia.Controls/NativeMenu.Export.cs
+++ b/src/Avalonia.Controls/NativeMenu.Export.cs
@@ -52,13 +52,13 @@ namespace Avalonia.Controls
         }
 
         public static readonly AttachedProperty<NativeMenu> MenuProperty
-            = AvaloniaProperty.RegisterAttached<NativeMenu, AvaloniaObject, NativeMenu>("Menu", validate:
+            = AvaloniaProperty.RegisterAttached<NativeMenu, AvaloniaObject, NativeMenu>("Menu"/*, validate:
                 (o, v) =>
                 {
                     if(!(o is Application || o is TopLevel))
                         throw new InvalidOperationException("NativeMenu.Menu property isn't valid on "+o.GetType());
                     return v;
-                });
+                }*/);
 
         public static void SetMenu(AvaloniaObject o, NativeMenu menu) => o.SetValue(MenuProperty, menu);
         public static NativeMenu GetMenu(AvaloniaObject o) => o.GetValue(MenuProperty);
@@ -77,7 +77,7 @@ namespace Avalonia.Controls
             {
                 if (args.Sender is TopLevel tl)
                 {
-                    GetInfo(tl).Exporter?.SetNativeMenu((NativeMenu)args.NewValue);
+                    GetInfo(tl).Exporter?.SetNativeMenu(args.NewValue.GetValueOrDefault());
                 }
             });
         }
diff --git a/src/Avalonia.Controls/NativeMenu.cs b/src/Avalonia.Controls/NativeMenu.cs
index 54aa2b5e3d..38a9f03d29 100644
--- a/src/Avalonia.Controls/NativeMenu.cs
+++ b/src/Avalonia.Controls/NativeMenu.cs
@@ -3,13 +3,11 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using Avalonia.Collections;
-using Avalonia.Data;
-using Avalonia.LogicalTree;
 using Avalonia.Metadata;
 
 namespace Avalonia.Controls
 {
-    public partial class NativeMenu : AvaloniaObject, IEnumerable<NativeMenuItemBase>
+    public partial class NativeMenu : AvaloniaObject, IEnumerable<NativeMenuItemBase>, INativeMenuExporterEventsImplBridge
     {
         private readonly AvaloniaList<NativeMenuItemBase> _items =
             new AvaloniaList<NativeMenuItemBase> { ResetBehavior = ResetBehavior.Remove };
@@ -17,12 +15,22 @@ namespace Avalonia.Controls
         [Content]
         public IList<NativeMenuItemBase> Items => _items;
 
+        /// <summary>
+        /// Raised when the user clicks the menu and before its opened. Use this event to update the menu dynamically.
+        /// </summary>
+        public event EventHandler<EventArgs> Opening;
+
         public NativeMenu()
         {
             _items.Validate = Validator;
             _items.CollectionChanged += ItemsChanged;
         }
 
+        void INativeMenuExporterEventsImplBridge.RaiseNeedsUpdate()
+        {
+            Opening?.Invoke(this, EventArgs.Empty);
+        }
+
         private void Validator(NativeMenuItemBase obj)
         {
             if (obj.Parent != null)
@@ -31,10 +39,10 @@ namespace Avalonia.Controls
 
         private void ItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            if(e.OldItems!=null)
+            if (e.OldItems != null)
                 foreach (NativeMenuItemBase i in e.OldItems)
                     i.Parent = null;
-            if(e.NewItems!=null)
+            if (e.NewItems != null)
                 foreach (NativeMenuItemBase i in e.NewItems)
                     i.Parent = this;
         }
@@ -49,7 +57,7 @@ namespace Avalonia.Controls
         }
 
         public void Add(NativeMenuItemBase item) => _items.Add(item);
-        
+
         public IEnumerator<NativeMenuItemBase> GetEnumerator() => _items.GetEnumerator();
 
         IEnumerator IEnumerable.GetEnumerator()
diff --git a/src/Avalonia.Controls/NativeMenuBar.cs b/src/Avalonia.Controls/NativeMenuBar.cs
index 9b96ab9c8c..5d2e1087a7 100644
--- a/src/Avalonia.Controls/NativeMenuBar.cs
+++ b/src/Avalonia.Controls/NativeMenuBar.cs
@@ -1,7 +1,6 @@
 using System;
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
-using Avalonia.Styling;
 
 namespace Avalonia.Controls
 {
@@ -16,7 +15,7 @@ namespace Avalonia.Controls
             EnableMenuItemClickForwardingProperty.Changed.Subscribe(args =>
             {
                 var item = (MenuItem)args.Sender;
-                if (args.NewValue.Equals(true))
+                if (args.NewValue.GetValueOrDefault<bool>())
                     item.Click += OnMenuItemClick;
                 else
                     item.Click -= OnMenuItemClick;
@@ -30,7 +29,7 @@ namespace Avalonia.Controls
 
         private static void OnMenuItemClick(object sender, RoutedEventArgs e)
         {
-            (((MenuItem)sender).DataContext as NativeMenuItem)?.RaiseClick();
+            (((MenuItem)sender).DataContext as INativeMenuItemExporterEventsImplBridge)?.RaiseClicked();
         }
     }
 }
diff --git a/src/Avalonia.Controls/NativeMenuItem.cs b/src/Avalonia.Controls/NativeMenuItem.cs
index c1144d45b2..2eaf24d2f2 100644
--- a/src/Avalonia.Controls/NativeMenuItem.cs
+++ b/src/Avalonia.Controls/NativeMenuItem.cs
@@ -1,15 +1,21 @@
 using System;
 using System.Windows.Input;
 using Avalonia.Input;
+using Avalonia.Media.Imaging;
+using Avalonia.Metadata;
 using Avalonia.Utilities;
 
 namespace Avalonia.Controls
 {
-    public class NativeMenuItem : NativeMenuItemBase
+    public class NativeMenuItem : NativeMenuItemBase, INativeMenuItemExporterEventsImplBridge
     {
         private string _header;
         private KeyGesture _gesture;
-        private bool _enabled = true;
+        private bool _isEnabled = true;
+        private ICommand _command;
+        private bool _isChecked = false;
+        private NativeMenuItemToggleType _toggleType;
+        private IBitmap _icon;
 
         private NativeMenu _menu;
 
@@ -18,7 +24,7 @@ namespace Avalonia.Controls
             MenuProperty.Changed.Subscribe(args =>
             {
                 var item = (NativeMenuItem)args.Sender;
-                var value = (NativeMenu)args.NewValue;
+                var value = args.NewValue.GetValueOrDefault();
                 if (value.Parent != null && value.Parent != item)
                     throw new InvalidOperationException("NativeMenu already has a parent");
                 value.Parent = item;
@@ -55,14 +61,9 @@ namespace Avalonia.Controls
         }
 
         public static readonly DirectProperty<NativeMenuItem, NativeMenu> MenuProperty =
-            AvaloniaProperty.RegisterDirect<NativeMenuItem, NativeMenu>(nameof(Menu), o => o._menu,
-                (o, v) =>
-                {
-                    if (v.Parent != null && v.Parent != o)
-                        throw new InvalidOperationException("NativeMenu already has a parent");
-                    o._menu = v;
-                });
+            AvaloniaProperty.RegisterDirect<NativeMenuItem, NativeMenu>(nameof(Menu), o => o.Menu, (o, v) => o.Menu = v);
 
+        [Content]
         public NativeMenu Menu
         {
             get => _menu;
@@ -74,39 +75,63 @@ namespace Avalonia.Controls
             }
         }
 
+        public static readonly DirectProperty<NativeMenuItem, IBitmap> IconProperty =
+            AvaloniaProperty.RegisterDirect<NativeMenuItem, IBitmap>(nameof(Icon), o => o.Icon, (o, v) => o.Icon = v);
+
+
+        public IBitmap Icon
+        {
+            get => _icon;
+            set => SetAndRaise(IconProperty, ref _icon, value);
+        }  
+
         public static readonly DirectProperty<NativeMenuItem, string> HeaderProperty =
-            AvaloniaProperty.RegisterDirect<NativeMenuItem, string>(nameof(Header), o => o._header, (o, v) => o._header = v);
+            AvaloniaProperty.RegisterDirect<NativeMenuItem, string>(nameof(Header), o => o.Header, (o, v) => o.Header = v);
 
         public string Header
         {
-            get => GetValue(HeaderProperty);
-            set => SetValue(HeaderProperty, value);
+            get => _header;
+            set => SetAndRaise(HeaderProperty, ref _header, value);
         }
 
         public static readonly DirectProperty<NativeMenuItem, KeyGesture> GestureProperty =
-            AvaloniaProperty.RegisterDirect<NativeMenuItem, KeyGesture>(nameof(Gesture), o => o._gesture, (o, v) => o._gesture = v);
+            AvaloniaProperty.RegisterDirect<NativeMenuItem, KeyGesture>(nameof(Gesture), o => o.Gesture, (o, v) => o.Gesture = v);
 
         public KeyGesture Gesture
         {
-            get => GetValue(GestureProperty);
-            set => SetValue(GestureProperty, value);
+            get => _gesture;
+            set => SetAndRaise(GestureProperty, ref _gesture, value);
         }
 
-        private ICommand _command;
+        public static readonly DirectProperty<NativeMenuItem, bool> IsCheckedProperty =
+            AvaloniaProperty.RegisterDirect<NativeMenuItem, bool>(
+                nameof(IsChecked),
+                o => o.IsChecked,
+                (o, v) => o.IsChecked = v);
+
+        public bool IsChecked
+        {
+            get => _isChecked;
+            set => SetAndRaise(IsCheckedProperty, ref _isChecked, value);
+        }
+        
+        public static readonly DirectProperty<NativeMenuItem, NativeMenuItemToggleType> ToggleTypeProperty =
+            AvaloniaProperty.RegisterDirect<NativeMenuItem, NativeMenuItemToggleType>(
+                nameof(ToggleType),
+                o => o.ToggleType,
+                (o, v) => o.ToggleType = v);
+
+        public NativeMenuItemToggleType ToggleType
+        {
+            get => _toggleType;
+            set => SetAndRaise(ToggleTypeProperty, ref _toggleType, value);
+        }
 
         public static readonly DirectProperty<NativeMenuItem, ICommand> CommandProperty =
-           AvaloniaProperty.RegisterDirect<NativeMenuItem, ICommand>(nameof(Command),
-               o => o._command, (o, v) =>
-               {
-                   if (o._command != null)
-                       WeakSubscriptionManager.Unsubscribe(o._command,
-                           nameof(ICommand.CanExecuteChanged), o._canExecuteChangedSubscriber);
-                   o._command = v;
-                   if (o._command != null)
-                       WeakSubscriptionManager.Subscribe(o._command,
-                           nameof(ICommand.CanExecuteChanged), o._canExecuteChangedSubscriber);
-                   o.CanExecuteChanged();
-               });
+            Button.CommandProperty.AddOwner<NativeMenuItem>(
+                menuItem => menuItem.Command,
+                (menuItem, command) => menuItem.Command = command,
+                enableDataValidation: true);
 
         /// <summary>
         /// Defines the <see cref="CommandParameter"/> property.
@@ -114,27 +139,39 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<object> CommandParameterProperty =
             Button.CommandParameterProperty.AddOwner<MenuItem>();
 
-        public static readonly DirectProperty<NativeMenuItem, bool> EnabledProperty =
-           AvaloniaProperty.RegisterDirect<NativeMenuItem, bool>(nameof(Enabled), o => o._enabled,
-               (o, v) => o._enabled = v, true);
+        public static readonly DirectProperty<NativeMenuItem, bool> IsEnabledProperty =
+           AvaloniaProperty.RegisterDirect<NativeMenuItem, bool>(nameof(IsEnabled), o => o.IsEnabled, (o, v) => o.IsEnabled = v, true);
 
-        public bool Enabled
+        public bool IsEnabled
         {
-            get => GetValue(EnabledProperty);
-            set => SetValue(EnabledProperty, value);
+            get => _isEnabled;
+            set => SetAndRaise(IsEnabledProperty, ref _isEnabled, value);
         }
 
         void CanExecuteChanged()
         {
-            Enabled = _command?.CanExecute(null) ?? true;
+            IsEnabled = _command?.CanExecute(CommandParameter) ?? true;
         }
 
-        public bool HasClickHandlers => Clicked != null;
+        public bool HasClickHandlers => Click != null;
 
         public ICommand Command
         {
-            get => GetValue(CommandProperty);
-            set => SetValue(CommandProperty, value);
+            get => _command;
+            set
+            {
+                if (_command != null)
+                    WeakSubscriptionManager.Unsubscribe(_command,
+                        nameof(ICommand.CanExecuteChanged), _canExecuteChangedSubscriber);
+
+                SetAndRaise(CommandProperty, ref _command, value);
+
+                if (_command != null)
+                    WeakSubscriptionManager.Subscribe(_command,
+                        nameof(ICommand.CanExecuteChanged), _canExecuteChangedSubscriber);
+
+                CanExecuteChanged();
+            }
         }
 
         /// <summary>
@@ -147,11 +184,21 @@ namespace Avalonia.Controls
             set { SetValue(CommandParameterProperty, value); }
         }
 
-        public event EventHandler Clicked;
+        /// <summary>
+        /// Occurs when a <see cref="NativeMenuItem"/> is clicked.
+        /// </summary>
+        public event EventHandler Click;
+
+        [Obsolete("Use Click event.")]
+        public event EventHandler Clicked
+        {
+            add => Click += value;
+            remove => Click -= value;
+        }
 
-        public void RaiseClick()
+        void INativeMenuItemExporterEventsImplBridge.RaiseClicked()
         {
-            Clicked?.Invoke(this, new EventArgs());
+            Click?.Invoke(this, new EventArgs());
 
             if (Command?.CanExecute(CommandParameter) == true)
             {
@@ -159,4 +206,11 @@ namespace Avalonia.Controls
             }
         }
     }
+    
+    public enum NativeMenuItemToggleType
+    {
+        None,
+        CheckBox,
+        Radio
+    }
 }
diff --git a/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
index 03c2fe85b8..977544674d 100644
--- a/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Controls.Notifications
+namespace Avalonia.Controls.Notifications
 {
     /// <summary>
     /// Represents a notification manager that can show arbitrary content.
diff --git a/src/Avalonia.Controls/Notifications/INotification.cs b/src/Avalonia.Controls/Notifications/INotification.cs
index 2c6cb90133..dc69a12887 100644
--- a/src/Avalonia.Controls/Notifications/INotification.cs
+++ b/src/Avalonia.Controls/Notifications/INotification.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Controls.Notifications
 {
diff --git a/src/Avalonia.Controls/Notifications/INotificationManager.cs b/src/Avalonia.Controls/Notifications/INotificationManager.cs
index 21430c900d..72fb8e6c08 100644
--- a/src/Avalonia.Controls/Notifications/INotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/INotificationManager.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Controls.Notifications
+namespace Avalonia.Controls.Notifications
 {
     /// <summary>
     /// Represents a notification manager that can be used to show notifications in a window or using
diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
index 4204ad0aee..9bb514971b 100644
--- a/src/Avalonia.Controls/Notifications/Notification.cs
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Controls.Notifications
 {
diff --git a/src/Avalonia.Controls/Notifications/NotificationCard.cs b/src/Avalonia.Controls/Notifications/NotificationCard.cs
index 7f69afaeeb..cdbace3ced 100644
--- a/src/Avalonia.Controls/Notifications/NotificationCard.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationCard.cs
@@ -1,9 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Linq;
 using System.Reactive.Linq;
+using Avalonia.Controls.Metadata;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
 
@@ -12,6 +10,7 @@ namespace Avalonia.Controls.Notifications
     /// <summary>
     /// Control that represents and displays a notification.
     /// </summary>
+    [PseudoClasses(":error", ":information", ":success", ":warning")]
     public class NotificationCard : ContentControl
     {
         private bool _isClosed;
@@ -118,7 +117,7 @@ namespace Avalonia.Controls.Notifications
         /// Defines the CloseOnClick property.
         /// </summary>
         public static readonly AvaloniaProperty CloseOnClickProperty =
-          AvaloniaProperty.RegisterAttached<Button, bool>("CloseOnClick", typeof(NotificationCard), validate: CloseOnClickChanged);
+          AvaloniaProperty.RegisterAttached<Button, bool>("CloseOnClick", typeof(NotificationCard)/*, validate: CloseOnClickChanged*/);
 
         private static bool CloseOnClickChanged(Button button, bool value)
         {
diff --git a/src/Avalonia.Controls/Notifications/NotificationPosition.cs b/src/Avalonia.Controls/Notifications/NotificationPosition.cs
index ef1d5e53d6..79f22f7972 100644
--- a/src/Avalonia.Controls/Notifications/NotificationPosition.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationPosition.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Controls.Notifications
+namespace Avalonia.Controls.Notifications
 {
     /// <summary>
     /// Describes the possible positions for <see cref="Notification"/>s that are displayed by a
diff --git a/src/Avalonia.Controls/Notifications/NotificationType.cs b/src/Avalonia.Controls/Notifications/NotificationType.cs
index fdcf5eec0a..f4ab46e973 100644
--- a/src/Avalonia.Controls/Notifications/NotificationType.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationType.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Controls.Notifications
+namespace Avalonia.Controls.Notifications
 {
     /// <summary>
     /// Enumeration of types for <see cref="INotification"/>.
diff --git a/src/Avalonia.Controls/Notifications/ReversibleStackPanel.cs b/src/Avalonia.Controls/Notifications/ReversibleStackPanel.cs
index 9edf9848fd..b64d94ff9b 100644
--- a/src/Avalonia.Controls/Notifications/ReversibleStackPanel.cs
+++ b/src/Avalonia.Controls/Notifications/ReversibleStackPanel.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Linq;
 using Avalonia.Layout;
 
diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index aa91224572..8f5c6faf40 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -1,20 +1,21 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections;
 using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 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>
-    public class WindowNotificationManager : TemplatedControl, IManagedNotificationManager
+    [PseudoClasses(":topleft", ":topright", ":bottomleft", ":bottomright")]
+    public class WindowNotificationManager : TemplatedControl, IManagedNotificationManager, ICustomSimpleHitTest
     {
         private IList _items;
 
@@ -67,24 +68,19 @@ namespace Avalonia.Controls.Notifications
                         Install(host);
                     });
             }
+
+            UpdatePseudoClasses(Position);
         }
 
         static WindowNotificationManager()
         {
-            PseudoClass<WindowNotificationManager, NotificationPosition>(PositionProperty, x => x == NotificationPosition.TopLeft, ":topleft");
-            PseudoClass<WindowNotificationManager, NotificationPosition>(PositionProperty, x => x == NotificationPosition.TopRight, ":topright");
-            PseudoClass<WindowNotificationManager, NotificationPosition>(PositionProperty, x => x == NotificationPosition.BottomLeft, ":bottomleft");
-            PseudoClass<WindowNotificationManager, NotificationPosition>(PositionProperty, x => x == NotificationPosition.BottomRight, ":bottomright");
-
             HorizontalAlignmentProperty.OverrideDefaultValue<WindowNotificationManager>(Layout.HorizontalAlignment.Stretch);
             VerticalAlignmentProperty.OverrideDefaultValue<WindowNotificationManager>(Layout.VerticalAlignment.Stretch);
         }
 
         /// <inheritdoc/>
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
-            base.OnTemplateApplied(e);
-
             var itemsControl = e.NameScope.Find<Panel>("PART_Items");
             _items = itemsControl?.Children;
         }
@@ -142,6 +138,16 @@ namespace Avalonia.Controls.Notifications
             notificationControl.Close();
         }
 
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == PositionProperty)
+            {
+                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<NotificationPosition>());
+            }
+        }
+
         /// <summary>
         /// Installs the <see cref="WindowNotificationManager"/> within the <see cref="AdornerLayer"/>
         /// of the host <see cref="Window"/>.
@@ -149,15 +155,19 @@ namespace Avalonia.Controls.Notifications
         /// <param name="host">The <see cref="Window"/> that will be the host.</param>
         private void Install(Window host)
         {
-            var adornerLayer = host.GetVisualDescendants()
-                .OfType<VisualLayerManager>()
-                .FirstOrDefault()
-                ?.AdornerLayer;
+            var adornerLayer = host.FindDescendantOfType<VisualLayerManager>()?.AdornerLayer;
 
-            if (adornerLayer != null)
-            {
-                adornerLayer.Children.Add(this);
-            }
+            adornerLayer?.Children.Add(this);
         }
+
+        private void UpdatePseudoClasses(NotificationPosition position)
+        {
+            PseudoClasses.Set(":topleft", position == NotificationPosition.TopLeft);
+            PseudoClasses.Set(":topright", position == NotificationPosition.TopRight);
+            PseudoClasses.Set(":bottomleft", position == NotificationPosition.BottomLeft);
+            PseudoClasses.Set(":bottomright", position == NotificationPosition.BottomRight);
+        }
+
+        public bool HitTest(Point point) => VisualChildren.HitTestCustom(point);
     }
 }
diff --git a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
index 6d450a0155..aae041071d 100644
--- a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
+++ b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
@@ -58,7 +58,7 @@ namespace Avalonia.Controls
         /// Defines the <see cref="Increment"/> property.
         /// </summary>
         public static readonly StyledProperty<double> IncrementProperty =
-            AvaloniaProperty.Register<NumericUpDown, double>(nameof(Increment), 1.0d, validate: OnCoerceIncrement);
+            AvaloniaProperty.Register<NumericUpDown, double>(nameof(Increment), 1.0d, coerce: OnCoerceIncrement);
 
         /// <summary>
         /// Defines the <see cref="IsReadOnly"/> property.
@@ -70,13 +70,13 @@ namespace Avalonia.Controls
         /// Defines the <see cref="Maximum"/> property.
         /// </summary>
         public static readonly StyledProperty<double> MaximumProperty =
-            AvaloniaProperty.Register<NumericUpDown, double>(nameof(Maximum), double.MaxValue, validate: OnCoerceMaximum);
+            AvaloniaProperty.Register<NumericUpDown, double>(nameof(Maximum), double.MaxValue, coerce: OnCoerceMaximum);
 
         /// <summary>
         /// Defines the <see cref="Minimum"/> property.
         /// </summary>
         public static readonly StyledProperty<double> MinimumProperty =
-            AvaloniaProperty.Register<NumericUpDown, double>(nameof(Minimum), double.MinValue, validate: OnCoerceMinimum);
+            AvaloniaProperty.Register<NumericUpDown, double>(nameof(Minimum), double.MinValue, coerce: OnCoerceMinimum);
 
         /// <summary>
         /// Defines the <see cref="ParsingNumberStyle"/> property.
@@ -295,7 +295,7 @@ namespace Avalonia.Controls
         }
 
         /// <inheritdoc />
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             if (TextBox != null)
             {
@@ -738,19 +738,34 @@ namespace Avalonia.Controls
             }
         }
 
-        private static double OnCoerceMaximum(NumericUpDown upDown, double value)
+        private static double OnCoerceMaximum(IAvaloniaObject instance, double value)
         {
-            return upDown.OnCoerceMaximum(value);
+            if (instance is NumericUpDown upDown)
+            {
+                return upDown.OnCoerceMaximum(value);
+            }
+
+            return value;
         }
 
-        private static double OnCoerceMinimum(NumericUpDown upDown, double value)
+        private static double OnCoerceMinimum(IAvaloniaObject instance, double value)
         {
-            return upDown.OnCoerceMinimum(value);
+            if (instance is NumericUpDown upDown)
+            {
+                return upDown.OnCoerceMinimum(value);
+            }
+
+            return value;
         }
 
-        private static double OnCoerceIncrement(NumericUpDown upDown, double value)
+        private static double OnCoerceIncrement(IAvaloniaObject instance, double value)
         {
-            return upDown.OnCoerceIncrement(value);
+            if (instance is NumericUpDown upDown)
+            {
+                return upDown.OnCoerceIncrement(value);
+            }
+
+            return value;
         }
 
         private void TextBoxOnTextChanged()
diff --git a/src/Avalonia.Controls/Panel.cs b/src/Avalonia.Controls/Panel.cs
index a4c674a03b..b7eeb065da 100644
--- a/src/Avalonia.Controls/Panel.cs
+++ b/src/Avalonia.Controls/Panel.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -140,6 +137,11 @@ namespace Avalonia.Controls
                     throw new NotSupportedException();
             }
 
+            InvalidateMeasureOnChildrenChanged();
+        }
+
+        private protected virtual void InvalidateMeasureOnChildrenChanged()
+        {
             InvalidateMeasure();
         }
 
diff --git a/src/Avalonia.Controls/PathIcon.cs b/src/Avalonia.Controls/PathIcon.cs
new file mode 100644
index 0000000000..764f245249
--- /dev/null
+++ b/src/Avalonia.Controls/PathIcon.cs
@@ -0,0 +1,21 @@
+using Avalonia.Media;
+
+namespace Avalonia.Controls
+{
+    public class PathIcon : IconElement
+    {
+        static PathIcon()
+        {
+            AffectsRender<PathIcon>(DataProperty);
+        }
+
+        public static readonly StyledProperty<Geometry> DataProperty =
+            AvaloniaProperty.Register<PathIcon, Geometry>(nameof(Data));
+
+        public Geometry Data
+        {
+            get { return GetValue(DataProperty); }
+            set { SetValue(DataProperty, value); }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/PixelPointEventArgs.cs b/src/Avalonia.Controls/PixelPointEventArgs.cs
index 2456d0aea4..57940b361b 100644
--- a/src/Avalonia.Controls/PixelPointEventArgs.cs
+++ b/src/Avalonia.Controls/PixelPointEventArgs.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Controls
diff --git a/src/Avalonia.Controls/PlacementMode.cs b/src/Avalonia.Controls/PlacementMode.cs
index 99958c4c9e..68a4b9eecb 100644
--- a/src/Avalonia.Controls/PlacementMode.cs
+++ b/src/Avalonia.Controls/PlacementMode.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Primitives;
 
 namespace Avalonia.Controls
diff --git a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
index 97aeead608..5cbd3698b6 100644
--- a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
+++ b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
@@ -5,6 +5,9 @@ using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
 using Avalonia.Rendering;
 using Avalonia.Threading;
+using Avalonia.VisualTree;
+
+#nullable enable
 
 namespace Avalonia.Controls.Platform
 {
@@ -14,8 +17,8 @@ namespace Avalonia.Controls.Platform
     public class DefaultMenuInteractionHandler : IMenuInteractionHandler
     {
         private readonly bool _isContextMenu;
-        private IDisposable _inputManagerSubscription;
-        private IRenderRoot _root;
+        private IDisposable? _inputManagerSubscription;
+        private IRenderRoot? _root;
 
         public DefaultMenuInteractionHandler(bool isContextMenu)
             : this(isContextMenu, Input.InputManager.Instance, DefaultDelayRun)
@@ -24,9 +27,11 @@ namespace Avalonia.Controls.Platform
 
         public DefaultMenuInteractionHandler(
             bool isContextMenu,
-            IInputManager inputManager,
+            IInputManager? inputManager,
             Action<Action, TimeSpan> delayRun)
         {
+            delayRun = delayRun ?? throw new ArgumentNullException(nameof(delayRun));
+
             _isContextMenu = isContextMenu;
             InputManager = inputManager;
             DelayRun = delayRun;
@@ -62,6 +67,9 @@ namespace Avalonia.Controls.Platform
                 window.Deactivated += WindowDeactivated;
             }
 
+            if (_root is TopLevel tl)
+                tl.PlatformImpl.LostFocus += TopLevelLostPlatformFocus;
+
             _inputManagerSubscription = InputManager?.Process.Subscribe(RawInput);
         }
 
@@ -91,8 +99,11 @@ namespace Avalonia.Controls.Platform
             {
                 root.Deactivated -= WindowDeactivated;
             }
+            
+            if (_root is TopLevel tl)
+                tl.PlatformImpl.LostFocus -= TopLevelLostPlatformFocus;
 
-            _inputManagerSubscription.Dispose();
+            _inputManagerSubscription?.Dispose();
 
             Menu = null;
             _root = null;
@@ -100,9 +111,9 @@ namespace Avalonia.Controls.Platform
 
         protected Action<Action, TimeSpan> DelayRun { get; }
 
-        protected IInputManager InputManager { get; }
+        protected IInputManager? InputManager { get; }
 
-        protected IMenu Menu { get; private set; }
+        protected IMenu? Menu { get; private set; }
 
         protected static TimeSpan MenuShowDelay { get; } = TimeSpan.FromMilliseconds(400);
 
@@ -131,12 +142,13 @@ namespace Avalonia.Controls.Platform
             KeyDown(GetMenuItem(e.Source as IControl), e);
         }
 
-        protected internal virtual void KeyDown(IMenuItem item, KeyEventArgs e)
+        protected internal virtual void KeyDown(IMenuItem? item, KeyEventArgs e)
         {
             switch (e.Key)
             {
                 case Key.Up:
                 case Key.Down:
+                {
                     if (item?.IsTopLevel == true)
                     {
                         if (item.HasSubMenu && !item.IsSubMenuOpen)
@@ -150,8 +162,10 @@ namespace Avalonia.Controls.Platform
                         goto default;
                     }
                     break;
+                }
 
                 case Key.Left:
+                {
                     if (item?.Parent is IMenuItem parent && !parent.IsTopLevel && parent.IsSubMenuOpen)
                     {
                         parent.Close();
@@ -163,8 +177,10 @@ namespace Avalonia.Controls.Platform
                         goto default;
                     }
                     break;
+                }
 
                 case Key.Right:
+                {
                     if (item != null && !item.IsTopLevel && item.HasSubMenu)
                     {
                         Open(item, true);
@@ -175,8 +191,10 @@ namespace Avalonia.Controls.Platform
                         goto default;
                     }
                     break;
+                }
 
                 case Key.Enter:
+                {
                     if (item != null)
                     {
                         if (!item.HasSubMenu)
@@ -191,39 +209,45 @@ namespace Avalonia.Controls.Platform
                         e.Handled = true;
                     }
                     break;
+                }
 
                 case Key.Escape:
-                    if (item?.Parent != null)
+                {
+                    if (item?.Parent is IMenuElement parent)
                     {
-                        item.Parent.Close();
-                        item.Parent.Focus();
+                        parent.Close();
+                        parent.Focus();
                     }
                     else
                     {
-                        Menu.Close();
+                        Menu!.Close();
                     }
 
                     e.Handled = true;
                     break;
+                }
 
                 default:
+                {
                     var direction = e.Key.ToNavigationDirection();
 
-                    if (direction.HasValue)
+                    if (direction?.IsDirectional() == true)
                     {
                         if (item == null && _isContextMenu)
                         {
-                            if (Menu.MoveSelection(direction.Value, true) == true)
+                            if (Menu!.MoveSelection(direction.Value, true) == true)
                             {
                                 e.Handled = true;
                             }
                         }
-                        else if (item.Parent?.MoveSelection(direction.Value, true) == true)
+                        else if (item?.Parent?.MoveSelection(direction.Value, true) == true)
                         {
                             // If the the parent is an IMenu which successfully moved its selection,
                             // and the current menu is open then close the current menu and open the
                             // new menu.
-                            if (item.IsSubMenuOpen && item.Parent is IMenu)
+                            if (item.IsSubMenuOpen &&
+                                item.Parent is IMenu &&
+                                item.Parent.SelectedItem is object)
                             {
                                 item.Close();
                                 Open(item.Parent.SelectedItem, true);
@@ -233,6 +257,7 @@ namespace Avalonia.Controls.Platform
                     }
 
                     break;
+                }
             }
 
             if (!e.Handled && item?.Parent is IMenuItem parentItem)
@@ -328,14 +353,19 @@ namespace Avalonia.Controls.Platform
                 {
                     item.Parent.SelectedItem = null;
                 }
+                else if (!item.IsPointerOverSubMenu)
+                {
+                    item.IsSubMenuOpen = false;
+                }
             }
         }
 
         protected internal virtual void PointerPressed(object sender, PointerPressedEventArgs e)
         {
             var item = GetMenuItem(e.Source as IControl);
+            var visual = (IVisual)sender;
 
-            if (e.MouseButton == MouseButton.Left && item?.HasSubMenu == true)
+            if (e.GetCurrentPoint(visual).Properties.IsLeftButtonPressed && item?.HasSubMenu == true)
             {
                 if (item.IsSubMenuOpen)
                 {
@@ -346,6 +376,11 @@ namespace Avalonia.Controls.Platform
                 }
                 else
                 {
+                    if (item.IsTopLevel && item.Parent is IMainMenu mainMenu)
+                    {
+                        mainMenu.Open();
+                    }
+
                     Open(item, false);
                 }
 
@@ -368,7 +403,7 @@ namespace Avalonia.Controls.Platform
         {
             if (e.Source == Menu)
             {
-                Menu.MoveSelection(NavigationDirection.First, true);
+                Menu?.MoveSelection(NavigationDirection.First, true);
             }
         }
 
@@ -388,7 +423,7 @@ namespace Avalonia.Controls.Platform
             {
                 var control = e.Source as ILogical;
 
-                if (!Menu.IsLogicalParentOf(control))
+                if (!Menu.IsLogicalAncestorOf(control))
                 {
                     Menu.Close();
                 }
@@ -399,6 +434,11 @@ namespace Avalonia.Controls.Platform
         {
             Menu?.Close();
         }
+        
+        private void TopLevelLostPlatformFocus()
+        {
+            Menu?.Close();
+        }
 
         protected void Click(IMenuItem item)
         {
@@ -408,7 +448,7 @@ namespace Avalonia.Controls.Platform
 
         protected void CloseMenu(IMenuItem item)
         {
-            var current = (IMenuElement)item;
+            var current = (IMenuElement?)item;
 
             while (current != null && !(current is IMenu))
             {
@@ -456,7 +496,7 @@ namespace Avalonia.Controls.Platform
 
         protected void SelectItemAndAncestors(IMenuItem item)
         {
-            var current = item;
+            var current = (IMenuItem?)item;
 
             while (current?.Parent != null)
             {
@@ -465,7 +505,7 @@ namespace Avalonia.Controls.Platform
             }
         }
 
-        protected static IMenuItem GetMenuItem(IControl item)
+        protected static IMenuItem? GetMenuItem(IControl? item)
         {
             while (true)
             {
diff --git a/src/Avalonia.Controls/Platform/ExtendClientAreaChromeHints.cs b/src/Avalonia.Controls/Platform/ExtendClientAreaChromeHints.cs
new file mode 100644
index 0000000000..de3f58886b
--- /dev/null
+++ b/src/Avalonia.Controls/Platform/ExtendClientAreaChromeHints.cs
@@ -0,0 +1,38 @@
+using System;
+
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Hint for Window Chrome when ClientArea is Extended.
+    /// </summary>
+    [Flags]
+    public enum ExtendClientAreaChromeHints
+    {
+        /// <summary>
+        /// The will be no chrome at all.
+        /// </summary>
+        NoChrome,
+
+        /// <summary>
+        /// The default for the platform.
+        /// </summary>
+        Default = SystemChrome,
+
+        /// <summary>
+        /// Use SystemChrome
+        /// </summary>
+        SystemChrome = 0x01,
+
+        /// <summary>
+        /// Use system chrome where possible. OSX system chrome is used, Windows managed chrome is used.
+        /// This is because Windows Chrome can not be shown ontop of user content.
+        /// </summary>
+        PreferSystemChrome = 0x02,
+
+        /// <summary>
+        /// On OSX the titlebar is the thicker toolbar kind. Causes traffic lights to be positioned
+        /// slightly lower than normal.
+        /// </summary>
+        OSXThickTitleBar = 0x08,               
+    }
+}
diff --git a/src/Avalonia.Controls/Platform/IEmbeddableWindowImpl.cs b/src/Avalonia.Controls/Platform/IEmbeddableWindowImpl.cs
deleted file mode 100644
index 3f974f3748..0000000000
--- a/src/Avalonia.Controls/Platform/IEmbeddableWindowImpl.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Defines a platform-specific embeddable window implementation.
-    /// </summary>
-    public interface IEmbeddableWindowImpl : ITopLevelImpl
-    {
-        event Action LostFocus;
-    }
-}
diff --git a/src/Avalonia.Controls/Platform/IMountedVolumeInfoProvider.cs b/src/Avalonia.Controls/Platform/IMountedVolumeInfoProvider.cs
index 1420fce3c2..6e10163175 100644
--- a/src/Avalonia.Controls/Platform/IMountedVolumeInfoProvider.cs
+++ b/src/Avalonia.Controls/Platform/IMountedVolumeInfoProvider.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
diff --git a/src/Avalonia.Controls/Platform/INativeControlHostImpl.cs b/src/Avalonia.Controls/Platform/INativeControlHostImpl.cs
new file mode 100644
index 0000000000..c6b1d09849
--- /dev/null
+++ b/src/Avalonia.Controls/Platform/INativeControlHostImpl.cs
@@ -0,0 +1,32 @@
+using System;
+using Avalonia.Platform;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Controls.Platform
+{
+    public interface INativeControlHostImpl
+    {
+        INativeControlHostDestroyableControlHandle CreateDefaultChild(IPlatformHandle parent);
+        INativeControlHostControlTopLevelAttachment CreateNewAttachment(Func<IPlatformHandle, IPlatformHandle> create);
+        INativeControlHostControlTopLevelAttachment CreateNewAttachment(IPlatformHandle handle);
+        bool IsCompatibleWith(IPlatformHandle handle);
+    }
+
+    public interface INativeControlHostDestroyableControlHandle : IPlatformHandle
+    {
+        void Destroy();
+    }
+
+    public interface INativeControlHostControlTopLevelAttachment : IDisposable
+    {
+        INativeControlHostImpl AttachedTo { get; set; }
+        bool IsCompatibleWith(INativeControlHostImpl host);
+        void HideWithSize(Size size);
+        void ShowInBounds(Rect rect);
+    }
+
+    public interface ITopLevelImplWithNativeControlHost
+    {
+        INativeControlHostImpl NativeControlHost { get; }
+    }
+}
diff --git a/src/Avalonia.Controls/Platform/IPopupImpl.cs b/src/Avalonia.Controls/Platform/IPopupImpl.cs
index 2978016519..477d5fab43 100644
--- a/src/Avalonia.Controls/Platform/IPopupImpl.cs
+++ b/src/Avalonia.Controls/Platform/IPopupImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Primitives.PopupPositioning;
 
 namespace Avalonia.Platform
@@ -11,5 +8,7 @@ namespace Avalonia.Platform
     public interface IPopupImpl : IWindowBaseImpl
     {
         IPopupPositioner PopupPositioner { get; }
+
+        void SetWindowManagerAddShadowHint(bool enabled);
     }
 }
diff --git a/src/Avalonia.Controls/Platform/ISystemDialogImpl.cs b/src/Avalonia.Controls/Platform/ISystemDialogImpl.cs
index c1e97320a1..affec6301b 100644
--- a/src/Avalonia.Controls/Platform/ISystemDialogImpl.cs
+++ b/src/Avalonia.Controls/Platform/ISystemDialogImpl.cs
@@ -1,8 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Threading.Tasks;
-using Avalonia.Platform;
 
 namespace Avalonia.Controls.Platform
 {
@@ -17,8 +13,8 @@ namespace Avalonia.Controls.Platform
         /// <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, IWindowImpl parent);
+        Task<string[]> ShowFileDialogAsync(FileDialog dialog, Window parent);
 
-        Task<string> ShowFolderDialogAsync(OpenFolderDialog dialog, IWindowImpl 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 cfbc0b1c4b..7514f214aa 100644
--- a/src/Avalonia.Controls/Platform/ITopLevelImpl.cs
+++ b/src/Avalonia.Controls/Platform/ITopLevelImpl.cs
@@ -1,8 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
+using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Rendering;
@@ -25,10 +23,10 @@ namespace Avalonia.Platform
         Size ClientSize { get; }
 
         /// <summary>
-        /// Gets the scaling factor for the toplevel.
+        /// Gets the scaling factor for the toplevel. This is used for rendering.
         /// </summary>
-        double Scaling { get; }
-
+        double RenderScaling { get; }
+        
         /// <summary>
         /// The list of native platform's surfaces that can be consumed by rendering subsystems.
         /// </summary>
@@ -61,6 +59,11 @@ namespace Avalonia.Platform
         /// </summary>
         Action<double> ScalingChanged { get; set; }
 
+        /// <summary>
+        /// Gets or sets a method called when the toplevel's TransparencyLevel changes.
+        /// </summary>
+        Action<WindowTransparencyLevel> TransparencyLevelChanged { get; set; }
+
         /// <summary>
         /// Creates a new renderer for the toplevel.
         /// </summary>
@@ -101,6 +104,11 @@ namespace Avalonia.Platform
         /// Gets or sets a method called when the underlying implementation is destroyed.
         /// </summary>
         Action Closed { get; set; }
+        
+        /// <summary>
+        /// 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
@@ -109,5 +117,20 @@ namespace Avalonia.Platform
         IMouseDevice MouseDevice { get; }
 
         IPopupImpl CreatePopup();
+
+        /// <summary>
+        /// Sets the <see cref="WindowTransparencyLevel"/> hint of the TopLevel.
+        /// </summary>
+        void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel);
+
+        /// <summary>
+        /// Gets the current <see cref="WindowTransparencyLevel"/> of the TopLevel.
+        /// </summary>
+        WindowTransparencyLevel TransparencyLevel { get; }
+
+        /// <summary>
+        /// Gets the <see cref="AcrylicPlatformCompensationLevels"/> for the platform.        
+        /// </summary>
+        AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; }
     }
 }
diff --git a/src/Avalonia.Controls/Platform/IWindowBaseImpl.cs b/src/Avalonia.Controls/Platform/IWindowBaseImpl.cs
index 8c99dffc28..0d303a6666 100644
--- a/src/Avalonia.Controls/Platform/IWindowBaseImpl.cs
+++ b/src/Avalonia.Controls/Platform/IWindowBaseImpl.cs
@@ -1,19 +1,23 @@
 using System;
-using Avalonia.Controls;
 
 namespace Avalonia.Platform
 {
     public interface IWindowBaseImpl : ITopLevelImpl
     {
         /// <summary>
-        /// Shows the top level.
+        /// Shows the window.
         /// </summary>
-        void Show();
+        void Show(bool activate);
 
         /// <summary>
         /// Hides the window.
         /// </summary>
         void Hide();
+        
+        /// <summary>
+        /// Gets the scaling factor for Window positioning and sizing.
+        /// </summary>
+        double DesktopScaling { get; }
 
         /// <summary>
         /// Gets the position of the window in device pixels.
@@ -46,9 +50,9 @@ namespace Avalonia.Platform
         IPlatformHandle Handle { get; }
        
         /// <summary>
-        /// Gets the maximum size of a window on the system.
+        /// Gets a maximum client size hint for an auto-sizing window, in device-independent pixels.
         /// </summary>
-        Size MaxClientSize { get; }
+        Size MaxAutoSizeHint { get; }
 
         /// <summary>
         /// Sets whether this window appears on top of all other windows
diff --git a/src/Avalonia.Controls/Platform/IWindowIconImpl.cs b/src/Avalonia.Controls/Platform/IWindowIconImpl.cs
index d106e2a616..7086b7651c 100644
--- a/src/Avalonia.Controls/Platform/IWindowIconImpl.cs
+++ b/src/Avalonia.Controls/Platform/IWindowIconImpl.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.IO;
+using System.IO;
 
 namespace Avalonia.Platform
 {
diff --git a/src/Avalonia.Controls/Platform/IWindowImpl.cs b/src/Avalonia.Controls/Platform/IWindowImpl.cs
index 91b895f38a..8a1554d344 100644
--- a/src/Avalonia.Controls/Platform/IWindowImpl.cs
+++ b/src/Avalonia.Controls/Platform/IWindowImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Controls;
 using Avalonia.Input;
@@ -29,14 +26,26 @@ namespace Avalonia.Platform
         void SetTitle(string title);
 
         /// <summary>
-        /// Shows the window as a dialog.
+        /// Sets the parent of the window.
+        /// </summary>
+        /// <param name="parent">The parent <see cref="IWindowImpl"/>.</param>
+        void SetParent(IWindowImpl parent);
+        
+        /// <summary>
+        /// Disables the window for example when a modal dialog is open.
+        /// </summary>
+        /// <param name="enable">true if the window is enabled, or false if it is disabled.</param>
+        void SetEnabled(bool enable);
+
+        /// <summary>
+        /// Called when a disabled window received input. Can be used to activate child windows.
         /// </summary>
-        void ShowDialog(IWindowImpl parent);
+        Action GotInputWhenDisabled { get; set; }        
 
         /// <summary>
         /// Enables or disables system window decorations (title bar, buttons, etc)
         /// </summary>
-        void SetSystemDecorations(bool enabled);
+        void SetSystemDecorations(SystemDecorations enabled);
 
         /// <summary>
         /// Sets the icon of this window.
@@ -59,6 +68,34 @@ namespace Avalonia.Platform
         /// </summary>
         Func<bool> Closing { get; set; }
 
+        /// <summary>
+        /// Gets a value to indicate if the platform was able to extend client area to non-client area.
+        /// </summary>
+        bool IsClientAreaExtendedToDecorations { get; }
+
+        /// <summary>
+        /// Gets or Sets an action that is called whenever one of the extend client area properties changed.
+        /// </summary>
+        Action<bool> ExtendClientAreaToDecorationsChanged { get; set; }
+
+        /// <summary>
+        /// Gets a flag that indicates if Managed decorations i.e. caption buttons are required.
+        /// This property is used when <see cref="IsClientAreaExtendedToDecorations"/> is set.
+        /// </summary>
+        bool NeedsManagedDecorations { get; }
+
+        /// <summary>
+        /// Gets a thickness that describes the amount each side of the non-client area extends into the client area.
+        /// It includes the titlebar.
+        /// </summary>
+        Thickness ExtendedMargins { get; }
+
+        /// <summary>
+        /// Gets a thickness that describes the margin around the window that is offscreen.
+        /// This may happen when a window is maximized and <see cref="IsClientAreaExtendedToDecorations"/> is set.
+        /// </summary>
+        Thickness OffScreenMargin { get; }
+
         /// <summary>
         /// Starts moving a window with left button being held. Should be called from left mouse button press event handler.
         /// </summary>
@@ -85,5 +122,23 @@ namespace Avalonia.Platform
         /// </summary>
         /// 
         void SetMinMaxSize(Size minSize, Size maxSize);
+
+        /// <summary>
+        /// Sets if the ClientArea is extended into the non-client area.
+        /// </summary>
+        /// <param name="extendIntoClientAreaHint">true to enable, false to disable</param>
+        void SetExtendClientAreaToDecorationsHint(bool extendIntoClientAreaHint);        
+
+        /// <summary>
+        /// Sets hints that configure how the client area extends. 
+        /// </summary>
+        /// <param name="hints"></param>
+        void SetExtendClientAreaChromeHints(ExtendClientAreaChromeHints hints);
+
+        /// <summary>
+        /// Sets how big the non-client titlebar area should be.
+        /// </summary>
+        /// <param name="titleBarHeight">-1 for platform default, otherwise the height in DIPs.</param>
+        void SetExtendClientAreaTitleBarHeightHint(double titleBarHeight);       
     }
 }
diff --git a/src/Avalonia.Controls/Platform/IWindowingPlatform.cs b/src/Avalonia.Controls/Platform/IWindowingPlatform.cs
index a55bd63c6a..be8939e19a 100644
--- a/src/Avalonia.Controls/Platform/IWindowingPlatform.cs
+++ b/src/Avalonia.Controls/Platform/IWindowingPlatform.cs
@@ -3,6 +3,6 @@ namespace Avalonia.Platform
     public interface IWindowingPlatform
     {
         IWindowImpl CreateWindow();
-        IEmbeddableWindowImpl CreateEmbeddableWindow();
+        IWindowImpl CreateEmbeddableWindow();
     }
 }
diff --git a/src/Avalonia.Controls/Platform/MountedDriveInfo.cs b/src/Avalonia.Controls/Platform/MountedDriveInfo.cs
index b534d11d40..9448f16c38 100644
--- a/src/Avalonia.Controls/Platform/MountedDriveInfo.cs
+++ b/src/Avalonia.Controls/Platform/MountedDriveInfo.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Controls.Platform
diff --git a/src/Avalonia.Controls/Platform/PlatformManager.cs b/src/Avalonia.Controls/Platform/PlatformManager.cs
index ef453274b8..19d034b4e2 100644
--- a/src/Avalonia.Controls/Platform/PlatformManager.cs
+++ b/src/Avalonia.Controls/Platform/PlatformManager.cs
@@ -34,7 +34,7 @@ namespace Avalonia.Controls.Platform
             return s_designerMode ? (IWindowImpl)platform.CreateEmbeddableWindow() : platform.CreateWindow();
         }
 
-        public static IEmbeddableWindowImpl CreateEmbeddableWindow()
+        public static IWindowImpl CreateEmbeddableWindow()
         {
             var platform = AvaloniaLocator.Current.GetService<IWindowingPlatform>();
             if (platform == null)
diff --git a/src/Avalonia.Controls/Presenters/CarouselPresenter.cs b/src/Avalonia.Controls/Presenters/CarouselPresenter.cs
index 89de24a81a..7888249bdd 100644
--- a/src/Avalonia.Controls/Presenters/CarouselPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/CarouselPresenter.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Specialized;
 using System.Linq;
 using System.Reactive.Linq;
@@ -158,6 +155,11 @@ namespace Avalonia.Controls.Presenters
             }
         }
 
+        protected override void PanelCreated(IPanel panel)
+        {
+            ItemsChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+        }
+
         /// <summary>
         /// Moves to the selected page, animating if a <see cref="PageTransition"/> is set.
         /// </summary>
diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index 5e1a844720..b28927c969 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -1,12 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Controls.Utils;
-using Avalonia.Data;
-using Avalonia.Input;
 using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
@@ -17,6 +14,7 @@ namespace Avalonia.Controls.Presenters
     /// <summary>
     /// Presents a single item of data inside a <see cref="TemplatedControl"/> template.
     /// </summary>
+    [PseudoClasses(":empty")]
     public class ContentPresenter : Control, IContentPresenter
     {
         /// <summary>
@@ -28,7 +26,7 @@ namespace Avalonia.Controls.Presenters
         /// <summary>
         /// Defines the <see cref="BorderBrush"/> property.
         /// </summary>
-        public static readonly AvaloniaProperty<IBrush> BorderBrushProperty =
+        public static readonly StyledProperty<IBrush> BorderBrushProperty =
             Border.BorderBrushProperty.AddOwner<ContentPresenter>();
 
         /// <summary>
@@ -43,7 +41,12 @@ namespace Avalonia.Controls.Presenters
         public static readonly StyledProperty<CornerRadius> CornerRadiusProperty =
             Border.CornerRadiusProperty.AddOwner<ContentPresenter>();
 
-
+        /// <summary>
+        /// Defines the <see cref="BoxShadow"/> property.
+        /// </summary>
+        public static readonly StyledProperty<BoxShadows> BoxShadowProperty =
+            Border.BoxShadowProperty.AddOwner<ContentPresenter>();
+        
         /// <summary>
         /// Defines the <see cref="Child"/> property.
         /// </summary>
@@ -82,10 +85,19 @@ namespace Avalonia.Controls.Presenters
         public static readonly StyledProperty<Thickness> PaddingProperty =
             Decorator.PaddingProperty.AddOwner<ContentPresenter>();
 
+        /// <summary>
+        /// Defines the <see cref="RecognizesAccessKey"/> property
+        /// </summary>
+        public static readonly DirectProperty<ContentPresenter, bool> RecognizesAccessKeyProperty =
+            AvaloniaProperty.RegisterDirect<ContentPresenter, bool>(
+                nameof(RecognizesAccessKey),
+                cp => cp.RecognizesAccessKey, (cp, value) => cp.RecognizesAccessKey = value);
+
         private IControl _child;
         private bool _createdChild;
-        private IDataTemplate _dataTemplate;
+        private IRecyclingDataTemplate _recyclingDataTemplate;
         private readonly BorderRenderHelper _borderRenderer = new BorderRenderHelper();
+        private bool _recognizesAccessKey;
 
         /// <summary>
         /// Initializes static members of the <see cref="ContentPresenter"/> class.
@@ -93,12 +105,18 @@ namespace Avalonia.Controls.Presenters
         static ContentPresenter()
         {
             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()
+        {
+            UpdatePseudoClasses();
+        }
+
         /// <summary>
         /// Gets or sets a brush with which to paint the background.
         /// </summary>
@@ -135,6 +153,15 @@ namespace Avalonia.Controls.Presenters
             set { SetValue(CornerRadiusProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the box shadow effect parameters
+        /// </summary>
+        public BoxShadows BoxShadow
+        {
+            get => GetValue(BoxShadowProperty);
+            set => SetValue(BoxShadowProperty, value);
+        }
+
         /// <summary>
         /// Gets the control displayed by the presenter.
         /// </summary>
@@ -190,6 +217,15 @@ namespace Avalonia.Controls.Presenters
             set { SetValue(PaddingProperty, value); }
         }
 
+        /// <summary>
+        /// Determine if <see cref="ContentPresenter"/> should use <see cref="AccessText"/> in its style
+        /// </summary>
+        public bool RecognizesAccessKey
+        {
+            get => _recognizesAccessKey;
+            set => SetAndRaise(RecognizesAccessKeyProperty, ref _recognizesAccessKey, value);
+        }
+
         /// <summary>
         /// Gets the host content control.
         /// </summary>
@@ -269,7 +305,7 @@ namespace Avalonia.Controls.Presenters
         protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
         {
             base.OnAttachedToLogicalTree(e);
-            _dataTemplate = null;
+            _recyclingDataTemplate = null;
             _createdChild = false;
             InvalidateMeasure();
         }
@@ -277,7 +313,8 @@ namespace Avalonia.Controls.Presenters
         /// <inheritdoc/>
         public override void Render(DrawingContext context)
         {
-            _borderRenderer.Render(context, Bounds.Size, BorderThickness, CornerRadius, Background, BorderBrush);
+            _borderRenderer.Render(context, Bounds.Size, BorderThickness, CornerRadius, Background, BorderBrush,
+                BoxShadow);
         }
 
         /// <summary>
@@ -292,24 +329,28 @@ namespace Avalonia.Controls.Presenters
 
             if (content != null && newChild == null)
             {
-                var dataTemplate = this.FindDataTemplate(content, ContentTemplate) ?? FuncDataTemplate.Default;
-
-                // We have content and it isn't a control, so if the new data template is the same
-                // as the old data template, try to recycle the existing child control to display
-                // the new data.
-                if (dataTemplate == _dataTemplate && dataTemplate.SupportsRecycling)
+                var dataTemplate = this.FindDataTemplate(content, ContentTemplate) ?? 
+                    (
+                        RecognizesAccessKey 
+                            ? FuncDataTemplate.Access 
+                            : FuncDataTemplate.Default
+                    );
+
+                if (dataTemplate is IRecyclingDataTemplate rdt)
                 {
-                    newChild = oldChild;
+                    var toRecycle = rdt == _recyclingDataTemplate ? oldChild : null;
+                    newChild = rdt.Build(content, toRecycle);
+                    _recyclingDataTemplate = rdt;
                 }
                 else
                 {
-                    _dataTemplate = dataTemplate;
-                    newChild = _dataTemplate.Build(content);
+                    newChild = dataTemplate.Build(content);
+                    _recyclingDataTemplate = null;
                 }
             }
             else
             {
-                _dataTemplate = null;
+                _recyclingDataTemplate = null;
             }
 
             return newChild;
@@ -324,8 +365,6 @@ namespace Avalonia.Controls.Presenters
         /// <inheritdoc/>
         protected override Size ArrangeOverride(Size finalSize)
         {
-            _borderRenderer.Update(finalSize, BorderThickness, CornerRadius);
-
             return ArrangeOverrideImpl(finalSize, new Vector());
         }
 
@@ -355,12 +394,8 @@ namespace Avalonia.Controls.Presenters
 
             if (useLayoutRounding)
             {
-                sizeForChild = new Size(
-                    Math.Ceiling(sizeForChild.Width * scale) / scale,
-                    Math.Ceiling(sizeForChild.Height * scale) / scale);
-                availableSize = new Size(
-                    Math.Ceiling(availableSize.Width * scale) / scale,
-                    Math.Ceiling(availableSize.Height * scale) / scale);
+                sizeForChild = LayoutHelper.RoundLayoutSize(sizeForChild, scale, scale);
+                availableSize = LayoutHelper.RoundLayoutSize(availableSize, scale, scale);
             }
 
             switch (horizontalContentAlignment)
@@ -385,8 +420,8 @@ namespace Avalonia.Controls.Presenters
 
             if (useLayoutRounding)
             {
-                originX = Math.Floor(originX * scale) / scale;
-                originY = Math.Floor(originY * scale) / scale;
+                originX = LayoutHelper.RoundLayoutValue(originX, scale);
+                originY = LayoutHelper.RoundLayoutValue(originY, scale);
             }
 
             var boundsForChild =
@@ -415,12 +450,18 @@ namespace Avalonia.Controls.Presenters
                 LogicalChildren.Remove(Child);
                 ((ISetInheritanceParent)Child).SetParent(Child.Parent);
                 Child = null;
-                _dataTemplate = null;
+                _recyclingDataTemplate = null;
             }
 
+            UpdatePseudoClasses();
             InvalidateMeasure();
         }
 
+        private void UpdatePseudoClasses()
+        {
+            PseudoClasses.Set(":empty", Content is null);
+        }
+
         private double GetLayoutScale()
         {
             var result = (VisualRoot as ILayoutRoot)?.LayoutScaling ?? 1.0;
diff --git a/src/Avalonia.Controls/Presenters/IContentPresenter.cs b/src/Avalonia.Controls/Presenters/IContentPresenter.cs
index 31ab3a21a6..b1e64c2f25 100644
--- a/src/Avalonia.Controls/Presenters/IContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/IContentPresenter.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Primitives;
 
 namespace Avalonia.Controls.Presenters
diff --git a/src/Avalonia.Controls/Presenters/IContentPresenterHost.cs b/src/Avalonia.Controls/Presenters/IContentPresenterHost.cs
index 4acfba2c71..78c4affe44 100644
--- a/src/Avalonia.Controls/Presenters/IContentPresenterHost.cs
+++ b/src/Avalonia.Controls/Presenters/IContentPresenterHost.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Collections;
 using Avalonia.LogicalTree;
 using Avalonia.Styling;
diff --git a/src/Avalonia.Controls/Presenters/IItemsPresenter.cs b/src/Avalonia.Controls/Presenters/IItemsPresenter.cs
index c4acf1ebef..873f0d756f 100644
--- a/src/Avalonia.Controls/Presenters/IItemsPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/IItemsPresenter.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections;
 using System.Collections.Specialized;
 
@@ -14,6 +11,6 @@ namespace Avalonia.Controls.Presenters
 
         void ItemsChanged(NotifyCollectionChangedEventArgs e);
 
-        void ScrollIntoView(object item);
+        void ScrollIntoView(int index);
     }
 }
diff --git a/src/Avalonia.Controls/Presenters/IItemsPresenterHost.cs b/src/Avalonia.Controls/Presenters/IItemsPresenterHost.cs
index 0bb1d03d1e..ba9ee0fe31 100644
--- a/src/Avalonia.Controls/Presenters/IItemsPresenterHost.cs
+++ b/src/Avalonia.Controls/Presenters/IItemsPresenterHost.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Styling;
 
 namespace Avalonia.Controls.Presenters
diff --git a/src/Avalonia.Controls/Presenters/IPresenter.cs b/src/Avalonia.Controls/Presenters/IPresenter.cs
index f78ba4c19d..5318ea2757 100644
--- a/src/Avalonia.Controls/Presenters/IPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/IPresenter.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Primitives;
 
 namespace Avalonia.Controls.Presenters
diff --git a/src/Avalonia.Controls/Presenters/ItemVirtualizer.cs b/src/Avalonia.Controls/Presenters/ItemVirtualizer.cs
index ae52e733b7..be2b1e86f0 100644
--- a/src/Avalonia.Controls/Presenters/ItemVirtualizer.cs
+++ b/src/Avalonia.Controls/Presenters/ItemVirtualizer.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections;
 using System.Collections.Specialized;
 using System.Reactive.Linq;
@@ -9,6 +6,7 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Utils;
 using Avalonia.Input;
 using Avalonia.Layout;
+using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Presenters
 {
@@ -102,9 +100,14 @@ namespace Avalonia.Controls.Presenters
         {
             get
             {
-                return Vertical ?
-                    new Size(Owner.Panel.DesiredSize.Width, ExtentValue) :
-                    new Size(ExtentValue, Owner.Panel.DesiredSize.Height);
+                if (IsLogicalScrollEnabled)
+                {
+                    return Vertical ?
+                        new Size(Owner.Panel.DesiredSize.Width, ExtentValue) :
+                        new Size(ExtentValue, Owner.Panel.DesiredSize.Height);
+                }
+
+                return default;
             }
         }
 
@@ -115,9 +118,14 @@ namespace Avalonia.Controls.Presenters
         {
             get
             {
-                return Vertical ? 
-                    new Size(Owner.Panel.Bounds.Width, ViewportValue) :
-                    new Size(ViewportValue, Owner.Panel.Bounds.Height);
+                if (IsLogicalScrollEnabled)
+                {
+                    return Vertical ?
+                        new Size(Owner.Panel.Bounds.Width, ViewportValue) :
+                        new Size(ViewportValue, Owner.Panel.Bounds.Height);
+                }
+
+                return default;
             }
         }
 
@@ -128,11 +136,21 @@ namespace Avalonia.Controls.Presenters
         {
             get
             {
-                return Vertical ? new Vector(_crossAxisOffset, OffsetValue) : new Vector(OffsetValue, _crossAxisOffset);
+                if (IsLogicalScrollEnabled)
+                {
+                    return Vertical ? new Vector(_crossAxisOffset, OffsetValue) : new Vector(OffsetValue, _crossAxisOffset);
+                }
+
+                return default;
             }
 
             set
             {
+                if (!IsLogicalScrollEnabled)
+                {
+                    throw new NotSupportedException("Logical scrolling disabled.");
+                }
+
                 var oldCrossAxisOffset = _crossAxisOffset;
 
                 if (Vertical)
@@ -167,10 +185,10 @@ namespace Avalonia.Controls.Presenters
             }
 
             var virtualizingPanel = owner.Panel as IVirtualizingPanel;
-            var scrollable = (ILogicalScrollable)owner;
+            var scrollContentPresenter = owner.Parent as IScrollable;
             ItemVirtualizer result = null;
 
-            if (virtualizingPanel != null && scrollable.InvalidateScroll != null)
+            if (virtualizingPanel != null && scrollContentPresenter is object)
             {
                 switch (owner.VirtualizationMode)
                 {
@@ -257,8 +275,8 @@ namespace Avalonia.Controls.Presenters
         /// <summary>
         /// Scrolls the specified item into view.
         /// </summary>
-        /// <param name="item">The item.</param>
-        public virtual void ScrollIntoView(object item)
+        /// <param name="index">The index of the item.</param>
+        public virtual void ScrollIntoView(int index)
         {
         }
 
@@ -280,6 +298,6 @@ namespace Avalonia.Controls.Presenters
         /// <summary>
         /// Invalidates the current scroll.
         /// </summary>
-        protected void InvalidateScroll() => ((ILogicalScrollable)Owner).InvalidateScroll?.Invoke();
+        protected void InvalidateScroll() => ((ILogicalScrollable)Owner).RaiseScrollInvalidated(EventArgs.Empty);
     }
 }
diff --git a/src/Avalonia.Controls/Presenters/ItemVirtualizerNone.cs b/src/Avalonia.Controls/Presenters/ItemVirtualizerNone.cs
index 56f64779f6..275f4d418e 100644
--- a/src/Avalonia.Controls/Presenters/ItemVirtualizerNone.cs
+++ b/src/Avalonia.Controls/Presenters/ItemVirtualizerNone.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -67,18 +64,13 @@ namespace Avalonia.Controls.Presenters
         /// <summary>
         /// Scrolls the specified item into view.
         /// </summary>
-        /// <param name="item">The item.</param>
-        public override void ScrollIntoView(object item)
+        /// <param name="index">The index of the item.</param>
+        public override void ScrollIntoView(int index)
         {
-            if (Items != null)
+            if (index != -1)
             {
-                var index = Items.IndexOf(item);
-
-                if (index != -1)
-                {
-                    var container = Owner.ItemContainerGenerator.ContainerFromIndex(index);
-                    container?.BringIntoView();
-                }
+                var container = Owner.ItemContainerGenerator.ContainerFromIndex(index);
+                container?.BringIntoView();
             }
         }
 
diff --git a/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs b/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs
index cd14211075..7d50ef7d33 100644
--- a/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs
+++ b/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections;
 using System.Collections.Specialized;
 using System.Linq;
@@ -116,7 +113,7 @@ namespace Avalonia.Controls.Presenters
         {
             var scrollable = (ILogicalScrollable)Owner;
             var visualRoot = Owner.GetVisualRoot();
-            var maxAvailableSize = (visualRoot as WindowBase)?.PlatformImpl?.MaxClientSize
+            var maxAvailableSize = (visualRoot as WindowBase)?.PlatformImpl?.MaxAutoSizeHint
                  ?? (visualRoot as TopLevel)?.ClientSize;
 
             // If infinity is passed as the available size and we're virtualized then we need to
@@ -188,8 +185,8 @@ namespace Avalonia.Controls.Presenters
                         break;
 
                     case NotifyCollectionChangedAction.Remove:
-                        if (e.OldStartingIndex >= FirstIndex &&
-                            e.OldStartingIndex < NextIndex)
+                        if ((e.OldStartingIndex >= FirstIndex && e.OldStartingIndex < NextIndex) ||
+                            panel.Children.Count > ItemCount)
                         {
                             RecycleContainersOnRemove();
                         }
@@ -289,20 +286,15 @@ namespace Avalonia.Controls.Presenters
                     break;
             }
 
-            return ScrollIntoView(newItemIndex);
+            return ScrollIntoViewCore(newItemIndex);
         }
 
         /// <inheritdoc/>
-        public override void ScrollIntoView(object item)
+        public override void ScrollIntoView(int index)
         {
-            if (Items != null)
+            if (index != -1)
             {
-                var index = Items.IndexOf(item);
-
-                if (index != -1)
-                {
-                    ScrollIntoView(index);
-                }
+                ScrollIntoViewCore(index);
             }
         }
 
@@ -514,12 +506,27 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         /// <param name="index">The item index.</param>
         /// <returns>The container that was brought into view.</returns>
-        private IControl ScrollIntoView(int index)
+        private IControl ScrollIntoViewCore(int index)
         {
             var panel = VirtualizingPanel;
             var generator = Owner.ItemContainerGenerator;
             var newOffset = -1.0;
 
+            //better not trigger any container generation/recycle while  or layout stuff
+            //before panel is attached/visible
+            if (!panel.IsAttachedToVisualTree)
+            {
+                return null;
+            }
+
+            if (!panel.IsMeasureValid && panel.PreviousMeasure.HasValue)
+            {
+                //before any kind of scrolling we need to make sure panel measure is valid
+                //or we risk get panel into not valid state
+                //we make a preemptive quick measure so scrolling is valid
+                panel.Measure(panel.PreviousMeasure.Value);
+            }
+
             if (index >= 0 && index < ItemCount)
             {
                 if (index <= FirstIndex)
diff --git a/src/Avalonia.Controls/Presenters/ItemsPresenter.cs b/src/Avalonia.Controls/Presenters/ItemsPresenter.cs
index ab40fbd53b..80c9e972d5 100644
--- a/src/Avalonia.Controls/Presenters/ItemsPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ItemsPresenter.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Specialized;
 using Avalonia.Controls.Primitives;
@@ -24,6 +21,7 @@ namespace Avalonia.Controls.Presenters
 
         private bool _canHorizontallyScroll;
         private bool _canVerticallyScroll;
+        private EventHandler _scrollInvalidated;
 
         /// <summary>
         /// Initializes static members of the <see cref="ItemsPresenter"/> class.
@@ -98,13 +96,17 @@ namespace Avalonia.Controls.Presenters
         Size IScrollable.Viewport => Virtualizer?.Viewport ?? Bounds.Size;
 
         /// <inheritdoc/>
-        Action ILogicalScrollable.InvalidateScroll { get; set; }
+        event EventHandler ILogicalScrollable.ScrollInvalidated
+        {
+            add => _scrollInvalidated += value;
+            remove => _scrollInvalidated -= value;
+        }
 
         /// <inheritdoc/>
-        Size ILogicalScrollable.ScrollSize => new Size(1, 1);
+        Size ILogicalScrollable.ScrollSize => new Size(ScrollViewer.DefaultSmallChange, 1);
 
         /// <inheritdoc/>
-        Size ILogicalScrollable.PageScrollSize => new Size(0, 1);
+        Size ILogicalScrollable.PageScrollSize => Virtualizer?.Viewport ?? new Size(16, 16);
 
         internal ItemVirtualizer Virtualizer { get; private set; }
 
@@ -120,9 +122,15 @@ namespace Avalonia.Controls.Presenters
             return Virtualizer?.GetControlInDirection(direction, from);
         }
 
-        public override void ScrollIntoView(object item)
+        /// <inheritdoc/>
+        void ILogicalScrollable.RaiseScrollInvalidated(EventArgs e)
+        {
+            _scrollInvalidated?.Invoke(this, e);
+        }
+
+        public override void ScrollIntoView(int index)
         {
-            Virtualizer?.ScrollIntoView(item);
+            Virtualizer?.ScrollIntoView(index);
         }
 
         /// <inheritdoc/>
@@ -141,7 +149,7 @@ namespace Avalonia.Controls.Presenters
         {
             Virtualizer?.Dispose();
             Virtualizer = ItemVirtualizer.Create(this);
-            ((ILogicalScrollable)this).InvalidateScroll?.Invoke();
+            _scrollInvalidated?.Invoke(this, EventArgs.Empty);
 
             KeyboardNavigation.SetTabNavigation(
                 (InputElement)Panel,
@@ -165,7 +173,7 @@ namespace Avalonia.Controls.Presenters
         {
             Virtualizer?.Dispose();
             Virtualizer = ItemVirtualizer.Create(this);
-            ((ILogicalScrollable)this).InvalidateScroll?.Invoke();
+            _scrollInvalidated?.Invoke(this, EventArgs.Empty);
         }
     }
 }
diff --git a/src/Avalonia.Controls/Presenters/ItemsPresenterBase.cs b/src/Avalonia.Controls/Presenters/ItemsPresenterBase.cs
index ef1f277162..52f173fc71 100644
--- a/src/Avalonia.Controls/Presenters/ItemsPresenterBase.cs
+++ b/src/Avalonia.Controls/Presenters/ItemsPresenterBase.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections;
 using System.Collections.Specialized;
@@ -142,7 +139,7 @@ namespace Avalonia.Controls.Presenters
         }
 
         /// <inheritdoc/>
-        public virtual void ScrollIntoView(object item)
+        public virtual void ScrollIntoView(int index)
         {
         }
 
@@ -232,8 +229,6 @@ namespace Avalonia.Controls.Presenters
             }
 
             PanelCreated(Panel);
-
-            ItemsChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
         }
 
         /// <summary>
diff --git a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
index 48d0aff551..b0b52812b9 100644
--- a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,13 +7,17 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.VisualTree;
 
+#nullable enable
+
 namespace Avalonia.Controls.Presenters
 {
     /// <summary>
     /// Presents a scrolling view of content inside a <see cref="ScrollViewer"/>.
     /// </summary>
-    public class ScrollContentPresenter : ContentPresenter, IPresenter, IScrollable
+    public class ScrollContentPresenter : ContentPresenter, IPresenter, IScrollable, IScrollAnchorProvider
     {
+        private const double EdgeDetectionTolerance = 0.1;
+
         /// <summary>
         /// Defines the <see cref="CanHorizontallyScroll"/> property.
         /// </summary>
@@ -59,13 +60,21 @@ namespace Avalonia.Controls.Presenters
                 o => o.Viewport,
                 (o, v) => o.Viewport = v);
 
+        // Arbitrary chosen value, probably need to ask ILogicalScrollable
+        private const int LogicalScrollItemSize = 50;
+
         private bool _canHorizontallyScroll;
         private bool _canVerticallyScroll;
+        private bool _arranging;
         private Size _extent;
         private Vector _offset;
-        private IDisposable _logicalScrollSubscription;
+        private IDisposable? _logicalScrollSubscription;
         private Size _viewport;
-        private Dictionary<int, Vector> _activeLogicalGestureScrolls;
+        private Dictionary<int, Vector>? _activeLogicalGestureScrolls;
+        private List<IControl>? _anchorCandidates;
+        private IControl? _anchorElement;
+        private Rect _anchorElementBounds;
+        private bool _isAnchorElementDirty;
 
         /// <summary>
         /// Initializes static members of the <see cref="ScrollContentPresenter"/> class.
@@ -74,7 +83,6 @@ namespace Avalonia.Controls.Presenters
         {
             ClipToBoundsProperty.OverrideDefaultValue(typeof(ScrollContentPresenter), true);
             ChildProperty.Changed.AddClassHandler<ScrollContentPresenter>((x, e) => x.ChildChanged(e));
-            AffectsArrange<ScrollContentPresenter>(OffsetProperty);
         }
 
         /// <summary>
@@ -121,7 +129,7 @@ namespace Avalonia.Controls.Presenters
         public Vector Offset
         {
             get { return _offset; }
-            set { SetAndRaise(OffsetProperty, ref _offset, value); }
+            set { SetAndRaise(OffsetProperty, ref _offset, ScrollViewer.CoerceOffset(Extent, Viewport, value)); }
         }
 
         /// <summary>
@@ -133,6 +141,16 @@ namespace Avalonia.Controls.Presenters
             private set { SetAndRaise(ViewportProperty, ref _viewport, value); }
         }
 
+        /// <inheritdoc/>
+        IControl? IScrollAnchorProvider.CurrentAnchor
+        {
+            get
+            {
+                EnsureAnchorElementSelection();
+                return _anchorElement;
+            }
+        }
+
         /// <summary>
         /// Attempts to bring a portion of the target visual into view by scrolling the content.
         /// </summary>
@@ -197,6 +215,32 @@ namespace Avalonia.Controls.Presenters
             return result;
         }
 
+        /// <inheritdoc/>
+        void IScrollAnchorProvider.RegisterAnchorCandidate(IControl element)
+        {
+            if (!this.IsVisualAncestorOf(element))
+            {
+                throw new InvalidOperationException(
+                    "An anchor control must be a visual descendent of the ScrollContentPresenter.");
+            }
+
+            _anchorCandidates ??= new List<IControl>();
+            _anchorCandidates.Add(element);
+            _isAnchorElementDirty = true;
+        }
+
+        /// <inheritdoc/>
+        void IScrollAnchorProvider.UnregisterAnchorCandidate(IControl element)
+        {
+            _anchorCandidates?.Remove(element);
+            _isAnchorElementDirty = true;
+
+            if (_anchorElement == element)
+            {
+                _anchorElement = null;
+            }
+        }
+
         /// <inheritdoc/>
         protected override Size MeasureOverride(Size availableSize)
         {
@@ -221,17 +265,87 @@ namespace Avalonia.Controls.Presenters
                 return base.ArrangeOverride(finalSize);
             }
 
+            return ArrangeWithAnchoring(finalSize);
+        }
+
+        private Size ArrangeWithAnchoring(Size finalSize)
+        {
             var size = new Size(
                 CanHorizontallyScroll ? Math.Max(Child.DesiredSize.Width, finalSize.Width) : finalSize.Width,
                 CanVerticallyScroll ? Math.Max(Child.DesiredSize.Height, finalSize.Height) : finalSize.Height);
-            ArrangeOverrideImpl(size, -Offset);
+
+            Vector TrackAnchor()
+            {
+                // If we have an anchor and its position relative to Child has changed during the
+                // arrange then that change wasn't just due to scrolling (as scrolling doesn't adjust
+                // relative positions within Child).
+                if (_anchorElement != null &&
+                    TranslateBounds(_anchorElement, Child, out var updatedBounds) &&
+                    updatedBounds.Position != _anchorElementBounds.Position)
+                {
+                    var offset = updatedBounds.Position - _anchorElementBounds.Position;
+                    return offset;
+                }
+
+                return default;
+            }
+
+            var isAnchoring = Offset.X >= EdgeDetectionTolerance || Offset.Y >= EdgeDetectionTolerance;
+
+            if (isAnchoring)
+            {
+                // Calculate the new anchor element if necessary.
+                EnsureAnchorElementSelection();
+
+                // Do the arrange.
+                ArrangeOverrideImpl(size, -Offset);
+
+                // If the anchor moved during the arrange, we need to adjust the offset and do another arrange.
+                var anchorShift = TrackAnchor();
+
+                if (anchorShift != default)
+                {
+                    var newOffset = Offset + anchorShift;
+                    var newExtent = Extent;
+                    var maxOffset = new Vector(Extent.Width - Viewport.Width, Extent.Height - Viewport.Height);
+
+                    if (newOffset.X > maxOffset.X)
+                    {
+                        newExtent = newExtent.WithWidth(newOffset.X + Viewport.Width);
+                    }
+
+                    if (newOffset.Y > maxOffset.Y)
+                    {
+                        newExtent = newExtent.WithHeight(newOffset.Y + Viewport.Height);
+                    }
+
+                    Extent = newExtent;
+
+                    try
+                    {
+                        _arranging = true;
+                        Offset = newOffset;
+                    }
+                    finally
+                    {
+                        _arranging = false;
+                    }
+
+                    ArrangeOverrideImpl(size, -Offset);
+                }
+            }
+            else
+            {
+                ArrangeOverrideImpl(size, -Offset);
+            }
+
             Viewport = finalSize;
             Extent = Child.Bounds.Size.Inflate(Child.Margin);
+            _isAnchorElementDirty = true;
+
             return finalSize;
         }
 
-        // Arbitrary chosen value, probably need to ask ILogicalScrollable
-        private const int LogicalScrollItemSize = 50;
         private void OnScrollGesture(object sender, ScrollGestureEventArgs e)
         {
             if (Extent.Height > Viewport.Height || Extent.Width > Viewport.Width)
@@ -254,7 +368,7 @@ namespace Avalonia.Controls.Presenters
                     {
                         var logicalUnits = delta.Y / LogicalScrollItemSize;
                         delta = delta.WithY(delta.Y - logicalUnits * LogicalScrollItemSize);
-                        dy = logicalUnits * scrollable.ScrollSize.Height;
+                        dy = logicalUnits * scrollable!.ScrollSize.Height;
                     }
                     else
                         dy = delta.Y;
@@ -272,7 +386,7 @@ namespace Avalonia.Controls.Presenters
                     {
                         var logicalUnits = delta.X / LogicalScrollItemSize;
                         delta = delta.WithX(delta.X - logicalUnits * LogicalScrollItemSize);
-                        dx = logicalUnits * scrollable.ScrollSize.Width;
+                        dx = logicalUnits * scrollable!.ScrollSize.Width;
                     }
                     else
                         dx = delta.X;
@@ -309,7 +423,7 @@ namespace Avalonia.Controls.Presenters
 
                 if (Extent.Height > Viewport.Height)
                 {
-                    double height = isLogical ? scrollable.ScrollSize.Height : 50;
+                    double height = isLogical ? scrollable!.ScrollSize.Height : 50;
                     y += -e.Delta.Y * height;
                     y = Math.Max(y, 0);
                     y = Math.Min(y, Extent.Height - Viewport.Height);
@@ -317,7 +431,7 @@ namespace Avalonia.Controls.Presenters
 
                 if (Extent.Width > Viewport.Width)
                 {
-                    double width = isLogical ? scrollable.ScrollSize.Width : 50;
+                    double width = isLogical ? scrollable!.ScrollSize.Width : 50;
                     x += -e.Delta.X * width;
                     x = Math.Max(x, 0);
                     x = Math.Min(x, Extent.Width - Viewport.Width);
@@ -328,6 +442,16 @@ namespace Avalonia.Controls.Presenters
             }
         }
 
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        {
+            if (change.Property == OffsetProperty && !_arranging)
+            {
+                InvalidateArrange();
+            }
+
+            base.OnPropertyChanged(change);
+        }
+
         private void BringIntoViewRequested(object sender, RequestBringIntoViewEventArgs e)
         {
             e.Handled = BringDescendantIntoView(e.TargetObject, e.TargetRect);
@@ -335,7 +459,7 @@ namespace Avalonia.Controls.Presenters
 
         private void ChildChanged(AvaloniaPropertyChangedEventArgs e)
         {
-            UpdateScrollableSubscription((IControl)e.NewValue);
+            UpdateScrollableSubscription((IControl?)e.NewValue);
 
             if (e.OldValue != null)
             {
@@ -343,7 +467,7 @@ namespace Avalonia.Controls.Presenters
             }
         }
 
-        private void UpdateScrollableSubscription(IControl child)
+        private void UpdateScrollableSubscription(IControl? child)
         {
             var scrollable = child as ILogicalScrollable;
 
@@ -352,7 +476,7 @@ namespace Avalonia.Controls.Presenters
 
             if (scrollable != null)
             {
-                scrollable.InvalidateScroll = () => UpdateFromScrollable(scrollable);
+                scrollable.ScrollInvalidated += ScrollInvalidated;
 
                 if (scrollable.IsLogicalScrollEnabled)
                 {
@@ -363,12 +487,17 @@ namespace Avalonia.Controls.Presenters
                             .Subscribe(x => scrollable.CanVerticallyScroll = x),
                         this.GetObservable(OffsetProperty)
                             .Skip(1).Subscribe(x => scrollable.Offset = x),
-                        Disposable.Create(() => scrollable.InvalidateScroll = null));
+                        Disposable.Create(() => scrollable.ScrollInvalidated -= ScrollInvalidated));
                     UpdateFromScrollable(scrollable);
                 }
             }
         }
 
+        private void ScrollInvalidated(object sender, EventArgs e)
+        {
+            UpdateFromScrollable((ILogicalScrollable)sender);
+        }
+
         private void UpdateFromScrollable(ILogicalScrollable scrollable)
         {
             var logicalScroll = _logicalScrollSubscription != null;
@@ -386,5 +515,87 @@ namespace Avalonia.Controls.Presenters
                 Offset = scrollable.Offset;
             }
         }
+
+        private void EnsureAnchorElementSelection()
+        {
+            if (!_isAnchorElementDirty || _anchorCandidates is null)
+            {
+                return;
+            }
+
+            _anchorElement = null;
+            _anchorElementBounds = default;
+            _isAnchorElementDirty = false;
+
+            var bestCandidate = default(IControl);
+            var bestCandidateDistance = double.MaxValue;
+
+            // Find the anchor candidate that is scrolled closest to the top-left of this
+            // ScrollContentPresenter.
+            foreach (var element in _anchorCandidates)
+            {
+                if (element.IsVisible && GetViewportBounds(element, out var bounds))
+                {
+                    var distance = (Vector)bounds.Position;
+                    var candidateDistance = Math.Abs(distance.Length);
+
+                    if (candidateDistance < bestCandidateDistance)
+                    {
+                        bestCandidate = element;
+                        bestCandidateDistance = candidateDistance;
+                    }
+                }
+            }
+
+            if (bestCandidate != null)
+            {
+                // We have a candidate, calculate its bounds relative to Child. Because these
+                // bounds aren't relative to the ScrollContentPresenter itself, if they change
+                // then we know it wasn't just due to scrolling.
+                var unscrolledBounds = TranslateBounds(bestCandidate, Child);
+                _anchorElement = bestCandidate;
+                _anchorElementBounds = unscrolledBounds;
+            }
+        }
+
+        private bool GetViewportBounds(IControl element, out Rect bounds)
+        {
+            if (TranslateBounds(element, Child, out var childBounds))
+            {
+                // We want the bounds relative to the new Offset, regardless of whether the child
+                // control has actually been arranged to this offset yet, so translate first to the
+                // child control and then apply Offset rather than translating directly to this
+                // control.
+                var thisBounds = new Rect(Bounds.Size);
+                bounds = new Rect(childBounds.Position - Offset, childBounds.Size);
+                return bounds.Intersects(thisBounds);
+            }
+
+            bounds = default;
+            return false;
+        }
+
+        private Rect TranslateBounds(IControl control, IControl to)
+        {
+            if (TranslateBounds(control, to, out var bounds))
+            {
+                return bounds;
+            }
+
+            throw new InvalidOperationException("The control's bounds could not be translated to the requested control.");
+        }
+
+        private bool TranslateBounds(IControl control, IControl to, out Rect bounds)
+        {
+            if (!control.IsVisible)
+            {
+                bounds = default;
+                return false;
+            }
+
+            var p = control.TranslatePoint(default, to);
+            bounds = p.HasValue ? new Rect(p.Value, control.Bounds.Size) : default;
+            return p.HasValue;
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs
index e0cc9aa128..078d8050bf 100644
--- a/src/Avalonia.Controls/Presenters/TextPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs
@@ -1,21 +1,23 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
 using Avalonia.Media;
+using Avalonia.Metadata;
 using Avalonia.Threading;
 using Avalonia.VisualTree;
+using Avalonia.Layout;
 
 namespace Avalonia.Controls.Presenters
 {
-    public class TextPresenter : TextBlock
+    public class TextPresenter : Control
     {
         public static readonly DirectProperty<TextPresenter, int> CaretIndexProperty =
             TextBox.CaretIndexProperty.AddOwner<TextPresenter>(
                 o => o.CaretIndex,
                 (o, v) => o.CaretIndex = v);
 
+        public static readonly StyledProperty<bool> RevealPasswordProperty =
+            AvaloniaProperty.Register<TextPresenter, bool>(nameof(RevealPassword));
+
         public static readonly StyledProperty<char> PasswordCharProperty =
             AvaloniaProperty.Register<TextPresenter, char>(nameof(PasswordChar));
 
@@ -38,34 +40,161 @@ namespace Avalonia.Controls.Presenters
                 o => o.SelectionEnd,
                 (o, v) => o.SelectionEnd = v);
 
+        /// <summary>
+        /// Defines the <see cref="Text"/> property.
+        /// </summary>
+        public static readonly DirectProperty<TextPresenter, string> TextProperty =
+            AvaloniaProperty.RegisterDirect<TextPresenter, string>(
+                nameof(Text),
+                o => o.Text,
+                (o, v) => o.Text = v);
+
+        /// <summary>
+        /// Defines the <see cref="TextAlignment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<TextAlignment> TextAlignmentProperty =
+            TextBlock.TextAlignmentProperty.AddOwner<TextPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="TextWrapping"/> property.
+        /// </summary>
+        public static readonly StyledProperty<TextWrapping> TextWrappingProperty =
+            TextBlock.TextWrappingProperty.AddOwner<TextPresenter>();
+
+        /// <summary>
+        /// Defines the <see cref="Background"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush> BackgroundProperty =
+            Border.BackgroundProperty.AddOwner<TextPresenter>();
+
         private readonly DispatcherTimer _caretTimer;
         private int _caretIndex;
         private int _selectionStart;
         private int _selectionEnd;
         private bool _caretBlink;
+        private string _text;
+        private FormattedText _formattedText;
+        private Size _constraint;
 
         static TextPresenter()
         {
-            AffectsRender<TextPresenter>(PasswordCharProperty,
-                SelectionBrushProperty, SelectionForegroundBrushProperty,
-                SelectionStartProperty, SelectionEndProperty);
-
-            Observable.Merge(
-                SelectionStartProperty.Changed,
-                SelectionEndProperty.Changed,
-                PasswordCharProperty.Changed
-            ).AddClassHandler<TextPresenter>((x,_) => x.InvalidateFormattedText());
+            AffectsRender<TextPresenter>(SelectionBrushProperty, TextBlock.ForegroundProperty, 
+                                         SelectionForegroundBrushProperty, CaretBrushProperty);
+            AffectsMeasure<TextPresenter>(TextProperty, PasswordCharProperty, RevealPasswordProperty, 
+                TextAlignmentProperty, TextWrappingProperty, TextBlock.FontSizeProperty,
+                TextBlock.FontStyleProperty, TextBlock.FontWeightProperty, TextBlock.FontFamilyProperty);
+
+            Observable.Merge<AvaloniaPropertyChangedEventArgs>(TextProperty.Changed, TextBlock.ForegroundProperty.Changed,
+                TextAlignmentProperty.Changed, TextWrappingProperty.Changed,
+                TextBlock.FontSizeProperty.Changed, TextBlock.FontStyleProperty.Changed, 
+                TextBlock.FontWeightProperty.Changed, TextBlock.FontFamilyProperty.Changed,
+                SelectionStartProperty.Changed, SelectionEndProperty.Changed,
+                SelectionForegroundBrushProperty.Changed, PasswordCharProperty.Changed, RevealPasswordProperty.Changed
+            ).AddClassHandler<TextPresenter>((x, _) => x.InvalidateFormattedText());
 
             CaretIndexProperty.Changed.AddClassHandler<TextPresenter>((x, e) => x.CaretIndexChanged((int)e.NewValue));
         }
 
         public TextPresenter()
         {
-            _caretTimer = new DispatcherTimer();
-            _caretTimer.Interval = TimeSpan.FromMilliseconds(500);
+            _text = string.Empty;
+            _caretTimer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(500) };
             _caretTimer.Tick += CaretTimerTick;
         }
 
+        /// <summary>
+        /// Gets or sets a brush used to paint the control's background.
+        /// </summary>
+        public IBrush Background
+        {
+            get => GetValue(BackgroundProperty);
+            set => SetValue(BackgroundProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the text.
+        /// </summary>
+        [Content]
+        public string Text
+        {
+            get => _text;
+            set => SetAndRaise(TextProperty, ref _text, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the font family.
+        /// </summary>
+        public FontFamily FontFamily
+        {
+            get => TextBlock.GetFontFamily(this);
+            set => TextBlock.SetFontFamily(this, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the font size.
+        /// </summary>
+        public double FontSize
+        {
+            get => TextBlock.GetFontSize(this);
+            set => TextBlock.SetFontSize(this, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the font style.
+        /// </summary>
+        public FontStyle FontStyle
+        {
+            get => TextBlock.GetFontStyle(this);
+            set => TextBlock.SetFontStyle(this, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the font weight.
+        /// </summary>
+        public FontWeight FontWeight
+        {
+            get => TextBlock.GetFontWeight(this);
+            set => TextBlock.SetFontWeight(this, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a brush used to paint the text.
+        /// </summary>
+        public IBrush Foreground
+        {
+            get => TextBlock.GetForeground(this);
+            set => TextBlock.SetForeground(this, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the control's text wrapping mode.
+        /// </summary>
+        public TextWrapping TextWrapping
+        {
+            get => GetValue(TextWrappingProperty);
+            set => SetValue(TextWrappingProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the text alignment.
+        /// </summary>
+        public TextAlignment TextAlignment
+        {
+            get => GetValue(TextAlignmentProperty);
+            set => SetValue(TextAlignmentProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="FormattedText"/> used to render the text.
+        /// </summary>
+        public FormattedText FormattedText
+        {
+            get
+            {
+                return _formattedText ?? (_formattedText = CreateFormattedText());
+            }
+        }
+
         public int CaretIndex
         {
             get
@@ -86,6 +215,12 @@ namespace Avalonia.Controls.Presenters
             set => SetValue(PasswordCharProperty, value);
         }
 
+        public bool RevealPassword
+        {
+            get => GetValue(RevealPasswordProperty);
+            set => SetValue(RevealPasswordProperty, value);
+        }
+
         public IBrush SelectionBrush
         {
             get => GetValue(SelectionBrushProperty);
@@ -97,7 +232,7 @@ namespace Avalonia.Controls.Presenters
             get => GetValue(SelectionForegroundBrushProperty);
             set => SetValue(SelectionForegroundBrushProperty, value);
         }
-        
+
         public IBrush CaretBrush
         {
             get => GetValue(CaretBrushProperty);
@@ -138,8 +273,72 @@ namespace Avalonia.Controls.Presenters
             return hit.TextPosition + (hit.IsTrailing ? 1 : 0);
         }
 
+        /// <summary>
+        /// Creates the <see cref="FormattedText"/> 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="FormattedText"/> object.</returns>
+        private FormattedText CreateFormattedTextInternal(Size constraint, string text)
+        {
+            return new FormattedText
+            {
+                Constraint = constraint,
+                Typeface = new Typeface(FontFamily, FontStyle, FontWeight),
+                FontSize = FontSize,
+                Text = text ?? string.Empty,
+                TextAlignment = TextAlignment,
+                TextWrapping = TextWrapping,
+            };
+        }
+
+        /// <summary>
+        /// Invalidates <see cref="FormattedText"/>.
+        /// </summary>
+        protected void InvalidateFormattedText()
+        {
+            _formattedText = null;
+        }
+
+        /// <summary>
+        /// Renders the <see cref="TextPresenter"/> to a drawing context.
+        /// </summary>
+        /// <param name="context">The drawing context.</param>
+        private void RenderInternal(DrawingContext context)
+        {
+            var background = Background;
+
+            if (background != null)
+            {
+                context.FillRectangle(background, new Rect(Bounds.Size));
+            }
+
+            double top = 0;
+            var textSize = FormattedText.Bounds.Size;
+
+            if (Bounds.Height < textSize.Height)
+            {
+                switch (VerticalAlignment)
+                {
+                    case VerticalAlignment.Center:
+                        top += (Bounds.Height - textSize.Height) / 2;
+                        break;
+
+                    case VerticalAlignment.Bottom:
+                        top += (Bounds.Height - textSize.Height);
+                        break;
+                }
+            }
+
+            context.DrawText(Foreground, new Point(0, top), FormattedText);
+        }
+
         public override void Render(DrawingContext context)
         {
+            FormattedText.Constraint = Bounds.Size;
+
+            _constraint = Bounds.Size;
+
             var selectionStart = SelectionStart;
             var selectionEnd = SelectionEnd;
 
@@ -148,10 +347,6 @@ namespace Avalonia.Controls.Presenters
                 var start = Math.Min(selectionStart, selectionEnd);
                 var length = Math.Max(selectionStart, selectionEnd) - start;
 
-                // issue #600: set constraint before any FormattedText manipulation
-                //             see base.Render(...) implementation
-                FormattedText.Constraint = Bounds.Size;
-
                 var rects = FormattedText.HitTestTextRange(start, length);
 
                 foreach (var rect in rects)
@@ -160,7 +355,7 @@ namespace Avalonia.Controls.Presenters
                 }
             }
 
-            base.Render(context);
+            RenderInternal(context);
 
             if (selectionStart == selectionEnd)
             {
@@ -168,7 +363,7 @@ namespace Avalonia.Controls.Presenters
 
                 if (caretBrush is null)
                 {
-                    var backgroundColor = (((Control)TemplatedParent).GetValue(BackgroundProperty) as SolidColorBrush)?.Color;
+                    var backgroundColor = (Background as SolidColorBrush)?.Color;
                     if (backgroundColor.HasValue)
                     {
                         byte red = (byte)~(backgroundColor.Value.R);
@@ -252,20 +447,20 @@ namespace Avalonia.Controls.Presenters
         /// <summary>
         /// Creates the <see cref="FormattedText"/> used to render the text.
         /// </summary>
-        /// <param name="constraint">The constraint of the text.</param>
-        /// <param name="text">The text to generated the <see cref="FormattedText"/> for.</param>
         /// <returns>A <see cref="FormattedText"/> object.</returns>
-        protected override FormattedText CreateFormattedText(Size constraint, string text)
+        protected virtual FormattedText CreateFormattedText()
         {
             FormattedText result = null;
 
-            if (PasswordChar != default(char))
+            var text = Text;
+
+            if (PasswordChar != default(char) && !RevealPassword)
             {
-                result = base.CreateFormattedText(constraint, new string(PasswordChar, text?.Length ?? 0));
+                result = CreateFormattedTextInternal(_constraint, new string(PasswordChar, text?.Length ?? 0));
             }
             else
             {
-                result = base.CreateFormattedText(constraint, text);
+                result = CreateFormattedTextInternal(_constraint, text);
             }
 
             var selectionStart = SelectionStart;
@@ -284,20 +479,46 @@ namespace Avalonia.Controls.Presenters
             return result;
         }
 
+        /// <summary>
+        /// Measures the control.
+        /// </summary>
+        /// <param name="availableSize">The available size for the control.</param>
+        /// <returns>The desired size.</returns>
+        private Size MeasureInternal(Size availableSize)
+        {
+            if (!string.IsNullOrEmpty(Text))
+            {
+                if (TextWrapping == TextWrapping.Wrap)
+                {
+                    _constraint = new Size(availableSize.Width, double.PositiveInfinity);
+                }
+                else
+                {
+                    _constraint = Size.Infinity;
+                }
+
+                _formattedText = null;
+
+                return FormattedText.Bounds.Size;
+            }
+
+            return new Size();
+        }
+
         protected override Size MeasureOverride(Size availableSize)
         {
             var text = Text;
 
             if (!string.IsNullOrEmpty(text))
             {
-                return base.MeasureOverride(availableSize);
+                return MeasureInternal(availableSize);
             }
             else
             {
                 return new FormattedText
                 {
                     Text = "X",
-                    Typeface = new Typeface(FontFamily, FontWeight, FontStyle),
+                    Typeface = new Typeface(FontFamily, FontStyle, FontWeight),
                     FontSize = FontSize,
                     TextAlignment = TextAlignment,
                     Constraint = availableSize,
diff --git a/src/Avalonia.Controls/Primitives/AccessText.cs b/src/Avalonia.Controls/Primitives/AccessText.cs
index 5adc8d2448..7a5e6ce426 100644
--- a/src/Avalonia.Controls/Primitives/AccessText.cs
+++ b/src/Avalonia.Controls/Primitives/AccessText.cs
@@ -1,9 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Input;
 using Avalonia.Media;
+using Avalonia.Media.TextFormatting;
 
 namespace Avalonia.Controls.Primitives
 {
@@ -69,7 +67,7 @@ namespace Avalonia.Controls.Primitives
 
             if (underscore != -1 && ShowAccessKey)
             {
-                var rect = FormattedText.HitTestTextPosition(underscore);
+                var rect = HitTestTextPosition(underscore);
                 var offset = new Vector(0, -0.5);
                 context.DrawLine(
                     new Pen(Foreground, 1),
@@ -78,21 +76,84 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        /// <inheritdoc/>
-        protected override FormattedText CreateFormattedText(Size constraint, string text)
+        /// <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>
+        private Rect HitTestTextPosition(int textPosition)
         {
-            return base.CreateFormattedText(constraint, StripAccessKey(text));
+            if (TextLayout == null)
+            {
+                return new Rect();
+            }
+
+            if (TextLayout.TextLines.Count == 0)
+            {
+                return new Rect();
+            }
+
+            if (textPosition < 0 || textPosition >= Text.Length)
+            {
+                var lastLine = TextLayout.TextLines[TextLayout.TextLines.Count - 1];
+
+                var lineX = lastLine.LineMetrics.Size.Width;
+
+                var lineY = Bounds.Height - lastLine.LineMetrics.Size.Height;
+
+                return new Rect(lineX, lineY, 0, lastLine.LineMetrics.Size.Height);
+            }
+
+            var currentY = 0.0;
+
+            foreach (var textLine in TextLayout.TextLines)
+            {
+                if (textLine.TextRange.End < textPosition)
+                {
+                    currentY += textLine.LineMetrics.Size.Height;
+
+                    continue;
+                }
+
+                var currentX = 0.0;
+
+                foreach (var textRun in textLine.TextRuns)
+                {
+                    if (!(textRun is ShapedTextCharacters shapedTextCharacters))
+                    {
+                        continue;
+                    }
+
+                    if (shapedTextCharacters.GlyphRun.Characters.End < textPosition)
+                    {
+                        currentX += shapedTextCharacters.Size.Width;
+
+                        continue;
+                    }
+
+                    var characterHit =
+                        shapedTextCharacters.GlyphRun.FindNearestCharacterHit(textPosition, out var width);
+
+                    var distance = shapedTextCharacters.GlyphRun.GetDistanceFromCharacterHit(characterHit);
+
+                    currentX += distance - width;
+
+                    if (characterHit.TrailingLength == 0)
+                    {
+                        width = 0.0;
+                    }
+
+                    return new Rect(currentX, currentY, width, shapedTextCharacters.Size.Height);
+                }
+            }
+
+            return new Rect();
         }
 
-        /// <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)
+        /// <inheritdoc/>
+        protected override TextLayout CreateTextLayout(Size constraint, string text)
         {
-            var result = base.MeasureOverride(availableSize);
-            return result.WithHeight(result.Height + 1);
+            return base.CreateTextLayout(constraint, StripAccessKey(text));
         }
 
         /// <inheritdoc/>
diff --git a/src/Avalonia.Controls/Primitives/AdornerLayer.cs b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
index ebe5e0a93e..9834bf3d3b 100644
--- a/src/Avalonia.Controls/Primitives/AdornerLayer.cs
+++ b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
@@ -1,11 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Specialized;
 using System.Linq;
 using Avalonia.Media;
 using Avalonia.Rendering;
+using Avalonia.Utilities;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Primitives
@@ -81,15 +79,20 @@ namespace Avalonia.Controls.Primitives
 
         private void UpdateClip(IControl control, TransformedBounds bounds)
         {
-            var clip = control.Clip as RectangleGeometry;
-
-            if (clip == null)
+            if (!(control.Clip is RectangleGeometry clip))
             {
-                clip = new RectangleGeometry { Transform = new MatrixTransform() };
+                clip = new RectangleGeometry();
                 control.Clip = clip;
             }
 
-            clip.Rect = bounds.Bounds;
+            var clipBounds = bounds.Bounds;
+
+            if (bounds.Transform.HasInverse)
+            {
+                clipBounds = bounds.Clip.TransformToAABB(bounds.Transform.Invert());
+            }
+
+            clip.Rect = clipBounds;
         }
 
         private void ChildrenCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
@@ -138,10 +141,7 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        public bool HitTest(Point point)
-        {
-            return Children.Any(ctrl => ctrl.TransformedBounds?.Contains(point) == true);
-        }
+        public bool HitTest(Point point) => Children.HitTestCustom(point);
 
         private class AdornedElementInfo
         {
diff --git a/src/Avalonia.Controls/Primitives/ChromeOverlayLayer.cs b/src/Avalonia.Controls/Primitives/ChromeOverlayLayer.cs
new file mode 100644
index 0000000000..7171ecc302
--- /dev/null
+++ b/src/Avalonia.Controls/Primitives/ChromeOverlayLayer.cs
@@ -0,0 +1,34 @@
+using System.Linq;
+using Avalonia.Rendering;
+using Avalonia.VisualTree;
+
+#nullable enable
+
+namespace Avalonia.Controls.Primitives
+{
+    public class ChromeOverlayLayer : Panel, ICustomSimpleHitTest
+    {
+        public static Panel? GetOverlayLayer(IVisual visual)
+        {
+            foreach (var v in visual.GetVisualAncestors())
+                if (v is VisualLayerManager vlm)
+                    if (vlm.OverlayLayer != null)
+                        return vlm.ChromeOverlayLayer;
+
+            if (visual is TopLevel tl)
+            {
+                var layers = tl.GetVisualDescendants().OfType<VisualLayerManager>().FirstOrDefault();
+                return layers?.ChromeOverlayLayer;
+            }
+
+            return null;
+        }
+
+        public void Add(Control c)
+        {
+            base.Children.Add(c);
+        }
+
+        public bool HitTest(Point point) => Children.HitTestCustom(point);
+    }
+}
diff --git a/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs b/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs
index d431420a8f..e55bdbb0eb 100644
--- a/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs
+++ b/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs
@@ -1,11 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
 using Avalonia.LogicalTree;
 
+#nullable enable
+
 namespace Avalonia.Controls.Primitives
 {
     /// <summary>
@@ -16,36 +14,36 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Defines the <see cref="Header"/> property.
         /// </summary>
-        public static readonly StyledProperty<object> HeaderProperty =
-            AvaloniaProperty.Register<HeaderedContentControl, object>(nameof(Header));
+        public static readonly StyledProperty<object?> HeaderProperty =
+            AvaloniaProperty.Register<HeaderedContentControl, object?>(nameof(Header));
 
         /// <summary>
         /// Defines the <see cref="HeaderTemplate"/> property.
         /// </summary>
-        public static readonly StyledProperty<IDataTemplate> HeaderTemplateProperty =
-            AvaloniaProperty.Register<HeaderedContentControl, IDataTemplate>(nameof(HeaderTemplate));
+        public static readonly StyledProperty<IDataTemplate?> HeaderTemplateProperty =
+            AvaloniaProperty.Register<HeaderedContentControl, IDataTemplate?>(nameof(HeaderTemplate));
 
         /// <summary>
         /// Initializes static members of the <see cref="ContentControl"/> class.
         /// </summary>
         static HeaderedContentControl()
         {
-            ContentProperty.Changed.AddClassHandler<HeaderedContentControl>((x, e) => x.HeaderChanged(e));
+            HeaderProperty.Changed.AddClassHandler<HeaderedContentControl>((x, e) => x.HeaderChanged(e));
         }
 
         /// <summary>
         /// Gets or sets the header content.
         /// </summary>
-        public object Header
+        public object? Header
         {
-            get { return GetValue(HeaderProperty); }
-            set { SetValue(HeaderProperty, value); }
+            get => GetValue(HeaderProperty);
+            set => SetValue(HeaderProperty, value);
         }
 
         /// <summary>
         /// Gets the header presenter from the control's template.
         /// </summary>
-        public IContentPresenter HeaderPresenter
+        public IContentPresenter? HeaderPresenter
         {
             get;
             private set;
@@ -54,10 +52,10 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Gets or sets the data template used to display the header content of the control.
         /// </summary>
-        public IDataTemplate HeaderTemplate
+        public IDataTemplate? HeaderTemplate
         {
-            get { return GetValue(HeaderTemplateProperty); }
-            set { SetValue(HeaderTemplateProperty, value); }
+            get => GetValue(HeaderTemplateProperty);
+            set => SetValue(HeaderTemplateProperty, value);
         }
 
         /// <inheritdoc/>
diff --git a/src/Avalonia.Controls/Primitives/HeaderedItemsControl.cs b/src/Avalonia.Controls/Primitives/HeaderedItemsControl.cs
index f4af694f28..be3c100ecf 100644
--- a/src/Avalonia.Controls/Primitives/HeaderedItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/HeaderedItemsControl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Collections;
 using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Presenters;
diff --git a/src/Avalonia.Controls/Primitives/HeaderedSelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/HeaderedSelectingItemsControl.cs
index 5e053ed9b4..78b5771b80 100644
--- a/src/Avalonia.Controls/Primitives/HeaderedSelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/HeaderedSelectingItemsControl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Collections;
 using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Presenters;
diff --git a/src/Avalonia.Controls/Primitives/ILogicalScrollable.cs b/src/Avalonia.Controls/Primitives/ILogicalScrollable.cs
index 490beb12b3..5c29945735 100644
--- a/src/Avalonia.Controls/Primitives/ILogicalScrollable.cs
+++ b/src/Avalonia.Controls/Primitives/ILogicalScrollable.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Input;
 
@@ -34,22 +31,6 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         bool IsLogicalScrollEnabled { get; }
 
-        /// <summary>
-        /// Gets or sets the scroll invalidation method.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// This method notifies the attached <see cref="ScrollViewer"/> of a change in 
-        /// the <see cref="IScrollable.Extent"/>, <see cref="IScrollable.Offset"/> or 
-        /// <see cref="IScrollable.Viewport"/> properties.
-        /// </para>
-        /// <para>
-        /// This property is set by the parent <see cref="ScrollViewer"/> when the 
-        /// <see cref="ILogicalScrollable"/> is placed inside it.
-        /// </para>
-        /// </remarks>
-        Action InvalidateScroll { get; set; }
-
         /// <summary>
         /// Gets the size to scroll by, in logical units.
         /// </summary>
@@ -60,6 +41,15 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         Size PageScrollSize { get; }
 
+        /// <summary>
+        /// Raised when the scroll is invalidated.
+        /// </summary>
+        /// <remarks>
+        /// This event notifies an attached <see cref="ScrollViewer"/> of a change in 
+        /// one of the scroll properties.
+        /// </remarks>
+        event EventHandler ScrollInvalidated;
+
         /// <summary>
         /// Attempts to bring a portion of the target visual into view by scrolling the content.
         /// </summary>
@@ -75,5 +65,11 @@ namespace Avalonia.Controls.Primitives
         /// <param name="from">The control from which movement begins.</param>
         /// <returns>The control.</returns>
         IControl GetControlInDirection(NavigationDirection direction, IControl from);
+
+        /// <summary>
+        /// Raises the <see cref="ScrollInvalidated"/> event.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        void RaiseScrollInvalidated(EventArgs e);
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/IPopupHost.cs b/src/Avalonia.Controls/Primitives/IPopupHost.cs
index 74a3ca8818..ab81fe869e 100644
--- a/src/Avalonia.Controls/Primitives/IPopupHost.cs
+++ b/src/Avalonia.Controls/Primitives/IPopupHost.cs
@@ -1,23 +1,76 @@
 using System;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives.PopupPositioning;
+using Avalonia.Input;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Primitives
 {
-    public interface IPopupHost : IDisposable
+    /// <summary>
+    /// Represents the top-level control opened by a <see cref="Popup"/>.
+    /// </summary>
+    /// <remarks>
+    /// A popup host can be either be a popup window created by the operating system
+    /// (<see cref="PopupRoot"/>) or an <see cref="OverlayPopupHost"/> which is created
+    /// on an <see cref="OverlayLayer"/>.
+    /// </remarks>
+    public interface IPopupHost : IDisposable, IFocusScope
     {
+        /// <summary>
+        /// Sets the control to display in the popup.
+        /// </summary>
+        /// <param name="control"></param>
         void SetChild(IControl control);
+
+        /// <summary>
+        /// Gets the presenter from the control's template.
+        /// </summary>
         IContentPresenter Presenter { get; }
+
+        /// <summary>
+        /// Gets the root of the visual tree in the case where the popup is presented using a
+        /// separate visual tree.
+        /// </summary>
         IVisual HostedVisualTreeRoot { get; }
 
+        /// <summary>
+        /// Raised when the control's template is applied.
+        /// </summary>
         event EventHandler<TemplateAppliedEventArgs> TemplateApplied;
 
+        /// <summary>
+        /// Configures the position of the popup according to a target control and a set of
+        /// placement parameters.
+        /// </summary>
+        /// <param name="target">The placement target.</param>
+        /// <param name="placement">The placement mode.</param>
+        /// <param name="offset">The offset, in device-independent pixels.</param>
+        /// <param name="anchor">The anchor point.</param>
+        /// <param name="gravity">The popup gravity.</param>
+        /// <param name="constraintAdjustment">Defines how a popup position will be adjusted if the unadjusted position would result in the popup being partly constrained.</param>
+        /// <param name="rect">
+        /// The anchor rect. If null, the bounds of <paramref name="target"/> will be used.
+        /// </param>
         void ConfigurePosition(IVisual target, PlacementMode placement, Point offset,
-            PopupPositioningEdge anchor = PopupPositioningEdge.None,
-            PopupPositioningEdge gravity = PopupPositioningEdge.None);
+            PopupAnchor anchor = PopupAnchor.None,
+            PopupGravity gravity = PopupGravity.None,
+            PopupPositionerConstraintAdjustment constraintAdjustment = PopupPositionerConstraintAdjustment.All,
+            Rect? rect = null);
+
+        /// <summary>
+        /// Shows the popup.
+        /// </summary>
         void Show();
+
+        /// <summary>
+        /// 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,
diff --git a/src/Avalonia.Controls/Primitives/LightDismissOverlayLayer.cs b/src/Avalonia.Controls/Primitives/LightDismissOverlayLayer.cs
new file mode 100644
index 0000000000..752eedb68a
--- /dev/null
+++ b/src/Avalonia.Controls/Primitives/LightDismissOverlayLayer.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Linq;
+using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.Rendering;
+using Avalonia.Styling;
+using Avalonia.VisualTree;
+
+#nullable enable
+
+namespace Avalonia.Controls.Primitives
+{
+    /// <summary>
+    /// A layer that is used to dismiss a <see cref="Popup"/> when the user clicks outside.
+    /// </summary>
+    public class LightDismissOverlayLayer : Border, ICustomHitTest
+    {
+        public IInputElement? InputPassThroughElement { get; set; }
+
+        /// <summary>
+        /// Returns the light dismiss overlay for a specified visual.
+        /// </summary>
+        /// <param name="visual">The visual.</param>
+        /// <returns>The light dismiss overlay, or null if none found.</returns>
+        public static LightDismissOverlayLayer? GetLightDismissOverlayLayer(IVisual visual)
+        {
+            visual = visual ?? throw new ArgumentNullException(nameof(visual));
+
+            VisualLayerManager? manager;
+
+            if (visual is TopLevel topLevel)
+            {
+                manager = topLevel.GetTemplateChildren()
+                    .OfType<VisualLayerManager>()
+                    .FirstOrDefault();
+            }
+            else
+            {
+                manager = visual.FindAncestorOfType<VisualLayerManager>();
+            }
+
+            return manager?.LightDismissOverlayLayer;
+        }
+
+        public bool HitTest(Point point)
+        {
+            if (InputPassThroughElement is object)
+            {
+                var p = point.Transform(this.TransformToVisual(VisualRoot)!.Value);
+                var hit = VisualRoot.GetVisualAt(p, x => x != this);
+
+                if (hit is object)
+                {
+                    return !InputPassThroughElement.IsVisualAncestorOf(hit);
+                }
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Primitives/OverlayLayer.cs b/src/Avalonia.Controls/Primitives/OverlayLayer.cs
index 487a5e91e4..5150033a53 100644
--- a/src/Avalonia.Controls/Primitives/OverlayLayer.cs
+++ b/src/Avalonia.Controls/Primitives/OverlayLayer.cs
@@ -21,11 +21,8 @@ namespace Avalonia.Controls.Primitives
 
             return null;
         }
-        
-        public bool HitTest(Point point)
-        {
-            return Children.Any(ctrl => ctrl.TransformedBounds?.Contains(point) == true);
-        }
+
+        public bool HitTest(Point point) => Children.HitTestCustom(point);
         
         protected override Size ArrangeOverride(Size finalSize)
         {
diff --git a/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs b/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs
index 3dc9d302db..762d8d37a6 100644
--- a/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs
+++ b/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs
@@ -71,10 +71,12 @@ namespace Avalonia.Controls.Primitives
         }
 
         public void ConfigurePosition(IVisual target, PlacementMode placement, Point offset,
-            PopupPositioningEdge anchor = PopupPositioningEdge.None, PopupPositioningEdge gravity = PopupPositioningEdge.None)
+            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);
+                gravity, constraintAdjustment, rect);
             UpdatePosition();
         }
 
@@ -122,10 +124,8 @@ namespace Avalonia.Controls.Primitives
             }, DispatcherPriority.Layout);
         }
 
-        Point IManagedPopupPositionerPopup.TranslatePoint(Point pt) => pt;
-
-        Size IManagedPopupPositionerPopup.TranslateSize(Size size) => size;
-        
+        double IManagedPopupPositionerPopup.Scaling => 1;
+       
         public static IPopupHost CreatePopupHost(IVisual target, IAvaloniaDependencyResolver dependencyResolver)
         {
             var platform = (target.GetVisualRoot() as TopLevel)?.PlatformImpl?.CreatePopup();
diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs
index 77febf9384..b445de0472 100644
--- a/src/Avalonia.Controls/Primitives/Popup.cs
+++ b/src/Avalonia.Controls/Primitives/Popup.cs
@@ -1,20 +1,17 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Reactive.Disposables;
 using Avalonia.Controls.Presenters;
-using Avalonia.Data;
+using Avalonia.Controls.Primitives.PopupPositioning;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
-using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
 using Avalonia.Metadata;
+using Avalonia.Platform;
 using Avalonia.VisualTree;
 
+#nullable enable
+
 namespace Avalonia.Controls.Primitives
 {
     /// <summary>
@@ -22,11 +19,14 @@ namespace Avalonia.Controls.Primitives
     /// </summary>
     public class Popup : Control, IVisualTreeHost
     {
+        public static readonly StyledProperty<bool> WindowManagerAddShadowHintProperty =
+            AvaloniaProperty.Register<PopupRoot, bool>(nameof(WindowManagerAddShadowHint), true);
+
         /// <summary>
         /// Defines the <see cref="Child"/> property.
         /// </summary>
-        public static readonly StyledProperty<Control> ChildProperty =
-            AvaloniaProperty.Register<Popup, Control>(nameof(Child));
+        public static readonly StyledProperty<Control?> ChildProperty =
+            AvaloniaProperty.Register<Popup, Control?>(nameof(Child));
 
         /// <summary>
         /// Defines the <see cref="IsOpen"/> property.
@@ -37,17 +37,61 @@ namespace Avalonia.Controls.Primitives
                 o => o.IsOpen,
                 (o, v) => o.IsOpen = v);
 
+        /// <summary>
+        /// Defines the <see cref="PlacementAnchor"/> property.
+        /// </summary>
+        public static readonly StyledProperty<PopupAnchor> PlacementAnchorProperty =
+            AvaloniaProperty.Register<Popup, PopupAnchor>(nameof(PlacementAnchor));
+
+        /// <summary>
+        /// Defines the <see cref="PlacementConstraintAdjustment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<PopupPositionerConstraintAdjustment> PlacementConstraintAdjustmentProperty =
+            AvaloniaProperty.Register<Popup, PopupPositionerConstraintAdjustment>(
+                nameof(PlacementConstraintAdjustment),
+                PopupPositionerConstraintAdjustment.FlipX | PopupPositionerConstraintAdjustment.FlipY |
+                PopupPositionerConstraintAdjustment.ResizeX | PopupPositionerConstraintAdjustment.ResizeY);
+
+        /// <summary>
+        /// Defines the <see cref="PlacementGravity"/> property.
+        /// </summary>
+        public static readonly StyledProperty<PopupGravity> PlacementGravityProperty =
+            AvaloniaProperty.Register<Popup, PopupGravity>(nameof(PlacementGravity));
+
         /// <summary>
         /// Defines the <see cref="PlacementMode"/> property.
         /// </summary>
         public static readonly StyledProperty<PlacementMode> PlacementModeProperty =
             AvaloniaProperty.Register<Popup, PlacementMode>(nameof(PlacementMode), defaultValue: PlacementMode.Bottom);
 
+        /// <summary>
+        /// Defines the <see cref="PlacementRect"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Rect?> PlacementRectProperty =
+            AvaloniaProperty.Register<Popup, Rect?>(nameof(PlacementRect));
+
+        /// <summary>
+        /// Defines the <see cref="PlacementTarget"/> property.
+        /// </summary>
+        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));
+
+        public static readonly DirectProperty<Popup, IInputElement> OverlayInputPassThroughElementProperty =
+            AvaloniaProperty.RegisterDirect<Popup, IInputElement>(
+                nameof(OverlayInputPassThroughElement),
+                o => o.OverlayInputPassThroughElement,
+                (o, v) => o.OverlayInputPassThroughElement = v);
 
         /// <summary>
         /// Defines the <see cref="HorizontalOffset"/> property.
@@ -56,22 +100,27 @@ namespace Avalonia.Controls.Primitives
             AvaloniaProperty.Register<Popup, double>(nameof(HorizontalOffset));
 
         /// <summary>
-        /// Defines the <see cref="VerticalOffset"/> property.
+        /// Defines the <see cref="IsLightDismissEnabled"/> property.
         /// </summary>
-        public static readonly StyledProperty<double> VerticalOffsetProperty =
-            AvaloniaProperty.Register<Popup, double>(nameof(VerticalOffset));
+        public static readonly StyledProperty<bool> IsLightDismissEnabledProperty =
+            AvaloniaProperty.Register<Popup, bool>(nameof(IsLightDismissEnabled));
 
         /// <summary>
-        /// Defines the <see cref="PlacementTarget"/> property.
+        /// Defines the <see cref="VerticalOffset"/> property.
         /// </summary>
-        public static readonly StyledProperty<Control> PlacementTargetProperty =
-            AvaloniaProperty.Register<Popup, Control>(nameof(PlacementTarget));
+        public static readonly StyledProperty<double> VerticalOffsetProperty =
+            AvaloniaProperty.Register<Popup, double>(nameof(VerticalOffset));
 
         /// <summary>
         /// Defines the <see cref="StaysOpen"/> property.
         /// </summary>
-        public static readonly StyledProperty<bool> StaysOpenProperty =
-            AvaloniaProperty.Register<Popup, bool>(nameof(StaysOpen), true);
+        [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.
@@ -79,13 +128,11 @@ namespace Avalonia.Controls.Primitives
         public static readonly StyledProperty<bool> TopmostProperty =
             AvaloniaProperty.Register<Popup, bool>(nameof(Topmost));
 
+        private bool _isOpenRequested = false;
         private bool _isOpen;
-        private IPopupHost _popupHost;
-        private TopLevel _topLevel;
-        private IDisposable _nonClientListener;
-        private IDisposable _presenterSubscription;
-        bool _ignoreIsOpenChanged = false;
-        private List<IDisposable> _bindings = new List<IDisposable>();
+        private bool _ignoreIsOpenChanged;
+        private PopupOpenState? _openState;
+        private IInputElement _overlayInputPassThroughElement;
 
         /// <summary>
         /// Initializes static members of the <see cref="Popup"/> class.
@@ -94,31 +141,32 @@ namespace Avalonia.Controls.Primitives
         {
             IsHitTestVisibleProperty.OverrideDefaultValue<Popup>(false);
             ChildProperty.Changed.AddClassHandler<Popup>((x, e) => x.ChildChanged(e));
-            IsOpenProperty.Changed.AddClassHandler<Popup>((x, e) => x.IsOpenChanged(e));
-        }
-
-        public Popup()
-        {
-            
+            IsOpenProperty.Changed.AddClassHandler<Popup>((x, e) => x.IsOpenChanged((AvaloniaPropertyChangedEventArgs<bool>)e));            
         }
 
         /// <summary>
         /// Raised when the popup closes.
         /// </summary>
-        public event EventHandler Closed;
+        public event EventHandler<EventArgs>? Closed;
 
         /// <summary>
         /// Raised when the popup opens.
         /// </summary>
-        public event EventHandler Opened;
+        public event EventHandler? Opened;
 
-        public IPopupHost Host => _popupHost;
+        public IPopupHost? Host => _openState?.PopupHost;
+
+        public bool WindowManagerAddShadowHint
+        {
+            get { return GetValue(WindowManagerAddShadowHintProperty); }
+            set { SetValue(WindowManagerAddShadowHintProperty, value); }
+        }
 
         /// <summary>
         /// Gets or sets the control to display in the popup.
         /// </summary>
         [Content]
-        public Control Child
+        public Control? Child
         {
             get { return GetValue(ChildProperty); }
             set { SetValue(ChildProperty, value); }
@@ -131,12 +179,24 @@ namespace Avalonia.Controls.Primitives
         /// This property allows a client to customize the behaviour of the popup by injecting
         /// a specialized dependency resolver into the <see cref="PopupRoot"/>'s constructor.
         /// </remarks>
-        public IAvaloniaDependencyResolver DependencyResolver
+        public IAvaloniaDependencyResolver? DependencyResolver
         {
             get;
             set;
         }
 
+        /// <summary>
+        /// Gets or sets a value that determines how the <see cref="Popup"/> can be dismissed.
+        /// </summary>
+        /// <remarks>
+        /// Light dismiss is when the user taps on any area other than the popup.
+        /// </remarks>
+        public bool IsLightDismissEnabled
+        {
+            get => GetValue(IsLightDismissEnabledProperty);
+            set => SetValue(IsLightDismissEnabledProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets a value indicating whether the popup is currently open.
         /// </summary>
@@ -146,6 +206,36 @@ namespace Avalonia.Controls.Primitives
             set { SetAndRaise(IsOpenProperty, ref _isOpen, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the anchor point on the <see cref="PlacementRect"/> when <see cref="PlacementMode"/>
+        /// is <see cref="PlacementMode.AnchorAndGravity"/>.
+        /// </summary>
+        public PopupAnchor PlacementAnchor
+        {
+            get { return GetValue(PlacementAnchorProperty); }
+            set { SetValue(PlacementAnchorProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value describing how the popup position will be adjusted if the
+        /// unadjusted position would result in the popup being partly constrained.
+        /// </summary>
+        public PopupPositionerConstraintAdjustment PlacementConstraintAdjustment
+        {
+            get { return GetValue(PlacementConstraintAdjustmentProperty); }
+            set { SetValue(PlacementConstraintAdjustmentProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value which defines in what direction the popup should open
+        /// when <see cref="PlacementMode"/> is <see cref="PlacementMode.AnchorAndGravity"/>.
+        /// </summary>
+        public PopupGravity PlacementGravity
+        {
+            get { return GetValue(PlacementGravityProperty); }
+            set { SetValue(PlacementGravityProperty, value); }
+        }
+
         /// <summary>
         /// Gets or sets the placement mode of the popup in relation to the <see cref="PlacementTarget"/>.
         /// </summary>
@@ -155,6 +245,33 @@ namespace Avalonia.Controls.Primitives
             set { SetValue(PlacementModeProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the the anchor rectangle within the parent that the popup will be placed
+        /// relative to when <see cref="PlacementMode"/> is <see cref="PlacementMode.AnchorAndGravity"/>.
+        /// </summary>
+        /// <remarks>
+        /// The placement rect defines a rectangle relative to <see cref="PlacementTarget"/> around
+        /// which the popup will be opened, with <see cref="PlacementAnchor"/> determining which edge
+        /// of the placement target is used.
+        /// 
+        /// If unset, the anchor rectangle will be the bounds of the <see cref="PlacementTarget"/>.
+        /// </remarks>
+        public Rect? PlacementRect
+        {
+            get { return GetValue(PlacementRectProperty); }
+            set { SetValue(PlacementRectProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the control that is used to determine the popup's position.
+        /// </summary>
+        [ResolveByName]
+        public Control? PlacementTarget
+        {
+            get { return GetValue(PlacementTargetProperty); }
+            set { SetValue(PlacementTargetProperty, value); }
+        }
+
         [Obsolete("This property has no effect")]
         public bool ObeyScreenEdges
         {
@@ -163,7 +280,33 @@ namespace Avalonia.Controls.Primitives
         }
 
         /// <summary>
-        /// Gets or sets the Horizontal offset of the popup in relation to the <see cref="PlacementTarget"/>
+        /// Gets or sets a value indicating whether the event that closes the popup is passed
+        /// through to the parent window.
+        /// </summary>
+        /// <remarks>
+        /// When <see cref="IsLightDismissEnabled"/> is set to true, clicks outside the the popup
+        /// cause the popup to close. When <see cref="OverlayDismissEventPassThrough"/> is set to
+        /// false, these clicks will be handled by the popup and not be registered by the parent
+        /// window. When set to true, the events will be passed through to the parent window.
+        /// </remarks>
+        public bool OverlayDismissEventPassThrough
+        {
+            get => GetValue(OverlayDismissEventPassThroughProperty);
+            set => SetValue(OverlayDismissEventPassThroughProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets an element that should receive pointer input events even when underneath
+        /// the popup's overlay.
+        /// </summary>
+        public IInputElement OverlayInputPassThroughElement
+        {
+            get => _overlayInputPassThroughElement;
+            set => SetAndRaise(OverlayInputPassThroughElementProperty, ref _overlayInputPassThroughElement, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the Horizontal offset of the popup in relation to the <see cref="PlacementTarget"/>.
         /// </summary>
         public double HorizontalOffset
         {
@@ -172,7 +315,7 @@ namespace Avalonia.Controls.Primitives
         }
 
         /// <summary>
-        /// Gets or sets the Vertical offset of the popup in relation to the <see cref="PlacementTarget"/>
+        /// Gets or sets the Vertical offset of the popup in relation to the <see cref="PlacementTarget"/>.
         /// </summary>
         public double VerticalOffset
         {
@@ -180,23 +323,15 @@ namespace Avalonia.Controls.Primitives
             set { SetValue(VerticalOffsetProperty, value); }
         }
 
-        /// <summary>
-        /// Gets or sets the control that is used to determine the popup's position.
-        /// </summary>
-        public Control PlacementTarget
-        {
-            get { return GetValue(PlacementTargetProperty); }
-            set { SetValue(PlacementTargetProperty, 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 { return GetValue(StaysOpenProperty); }
-            set { SetValue(StaysOpenProperty, value); }
+            get => !IsLightDismissEnabled;
+            set => IsLightDismissEnabled = !value;
         }
 
         /// <summary>
@@ -211,7 +346,7 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Gets the root of the popup window.
         /// </summary>
-        IVisual IVisualTreeHost.Root => _popupHost?.HostedVisualTreeRoot;
+        IVisual? IVisualTreeHost.Root => _openState?.PopupHost.HostedVisualTreeRoot;
 
         /// <summary>
         /// Opens the popup.
@@ -219,115 +354,138 @@ namespace Avalonia.Controls.Primitives
         public void Open()
         {
             // Popup is currently open
-            if (_topLevel != null)
+            if (_openState != null)
+            {
                 return;
-            CloseCurrent();
-            var placementTarget = PlacementTarget ?? this.GetLogicalAncestors().OfType<IVisual>().FirstOrDefault();
+            }
+
+            var placementTarget = PlacementTarget ?? this.FindLogicalAncestorOfType<IControl>();
+
             if (placementTarget == null)
-                throw new InvalidOperationException("Popup has no logical parent and PlacementTarget is null");
+            {
+                _isOpenRequested = true;
+                return;
+            }
             
-            _topLevel = placementTarget.GetVisualRoot() as TopLevel;
+            var topLevel = placementTarget.VisualRoot as TopLevel;
 
-            if (_topLevel == null)
+            if (topLevel == null)
             {
-                throw new InvalidOperationException(
-                    "Attempted to open a popup not attached to a TopLevel");
+                _isOpenRequested = true;
+                return;
             }
 
-            _popupHost = OverlayPopupHost.CreatePopupHost(placementTarget, DependencyResolver);
+            _isOpenRequested = false;
+            var popupHost = OverlayPopupHost.CreatePopupHost(placementTarget, DependencyResolver);
 
-            _bindings.Add(_popupHost.BindConstraints(this, WidthProperty, MinWidthProperty, MaxWidthProperty,
-                HeightProperty, MinHeightProperty, MaxHeightProperty, TopmostProperty));
+            var handlerCleanup = new CompositeDisposable(5);
 
-            _popupHost.SetChild(Child);
-            ((ISetLogicalParent)_popupHost).SetParent(this);
-            _popupHost.ConfigurePosition(placementTarget,
-                PlacementMode, new Point(HorizontalOffset, VerticalOffset));
-            _popupHost.TemplateApplied += RootTemplateApplied;
-            
-            var window = _topLevel as Window;
-            if (window != null)
+            void DeferCleanup(IDisposable? disposable)
             {
-                window.Deactivated += WindowDeactivated;
-            }
-            else
-            {
-                var parentPopuproot = _topLevel as PopupRoot;
-                if (parentPopuproot?.Parent is Popup popup)
+                if (disposable is null)
                 {
-                    popup.Closed += ParentClosed;
+                    return;
                 }
+
+                handlerCleanup.Add(disposable);
             }
-            _topLevel.AddHandler(PointerPressedEvent, PointerPressedOutside, RoutingStrategies.Tunnel);
-            _nonClientListener = InputManager.Instance?.Process.Subscribe(ListenForNonClientClick);
-        
 
-            _popupHost.Show();
+            DeferCleanup(popupHost.BindConstraints(this, WidthProperty, MinWidthProperty, MaxWidthProperty,
+                HeightProperty, MinHeightProperty, MaxHeightProperty, TopmostProperty));
 
-            using (BeginIgnoringIsOpen())
-            {
-                IsOpen = true;
-            }
+            popupHost.SetChild(Child);
+            ((ISetLogicalParent)popupHost).SetParent(this);
 
-            Opened?.Invoke(this, EventArgs.Empty);
-        }
+            popupHost.ConfigurePosition(
+                placementTarget,
+                PlacementMode,
+                new Point(HorizontalOffset, VerticalOffset),
+                PlacementAnchor,
+                PlacementGravity,
+                PlacementConstraintAdjustment,
+                PlacementRect);
 
-        /// <summary>
-        /// Closes the popup.
-        /// </summary>
-        public void Close()
-        {
-            if (_popupHost != null)
+            DeferCleanup(SubscribeToEventHandler<IPopupHost, EventHandler<TemplateAppliedEventArgs>>(popupHost, RootTemplateApplied,
+                (x, handler) => x.TemplateApplied += handler,
+                (x, handler) => x.TemplateApplied -= handler));
+
+            if (topLevel is Window window)
             {
-                _popupHost.TemplateApplied -= RootTemplateApplied;
+                DeferCleanup(SubscribeToEventHandler<Window, EventHandler>(window, WindowDeactivated,
+                    (x, handler) => x.Deactivated += handler,
+                    (x, handler) => x.Deactivated -= handler));
+                
+                DeferCleanup(SubscribeToEventHandler<IWindowImpl, Action>(window.PlatformImpl, WindowLostFocus,
+                        (x, handler) => x.LostFocus += handler,
+                        (x, handler) => x.LostFocus -= handler));
             }
+            else
+            {
+                var parentPopupRoot = topLevel as PopupRoot;
 
-            _presenterSubscription?.Dispose();
+                if (parentPopupRoot?.Parent is Popup popup)
+                {
+                    DeferCleanup(SubscribeToEventHandler<Popup, EventHandler<EventArgs>>(popup, ParentClosed,
+                        (x, handler) => x.Closed += handler,
+                        (x, handler) => x.Closed -= handler));
+                }
+            }
 
-            CloseCurrent();
-            using (BeginIgnoringIsOpen())
+            DeferCleanup(InputManager.Instance?.Process.Subscribe(ListenForNonClientClick));
+
+            var cleanupPopup = Disposable.Create((popupHost, handlerCleanup), state =>
             {
-                IsOpen = false;
-            }
+                state.handlerCleanup.Dispose();
 
-            Closed?.Invoke(this, EventArgs.Empty);
-        }
+                state.popupHost.SetChild(null);
+                state.popupHost.Hide();
 
-        void CloseCurrent()
-        {
-            if (_topLevel != null)
+                ((ISetLogicalParent)state.popupHost).SetParent(null);
+                state.popupHost.Dispose();
+            });
+
+            if (IsLightDismissEnabled)
             {
-                _topLevel.RemoveHandler(PointerPressedEvent, PointerPressedOutside);
-                var window = _topLevel as Window;
-                if (window != null)
-                    window.Deactivated -= WindowDeactivated;
-                else
+                var dismissLayer = LightDismissOverlayLayer.GetLightDismissOverlayLayer(placementTarget);
+
+                if (dismissLayer != null)
                 {
-                    var parentPopuproot = _topLevel as PopupRoot;
-                    if (parentPopuproot?.Parent is Popup popup)
+                    dismissLayer.IsVisible = true;
+                    dismissLayer.InputPassThroughElement = _overlayInputPassThroughElement;
+                    
+                    DeferCleanup(Disposable.Create(() =>
                     {
-                        popup.Closed -= ParentClosed;
-                    }
+                        dismissLayer.IsVisible = false;
+                        dismissLayer.InputPassThroughElement = null;
+                    }));
+                    
+                    DeferCleanup(SubscribeToEventHandler<LightDismissOverlayLayer, EventHandler<PointerPressedEventArgs>>(
+                        dismissLayer,
+                        PointerPressedDismissOverlay,
+                        (x, handler) => x.PointerPressed += handler,
+                        (x, handler) => x.PointerPressed -= handler));
                 }
-                _nonClientListener?.Dispose();
-                _nonClientListener = null;
-                
-                _topLevel = null;
             }
-            if (_popupHost != null)
-            {
-                foreach(var b in _bindings)
-                    b.Dispose();
-                _bindings.Clear();
-                _popupHost.SetChild(null);
-                _popupHost.Hide();
-                ((ISetLogicalParent)_popupHost).SetParent(null);
-                _popupHost.Dispose();
-                _popupHost = null;
+
+            _openState = new PopupOpenState(topLevel, popupHost, cleanupPopup);
+
+            WindowManagerAddShadowHintChanged(popupHost, WindowManagerAddShadowHint);
+
+            popupHost.Show();
+
+            using (BeginIgnoringIsOpen())
+            {
+                IsOpen = true;
             }
 
+            Opened?.Invoke(this, EventArgs.Empty);
         }
 
+        /// <summary>
+        /// Closes the popup.
+        /// </summary>
+        public void Close() => CloseCore();
+
         /// <summary>
         /// Measures the control.
         /// </summary>
@@ -338,6 +496,17 @@ namespace Avalonia.Controls.Primitives
             return new Size();
         }
 
+
+        /// <inheritdoc/>
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+            if (_isOpenRequested)
+            {
+                Open();
+            }
+        }
+
         /// <inheritdoc/>
         protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
         {
@@ -345,16 +514,30 @@ namespace Avalonia.Controls.Primitives
             Close();
         }
 
+        private static IDisposable SubscribeToEventHandler<T, TEventHandler>(T target, TEventHandler handler, Action<T, TEventHandler> subscribe, Action<T, TEventHandler> unsubscribe)
+        {
+            subscribe(target, handler);
+
+            return Disposable.Create((unsubscribe, target, handler), state => state.unsubscribe(state.target, state.handler));
+        }
+
+        private void WindowManagerAddShadowHintChanged(IPopupHost host, bool hint)
+        {
+            if(host is PopupRoot pr)
+            {
+                pr.PlatformImpl.SetWindowManagerAddShadowHint(hint);
+            }
+        }
 
         /// <summary>
         /// Called when the <see cref="IsOpen"/> property changes.
         /// </summary>
         /// <param name="e">The event args.</param>
-        private void IsOpenChanged(AvaloniaPropertyChangedEventArgs e)
+        private void IsOpenChanged(AvaloniaPropertyChangedEventArgs<bool> e)
         {
             if (!_ignoreIsOpenChanged)
             {
-                if ((bool)e.NewValue)
+                if (e.NewValue.Value)
                 {
                     Open();
                 }
@@ -373,7 +556,7 @@ namespace Avalonia.Controls.Primitives
         {
             LogicalChildren.Clear();
 
-            ((ISetLogicalParent)e.OldValue)?.SetParent(null);
+            ((ISetLogicalParent?)e.OldValue)?.SetParent(null);
 
             if (e.NewValue != null)
             {
@@ -382,23 +565,85 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
+        private void CloseCore()
+        {
+            _isOpenRequested = false;
+            if (_openState is null)
+            {
+                using (BeginIgnoringIsOpen())
+                {
+                    IsOpen = false;
+                }
+
+                return;
+            }
+
+            _openState.Dispose();
+            _openState = null;
+
+            using (BeginIgnoringIsOpen())
+            {
+                IsOpen = false;
+            }
+
+            Closed?.Invoke(this, EventArgs.Empty);
+
+            var focusCheck = FocusManager.Instance?.Current;
+
+            // Focus is set to null as part of popup closing, so we only want to
+            // set focus to PlacementTarget if this is the case
+            if (focusCheck == null)
+            {
+                if (PlacementTarget != null)
+                {
+                    FocusManager.Instance?.Focus(PlacementTarget);
+                }
+                else
+                {
+                    var anc = this.FindLogicalAncestorOfType<IControl>();
+                    if (anc != null)
+                    {
+                        FocusManager.Instance?.Focus(anc);
+                    }
+                }
+            }
+        }
+
         private void ListenForNonClientClick(RawInputEventArgs e)
         {
             var mouse = e as RawPointerEventArgs;
 
-            if (!StaysOpen && mouse?.Type == RawPointerEventType.NonClientLeftButtonDown)
+            if (IsLightDismissEnabled && mouse?.Type == RawPointerEventType.NonClientLeftButtonDown)
             {
-                Close();
+                CloseCore();
             }
         }
 
-        private void PointerPressedOutside(object sender, PointerPressedEventArgs e)
+        private void PointerPressedDismissOverlay(object sender, PointerPressedEventArgs e)
         {
-            if (!StaysOpen)
+            if (IsLightDismissEnabled && e.Source is IVisual v && !IsChildOrThis(v))
             {
-                if (!IsChildOrThis((IVisual)e.Source))
+                CloseCore();
+
+                if (OverlayDismissEventPassThrough)
                 {
-                    Close();
+                    PassThroughEvent(e);
+                }
+            }
+        }
+
+        private void PassThroughEvent(PointerPressedEventArgs e)
+        {
+            if (e.Source is LightDismissOverlayLayer layer &&
+                layer.GetVisualRoot() is IInputElement root)
+            {
+                var p = e.GetCurrentPoint(root);
+                var hit = root.InputHitTest(p.Position, x => x != layer);
+
+                if (hit != null)
+                {
+                    e.Pointer.Capture(hit);
+                    hit.RaiseEvent(e);
                     e.Handled = true;
                 }
             }
@@ -406,22 +651,28 @@ namespace Avalonia.Controls.Primitives
 
         private void RootTemplateApplied(object sender, TemplateAppliedEventArgs e)
         {
-            _popupHost.TemplateApplied -= RootTemplateApplied;
-
-            if (_presenterSubscription != null)
+            if (_openState is null)
             {
-                _presenterSubscription.Dispose();
-                _presenterSubscription = null;
+                return;
             }
 
+            var popupHost = _openState.PopupHost;
+
+            popupHost.TemplateApplied -= RootTemplateApplied;
+
+            _openState.SetPresenterSubscription(null);
+
             // If the Popup appears in a control template, then the child controls
             // that appear in the popup host need to have their TemplatedParent
             // properties set.
-            if (TemplatedParent != null)
+            if (TemplatedParent != null && popupHost.Presenter != null)
             {
-                _popupHost.Presenter?.ApplyTemplate();
-                _popupHost.Presenter?.GetObservable(ContentPresenter.ChildProperty)
+                popupHost.Presenter.ApplyTemplate();
+
+                var presenterSubscription = popupHost.Presenter.GetObservable(ContentPresenter.ChildProperty)
                     .Subscribe(SetTemplatedParentAndApplyChildTemplates);
+
+                _openState.SetPresenterSubscription(presenterSubscription);
             }
         }
 
@@ -440,7 +691,7 @@ namespace Avalonia.Controls.Primitives
 
                 if (!(control is IPresenter) && control.TemplatedParent == templatedParent)
                 {
-                    foreach (IControl child in control.GetVisualChildren())
+                    foreach (IControl child in control.VisualChildren)
                     {
                         SetTemplatedParentAndApplyChildTemplates(child);
                     }
@@ -450,26 +701,45 @@ namespace Avalonia.Controls.Primitives
 
         private bool IsChildOrThis(IVisual child)
         {
-            IVisual root = child.GetVisualRoot();
-            while (root is IHostedVisualTreeRoot hostedRoot )
+            if (_openState is null)
             {
-                if (root == this._popupHost)
+                return false;
+            }
+
+            var popupHost = _openState.PopupHost;
+
+            IVisual? root = child.VisualRoot;
+            
+            while (root is IHostedVisualTreeRoot hostedRoot)
+            {
+                if (root == popupHost)
+                {
                     return true;
-                root = hostedRoot.Host?.GetVisualRoot();
+                }
+
+                root = hostedRoot.Host?.VisualRoot;
             }
+
             return false;
         }
         
         public bool IsInsidePopup(IVisual visual)
         {
-            return _popupHost != null && ((IVisual)_popupHost)?.IsVisualAncestorOf(visual) == true;
+            if (_openState is null)
+            {
+                return false;
+            }
+
+            var popupHost = _openState.PopupHost;
+
+            return popupHost != null && ((IVisual)popupHost).IsVisualAncestorOf(visual);
         }
 
-        public bool IsPointerOverPopup => ((IInputElement)_popupHost).IsPointerOver;
+        public bool IsPointerOverPopup => ((IInputElement?)_openState?.PopupHost)?.IsPointerOver ?? false;
 
         private void WindowDeactivated(object sender, EventArgs e)
         {
-            if (!StaysOpen)
+            if (IsLightDismissEnabled)
             {
                 Close();
             }
@@ -477,11 +747,17 @@ namespace Avalonia.Controls.Primitives
 
         private void ParentClosed(object sender, EventArgs e)
         {
-            if (!StaysOpen)
+            if (IsLightDismissEnabled)
             {
                 Close();
             }
         }
+        
+        private void WindowLostFocus()
+        {
+            if (IsLightDismissEnabled)
+                Close();
+        }
 
         private IgnoreIsOpenScope BeginIgnoringIsOpen()
         {
@@ -503,5 +779,36 @@ namespace Avalonia.Controls.Primitives
                 _owner._ignoreIsOpenChanged = false;
             }
         }
+
+        private class PopupOpenState : IDisposable
+        {
+            private readonly IDisposable _cleanup;
+            private IDisposable? _presenterCleanup;
+
+            public PopupOpenState(TopLevel topLevel, IPopupHost popupHost, IDisposable cleanup)
+            {
+                TopLevel = topLevel;
+                PopupHost = popupHost;
+                _cleanup = cleanup;
+            }
+
+            public TopLevel TopLevel { get; }
+
+            public IPopupHost PopupHost { get; }
+
+            public void SetPresenterSubscription(IDisposable? presenterCleanup)
+            {
+                _presenterCleanup?.Dispose();
+
+                _presenterCleanup = presenterCleanup;
+            }
+
+            public void Dispose()
+            {
+                _presenterCleanup?.Dispose();
+
+                _cleanup.Dispose();
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs b/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs
index 3010a3d8a8..aed7dff0fe 100644
--- a/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs
+++ b/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs
@@ -50,46 +50,48 @@ using Avalonia.VisualTree;
 namespace Avalonia.Controls.Primitives.PopupPositioning
 {
     /// <summary>
-    /// 
-    /// The IPopupPositioner provides a collection of rules for the placement of a
-    /// a popup relative to its parent. Rules can be defined to ensure
-    /// the popup remains within the visible area's borders, and to
-    /// specify how the popup changes its position, such as sliding along
-    /// an axis, or flipping around a rectangle. These positioner-created rules are
-    /// constrained by the requirement that a popup must intersect with or
-    /// be at least partially adjacent to its parent surface.
+    /// Provides positioning parameters to <see cref="IPopupPositioner"/>.
     /// </summary>
+    /// <remarks>
+    /// The IPopupPositioner provides a collection of rules for the placement of a a popup relative
+    /// to its parent. Rules can be defined to ensure the popup remains within the visible area's
+    /// borders, and to specify how the popup changes its position, such as sliding along an axis,
+    /// or flipping around a rectangle. These positioner-created rules are constrained by the
+    /// requirement that a popup must intersect with or be at least partially adjacent to its parent
+    /// surface.
+    /// </remarks>
     public struct PopupPositionerParameters
     {
-        private PopupPositioningEdge _gravity;
-        private PopupPositioningEdge _anchor;
+        private PopupGravity _gravity;
+        private PopupAnchor _anchor;
 
         /// <summary>
-        /// Set the size of the popup that is to be positioned with the positioner
-        /// object. The size is in scaled coordinates.
+        /// Set the size of the popup that is to be positioned with the positioner object, in device-
+        /// independent pixels.
         /// </summary>
         public Size Size { get; set; }
 
         /// <summary>
-        /// Specify the anchor rectangle within the parent that the popup
-        /// will be placed relative to. The rectangle is relative to the
-        /// parent geometry
-        /// 
-        /// The anchor rectangle may not extend outside the window geometry of the
-        /// popup's parent. The anchor rectangle is in scaled coordinates
+        /// Specifies the anchor rectangle within the parent that the popup will be placed relative
+        /// to, in device-independent pixels.
         /// </summary>
+        /// <remarks>
+        /// The rectangle is relative to the parent geometry and may not extend outside the window
+        /// geometry of the popup's parent.
+        /// </remarks>
         public Rect AnchorRectangle { get; set; }
 
-
         /// <summary>
-        /// Defines the anchor point for the anchor rectangle. The specified anchor
-        /// is used derive an anchor point that the popup will be
-        /// positioned relative to. If a corner anchor is set (e.g. 'TopLeft' or
-        /// 'BottomRight'), the anchor point will be at the specified corner;
-        /// otherwise, the derived anchor point will be centered on the specified
-        /// edge, or in the center of the anchor rectangle if no edge is specified.
+        /// Defines the anchor point for the anchor rectangle.
         /// </summary>
-        public PopupPositioningEdge Anchor
+        /// <remarks>
+        /// The specified anchor is used derive an anchor point that the popup will be positioned
+        /// relative to. If a corner anchor is set (e.g. 'TopLeft' or 'BottomRight'), the anchor
+        /// point will be at the specified corner; otherwise, the derived anchor point will be
+        /// centered on the specified edge, or in the center of the anchor rectangle if no edge is
+        /// specified.
+        /// </remarks>
+        public PopupAnchor Anchor
         {
             get => _anchor;
             set
@@ -100,66 +102,70 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
         }
 
         /// <summary>
-        /// Defines in what direction a popup should be positioned, relative to
-        /// the anchor point of the parent. If a corner gravity is
-        /// specified (e.g. 'BottomRight' or 'TopLeft'), then the popup
-        /// will be placed towards the specified gravity; otherwise, the popup
-        /// will be centered over the anchor point on any axis that had no
-        /// gravity specified.
+        /// Defines in what direction a popup should be positioned, relative to the anchor point of
+        /// the parent.
         /// </summary>
-        public PopupPositioningEdge Gravity
+        /// <remarks>
+        /// If a corner gravity is specified (e.g. 'BottomRight' or 'TopLeft'), then the popup will
+        /// be placed towards the specified gravity; otherwise, the popup will be centered over the
+        /// anchor point on any axis that had no gravity specified.
+        /// </remarks>
+        public PopupGravity Gravity
         {
             get => _gravity;
             set
             {
-                PopupPositioningEdgeHelper.ValidateEdge(value);
+                PopupPositioningEdgeHelper.ValidateGravity(value);
                 _gravity = value;
             }
         }
 
         /// <summary>
-        /// Specify how the popup should be positioned if the originally intended
-        /// position caused the popup to be constrained, meaning at least
-        /// partially outside positioning boundaries set by the positioner. The
-        /// adjustment is set by constructing a bitmask describing the adjustment to
-        /// be made when the popup is constrained on that axis.
+        /// Specify how the popup should be positioned if the originally intended position caused
+        /// the popup to be constrained.
+        /// </summary>
+        /// <remarks>
+        /// Adjusts the popup position if the intended position caused the popup to be constrained;
+        /// meaning at least partially outside positioning boundaries set by the positioner. The
+        /// adjustment is set by constructing a bitmask describing the adjustment to be made when
+        /// the popup is constrained on that axis.
         /// 
-        /// If no bit for one axis is set, the positioner will assume that the child
-        /// surface should not change its position on that axis when constrained.
+        /// If no bit for one axis is set, the positioner will assume that the child surface should
+        /// not change its position on that axis when constrained.
         /// 
-        /// If more than one bit for one axis is set, the order of how adjustments
-        /// are applied is specified in the corresponding adjustment descriptions.
+        /// If more than one bit for one axis is set, the order of how adjustments are applied is
+        /// specified in the corresponding adjustment descriptions.
         /// 
         /// The default adjustment is none.
-        /// </summary>
+        /// </remarks>
         public PopupPositionerConstraintAdjustment ConstraintAdjustment { get; set; }
-        
+
         /// <summary>
         /// Specify the popup position offset relative to the position of the
-        /// anchor on the anchor rectangle and the anchor on the popup. For
-        /// example if the anchor of the anchor rectangle is at (x, y), the popup
-        /// has the gravity bottom|right, and the offset is (ox, oy), the calculated
-        /// surface position will be (x + ox, y + oy). The offset position of the
-        /// surface is the one used for constraint testing. See
-        /// set_constraint_adjustment.
-        /// 
-        /// An example use case is placing a popup menu on top of a user interface
-        /// element, while aligning the user interface element of the parent surface
-        /// with some user interface element placed somewhere in the popup.
+        /// anchor on the anchor rectangle and the anchor on the popup.
         /// </summary>
+        /// <remarks>
+        /// For example if the anchor of the anchor rectangle is at (x, y), the popup has the
+        /// gravity bottom|right, and the offset is (ox, oy), the calculated surface position will
+        /// be (x + ox, y + oy). The offset position of the surface is the one used for constraint
+        /// testing. See set_constraint_adjustment.
+        /// 
+        /// An example use case is placing a popup menu on top of a user interface element, while
+        /// aligning the user interface element of the parent surface with some user interface
+        /// element placed somewhere in the popup.
+        /// </remarks>
         public Point Offset { get; set; }
     }
-    
+
     /// <summary>
-    /// The constraint adjustment value define ways how popup position will
-    /// be adjusted if the unadjusted position would result in the popup
-    /// being partly constrained.
-    /// 
-    /// Whether a popup is considered 'constrained' is left to the positioner
-    /// to determine. For example, the popup may be partly outside the
-    /// target platform defined 'work area', thus necessitating the popup's
-    /// position be adjusted until it is entirely inside the work area.
+    /// Defines how a popup position will be adjusted if the unadjusted position would result in
+    /// the popup being partly constrained.
     /// </summary>
+    /// <remarks>
+    /// Whether a popup is considered 'constrained' is left to the positioner to determine. For
+    /// example, the popup may be partly outside the target platform defined 'work area', thus
+    /// necessitating the popup's position be adjusted until it is entirely inside the work area.
+    /// </remarks>
     [Flags]
     public enum PopupPositionerConstraintAdjustment
     {
@@ -171,79 +177,97 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
 
         /// <summary>
         /// Slide the surface along the x axis until it is no longer constrained.
-        ///        First try to slide towards the direction of the gravity on the x axis
-        ///        until either the edge in the opposite direction of the gravity is
-        ///        unconstrained or the edge in the direction of the gravity is
-        ///        constrained.
-        ///
-        ///        Then try to slide towards the opposite direction of the gravity on the
-        ///        x axis until either the edge in the direction of the gravity is
-        ///        unconstrained or the edge in the opposite direction of the gravity is
-        ///        constrained.
         /// </summary>
+        /// <remarks>
+        /// First try to slide towards the direction of the gravity on the x axis until either the
+        /// edge in the opposite direction of the gravity is unconstrained or the edge in the
+        /// direction of the gravity is constrained.
+        ///
+        /// Then try to slide towards the opposite direction of the gravity on the x axis until
+        /// either the edge in the direction of the gravity is unconstrained or the edge in the
+        /// opposite direction of the gravity is constrained.
+        /// </remarks>
         SlideX = 1,
 
-
         /// <summary>
-        ///            Slide the surface along the y axis until it is no longer constrained.
-        /// 
-        /// First try to slide towards the direction of the gravity on the y axis
-        /// until either the edge in the opposite direction of the gravity is
-        /// unconstrained or the edge in the direction of the gravity is
-        /// constrained.
-        /// 
-        /// Then try to slide towards the opposite direction of the gravity on the
-        /// y axis until either the edge in the direction of the gravity is
-        /// unconstrained or the edge in the opposite direction of the gravity is
-        /// constrained.
-        /// */
+        /// Slide the surface along the y axis until it is no longer constrained.
         /// </summary>
+        /// <remarks>
+        /// First try to slide towards the direction of the gravity on the y axis until either the
+        /// edge in the opposite direction of the gravity is unconstrained or the edge in the
+        /// direction of the gravity is constrained.
+        /// 
+        /// Then try to slide towards the opposite direction of the gravity on the y axis until
+        /// either the edge in the direction of the gravity is unconstrained or the edge in the
+        /// opposite direction of the gravity is constrained.
+        /// </remarks>
         SlideY = 2,
 
         /// <summary>
-        /// Invert the anchor and gravity on the x axis if the surface is
-        /// constrained on the x axis. For example, if the left edge of the
-        /// surface is constrained, the gravity is 'left' and the anchor is
-        /// 'left', change the gravity to 'right' and the anchor to 'right'.
-        /// 
-        /// If the adjusted position also ends up being constrained, the resulting
-        /// position of the flip_x adjustment will be the one before the
-        /// adjustment.
+        /// Invert the anchor and gravity on the x axis if the surface is constrained on the x axis.
         /// </summary>
+        /// <remarks>
+        /// For example, if the left edge of the surface is constrained, the gravity is 'left' and
+        /// the anchor is 'left', change the gravity to 'right' and the anchor to 'right'.
+        /// 
+        /// If the adjusted position also ends up being constrained, the resulting position of the
+        /// FlipX adjustment will be the one before the adjustment.
+        /// /// </remarks>
         FlipX = 4,
 
         /// <summary>
-        /// Invert the anchor and gravity on the y axis if the surface is
-        /// constrained on the y axis. For example, if the bottom edge of the
-        /// surface is constrained, the gravity is 'bottom' and the anchor is
-        /// 'bottom', change the gravity to 'top' and the anchor to 'top'.
+        /// Invert the anchor and gravity on the y axis if the surface is constrained on the y axis.
+        /// </summary>
+        /// <remarks>
+        /// For example, if the bottom edge of the surface is constrained, the gravity is 'bottom'
+        /// and the anchor is 'bottom', change the gravity to 'top' and the anchor to 'top'.
         /// 
-        /// The adjusted position is calculated given the original anchor
-        /// rectangle and offset, but with the new flipped anchor and gravity
-        /// values.
+        /// The adjusted position is calculated given the original anchor rectangle and offset, but
+        /// with the new flipped anchor and gravity values.
         /// 
-        /// If the adjusted position also ends up being constrained, the resulting
-        /// position of the flip_y adjustment will be the one before the
-        /// adjustment.
-        /// </summary>
+        /// If the adjusted position also ends up being constrained, the resulting position of the
+        /// FlipY adjustment will be the one before the adjustment.
+        /// </remarks>
         FlipY = 8,
-        All = SlideX|SlideY|FlipX|FlipY
+
+        /// <summary>
+        /// Horizontally resize the surface
+        /// </summary>
+        /// <remarks>
+        /// Resize the surface horizontally so that it is completely unconstrained.
+        /// </remarks>
+        ResizeX = 16,
+
+        /// <summary>
+        /// Vertically resize the surface
+        /// </summary>
+        /// <remarks>
+        /// Resize the surface vertically so that it is completely unconstrained.
+        /// </remarks>
+        ResizeY = 16,
+
+        All = SlideX|SlideY|FlipX|FlipY|ResizeX|ResizeY
     }
 
     static class PopupPositioningEdgeHelper
     {
-        public static void ValidateEdge(this PopupPositioningEdge edge)
+        public static void ValidateEdge(this PopupAnchor edge)
         {
-            if (((edge & PopupPositioningEdge.Left) != 0 && (edge & PopupPositioningEdge.Right) != 0)
+            if (((edge & PopupAnchor.Left) != 0 && (edge & PopupAnchor.Right) != 0)
                 ||
-                ((edge & PopupPositioningEdge.Top) != 0 && (edge & PopupPositioningEdge.Bottom) != 0))
+                ((edge & PopupAnchor.Top) != 0 && (edge & PopupAnchor.Bottom) != 0))
                 throw new ArgumentException("Opposite edges specified");
         }
 
-        public static PopupPositioningEdge Flip(this PopupPositioningEdge edge)
+        public static void ValidateGravity(this PopupGravity gravity)
+        {
+            ValidateEdge((PopupAnchor)gravity);
+        }
+
+        public static PopupAnchor Flip(this PopupAnchor edge)
         {
-            var hmask = PopupPositioningEdge.Left | PopupPositioningEdge.Right;
-            var vmask = PopupPositioningEdge.Top | PopupPositioningEdge.Bottom;
+            var hmask = PopupAnchor.Left | PopupAnchor.Right;
+            var vmask = PopupAnchor.Top | PopupAnchor.Bottom;
             if ((edge & hmask) != 0)
                 edge ^= hmask;
             if ((edge & vmask) != 0)
@@ -251,43 +275,167 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
             return edge;
         }
 
-        public static PopupPositioningEdge FlipX(this PopupPositioningEdge edge)
+        public static PopupAnchor FlipX(this PopupAnchor edge)
         {
-            if ((edge & PopupPositioningEdge.HorizontalMask) != 0)
-                edge ^= PopupPositioningEdge.HorizontalMask;
+            if ((edge & PopupAnchor.HorizontalMask) != 0)
+                edge ^= PopupAnchor.HorizontalMask;
             return edge;
         }
         
-        public static PopupPositioningEdge FlipY(this PopupPositioningEdge edge)
+        public static PopupAnchor FlipY(this PopupAnchor edge)
         {
-            if ((edge & PopupPositioningEdge.VerticalMask) != 0)
-                edge ^= PopupPositioningEdge.VerticalMask;
+            if ((edge & PopupAnchor.VerticalMask) != 0)
+                edge ^= PopupAnchor.VerticalMask;
             return edge;
         }
-        
+
+        public static PopupGravity FlipX(this PopupGravity gravity)
+        {
+            return (PopupGravity)FlipX((PopupAnchor)gravity);
+        }
+
+        public static PopupGravity FlipY(this PopupGravity gravity)
+        {
+            return (PopupGravity)FlipY((PopupAnchor)gravity);
+        }
     }
 
+    /// <summary>
+    /// Defines the edges around an anchor rectangle on which a popup will open.
+    /// </summary>
     [Flags]
-    public enum PopupPositioningEdge
+    public enum PopupAnchor
     {
+        /// <summary>
+        /// The center of the anchor rectangle.
+        /// </summary>
         None,
+
+        /// <summary>
+        /// The top edge of the anchor rectangle.
+        /// </summary>
         Top = 1,
+
+        /// <summary>
+        /// The bottom edge of the anchor rectangle.
+        /// </summary>
         Bottom = 2,
+
+        /// <summary>
+        /// The left edge of the anchor rectangle.
+        /// </summary>
         Left = 4,
+
+        /// <summary>
+        /// The right edge of the anchor rectangle.
+        /// </summary>
         Right = 8,
+
+        /// <summary>
+        /// The top-left corner of the anchor rectangle.
+        /// </summary>
         TopLeft = Top | Left,
+
+        /// <summary>
+        /// The top-right corner of the anchor rectangle.
+        /// </summary>
         TopRight = Top | Right,
+
+        /// <summary>
+        /// The bottom-left corner of the anchor rectangle.
+        /// </summary>
         BottomLeft = Bottom | Left,
+
+        /// <summary>
+        /// The bottom-right corner of the anchor rectangle.
+        /// </summary>
         BottomRight = Bottom | Right,
 
-        
+        /// <summary>
+        /// A mask for the vertical component flags.
+        /// </summary>
         VerticalMask = Top | Bottom,
+
+        /// <summary>
+        /// A mask for the horizontal component flags.
+        /// </summary>
         HorizontalMask = Left | Right,
+
+        /// <summary>
+        /// A mask for all flags.
+        /// </summary>
         AllMask = VerticalMask|HorizontalMask
     }
 
+    /// <summary>
+    /// Defines the direction in which a popup will open.
+    /// </summary>
+    [Flags]
+    public enum PopupGravity
+    {
+        /// <summary>
+        /// The popup will be centered over the anchor edge.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// The popup will be positioned above the anchor edge
+        /// </summary>
+        Top = 1,
+
+        /// <summary>
+        /// The popup will be positioned below the anchor edge
+        /// </summary>
+        Bottom = 2,
+
+        /// <summary>
+        /// The popup will be positioned to the left of the anchor edge
+        /// </summary>
+        Left = 4,
+
+        /// <summary>
+        /// The popup will be positioned to the right of the anchor edge
+        /// </summary>
+        Right = 8,
+
+        /// <summary>
+        /// The popup will be positioned to the top-left of the anchor edge
+        /// </summary>
+        TopLeft = Top | Left,
+
+        /// <summary>
+        /// The popup will be positioned to the top-right of the anchor edge
+        /// </summary>
+        TopRight = Top | Right,
+
+        /// <summary>
+        /// The popup will be positioned to the bottom-left of the anchor edge
+        /// </summary>
+        BottomLeft = Bottom | Left,
+
+        /// <summary>
+        /// The popup will be positioned to the bottom-right of the anchor edge
+        /// </summary>
+        BottomRight = Bottom | Right,
+    }
+
+    /// <summary>
+    /// Positions an <see cref="IPopupHost"/>.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="IPopupPositioner"/> is an abstraction of the wayland xdg_positioner spec.
+    /// 
+    /// The popup positioner implementation is determined by the platform implementation. A default
+    /// managed implementation is provided in <see cref="ManagedPopupPositioner"/> for platforms
+    /// on which popups can be arbitrarily positioned.
+    /// </remarks>
     public interface IPopupPositioner
     {
+        /// <summary>
+        /// Updates the position of the associated <see cref="IPopupHost"/> according to the
+        /// specified parameters.
+        /// </summary>
+        /// <param name="parameters">The positioning parameters.</param>
         void Update(PopupPositionerParameters parameters);
     }
 
@@ -296,18 +444,19 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
         public static void ConfigurePosition(ref this PopupPositionerParameters positionerParameters,
             TopLevel topLevel,
             IVisual target, PlacementMode placement, Point offset,
-            PopupPositioningEdge anchor, PopupPositioningEdge gravity)
+            PopupAnchor anchor, PopupGravity gravity,
+            PopupPositionerConstraintAdjustment constraintAdjustment, Rect? rect)
         {
             // We need a better way for tracking the last pointer position
             var pointer = topLevel.PointToClient(topLevel.PlatformImpl.MouseDevice.Position);
             
             positionerParameters.Offset = offset;
-            positionerParameters.ConstraintAdjustment = PopupPositionerConstraintAdjustment.All;
+            positionerParameters.ConstraintAdjustment = constraintAdjustment;
             if (placement == PlacementMode.Pointer)
             {
                 positionerParameters.AnchorRectangle = new Rect(pointer, new Size(1, 1));
-                positionerParameters.Anchor = PopupPositioningEdge.BottomRight;
-                positionerParameters.Gravity = PopupPositioningEdge.BottomRight;
+                positionerParameters.Anchor = PopupAnchor.TopLeft;
+                positionerParameters.Gravity = PopupGravity.BottomRight;
             }
             else
             {
@@ -317,32 +466,33 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
                 if (matrix == null)
                 {
                     if (target.GetVisualRoot() == null)
-                        throw new InvalidCastException("Target control is not attached to the visual tree");
-                    throw new InvalidCastException("Target control is not in the same tree as the popup parent");
+                        throw new InvalidOperationException("Target control is not attached to the visual tree");
+                    throw new InvalidOperationException("Target control is not in the same tree as the popup parent");
                 }
 
-                positionerParameters.AnchorRectangle = new Rect(default, target.Bounds.Size)
-                    .TransformToAABB(matrix.Value);
+                var bounds = new Rect(default, target.Bounds.Size);
+                var anchorRect = rect ?? bounds;
+                positionerParameters.AnchorRectangle = anchorRect.Intersect(bounds).TransformToAABB(matrix.Value);
 
                 if (placement == PlacementMode.Right)
                 {
-                    positionerParameters.Anchor = PopupPositioningEdge.TopRight;
-                    positionerParameters.Gravity = PopupPositioningEdge.BottomRight;
+                    positionerParameters.Anchor = PopupAnchor.TopRight;
+                    positionerParameters.Gravity = PopupGravity.BottomRight;
                 }
                 else if (placement == PlacementMode.Bottom)
                 {
-                    positionerParameters.Anchor = PopupPositioningEdge.BottomLeft;
-                    positionerParameters.Gravity = PopupPositioningEdge.BottomRight;
+                    positionerParameters.Anchor = PopupAnchor.BottomLeft;
+                    positionerParameters.Gravity = PopupGravity.BottomRight;
                 }
                 else if (placement == PlacementMode.Left)
                 {
-                    positionerParameters.Anchor = PopupPositioningEdge.TopLeft;
-                    positionerParameters.Gravity = PopupPositioningEdge.BottomLeft;
+                    positionerParameters.Anchor = PopupAnchor.TopLeft;
+                    positionerParameters.Gravity = PopupGravity.BottomLeft;
                 }
                 else if (placement == PlacementMode.Top)
                 {
-                    positionerParameters.Anchor = PopupPositioningEdge.TopLeft;
-                    positionerParameters.Gravity = PopupPositioningEdge.TopRight;
+                    positionerParameters.Anchor = PopupAnchor.TopLeft;
+                    positionerParameters.Gravity = PopupGravity.TopRight;
                 }
                 else if (placement == PlacementMode.AnchorAndGravity)
                 {
diff --git a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs
index 07348cdf78..7f1dbdf592 100644
--- a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs
+++ b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Transactions;
 
 namespace Avalonia.Controls.Primitives.PopupPositioning
 {
@@ -8,9 +9,8 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
     {
         IReadOnlyList<ManagedPopupPositionerScreenInfo> Screens { get; }
         Rect ParentClientAreaScreenGeometry { get; }
+        double Scaling { get; }
         void MoveAndResize(Point devicePoint, Size virtualSize);
-        Point TranslatePoint(Point pt);
-        Size TranslateSize(Size size);
     }
 
     public class ManagedPopupPositionerScreenInfo
@@ -25,6 +25,10 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
         }
     }
 
+    /// <summary>
+    /// An <see cref="IPopupPositioner"/> implementation for platforms on which a popup can be
+    /// aritrarily positioned.
+    /// </summary>
     public class ManagedPopupPositioner : IPopupPositioner
     {
         private readonly IManagedPopupPositionerPopup _popup;
@@ -35,38 +39,38 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
         }
 
 
-        private static Point GetAnchorPoint(Rect anchorRect, PopupPositioningEdge edge)
+        private static Point GetAnchorPoint(Rect anchorRect, PopupAnchor edge)
         {
             double x, y;
-            if ((edge & PopupPositioningEdge.Left) != 0)
+            if ((edge & PopupAnchor.Left) != 0)
                 x = anchorRect.X;
-            else if ((edge & PopupPositioningEdge.Right) != 0)
+            else if ((edge & PopupAnchor.Right) != 0)
                 x = anchorRect.Right;
             else
                 x = anchorRect.X + anchorRect.Width / 2;
             
-            if ((edge & PopupPositioningEdge.Top) != 0)
+            if ((edge & PopupAnchor.Top) != 0)
                 y = anchorRect.Y;
-            else if ((edge & PopupPositioningEdge.Bottom) != 0)
+            else if ((edge & PopupAnchor.Bottom) != 0)
                 y = anchorRect.Bottom;
             else
                 y = anchorRect.Y + anchorRect.Height / 2;
             return new Point(x, y);
         }
 
-        private static Point Gravitate(Point anchorPoint, Size size, PopupPositioningEdge gravity)
+        private static Point Gravitate(Point anchorPoint, Size size, PopupGravity gravity)
         {
             double x, y;
-            if ((gravity & PopupPositioningEdge.Left) != 0)
+            if ((gravity & PopupGravity.Left) != 0)
                 x = -size.Width;
-            else if ((gravity & PopupPositioningEdge.Right) != 0)
+            else if ((gravity & PopupGravity.Right) != 0)
                 x = 0;
             else
                 x = -size.Width / 2;
             
-            if ((gravity & PopupPositioningEdge.Top) != 0)
+            if ((gravity & PopupGravity.Top) != 0)
                 y = -size.Height;
-            else if ((gravity & PopupPositioningEdge.Bottom) != 0)
+            else if ((gravity & PopupGravity.Bottom) != 0)
                 y = 0;
             else
                 y = -size.Height / 2;
@@ -75,17 +79,24 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
 
         public void Update(PopupPositionerParameters parameters)
         {
-
-            Update(_popup.TranslateSize(parameters.Size), parameters.Size,
-                new Rect(_popup.TranslatePoint(parameters.AnchorRectangle.TopLeft),
-                    _popup.TranslateSize(parameters.AnchorRectangle.Size)),
-                parameters.Anchor, parameters.Gravity, parameters.ConstraintAdjustment,
-                _popup.TranslatePoint(parameters.Offset));
+            var rect = Calculate(
+                parameters.Size * _popup.Scaling,
+                new Rect(
+                    parameters.AnchorRectangle.TopLeft * _popup.Scaling,
+                    parameters.AnchorRectangle.Size * _popup.Scaling),
+                parameters.Anchor,
+                parameters.Gravity,
+                parameters.ConstraintAdjustment,
+                parameters.Offset * _popup.Scaling);
+           
+            _popup.MoveAndResize(
+                rect.Position,
+                rect.Size / _popup.Scaling);
         }
 
         
-        private void Update(Size translatedSize, Size originalSize,
-            Rect anchorRect, PopupPositioningEdge anchor, PopupPositioningEdge gravity,
+        private Rect Calculate(Size translatedSize, 
+            Rect anchorRect, PopupAnchor anchor, PopupGravity gravity,
             PopupPositionerConstraintAdjustment constraintAdjustment, Point offset)
         {
             var parentGeometry = _popup.ParentClientAreaScreenGeometry;
@@ -112,28 +123,30 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
 
             var bounds = GetBounds();
 
-            bool FitsInBounds(Rect rc, PopupPositioningEdge edge = PopupPositioningEdge.AllMask)
+            bool FitsInBounds(Rect rc, PopupAnchor edge = PopupAnchor.AllMask)
             {
-                if ((edge & PopupPositioningEdge.Left) != 0
+                if ((edge & PopupAnchor.Left) != 0
                     && rc.X < bounds.X)
                     return false;
 
-                if ((edge & PopupPositioningEdge.Top) != 0
+                if ((edge & PopupAnchor.Top) != 0
                     && rc.Y < bounds.Y)
                     return false;
 
-                if ((edge & PopupPositioningEdge.Right) != 0
+                if ((edge & PopupAnchor.Right) != 0
                     && rc.Right > bounds.Right)
                     return false;
 
-                if ((edge & PopupPositioningEdge.Bottom) != 0
+                if ((edge & PopupAnchor.Bottom) != 0
                     && rc.Bottom > bounds.Bottom)
                     return false;
 
                 return true;
             }
 
-            Rect GetUnconstrained(PopupPositioningEdge a, PopupPositioningEdge g) =>
+            static bool IsValid(in Rect rc) => rc.Width > 0 && rc.Height > 0;
+
+            Rect GetUnconstrained(PopupAnchor a, PopupGravity g) =>
                 new Rect(Gravitate(GetAnchorPoint(anchorRect, a), translatedSize, g) + offset, translatedSize);
 
 
@@ -141,11 +154,11 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
 
             // If flipping geometry and anchor is allowed and helps, use the flipped one,
             // otherwise leave it as is
-            if (!FitsInBounds(geo, PopupPositioningEdge.HorizontalMask)
+            if (!FitsInBounds(geo, PopupAnchor.HorizontalMask)
                 && (constraintAdjustment & PopupPositionerConstraintAdjustment.FlipX) != 0)
             {
                 var flipped = GetUnconstrained(anchor.FlipX(), gravity.FlipX());
-                if (FitsInBounds(flipped, PopupPositioningEdge.HorizontalMask))
+                if (FitsInBounds(flipped, PopupAnchor.HorizontalMask))
                     geo = geo.WithX(flipped.X);
             }
 
@@ -157,13 +170,34 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
                     geo = geo.WithX(bounds.Right - geo.Width);
             }
             
+            // Resize the rect horizontally if allowed.
+            if ((constraintAdjustment & PopupPositionerConstraintAdjustment.ResizeX) != 0)
+            {
+                var unconstrainedRect = geo;
+
+                if (!FitsInBounds(unconstrainedRect, PopupAnchor.Left))
+                {
+                    unconstrainedRect = unconstrainedRect.WithX(bounds.X);
+                }
+
+                if (!FitsInBounds(unconstrainedRect, PopupAnchor.Right))
+                {
+                    unconstrainedRect = unconstrainedRect.WithWidth(bounds.Width - unconstrainedRect.X);
+                }
+
+                if (IsValid(unconstrainedRect))
+                {
+                    geo = unconstrainedRect;
+                }
+            }
+
             // If flipping geometry and anchor is allowed and helps, use the flipped one,
             // otherwise leave it as is
-            if (!FitsInBounds(geo, PopupPositioningEdge.VerticalMask)
+            if (!FitsInBounds(geo, PopupAnchor.VerticalMask)
                 && (constraintAdjustment & PopupPositionerConstraintAdjustment.FlipY) != 0)
             {
                 var flipped = GetUnconstrained(anchor.FlipY(), gravity.FlipY());
-                if (FitsInBounds(flipped, PopupPositioningEdge.VerticalMask))
+                if (FitsInBounds(flipped, PopupAnchor.VerticalMask))
                     geo = geo.WithY(flipped.Y);
             }
 
@@ -175,7 +209,28 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
                     geo = geo.WithY(bounds.Bottom - geo.Height);
             }
 
-            _popup.MoveAndResize(geo.TopLeft, originalSize);
+            // Resize the rect vertically if allowed.
+            if ((constraintAdjustment & PopupPositionerConstraintAdjustment.ResizeY) != 0)
+            {
+                var unconstrainedRect = geo;
+
+                if (!FitsInBounds(unconstrainedRect, PopupAnchor.Top))
+                {
+                    unconstrainedRect = unconstrainedRect.WithY(bounds.Y);
+                }
+
+                if (!FitsInBounds(unconstrainedRect, PopupAnchor.Bottom))
+                {
+                    unconstrainedRect = unconstrainedRect.WithHeight(bounds.Bottom - unconstrainedRect.Y);
+                }
+
+                if (IsValid(unconstrainedRect))
+                {
+                    geo = unconstrainedRect;
+                }
+            }
+
+            return geo;
         }
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs
index 8e7e429a73..91ed5d975d 100644
--- a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs
+++ b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs
@@ -32,7 +32,7 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
             {
                 // Popup positioner operates with abstract coordinates, but in our case they are pixel ones
                 var point = _parent.PointToScreen(default);
-                var size = TranslateSize(_parent.ClientSize);
+                var size = _parent.ClientSize * Scaling;
                 return new Rect(point.X, point.Y, size.Width, size.Height);
 
             }
@@ -40,11 +40,9 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
 
         public void MoveAndResize(Point devicePoint, Size virtualSize)
         {
-            _moveResize(new PixelPoint((int)devicePoint.X, (int)devicePoint.Y), virtualSize, _parent.Scaling);
+            _moveResize(new PixelPoint((int)devicePoint.X, (int)devicePoint.Y), virtualSize, _parent.RenderScaling);
         }
 
-        public virtual Point TranslatePoint(Point pt) => pt * _parent.Scaling;
-
-        public virtual Size TranslateSize(Size size) => size * _parent.Scaling;
+        public virtual double Scaling => _parent.DesktopScaling;
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs
index caaf58b25b..da7352b77f 100644
--- a/src/Avalonia.Controls/Primitives/PopupRoot.cs
+++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Reactive.Disposables;
@@ -20,14 +17,14 @@ namespace Avalonia.Controls.Primitives
     public sealed class PopupRoot : WindowBase, IInteractive, IHostedVisualTreeRoot, IDisposable, IStyleHost, IPopupHost
     {
         private readonly TopLevel _parent;
-        private PopupPositionerParameters _positionerParameters;
+        private PopupPositionerParameters _positionerParameters;        
 
         /// <summary>
         /// Initializes static members of the <see cref="PopupRoot"/> class.
         /// </summary>
         static PopupRoot()
         {
-            BackgroundProperty.OverrideDefaultValue(typeof(PopupRoot), Brushes.White);
+            BackgroundProperty.OverrideDefaultValue(typeof(PopupRoot), Brushes.White);            
         }
 
         /// <summary>
@@ -56,7 +53,7 @@ namespace Avalonia.Controls.Primitives
         /// Gets the platform-specific window implementation.
         /// </summary>
         [CanBeNull]
-        public new IPopupImpl PlatformImpl => (IPopupImpl)base.PlatformImpl;
+        public new IPopupImpl PlatformImpl => (IPopupImpl)base.PlatformImpl;               
 
         /// <summary>
         /// Gets the parent control in the event route.
@@ -85,11 +82,13 @@ namespace Avalonia.Controls.Primitives
         }
 
         public void ConfigurePosition(IVisual target, PlacementMode placement, Point offset,
-            PopupPositioningEdge anchor = PopupPositioningEdge.None,
-            PopupPositioningEdge gravity = PopupPositioningEdge.None)
+            PopupAnchor anchor = PopupAnchor.None,
+            PopupGravity gravity = PopupGravity.None,
+            PopupPositionerConstraintAdjustment constraintAdjustment = PopupPositionerConstraintAdjustment.All,
+            Rect? rect = null)
         {
             _positionerParameters.ConfigurePosition(_parent, target,
-                placement, offset, anchor, gravity);
+                placement, offset, anchor, gravity, constraintAdjustment, rect);
 
             if (_positionerParameters.Size != default)
                 UpdatePosition();
@@ -120,20 +119,54 @@ namespace Avalonia.Controls.Primitives
             });
         }
 
-        /// <summary>
-        /// Carries out the arrange pass of the window.
-        /// </summary>
-        /// <param name="finalSize">The final window size.</param>
-        /// <returns>The <paramref name="finalSize"/> parameter unchanged.</returns>
-        protected override Size ArrangeOverride(Size finalSize)
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            var maxAutoSize = PlatformImpl?.MaxAutoSizeHint ?? Size.Infinity;
+            var constraint = availableSize;
+
+            if (double.IsInfinity(constraint.Width))
+            {
+                constraint = constraint.WithWidth(maxAutoSize.Width);
+            }
+
+            if (double.IsInfinity(constraint.Height))
+            {
+                constraint = constraint.WithHeight(maxAutoSize.Height);
+            }
+
+            var measured = base.MeasureOverride(constraint);
+            var width = measured.Width;
+            var height = measured.Height;
+            var widthCache = Width;
+            var heightCache = Height;
+
+            if (!double.IsNaN(widthCache))
+            {
+                width = widthCache;
+            }
+
+            width = Math.Min(width, MaxWidth);
+            width = Math.Max(width, MinWidth);
+
+            if (!double.IsNaN(heightCache))
+            {
+                height = heightCache;
+            }
+
+            height = Math.Min(height, MaxHeight);
+            height = Math.Max(height, MinHeight);
+
+            return new Size(width, height);
+        }
+
+        protected override sealed Size ArrangeSetBounds(Size size)
         {
             using (BeginAutoSizing())
             {
-                _positionerParameters.Size = finalSize;
+                _positionerParameters.Size = size;
                 UpdatePosition();
+                return ClientSize;
             }
-
-            return base.ArrangeOverride(PlatformImpl?.ClientSize ?? default(Size));
         }
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/RangeBase.cs b/src/Avalonia.Controls/Primitives/RangeBase.cs
index f1ee7c0e1a..0b716ec1ca 100644
--- a/src/Avalonia.Controls/Primitives/RangeBase.cs
+++ b/src/Avalonia.Controls/Primitives/RangeBase.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Data;
 using Avalonia.Utilities;
@@ -75,7 +72,10 @@ namespace Avalonia.Controls.Primitives
 
             set
             {
-                ValidateDouble(value, "Minimum");
+                if (!ValidateDouble(value))
+                {
+                    return;
+                }
 
                 if (IsInitialized)
                 {
@@ -102,7 +102,10 @@ namespace Avalonia.Controls.Primitives
 
             set
             {
-                ValidateDouble(value, "Maximum");
+                if (!ValidateDouble(value))
+                {
+                    return;
+                }
 
                 if (IsInitialized)
                 {
@@ -129,7 +132,10 @@ namespace Avalonia.Controls.Primitives
 
             set
             {
-                ValidateDouble(value, "Value");
+                if (!ValidateDouble(value))
+                {
+                    return;
+                }
 
                 if (IsInitialized)
                 {
@@ -164,16 +170,12 @@ namespace Avalonia.Controls.Primitives
         }
 
         /// <summary>
-        /// Throws an exception if the double value is NaN or Inf.
+        /// Checks if the double value is not inifinity nor NaN.
         /// </summary>
         /// <param name="value">The value.</param>
-        /// <param name="property">The name of the property being set.</param>
-        private static void ValidateDouble(double value, string property)
+        private static bool ValidateDouble(double value)
         {
-            if (double.IsInfinity(value) || double.IsNaN(value))
-            {
-                throw new ArgumentException($"{value} is not a valid value for {property}.");
-            }
+            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 9251ca273f..d264ed76cc 100644
--- a/src/Avalonia.Controls/Primitives/ScrollBar.cs
+++ b/src/Avalonia.Controls/Primitives/ScrollBar.cs
@@ -1,13 +1,10 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Reactive;
-using System.Reactive.Linq;
 using Avalonia.Data;
 using Avalonia.Interactivity;
 using Avalonia.Input;
 using Avalonia.Layout;
+using Avalonia.Threading;
+using Avalonia.Controls.Metadata;
 
 namespace Avalonia.Controls.Primitives
 {
@@ -25,6 +22,7 @@ namespace Avalonia.Controls.Primitives
     /// <summary>
     /// A scrollbar control.
     /// </summary>
+    [PseudoClasses(":vertical", ":horizontal")]
     public class ScrollBar : RangeBase
     {
         /// <summary>
@@ -37,7 +35,7 @@ namespace Avalonia.Controls.Primitives
         /// Defines the <see cref="Visibility"/> property.
         /// </summary>
         public static readonly StyledProperty<ScrollBarVisibility> VisibilityProperty =
-            AvaloniaProperty.Register<ScrollBar, ScrollBarVisibility>(nameof(Visibility));
+            AvaloniaProperty.Register<ScrollBar, ScrollBarVisibility>(nameof(Visibility), ScrollBarVisibility.Visible);
 
         /// <summary>
         /// Defines the <see cref="Orientation"/> property.
@@ -45,19 +43,32 @@ namespace Avalonia.Controls.Primitives
         public static readonly StyledProperty<Orientation> OrientationProperty =
             AvaloniaProperty.Register<ScrollBar, Orientation>(nameof(Orientation), Orientation.Vertical);
 
+        /// <summary>
+        /// Defines the <see cref="IsExpandedProperty"/> property.
+        /// </summary>
+        public static readonly DirectProperty<ScrollBar, bool> IsExpandedProperty =
+            AvaloniaProperty.RegisterDirect<ScrollBar, bool>(
+                nameof(IsExpanded),
+                o => o.IsExpanded);
+
+        /// <summary>
+        /// Defines the <see cref="AllowAutoHide"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> AllowAutoHideProperty =
+            AvaloniaProperty.Register<ScrollBar, bool>(nameof(AllowAutoHide), true);
+
         private Button _lineUpButton;
         private Button _lineDownButton;
         private Button _pageUpButton;
         private Button _pageDownButton;
+        private DispatcherTimer _timer;
+        private bool _isExpanded;
 
         /// <summary>
         /// Initializes static members of the <see cref="ScrollBar"/> class. 
         /// </summary>
         static ScrollBar()
         {
-            PseudoClass<ScrollBar, Orientation>(OrientationProperty, o => o == Orientation.Vertical, ":vertical");
-            PseudoClass<ScrollBar, Orientation>(OrientationProperty, o => o == Orientation.Horizontal, ":horizontal");
-
             Thumb.DragDeltaEvent.AddClassHandler<ScrollBar>((x, e) => x.OnThumbDragDelta(e), RoutingStrategies.Bubble);
             Thumb.DragCompletedEvent.AddClassHandler<ScrollBar>((x, e) => x.OnThumbDragComplete(e), RoutingStrategies.Bubble);
         }
@@ -67,13 +78,7 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public ScrollBar()
         {
-            var isVisible = Observable.Merge(
-                this.GetObservable(MinimumProperty).Select(_ => Unit.Default),
-                this.GetObservable(MaximumProperty).Select(_ => Unit.Default),
-                this.GetObservable(ViewportSizeProperty).Select(_ => Unit.Default),
-                this.GetObservable(VisibilityProperty).Select(_ => Unit.Default))
-                .Select(_ => CalculateIsVisible());
-            Bind(IsVisibleProperty, isVisible, BindingPriority.Style);
+            UpdatePseudoClasses(Orientation);
         }
 
         /// <summary>
@@ -104,29 +109,41 @@ namespace Avalonia.Controls.Primitives
             set { SetValue(OrientationProperty, value); }
         }
 
-        public event EventHandler<ScrollEventArgs> Scroll;
-
         /// <summary>
-        /// Calculates whether the scrollbar should be visible.
+        /// Gets a value that indicates whether the scrollbar is expanded.
         /// </summary>
-        /// <returns>The scrollbar's visibility.</returns>
-        private bool CalculateIsVisible()
+        public bool IsExpanded
         {
-            switch (Visibility)
-            {
-                case ScrollBarVisibility.Visible:
-                    return true;
+            get => _isExpanded;
+            private set => SetAndRaise(IsExpandedProperty, ref _isExpanded, value);
+        }
 
-                case ScrollBarVisibility.Disabled:
-                case ScrollBarVisibility.Hidden:
-                    return false;
+        /// <summary>
+        /// Gets a value that indicates whether the scrollbar can hide itself when user is not interacting with it.
+        /// </summary>
+        public bool AllowAutoHide
+        {
+            get => GetValue(AllowAutoHideProperty);
+            set => SetValue(AllowAutoHideProperty, value);
+        }
 
-                case ScrollBarVisibility.Auto:
-                    return double.IsNaN(ViewportSize) || Maximum > 0;
+        public event EventHandler<ScrollEventArgs> Scroll;
 
-                default:
-                    throw new InvalidOperationException("Invalid value for ScrollBar.Visibility.");
-            }
+        /// <summary>
+        /// Calculates and updates whether the scrollbar should be visible.
+        /// </summary>
+        private void UpdateIsVisible()
+        {
+            var isVisible = Visibility switch
+            {
+                ScrollBarVisibility.Visible => true,
+                ScrollBarVisibility.Disabled => false,
+                ScrollBarVisibility.Hidden => false,
+                ScrollBarVisibility.Auto => (double.IsNaN(ViewportSize) || Maximum > 0),
+                _ => throw new InvalidOperationException("Invalid value for ScrollBar.Visibility.")
+            };
+
+            SetValue(IsVisibleProperty, isVisible);
         }
 
         protected override void OnKeyDown(KeyEventArgs e)
@@ -143,10 +160,52 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
         {
-            base.OnTemplateApplied(e);
+            base.OnPropertyChanged(change);
+
+            if (change.Property == OrientationProperty)
+            {
+                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<Orientation>());
+            }
+            else if (change.Property == AllowAutoHideProperty)
+            {
+                UpdateIsExpandedState();
+            }
+            else
+            {
+                if (change.Property == MinimumProperty ||
+                    change.Property == MaximumProperty ||
+                    change.Property == ViewportSizeProperty ||
+                    change.Property == VisibilityProperty)
+                {
+                    UpdateIsVisible();
+                }
+            }
+        }
 
+        protected override void OnPointerEnter(PointerEventArgs e)
+        {
+            base.OnPointerEnter(e);
+
+            if (AllowAutoHide)
+            {
+                ExpandAfterDelay();
+            }
+        }
+
+        protected override void OnPointerLeave(PointerEventArgs e)
+        {
+            base.OnPointerLeave(e);
+
+            if (AllowAutoHide)
+            {
+                CollapseAfterDelay();
+            }
+        }
+
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
             if (_lineUpButton != null)
             {
                 _lineUpButton.Click -= LineUpClick;
@@ -172,8 +231,6 @@ namespace Avalonia.Controls.Primitives
             _pageUpButton = e.NameScope.Find<Button>("PART_PageUpButton");
             _pageDownButton = e.NameScope.Find<Button>("PART_PageDownButton");
 
-
-
             if (_lineUpButton != null)
             {
                 _lineUpButton.Click += LineUpClick;
@@ -195,6 +252,68 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
+        private void InvokeAfterDelay(Action handler, TimeSpan delay)
+        {
+            if (_timer != null)
+            {
+                _timer.Stop();
+            }
+            else
+            {
+                _timer = new DispatcherTimer(DispatcherPriority.Normal);
+                _timer.Tick += (sender, args) =>
+                {
+                    var senderTimer = (DispatcherTimer)sender;
+
+                    if (senderTimer.Tag is Action action)
+                    {
+                        action();
+                    }
+
+                    senderTimer.Stop();
+                };
+            }
+
+            _timer.Tag = handler;
+            _timer.Interval = delay;
+
+            _timer.Start();
+        }
+
+        private void UpdateIsExpandedState()
+        {
+            if (!AllowAutoHide)
+            {
+                _timer?.Stop();
+
+                IsExpanded = true;
+            }
+            else
+            {
+                IsExpanded = IsPointerOver;
+            }
+        }
+
+        private void CollapseAfterDelay()
+        {
+            InvokeAfterDelay(Collapse, TimeSpan.FromSeconds(2));
+        }
+
+        private void ExpandAfterDelay()
+        {
+            InvokeAfterDelay(Expand, TimeSpan.FromMilliseconds(400));
+        }
+
+        private void Collapse()
+        {
+            IsExpanded = false;
+        }
+
+        private void Expand()
+        {
+            IsExpanded = true;
+        }
+
         private void LineUpClick(object sender, RoutedEventArgs e)
         {
             SmallDecrement();
@@ -252,5 +371,11 @@ namespace Avalonia.Controls.Primitives
         {
             Scroll?.Invoke(this, new ScrollEventArgs(scrollEventType, Value));
         }
+
+        private void UpdatePseudoClasses(Orientation o)
+        {
+            PseudoClasses.Set(":vertical", o == Orientation.Vertical);
+            PseudoClasses.Set(":horizontal", o == Orientation.Horizontal);
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/ScrollBarVisibility.cs b/src/Avalonia.Controls/Primitives/ScrollBarVisibility.cs
index f1cca8f909..90727a3505 100644
--- a/src/Avalonia.Controls/Primitives/ScrollBarVisibility.cs
+++ b/src/Avalonia.Controls/Primitives/ScrollBarVisibility.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Controls.Primitives
 {
     public enum ScrollBarVisibility
diff --git a/src/Avalonia.Controls/Primitives/ScrollEventType.cs b/src/Avalonia.Controls/Primitives/ScrollEventType.cs
index ea639d82e0..4b5c24e6ee 100644
--- a/src/Avalonia.Controls/Primitives/ScrollEventType.cs
+++ b/src/Avalonia.Controls/Primitives/ScrollEventType.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Controls.Primitives
+namespace Avalonia.Controls.Primitives
 {
     /// <summary>    
     /// Specifies the type of Avalonia.Controls.Primitives.ScrollBar.Scroll event
diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
index 329b086a7c..280f46be9f 100644
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@@ -1,21 +1,19 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Linq;
-using Avalonia.Collections;
 using Avalonia.Controls.Generators;
+using Avalonia.Controls.Selection;
 using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
-using Avalonia.Logging;
-using Avalonia.Styling;
 using Avalonia.VisualTree;
 
+#nullable enable
+
 namespace Avalonia.Controls.Primitives
 {
     /// <summary>
@@ -26,8 +24,8 @@ namespace Avalonia.Controls.Primitives
     /// <see cref="SelectingItemsControl"/> provides a base class for <see cref="ItemsControl"/>s
     /// that maintain a selection (single or multiple). By default only its 
     /// <see cref="SelectedIndex"/> and <see cref="SelectedItem"/> properties are visible; the
-    /// current multiple selection <see cref="SelectedItems"/> together with the 
-    /// <see cref="SelectionMode"/> properties are protected, however a derived  class can expose 
+    /// current multiple <see cref="Selection"/> and <see cref="SelectedItems"/> together with the
+    /// <see cref="SelectionMode"/> properties are protected, however a derived class can expose
     /// these if it wishes to support multiple selection.
     /// </para>
     /// <para>
@@ -61,8 +59,8 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Defines the <see cref="SelectedItem"/> property.
         /// </summary>
-        public static readonly DirectProperty<SelectingItemsControl, object> SelectedItemProperty =
-            AvaloniaProperty.RegisterDirect<SelectingItemsControl, object>(
+        public static readonly DirectProperty<SelectingItemsControl, object?> SelectedItemProperty =
+            AvaloniaProperty.RegisterDirect<SelectingItemsControl, object?>(
                 nameof(SelectedItem),
                 o => o.SelectedItem,
                 (o, v) => o.SelectedItem = v,
@@ -71,12 +69,21 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Defines the <see cref="SelectedItems"/> property.
         /// </summary>
-        protected static readonly DirectProperty<SelectingItemsControl, IList> SelectedItemsProperty =
-            AvaloniaProperty.RegisterDirect<SelectingItemsControl, IList>(
+        protected static readonly DirectProperty<SelectingItemsControl, IList?> SelectedItemsProperty =
+            AvaloniaProperty.RegisterDirect<SelectingItemsControl, IList?>(
                 nameof(SelectedItems),
                 o => o.SelectedItems,
                 (o, v) => o.SelectedItems = v);
 
+        /// <summary>
+        /// Defines the <see cref="Selection"/> property.
+        /// </summary>
+        protected static readonly DirectProperty<SelectingItemsControl, ISelectionModel> SelectionProperty =
+            AvaloniaProperty.RegisterDirect<SelectingItemsControl, ISelectionModel>(
+                nameof(Selection),
+                o => o.Selection,
+                (o, v) => o.Selection = v);
+
         /// <summary>
         /// Defines the <see cref="SelectionMode"/> property.
         /// </summary>
@@ -103,16 +110,13 @@ namespace Avalonia.Controls.Primitives
                 RoutingStrategies.Bubble);
 
         private static readonly IList Empty = Array.Empty<object>();
-
-        private readonly Selection _selection = new Selection();
-        private int _selectedIndex = -1;
-        private object _selectedItem;
-        private IList _selectedItems;
+        private ISelectionModel? _selection;
+        private int _oldSelectedIndex;
+        private object? _oldSelectedItem;
+        private IList? _oldSelectedItems;
         private bool _ignoreContainerSelectionChanged;
-        private bool _syncingSelectedItems;
-        private int _updateCount;
-        private int _updateSelectedIndex;
-        private object _updateSelectedItem;
+        private UpdateState? _updateState;
+        private bool _hasScrolledToSelectedItem;
 
         /// <summary>
         /// Initializes static members of the <see cref="SelectingItemsControl"/> class.
@@ -147,20 +151,23 @@ namespace Avalonia.Controls.Primitives
         {
             get
             {
-                return _selectedIndex;
+                // When a Begin/EndInit/DataContext update is in place we return the value to be
+                // updated here, even though it's not yet active and the property changed notification
+                // has not yet been raised. If we don't do this then the old value will be written back
+                // to the source when two-way bound, and the update value will be lost.
+                return _updateState?.SelectedIndex.HasValue == true ?
+                    _updateState.SelectedIndex.Value :
+                    Selection.SelectedIndex;
             }
-
             set
             {
-                if (_updateCount == 0)
+                if (_updateState is object)
                 {
-                    var effective = (value >= 0 && value < ItemCount) ? value : -1;
-                    UpdateSelectedItem(effective);
+                    _updateState.SelectedIndex = value;
                 }
                 else
                 {
-                    _updateSelectedIndex = value;
-                    _updateSelectedItem = null;
+                    Selection.SelectedIndex = value;
                 }
             }
         }
@@ -168,54 +175,133 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Gets or sets the selected item.
         /// </summary>
-        public object SelectedItem
+        public object? SelectedItem
         {
             get
             {
-                return _selectedItem;
+                // See SelectedIndex setter for more information.
+                return _updateState?.SelectedItem.HasValue == true ?
+                    _updateState.SelectedItem.Value :
+                    Selection.SelectedItem;
             }
-
             set
             {
-                if (_updateCount == 0)
+                if (_updateState is object)
                 {
-                    UpdateSelectedItem(IndexOf(Items, value));
+                    _updateState.SelectedItem = value;
                 }
                 else
                 {
-                    _updateSelectedItem = value;
-                    _updateSelectedIndex = int.MinValue;
+                    Selection.SelectedItem = value;
                 }
             }
         }
 
         /// <summary>
-        /// Gets the selected items.
+        /// Gets or sets the selected items.
         /// </summary>
-        protected IList SelectedItems
+        /// <remarks>
+        /// By default returns a collection that can be modified in order to manipulate the control
+        /// selection, however this property will return null if <see cref="Selection"/> is
+        /// re-assigned; you should only use _either_ Selection or SelectedItems.
+        /// </remarks>
+        protected IList? SelectedItems
         {
             get
             {
-                if (_selectedItems == null)
+                // See SelectedIndex setter for more information.
+                if (_updateState?.SelectedItems.HasValue == true)
+                {
+                    return _updateState.SelectedItems.Value;
+                }
+                else if (Selection is InternalSelectionModel ism)
                 {
-                    _selectedItems = new AvaloniaList<object>();
-                    SubscribeToSelectedItems();
+                    var result = ism.WritableSelectedItems;
+                    _oldSelectedItems = result;
+                    return result;
                 }
 
-                return _selectedItems;
+                return null;
             }
+            set
+            {
+                if (_updateState is object)
+                {
+                    _updateState.SelectedItems = new Optional<IList?>(value);
+                }
+                else if (Selection is InternalSelectionModel i)
+                {
+                    i.WritableSelectedItems = value;
+                }
+                else
+                {
+                    throw new InvalidOperationException("Cannot set both Selection and SelectedItems.");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the model that holds the current selection.
+        /// </summary>
+        protected ISelectionModel Selection
+        {
+            get
+            {
+                if (_updateState?.Selection.HasValue == true)
+                {
+                    return _updateState.Selection.Value;
+                }
+                else
+                {
+                    if (_selection is null)
+                    {
+                        _selection = CreateDefaultSelectionModel();
+                        InitializeSelectionModel(_selection);
+                    }
 
+                    return _selection;
+                }
+            }
             set
             {
-                if (value?.IsFixedSize == true || value?.IsReadOnly == true)
+                value ??= CreateDefaultSelectionModel();
+
+                if (_updateState is object)
                 {
-                    throw new NotSupportedException(
-                        "Cannot use a fixed size or read-only collection as SelectedItems.");
+                    _updateState.Selection = new Optional<ISelectionModel>(value);
                 }
+                else if (_selection != value)
+                {
+                    if (value.Source != null && value.Source != Items)
+                    {
+                        throw new ArgumentException(
+                            "The supplied ISelectionModel already has an assigned Source but this " +
+                            "collection is different to the Items on the control.");
+                    }
+
+                    var oldSelection = _selection?.SelectedItems.ToList();
+                    DeinitializeSelectionModel(_selection);
+                    _selection = value;
 
-                UnsubscribeFromSelectedItems();
-                _selectedItems = value ?? new AvaloniaList<object>();
-                SubscribeToSelectedItems();
+                    if (oldSelection?.Count > 0)
+                    {
+                        RaiseEvent(new SelectionChangedEventArgs(
+                            SelectionChangedEvent,
+                            oldSelection,
+                            Array.Empty<object>()));
+                    }
+
+                    InitializeSelectionModel(_selection);
+
+                    if (_oldSelectedItems != SelectedItems)
+                    {
+                        RaisePropertyChanged(
+                            SelectedItemsProperty,
+                            new Optional<IList?>(_oldSelectedItems),
+                            new BindingValue<IList?>(SelectedItems));
+                        _oldSelectedItems = SelectedItems;
+                    }
+                }
             }
         }
 
@@ -241,118 +327,76 @@ namespace Avalonia.Controls.Primitives
         public override void BeginInit()
         {
             base.BeginInit();
-            ++_updateCount;
-            _updateSelectedIndex = int.MinValue;
+            BeginUpdating();
         }
 
         /// <inheritdoc/>
         public override void EndInit()
         {
-            if (--_updateCount == 0)
-            {
-                UpdateFinished();
-            }
-
             base.EndInit();
+            EndUpdating();
         }
 
+        /// <summary>
+        /// Scrolls the specified item into view.
+        /// </summary>
+        /// <param name="index">The index of the item.</param>
+        public void ScrollIntoView(int index) => Presenter?.ScrollIntoView(index);
+
         /// <summary>
         /// Scrolls the specified item into view.
         /// </summary>
         /// <param name="item">The item.</param>
-        public void ScrollIntoView(object item) => Presenter?.ScrollIntoView(item);
+        public void ScrollIntoView(object item) => ScrollIntoView(IndexOf(Items, item));
 
         /// <summary>
         /// Tries to get the container that was the source of an event.
         /// </summary>
         /// <param name="eventSource">The control that raised the event.</param>
         /// <returns>The container or null if the event did not originate in a container.</returns>
-        protected IControl GetContainerFromEventSource(IInteractive eventSource)
-        {
-            var item = ((IVisual)eventSource).GetSelfAndVisualAncestors()
-                .OfType<IControl>()
-                .FirstOrDefault(x => x.LogicalParent == this && ItemContainerGenerator?.IndexFromContainer(x) != -1);
-
-            return item;
-        }
-
-        /// <inheritdoc/>
-        protected override void ItemsChanged(AvaloniaPropertyChangedEventArgs e)
+        protected IControl? GetContainerFromEventSource(IInteractive? eventSource)
         {
-            base.ItemsChanged(e);
-
-            if (_updateCount == 0)
+            for (var current = eventSource as IVisual; current != null; current = current.VisualParent)
             {
-                var newIndex = -1;
-
-                if (SelectedIndex != -1)
-                {
-                    newIndex = IndexOf((IEnumerable)e.NewValue, SelectedItem);
-                }
-
-                if (AlwaysSelected && Items != null && Items.Cast<object>().Any())
+                if (current is IControl control && control.LogicalParent == this &&
+                    ItemContainerGenerator?.IndexFromContainer(control) != -1)
                 {
-                    newIndex = 0;
+                    return control;
                 }
-
-                SelectedIndex = newIndex;
             }
+
+            return null;
         }
 
-        /// <inheritdoc/>
         protected override void ItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            if (_updateCount > 0)
-            {
-                base.ItemsCollectionChanged(sender, e);
-                return;
-            }
-
-            switch (e.Action)
-            {
-                case NotifyCollectionChangedAction.Add:
-                    _selection.ItemsInserted(e.NewStartingIndex, e.NewItems.Count);
-                    break;
-                case NotifyCollectionChangedAction.Remove:
-                    _selection.ItemsRemoved(e.OldStartingIndex, e.OldItems.Count);
-                    break;
-            }
-
             base.ItemsCollectionChanged(sender, e);
 
-            switch (e.Action)
+            if (AlwaysSelected && SelectedIndex == -1 && ItemCount > 0)
             {
-                case NotifyCollectionChangedAction.Add:
-                    if (AlwaysSelected && SelectedIndex == -1)
-                    {
-                        SelectedIndex = 0;
-                    }
-                    else
-                    {
-                        UpdateSelectedItem(_selection.First(), false);
-                    }
-
-                    break;
+                SelectedIndex = 0;
+            }
+        }
 
-                case NotifyCollectionChangedAction.Remove:
-                    UpdateSelectedItem(_selection.First(), false);
-                    ResetSelectedItems();
-                    break;
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+            AutoScrollToSelectedItemIfNecessary();
+        }
 
-                case NotifyCollectionChangedAction.Replace:
-                    UpdateSelectedItem(SelectedIndex, false);
-                    ResetSelectedItems();
-                    break;
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            base.OnApplyTemplate(e);
 
-                case NotifyCollectionChangedAction.Move:
-                case NotifyCollectionChangedAction.Reset:
-                    SelectedIndex = IndexOf(Items, SelectedItem);
+            void ExecuteScrollWhenLayoutUpdated(object sender, EventArgs e)
+            {
+                LayoutUpdated -= ExecuteScrollWhenLayoutUpdated;
+                AutoScrollToSelectedItemIfNecessary();
+            }
 
-                    if (AlwaysSelected && SelectedIndex == -1 && ItemCount > 0)
-                    {
-                        SelectedIndex = 0;
-                    }
-                    break;
+            if (AutoScrollToSelectedItem)
+            {
+                LayoutUpdated += ExecuteScrollWhenLayoutUpdated;
             }
         }
 
@@ -361,36 +405,19 @@ namespace Avalonia.Controls.Primitives
         {
             base.OnContainersMaterialized(e);
 
-            var resetSelectedItems = false;
-
             foreach (var container in e.Containers)
             {
                 if ((container.ContainerControl as ISelectable)?.IsSelected == true)
                 {
-                    if (SelectionMode.HasFlag(SelectionMode.Multiple))
-                    {
-                        if (_selection.Add(container.Index))
-                        {
-                            resetSelectedItems = true;
-                        }
-                    }
-                    else
-                    {
-                        SelectedIndex = container.Index;
-                    }
-
+                    Selection.Select(container.Index);
                     MarkContainerSelected(container.ContainerControl, true);
                 }
-                else if (_selection.Contains(container.Index))
+                else
                 {
-                    MarkContainerSelected(container.ContainerControl, true);
+                    var selected = Selection.IsSelected(container.Index);
+                    MarkContainerSelected(container.ContainerControl, selected);
                 }
             }
-
-            if (resetSelectedItems)
-            {
-                ResetSelectedItems();
-            }
         }
 
         /// <inheritdoc/>
@@ -419,7 +446,7 @@ namespace Avalonia.Controls.Primitives
             {
                 if (i.ContainerControl != null && i.Item != null)
                 {
-                    bool selected = _selection.Contains(i.Index);
+                    bool selected = Selection.IsSelected(i.Index);
                     MarkContainerSelected(i.ContainerControl, selected);
                 }
             }
@@ -429,17 +456,23 @@ namespace Avalonia.Controls.Primitives
         protected override void OnDataContextBeginUpdate()
         {
             base.OnDataContextBeginUpdate();
-            ++_updateCount;
+            BeginUpdating();
         }
 
         /// <inheritdoc/>
         protected override void OnDataContextEndUpdate()
         {
             base.OnDataContextEndUpdate();
+            EndUpdating();
+        }
 
-            if (--_updateCount == 0)
+        protected override void OnInitialized()
+        {
+            base.OnInitialized();
+
+            if (_selection is object)
             {
-                UpdateFinished();
+                _selection.Source = Items;
             }
         }
 
@@ -454,15 +487,39 @@ namespace Avalonia.Controls.Primitives
 
                 if (ItemCount > 0 &&
                     Match(keymap.SelectAll) &&
-                    (((SelectionMode & SelectionMode.Multiple) != 0) ||
-                      (SelectionMode & SelectionMode.Toggle) != 0))
+                    SelectionMode.HasFlag(SelectionMode.Multiple))
                 {
-                    SelectAll();
+                    Selection.SelectAll();
                     e.Handled = true;
                 }
             }
         }
 
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == AutoScrollToSelectedItemProperty)
+            {
+                AutoScrollToSelectedItemIfNecessary();
+            }
+            if (change.Property == ItemsProperty && _updateState is null && _selection is object)
+            {
+                var newValue = change.NewValue.GetValueOrDefault<IEnumerable>();
+                _selection.Source = newValue;
+
+                if (newValue is null)
+                {
+                    _selection.Clear();
+                }
+            }
+            else if (change.Property == SelectionModeProperty && _selection is object)
+            {
+                var newValue = change.NewValue.GetValueOrDefault<SelectionMode>();
+                _selection.SingleSelect = !newValue.HasFlagCustom(SelectionMode.Multiple);
+            }
+        }
+
         /// <summary>
         /// Moves the selection in the specified direction relative to the current selection.
         /// </summary>
@@ -482,7 +539,7 @@ namespace Avalonia.Controls.Primitives
         /// <param name="direction">The direction to move.</param>
         /// <param name="wrap">Whether to wrap when the selection reaches the first or last item.</param>
         /// <returns>True if the selection was moved; otherwise false.</returns>
-        protected bool MoveSelection(IControl from, NavigationDirection direction, bool wrap)
+        protected bool MoveSelection(IControl? from, NavigationDirection direction, bool wrap)
         {
             if (Presenter?.Panel is INavigableContainer container &&
                 GetNextControl(container, direction, from, wrap) is IControl next)
@@ -499,36 +556,6 @@ namespace Avalonia.Controls.Primitives
             return false;
         }
 
-        /// <summary>
-        /// Selects all items in the control.
-        /// </summary>
-        protected void SelectAll()
-        {
-            UpdateSelectedItems(() =>
-            {
-                _selection.Clear();
-
-                for (var i = 0; i < ItemCount; ++i)
-                {
-                    _selection.Add(i);
-                }
-
-                UpdateSelectedItem(0, false);
-
-                foreach (var container in ItemContainerGenerator.Containers)
-                {
-                    MarkItemSelected(container.Index, true);
-                }
-
-                ResetSelectedItems();
-            });
-        }
-
-        /// <summary>
-        /// Deselects all items in the control.
-        /// </summary>
-        protected void UnselectAll() => UpdateSelectedItem(-1);
-
         /// <summary>
         /// Updates the selection for an item based on user interaction.
         /// </summary>
@@ -544,97 +571,62 @@ namespace Avalonia.Controls.Primitives
             bool toggleModifier = false,
             bool rightButton = false)
         {
-            if (index != -1)
+            if (index < 0 || index >= ItemCount)
             {
-                if (select)
-                {
-                    var mode = SelectionMode;
-                    var multi = (mode & SelectionMode.Multiple) != 0;
-                    var toggle = (toggleModifier || (mode & SelectionMode.Toggle) != 0);
-                    var range = multi && rangeModifier;
-
-                    if (rightButton)
-                    {
-                        if (!_selection.Contains(index))
-                        {
-                            UpdateSelectedItem(index);
-                        }
-                    }
-                    else if (range)
-                    {
-                        UpdateSelectedItems(() =>
-                        {
-                            var start = SelectedIndex != -1 ? SelectedIndex : 0;
-                            var step = start < index ? 1 : -1;
-
-                            _selection.Clear();
-
-                            for (var i = start; i != index; i += step)
-                            {
-                                _selection.Add(i);
-                            }
-
-                            _selection.Add(index);
-
-                            var first = Math.Min(start, index);
-                            var last = Math.Max(start, index);
-
-                            foreach (var container in ItemContainerGenerator.Containers)
-                            {
-                                MarkItemSelected(
-                                    container.Index,
-                                    container.Index >= first && container.Index <= last);
-                            }
+                return;
+            }
 
-                            ResetSelectedItems();
-                        });
-                    }
-                    else if (multi && toggle)
-                    {
-                        UpdateSelectedItems(() =>
-                        {
-                            if (!_selection.Contains(index))
-                            {
-                                _selection.Add(index);
-                                MarkItemSelected(index, true);
-                                SelectedItems.Add(ElementAt(Items, index));
-                            }
-                            else
-                            {
-                                _selection.Remove(index);
-                                MarkItemSelected(index, false);
-
-                                if (index == _selectedIndex)
-                                {
-                                    UpdateSelectedItem(_selection.First(), false);
-                                }
-
-                                SelectedItems.Remove(ElementAt(Items, index));
-                            }
-                        });
-                    }
-                    else if (toggle)
-                    {
-                        SelectedIndex = (SelectedIndex == index) ? -1 : index;
-                    }
-                    else
-                    {
-                        UpdateSelectedItem(index);
-                    }
+            var mode = SelectionMode;
+            var multi = (mode & SelectionMode.Multiple) != 0;
+            var toggle = (toggleModifier || (mode & SelectionMode.Toggle) != 0);
+            var range = multi && rangeModifier;
 
-                    if (Presenter?.Panel != null)
-                    {
-                        var container = ItemContainerGenerator.ContainerFromIndex(index);
-                        KeyboardNavigation.SetTabOnceActiveElement(
-                            (InputElement)Presenter.Panel,
-                            container);
-                    }
+            if (!select)
+            {
+                Selection.Deselect(index);
+            }
+            else if (rightButton)
+            {
+                if (Selection.IsSelected(index) == false)
+                {
+                    SelectedIndex = index;
+                }
+            }
+            else if (range)
+            {
+                using var operation = Selection.BatchUpdate();
+                Selection.Clear();
+                Selection.SelectRange(Selection.AnchorIndex, index);
+            }
+            else if (multi && toggle)
+            {
+                if (Selection.IsSelected(index) == true)
+                {
+                    Selection.Deselect(index);
                 }
                 else
                 {
-                    LostSelection();
+                    Selection.Select(index);
                 }
             }
+            else if (toggle)
+            {
+                SelectedIndex = (SelectedIndex == index) ? -1 : index;
+            }
+            else
+            {
+                using var operation = Selection.BatchUpdate();
+                Selection.Clear();
+                Selection.Select(index);
+            }
+
+            if (Presenter?.Panel != null)
+            {
+                var container = ItemContainerGenerator.ContainerFromIndex(index);
+                KeyboardNavigation.SetTabOnceActiveElement(
+                    (InputElement)Presenter.Panel,
+                    container);
+            }
         }
 
         /// <summary>
@@ -674,7 +666,7 @@ namespace Avalonia.Controls.Primitives
         /// false.
         /// </returns>
         protected bool UpdateSelectionFromEventSource(
-            IInteractive eventSource,
+            IInteractive? eventSource,
             bool select = true,
             bool rangeModifier = false,
             bool toggleModifier = false,
@@ -692,68 +684,125 @@ namespace Avalonia.Controls.Primitives
         }
 
         /// <summary>
-        /// Gets a range of items from an IEnumerable.
+        /// Called when <see cref="INotifyPropertyChanged.PropertyChanged"/> is raised on
+        /// <see cref="Selection"/>.
         /// </summary>
-        /// <param name="items">The items.</param>
-        /// <param name="first">The index of the first item.</param>
-        /// <param name="last">The index of the last item.</param>
-        /// <returns>The items.</returns>
-        private static List<object> GetRange(IEnumerable items, int first, int last)
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The event args.</param>
+        private void OnSelectionModelPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            var list = (items as IList) ?? items.Cast<object>().ToList();
-            var step = first > last ? -1 : 1;
-            var result = new List<object>();
-
-            for (int i = first; i != last; i += step)
+            if (e.PropertyName == nameof(ISelectionModel.AnchorIndex))
             {
-                result.Add(list[i]);
+                _hasScrolledToSelectedItem = false;
+                AutoScrollToSelectedItemIfNecessary();
+            }
+            else if (e.PropertyName == nameof(ISelectionModel.SelectedIndex) && _oldSelectedIndex != SelectedIndex)
+            {
+                RaisePropertyChanged(SelectedIndexProperty, _oldSelectedIndex, SelectedIndex);
+                _oldSelectedIndex = SelectedIndex;
+            }
+            else if (e.PropertyName == nameof(ISelectionModel.SelectedItem) && _oldSelectedItem != SelectedItem)
+            {
+                RaisePropertyChanged(SelectedItemProperty, _oldSelectedItem, SelectedItem);
+                _oldSelectedItem = SelectedItem;
+            }
+            else if (e.PropertyName == nameof(InternalSelectionModel.WritableSelectedItems) &&
+                _oldSelectedItems != (Selection as InternalSelectionModel)?.SelectedItems)
+            {
+                RaisePropertyChanged(
+                    SelectedItemsProperty,
+                    new Optional<IList?>(_oldSelectedItems),
+                    new BindingValue<IList?>(SelectedItems));
+                _oldSelectedItems = SelectedItems;
             }
-
-            result.Add(list[last]);
-            return result;
         }
 
         /// <summary>
-        /// Called when a container raises the <see cref="IsSelectedChangedEvent"/>.
+        /// Called when <see cref="ISelectionModel.SelectionChanged"/> event is raised on
+        /// <see cref="Selection"/>.
         /// </summary>
-        /// <param name="e">The event.</param>
-        private void ContainerSelectionChanged(RoutedEventArgs e)
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The event args.</param>
+        private void OnSelectionModelSelectionChanged(object sender, SelectionModelSelectionChangedEventArgs e)
         {
-            if (!_ignoreContainerSelectionChanged)
+            void Mark(int index, bool selected)
             {
-                var control = e.Source as IControl;
-                var selectable = e.Source as ISelectable;
+                var container = ItemContainerGenerator.ContainerFromIndex(index);
 
-                if (control != null &&
-                    selectable != null &&
-                    control.LogicalParent == this &&
-                    ItemContainerGenerator?.IndexFromContainer(control) != -1)
+                if (container != null)
                 {
-                    UpdateSelection(control, selectable.IsSelected);
+                    MarkContainerSelected(container, selected);
                 }
             }
 
-            if (e.Source != this)
+            foreach (var i in e.SelectedIndexes)
             {
-                e.Handled = true;
+                Mark(i, true);
+            }
+
+            foreach (var i in e.DeselectedIndexes)
+            {
+                Mark(i, false);
+            }
+
+            var route = BuildEventRoute(SelectionChangedEvent);
+
+            if (route.HasHandlers)
+            {
+                var ev = new SelectionChangedEventArgs(
+                    SelectionChangedEvent,
+                    e.DeselectedItems.ToList(),
+                    e.SelectedItems.ToList());
+                RaiseEvent(ev);
             }
         }
 
         /// <summary>
-        /// Called when the currently selected item is lost and the selection must be changed
-        /// depending on the <see cref="SelectionMode"/> property.
+        /// Called when <see cref="ISelectionModel.LostSelection"/> event is raised on
+        /// <see cref="Selection"/>.
         /// </summary>
-        private void LostSelection()
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The event args.</param>
+        private void OnSelectionModelLostSelection(object sender, EventArgs e)
+        {
+            if (AlwaysSelected && Items is object)
+            {
+                SelectedIndex = 0;
+            }
+        }
+
+        private void AutoScrollToSelectedItemIfNecessary()
         {
-            var items = Items?.Cast<object>();
-            var index = -1;
+            if (AutoScrollToSelectedItem &&
+                !_hasScrolledToSelectedItem &&
+                Presenter is object &&
+                Selection.AnchorIndex >= 0 &&
+                ((IVisual)this).IsAttachedToVisualTree)
+            {
+                ScrollIntoView(Selection.AnchorIndex);
+                _hasScrolledToSelectedItem = true;
+            }
+        }
 
-            if (items != null && AlwaysSelected)
+        /// <summary>
+        /// Called when a container raises the <see cref="IsSelectedChangedEvent"/>.
+        /// </summary>
+        /// <param name="e">The event.</param>
+        private void ContainerSelectionChanged(RoutedEventArgs e)
+        {
+            if (!_ignoreContainerSelectionChanged &&
+                e.Source is IControl control &&
+                e.Source is ISelectable selectable &&
+                control.LogicalParent == this &&
+                ItemContainerGenerator?.IndexFromContainer(control) != -1)
             {
-                index = Math.Min(SelectedIndex, items.Count() - 1);
+                UpdateSelection(control, selectable.IsSelected);
             }
 
-            SelectedIndex = index;
+            if (e.Source != this)
+            {
+                e.Handled = true;
+            }
         }
 
         /// <summary>
@@ -766,12 +815,11 @@ namespace Avalonia.Controls.Primitives
         {
             try
             {
-                var selectable = container as ISelectable;
                 bool result;
 
                 _ignoreContainerSelectionChanged = true;
 
-                if (selectable != null)
+                if (container is ISelectable selectable)
                 {
                     result = selectable.IsSelected;
                     selectable.IsSelected = selected;
@@ -790,423 +838,164 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        /// <summary>
-        /// Sets an item container's 'selected' class or <see cref="ISelectable.IsSelected"/>.
-        /// </summary>
-        /// <param name="index">The index of the item.</param>
-        /// <param name="selected">Whether the item should be selected or deselected.</param>
-        private void MarkItemSelected(int index, bool selected)
+        private void UpdateContainerSelection()
         {
-            var container = ItemContainerGenerator?.ContainerFromIndex(index);
-
-            if (container != null)
+            if (Presenter?.Panel is IPanel panel)
             {
-                MarkContainerSelected(container, selected);
+                foreach (var container in panel.Children)
+                {
+                    MarkContainerSelected(
+                        container,
+                        Selection.IsSelected(ItemContainerGenerator.IndexFromContainer(container)));
+                }
             }
         }
 
-        /// <summary>
-        /// Sets an item container's 'selected' class or <see cref="ISelectable.IsSelected"/>.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <param name="selected">Whether the item should be selected or deselected.</param>
-        private int MarkItemSelected(object item, bool selected)
+        private ISelectionModel CreateDefaultSelectionModel()
         {
-            var index = IndexOf(Items, item);
-
-            if (index != -1)
+            return new InternalSelectionModel
             {
-                MarkItemSelected(index, selected);
-            }
-
-            return index;
+                SingleSelect = !SelectionMode.HasFlagCustom(SelectionMode.Multiple),
+            };
         }
 
-        private void ResetSelectedItems()
+        private void InitializeSelectionModel(ISelectionModel model)
         {
-            UpdateSelectedItems(() =>
+            if (_updateState is null)
             {
-                SelectedItems.Clear();
-
-                foreach (var i in _selection)
-                {
-                    SelectedItems.Add(ElementAt(Items, i));
-                }
-            });
-        }
-
-        /// <summary>
-        /// Called when the <see cref="SelectedItems"/> CollectionChanged event is raised.
-        /// </summary>
-        /// <param name="sender">The event sender.</param>
-        /// <param name="e">The event args.</param>
-        private void SelectedItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            if (_syncingSelectedItems)
-            {
-                return;
+                model.Source = Items;
             }
 
-            void Add(IList newItems, IList addedItems = null)
-            {
-                foreach (var item in newItems)
-                {
-                    var index = MarkItemSelected(item, true);
+            model.PropertyChanged += OnSelectionModelPropertyChanged;
+            model.SelectionChanged += OnSelectionModelSelectionChanged;
+            model.LostSelection += OnSelectionModelLostSelection;
 
-                    if (index != -1 && _selection.Add(index) && addedItems != null)
-                    {
-                        addedItems.Add(item);
-                    }
-                }
+            if (model.SingleSelect)
+            {
+                SelectionMode &= ~SelectionMode.Multiple;
             }
-
-            void UpdateSelection()
+            else
             {
-                if ((SelectedIndex != -1 && !_selection.Contains(SelectedIndex)) ||
-                    (SelectedIndex == -1 && _selection.HasItems))
-                {
-                    _selectedIndex = _selection.First();
-                    _selectedItem = ElementAt(Items, _selectedIndex);
-                    RaisePropertyChanged(SelectedIndexProperty, -1, _selectedIndex, BindingPriority.LocalValue);
-                    RaisePropertyChanged(SelectedItemProperty, null, _selectedItem, BindingPriority.LocalValue);
-                }
+                SelectionMode |= SelectionMode.Multiple;
             }
 
-            IList added = null;
-            IList removed = null;
+            _oldSelectedIndex = model.SelectedIndex;
+            _oldSelectedItem = model.SelectedItem;
 
-            switch (e.Action)
+            if (AlwaysSelected && model.Count == 0)
             {
-                case NotifyCollectionChangedAction.Add:
-                    {
-                        Add(e.NewItems);
-                        UpdateSelection();
-                        added = e.NewItems;
-                    }
-
-                    break;
-
-                case NotifyCollectionChangedAction.Remove:
-                    if (SelectedItems.Count == 0)
-                    {
-                        SelectedIndex = -1;
-                    }
-
-                    foreach (var item in e.OldItems)
-                    {
-                        var index = MarkItemSelected(item, false);
-                        _selection.Remove(index);
-                    }
-
-                    removed = e.OldItems;
-                    break;
-
-                case NotifyCollectionChangedAction.Replace:
-                    throw new NotSupportedException("Replacing items in a SelectedItems collection is not supported.");
-
-                case NotifyCollectionChangedAction.Move:
-                    throw new NotSupportedException("Moving items in a SelectedItems collection is not supported.");
-
-                case NotifyCollectionChangedAction.Reset:
-                    {
-                        removed = new List<object>();
-                        added = new List<object>();
-
-                        foreach (var index in _selection.ToList())
-                        {
-                            var item = ElementAt(Items, index);
-
-                            if (!SelectedItems.Contains(item))
-                            {
-                                MarkItemSelected(index, false);
-                                removed.Add(item);
-                                _selection.Remove(index);
-                            }
-                        }
-
-                        Add(SelectedItems, added);
-                        UpdateSelection();
-                    }
-
-                    break;
+                model.SelectedIndex = 0;
             }
 
-            if (added?.Count > 0 || removed?.Count > 0)
+            UpdateContainerSelection();
+
+            if (SelectedIndex != -1)
             {
-                var changed = new SelectionChangedEventArgs(
+                RaiseEvent(new SelectionChangedEventArgs(
                     SelectionChangedEvent,
-                    added ?? Empty,
-                    removed ?? Empty);
-                RaiseEvent(changed);
+                    Array.Empty<object>(),
+                    Selection.SelectedItems.ToList()));
             }
         }
 
-        /// <summary>
-        /// Subscribes to the <see cref="SelectedItems"/> CollectionChanged event, if any.
-        /// </summary>
-        private void SubscribeToSelectedItems()
+        private void DeinitializeSelectionModel(ISelectionModel? model)
         {
-            var incc = _selectedItems as INotifyCollectionChanged;
-
-            if (incc != null)
+            if (model is object)
             {
-                incc.CollectionChanged += SelectedItemsCollectionChanged;
+                model.PropertyChanged -= OnSelectionModelPropertyChanged;
+                model.SelectionChanged -= OnSelectionModelSelectionChanged;
             }
-
-            SelectedItemsCollectionChanged(
-                _selectedItems,
-                new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
         }
 
-        /// <summary>
-        /// Unsubscribes from the <see cref="SelectedItems"/> CollectionChanged event, if any.
-        /// </summary>
-        private void UnsubscribeFromSelectedItems()
+        private void BeginUpdating()
         {
-            var incc = _selectedItems as INotifyCollectionChanged;
-
-            if (incc != null)
-            {
-                incc.CollectionChanged -= SelectedItemsCollectionChanged;
-            }
+            _updateState ??= new UpdateState();
+            _updateState.UpdateCount++;
         }
 
-        /// <summary>
-        /// Updates the selection due to a change to <see cref="SelectedIndex"/> or
-        /// <see cref="SelectedItem"/>.
-        /// </summary>
-        /// <param name="index">The new selected index.</param>
-        /// <param name="clear">Whether to clear existing selection.</param>
-        private void UpdateSelectedItem(int index, bool clear = true)
+        private void EndUpdating()
         {
-            var oldIndex = _selectedIndex;
-            var oldItem = _selectedItem;
-
-            if (index == -1 && AlwaysSelected)
+            if (_updateState is object && --_updateState.UpdateCount == 0)
             {
-                index = Math.Min(SelectedIndex, ItemCount - 1);
-            }
-
-            var item = ElementAt(Items, index);
-            var itemChanged = !Equals(item, oldItem);
-            var added = -1;
-            HashSet<int> removed = null;
-
-            _selectedIndex = index;
-            _selectedItem = item;
+                var state = _updateState;
+                _updateState = null;
 
-            if (oldIndex != index || itemChanged || _selection.HasMultiple)
-            {
-                if (clear)
+                if (state.Selection.HasValue)
                 {
-                    removed = _selection.Clear();
+                    Selection = state.Selection.Value;
                 }
 
-                if (index != -1)
+                if (state.SelectedItems.HasValue)
                 {
-                    if (_selection.Add(index))
-                    {
-                        added = index;
-                    }
-
-                    if (removed?.Contains(index) == true)
-                    {
-                        removed.Remove(index);
-                        added = -1;
-                    }
+                    SelectedItems = state.SelectedItems.Value;
                 }
 
-                if (removed != null)
+                Selection.Source = Items;
+
+                if (Items is null)
                 {
-                    foreach (var i in removed)
-                    {
-                        MarkItemSelected(i, false);
-                    }
+                    Selection.Clear();
                 }
 
-                MarkItemSelected(index, true);
-
-                RaisePropertyChanged(
-                    SelectedIndexProperty,
-                    oldIndex,
-                    index);
-            }
-
-            if (itemChanged)
-            {
-                RaisePropertyChanged(
-                    SelectedItemProperty,
-                    oldItem,
-                    item);
-            }
-
-            if (removed != null && index != -1)
-            {
-                removed.Remove(index);
-            }
-
-            if (added != -1 || removed?.Count > 0)
-            {
-                ResetSelectedItems();
-
-                var e = new SelectionChangedEventArgs(
-                    SelectionChangedEvent,
-                    added != -1 ? new[] { ElementAt(Items, added) } : Array.Empty<object>(),
-                    removed?.Select(x => ElementAt(Items, x)).ToArray() ?? Array.Empty<object>());
-                RaiseEvent(e);
-            }
-
-            if (AutoScrollToSelectedItem && _selectedIndex != -1)
-            {
-                ScrollIntoView(_selectedItem);
-            }
-        }
-
-        private void UpdateSelectedItems(Action action)
-        {
-            try
-            {
-                _syncingSelectedItems = true;
-                action();
-            }
-            catch (Exception ex)
-            {
-                Logger.TryGet(LogEventLevel.Error)?.Log(
-                    LogArea.Property,
-                    this,
-                    "Error thrown updating SelectedItems: {Error}",
-                    ex);
-            }
-            finally
-            {
-                _syncingSelectedItems = false;
-            }
-        }
-
-        private void UpdateFinished()
-        {
-            if (_updateSelectedItem != null)
-            {
-                SelectedItem = _updateSelectedItem;
-            }
-            else
-            {
-                if (ItemCount == 0 && SelectedIndex != -1)
+                if (state.SelectedIndex.HasValue)
                 {
-                    SelectedIndex = -1;
+                    SelectedIndex = state.SelectedIndex.Value;
                 }
-                else
+                else if (state.SelectedItem.HasValue)
                 {
-                    if (_updateSelectedIndex != int.MinValue)
-                    {
-                        SelectedIndex = _updateSelectedIndex;
-                    }
-
-                    if (AlwaysSelected && SelectedIndex == -1)
-                    {
-                        SelectedIndex = 0;
-                    }
+                    SelectedItem = state.SelectedItem.Value;
                 }
             }
         }
 
-        private class Selection : IEnumerable<int>
+        // When in a BeginInit..EndInit block, or when the DataContext is updating, we need to
+        // defer changes to the selection model because we have no idea in which order properties
+        // will be set. Consider:
+        //
+        // - Both Items and SelectedItem are bound
+        // - The DataContext changes
+        // - The binding for SelectedItem updates first, producing an item
+        // - Items is searched to find the index of the new selected item
+        // - However Items isn't yet updated; the item is not found
+        // - SelectedIndex is incorrectly set to -1
+        //
+        // This logic cannot be encapsulated in SelectionModel because the selection model can also
+        // be bound, consider:
+        //
+        // - Both Items and Selection are bound
+        // - The DataContext changes
+        // - The binding for Items updates first
+        // - The new items are assigned to Selection.Source
+        // - The binding for Selection updates, producing a new SelectionModel
+        // - Both the old and new SelectionModels have the incorrect Source
+        private class UpdateState
         {
-            private readonly List<int> _list = new List<int>();
-            private HashSet<int> _set = new HashSet<int>();
+            private Optional<int> _selectedIndex;
+            private Optional<object?> _selectedItem;
 
-            public bool HasItems => _set.Count > 0;
-            public bool HasMultiple => _set.Count > 1;
+            public int UpdateCount { get; set; }
+            public Optional<ISelectionModel> Selection { get; set; }
+            public Optional<IList?> SelectedItems { get; set; }
 
-            public bool Add(int index)
+            public Optional<int> SelectedIndex 
             {
-                if (index == -1)
-                {
-                    throw new ArgumentException("Invalid index", "index");
-                }
-
-                if (_set.Add(index))
+                get => _selectedIndex;
+                set
                 {
-                    _list.Add(index);
-                    return true;
+                    _selectedIndex = value;
+                    _selectedItem = default;
                 }
-
-                return false;
             }
 
-            public bool Remove(int index)
+            public Optional<object?> SelectedItem
             {
-                if (_set.Remove(index))
+                get => _selectedItem;
+                set
                 {
-                    _list.RemoveAll(x => x == index);
-                    return true;
+                    _selectedItem = value;
+                    _selectedIndex = default;
                 }
-
-                return false;
-            }
-
-            public HashSet<int> Clear()
-            {
-                var result = _set;
-                _list.Clear();
-                _set = new HashSet<int>();
-                return result;
             }
-
-            public void ItemsInserted(int index, int count)
-            {
-                _set = new HashSet<int>();
-
-                for (var i = 0; i < _list.Count; ++i)
-                {
-                    var ix = _list[i];
-
-                    if (ix >= index)
-                    {
-                        var newIndex = ix + count;
-                        _list[i] = newIndex;
-                        _set.Add(newIndex);
-                    }
-                    else
-                    {
-                        _set.Add(ix);
-                    }
-                }
-            }
-
-            public void ItemsRemoved(int index, int count)
-            {
-                var last = (index + count) - 1;
-
-                _set = new HashSet<int>();
-
-                for (var i = 0; i < _list.Count; ++i)
-                {
-                    var ix = _list[i];
-
-                    if (ix >= index && ix <= last)
-                    {
-                        _list.RemoveAt(i--);
-                    }
-                    else if (ix > last)
-                    {
-                        var newIndex = ix - count;
-                        _list[i] = newIndex;
-                        _set.Add(newIndex);
-                    }
-                    else
-                    {
-                        _set.Add(ix);
-                    }
-                }
-            }
-
-            public bool Contains(int index) => _set.Contains(index);
-
-            public int First() => HasItems ? _list[0] : -1;
-
-            public IEnumerator<int> GetEnumerator() => _set.GetEnumerator();
-            IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-        }
+       }
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/TabStrip.cs b/src/Avalonia.Controls/Primitives/TabStrip.cs
index e1a6cf79bb..f8f7674da8 100644
--- a/src/Avalonia.Controls/Primitives/TabStrip.cs
+++ b/src/Avalonia.Controls/Primitives/TabStrip.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Generators;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
diff --git a/src/Avalonia.Controls/Primitives/TabStripItem.cs b/src/Avalonia.Controls/Primitives/TabStripItem.cs
index f7b73304e8..fb2016b485 100644
--- a/src/Avalonia.Controls/Primitives/TabStripItem.cs
+++ b/src/Avalonia.Controls/Primitives/TabStripItem.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Controls.Primitives
 {
     /// <summary>
diff --git a/src/Avalonia.Controls/Primitives/TemplateAppliedEventArgs.cs b/src/Avalonia.Controls/Primitives/TemplateAppliedEventArgs.cs
index 1b2c243071..a689a63e27 100644
--- a/src/Avalonia.Controls/Primitives/TemplateAppliedEventArgs.cs
+++ b/src/Avalonia.Controls/Primitives/TemplateAppliedEventArgs.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Interactivity;
 
 namespace Avalonia.Controls.Primitives
diff --git a/src/Avalonia.Controls/Primitives/TemplatedControl.cs b/src/Avalonia.Controls/Primitives/TemplatedControl.cs
index 0ace387185..9c73ff2411 100644
--- a/src/Avalonia.Controls/Primitives/TemplatedControl.cs
+++ b/src/Avalonia.Controls/Primitives/TemplatedControl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Controls.Templates;
 using Avalonia.Interactivity;
@@ -255,7 +252,7 @@ namespace Avalonia.Controls.Primitives
 
                 if (template != null)
                 {
-                    Logger.TryGet(LogEventLevel.Verbose)?.Log(LogArea.Control, this, "Creating control template");
+                    Logger.TryGet(LogEventLevel.Verbose, LogArea.Control)?.Log(this, "Creating control template");
 
                     var (child, nameScope) = template.Build(this);
                     ApplyTemplatedParent(child);
@@ -266,7 +263,10 @@ namespace Avalonia.Controls.Primitives
                     if (nameScope == null)
                         nameScope = new NameScope();
 
-                    OnTemplateApplied(new TemplateAppliedEventArgs(nameScope));
+                    var e = new TemplateAppliedEventArgs(nameScope);
+                    OnApplyTemplate(e);
+                    OnTemplateApplied(e);
+                    RaiseEvent(e);
                 }
 
                 _appliedTemplate = template;
@@ -287,6 +287,21 @@ namespace Avalonia.Controls.Primitives
             return this;
         }
 
+        protected sealed override void NotifyChildResourcesChanged(ResourcesChangedEventArgs e)
+        {
+            var count = VisualChildren.Count;
+
+            for (var i = 0; i < count; ++i)
+            {
+                if (VisualChildren[i] is ILogical logical)
+                {
+                    logical.NotifyResourcesChanged(e);
+                }
+            }
+
+            base.NotifyChildResourcesChanged(e);
+        }
+
         /// <inheritdoc/>
         protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
         {
@@ -309,13 +324,17 @@ namespace Avalonia.Controls.Primitives
             base.OnDetachedFromLogicalTree(e);
         }
 
+        protected virtual void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+        }
+
         /// <summary>
         /// Called when the control's template is applied.
         /// </summary>
         /// <param name="e">The event args.</param>
+        [Obsolete("Use OnApplyTemplate")]
         protected virtual void OnTemplateApplied(TemplateAppliedEventArgs e)
         {
-            RaiseEvent(e);
         }
 
         /// <summary>
@@ -335,11 +354,14 @@ namespace Avalonia.Controls.Primitives
         {
             control.SetValue(TemplatedParentProperty, this);
 
-            foreach (var child in control.LogicalChildren)
+            var children = control.LogicalChildren;
+            var count = children.Count;
+
+            for (var i = 0; i < count; i++)
             {
-                if (child is IControl c)
+                if (children[i] is IControl child)
                 {
-                    ApplyTemplatedParent(c);
+                    ApplyTemplatedParent(child);
                 }
             }
         }
diff --git a/src/Avalonia.Controls/Primitives/Thumb.cs b/src/Avalonia.Controls/Primitives/Thumb.cs
index d88018cf32..348922b71d 100644
--- a/src/Avalonia.Controls/Primitives/Thumb.cs
+++ b/src/Avalonia.Controls/Primitives/Thumb.cs
@@ -1,12 +1,11 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using Avalonia.Controls.Metadata;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 
 namespace Avalonia.Controls.Primitives
 {
+    [PseudoClasses(":pressed")]
     public class Thumb : TemplatedControl
     {
         public static readonly RoutedEvent<VectorEventArgs> DragStartedEvent =
diff --git a/src/Avalonia.Controls/Primitives/ToggleButton.cs b/src/Avalonia.Controls/Primitives/ToggleButton.cs
index e7cd0697a0..6b2c566422 100644
--- a/src/Avalonia.Controls/Primitives/ToggleButton.cs
+++ b/src/Avalonia.Controls/Primitives/ToggleButton.cs
@@ -1,14 +1,19 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using Avalonia.Interactivity;
+using Avalonia.Controls.Metadata;
 using Avalonia.Data;
+using Avalonia.Interactivity;
 
 namespace Avalonia.Controls.Primitives
 {
+    /// <summary>
+    /// Represents a control that a user can select (check) or clear (uncheck). Base class for controls that can switch states.
+    /// </summary>
+    [PseudoClasses(":checked", ":unchecked", ":indeterminate")]
     public class ToggleButton : Button
     {
+        /// <summary>
+        /// Defines the <see cref="IsChecked"/> property.
+        /// </summary>
         public static readonly DirectProperty<ToggleButton, bool?> IsCheckedProperty =
             AvaloniaProperty.RegisterDirect<ToggleButton, bool?>(
                 nameof(IsChecked),
@@ -17,24 +22,85 @@ namespace Avalonia.Controls.Primitives
                 unsetValue: null,
                 defaultBindingMode: BindingMode.TwoWay);
 
+        /// <summary>
+        /// Defines the <see cref="IsThreeState"/> property.
+        /// </summary>
         public static readonly StyledProperty<bool> IsThreeStateProperty =
             AvaloniaProperty.Register<ToggleButton, bool>(nameof(IsThreeState));
 
+        /// <summary>
+        /// Defines the <see cref="Checked"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<RoutedEventArgs> CheckedEvent =
+            RoutedEvent.Register<ToggleButton, RoutedEventArgs>(nameof(Checked), RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="Unchecked"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<RoutedEventArgs> UncheckedEvent =
+            RoutedEvent.Register<ToggleButton, RoutedEventArgs>(nameof(Unchecked), RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="Unchecked"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<RoutedEventArgs> IndeterminateEvent =
+            RoutedEvent.Register<ToggleButton, RoutedEventArgs>(nameof(Indeterminate), RoutingStrategies.Bubble);
+
         private bool? _isChecked = false;
 
         static ToggleButton()
         {
-            PseudoClass<ToggleButton, bool?>(IsCheckedProperty, c => c == true, ":checked");
-            PseudoClass<ToggleButton, bool?>(IsCheckedProperty, c => c == false, ":unchecked");
-            PseudoClass<ToggleButton, bool?>(IsCheckedProperty, c => c == null, ":indeterminate");
+            IsCheckedProperty.Changed.AddClassHandler<ToggleButton>((x, e) => x.OnIsCheckedChanged(e));
+        }
+
+        public ToggleButton()
+        {
+            UpdatePseudoClasses(IsChecked);
+        }
+
+        /// <summary>
+        /// Raised when a <see cref="ToggleButton"/> is checked.
+        /// </summary>
+        public event EventHandler<RoutedEventArgs> Checked
+        {
+            add => AddHandler(CheckedEvent, value);
+            remove => RemoveHandler(CheckedEvent, value);
+        }
+
+        /// <summary>
+        /// Raised when a <see cref="ToggleButton"/> is unchecked.
+        /// </summary>
+        public event EventHandler<RoutedEventArgs> Unchecked
+        {
+            add => AddHandler(UncheckedEvent, value);
+            remove => RemoveHandler(UncheckedEvent, value);
+        }
+
+        /// <summary>
+        /// Raised when a <see cref="ToggleButton"/> is neither checked nor unchecked.
+        /// </summary>
+        public event EventHandler<RoutedEventArgs> Indeterminate
+        {
+            add => AddHandler(IndeterminateEvent, value);
+            remove => RemoveHandler(IndeterminateEvent, value);
         }
 
+        /// <summary>
+        /// Gets or sets whether the <see cref="ToggleButton"/> is checked.
+        /// </summary>
         public bool? IsChecked
         {
-            get { return _isChecked; }
-            set { SetAndRaise(IsCheckedProperty, ref _isChecked, value); }
+            get => _isChecked;
+            set 
+            { 
+                SetAndRaise(IsCheckedProperty, ref _isChecked, value);
+                UpdatePseudoClasses(IsChecked);
+            }
         }
 
+        /// <summary>
+        /// Gets or sets a value that indicates whether the control supports three states.
+        /// </summary>
         public bool IsThreeState
         {
             get => GetValue(IsThreeStateProperty);
@@ -47,18 +113,85 @@ namespace Avalonia.Controls.Primitives
             base.OnClick();
         }
 
+        /// <summary>
+        /// Toggles the <see cref="IsChecked"/> property.
+        /// </summary>
         protected virtual void Toggle()
         {
             if (IsChecked.HasValue)
+            {
                 if (IsChecked.Value)
+                {
                     if (IsThreeState)
+                    {
                         IsChecked = null;
+                    }
                     else
+                    {
                         IsChecked = false;
+                    }
+                }
                 else
+                {
                     IsChecked = true;
+                }
+            }
             else
+            {
                 IsChecked = false;
+            }
+        }
+
+        /// <summary>
+        /// Called when <see cref="IsChecked"/> becomes true.
+        /// </summary>
+        /// <param name="e">Event arguments for the routed event that is raised by the default implementation of this method.</param>
+        protected virtual void OnChecked(RoutedEventArgs e)
+        {
+            RaiseEvent(e);
+        }
+
+        /// <summary>
+        /// Called when <see cref="IsChecked"/> becomes false.
+        /// </summary>
+        /// <param name="e">Event arguments for the routed event that is raised by the default implementation of this method.</param>
+        protected virtual void OnUnchecked(RoutedEventArgs e)
+        {
+            RaiseEvent(e);
+        }
+
+        /// <summary>
+        /// Called when <see cref="IsChecked"/> becomes null.
+        /// </summary>
+        /// <param name="e">Event arguments for the routed event that is raised by the default implementation of this method.</param>
+        protected virtual void OnIndeterminate(RoutedEventArgs e)
+        {
+            RaiseEvent(e);
+        }
+
+        private void OnIsCheckedChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var newValue = (bool?)e.NewValue;
+
+            switch (newValue)
+            {
+                case true:
+                    OnChecked(new RoutedEventArgs(CheckedEvent));
+                    break;
+                case false:
+                    OnUnchecked(new RoutedEventArgs(UncheckedEvent));
+                    break;
+                default:
+                    OnIndeterminate(new RoutedEventArgs(IndeterminateEvent));
+                    break;
+            }
+        }
+
+        private void UpdatePseudoClasses(bool? isChecked)
+        {
+            PseudoClasses.Set(":checked", isChecked == true);
+            PseudoClasses.Set(":unchecked", isChecked == false);
+            PseudoClasses.Set(":indeterminate", isChecked == null);
         }
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/Track.cs b/src/Avalonia.Controls/Primitives/Track.cs
index 292c65aa06..9399f5fb31 100644
--- a/src/Avalonia.Controls/Primitives/Track.cs
+++ b/src/Avalonia.Controls/Primitives/Track.cs
@@ -4,6 +4,8 @@
 // Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
 
 using System;
+using Avalonia.Controls.Metadata;
+using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Layout;
 using Avalonia.Metadata;
@@ -11,6 +13,7 @@ using Avalonia.Utilities;
 
 namespace Avalonia.Controls.Primitives
 {
+    [PseudoClasses(":vertical", ":horizontal")]
     public class Track : Control
     {
         public static readonly DirectProperty<Track, double> MinimumProperty =
@@ -40,20 +43,26 @@ namespace Avalonia.Controls.Primitives
         public static readonly StyledProperty<bool> IsDirectionReversedProperty =
             AvaloniaProperty.Register<Track, bool>(nameof(IsDirectionReversed));
 
+        public static readonly StyledProperty<bool> IgnoreThumbDragProperty =
+            AvaloniaProperty.Register<Track, bool>(nameof(IsThumbDragHandled));
+
         private double _minimum;
         private double _maximum = 100.0;
         private double _value;
 
         static Track()
         {
-            PseudoClass<Track, Orientation>(OrientationProperty, o => o == Orientation.Vertical, ":vertical");
-            PseudoClass<Track, Orientation>(OrientationProperty, o => o == Orientation.Horizontal, ":horizontal");
-            ThumbProperty.Changed.AddClassHandler<Track>((x,e) => x.ThumbChanged(e));
+            ThumbProperty.Changed.AddClassHandler<Track>((x, e) => x.ThumbChanged(e));
             IncreaseButtonProperty.Changed.AddClassHandler<Track>((x, e) => x.ButtonChanged(e));
             DecreaseButtonProperty.Changed.AddClassHandler<Track>((x, e) => x.ButtonChanged(e));
             AffectsArrange<Track>(MinimumProperty, MaximumProperty, ValueProperty, OrientationProperty);
         }
 
+        public Track()
+        {
+            UpdatePseudoClasses(Orientation);
+        }
+
         public double Minimum
         {
             get { return _minimum; }
@@ -109,6 +118,12 @@ namespace Avalonia.Controls.Primitives
             set { SetValue(IsDirectionReversedProperty, value); }
         }
 
+        public bool IsThumbDragHandled
+        {
+            get { return GetValue(IgnoreThumbDragProperty); }
+            set { SetValue(IgnoreThumbDragProperty, value); }
+        }
+
         private double ThumbCenterOffset { get; set; }
         private double Density { get; set; }
 
@@ -246,7 +261,7 @@ namespace Avalonia.Controls.Primitives
                 CoerceLength(ref increaseButtonLength, arrangeSize.Width);
                 CoerceLength(ref thumbLength, arrangeSize.Width);
 
-                offset = offset.WithY(isDirectionReversed ? increaseButtonLength + thumbLength : 0.0);
+                offset = offset.WithX(isDirectionReversed ? increaseButtonLength + thumbLength : 0.0);
                 pieceSize = pieceSize.WithWidth(decreaseButtonLength);
 
                 if (DecreaseButton != null)
@@ -276,6 +291,16 @@ namespace Avalonia.Controls.Primitives
             return arrangeSize;
         }
 
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == OrientationProperty)
+            {
+                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<Orientation>());
+            }
+        }
+
         private static void CoerceLength(ref double componentLength, double trackLength)
         {
             if (componentLength < 0)
@@ -330,6 +355,15 @@ namespace Avalonia.Controls.Primitives
             var trackLength = isVertical ? arrangeSize.Height : arrangeSize.Width;
             double thumbMinLength = 10;
 
+            StyledProperty<double> minLengthProperty = isVertical ? MinHeightProperty : MinWidthProperty;
+
+            var thumb = Thumb;
+
+            if (thumb != null && thumb.IsSet(minLengthProperty))
+            {
+                thumbMinLength = thumb.GetValue(minLengthProperty);
+            }
+
             thumbLength = trackLength * viewportSize / extent;
             CoerceLength(ref thumbLength, trackLength);
             thumbLength = Math.Max(thumbMinLength, thumbLength);
@@ -408,6 +442,9 @@ namespace Avalonia.Controls.Primitives
 
         private void ThumbDragged(object sender, VectorEventArgs e)
         {
+            if (IsThumbDragHandled)
+                return;
+                
             Value = MathUtilities.Clamp(
                 Value + ValueFromDistance(e.Vector.X, e.Vector.Y),
                 Minimum,
@@ -433,5 +470,11 @@ namespace Avalonia.Controls.Primitives
                 DecreaseButton.IsVisible = visible;
             }
         }
+
+        private void UpdatePseudoClasses(Orientation o)
+        {
+            PseudoClasses.Set(":vertical", o == Orientation.Vertical);
+            PseudoClasses.Set(":horizontal", o == Orientation.Horizontal);
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/VisualLayerManager.cs b/src/Avalonia.Controls/Primitives/VisualLayerManager.cs
index b7229eb121..d8d3450c6f 100644
--- a/src/Avalonia.Controls/Primitives/VisualLayerManager.cs
+++ b/src/Avalonia.Controls/Primitives/VisualLayerManager.cs
@@ -1,19 +1,24 @@
 using System.Collections.Generic;
 using Avalonia.LogicalTree;
-using Avalonia.Styling;
+using Avalonia.Media;
 
 namespace Avalonia.Controls.Primitives
 {
     public class VisualLayerManager : Decorator
     {
         private const int AdornerZIndex = int.MaxValue - 100;
-        private const int OverlayZIndex = int.MaxValue - 99;
-        private IStyleHost _styleRoot;
+        private const int ChromeZIndex = int.MaxValue - 99;
+        private const int LightDismissOverlayZIndex = int.MaxValue - 98;
+        private const int OverlayZIndex = int.MaxValue - 97;
+
+        private ILogicalRoot _logicalRoot;
         private readonly List<Control> _layers = new List<Control>();
-        
+
+        public static readonly StyledProperty<ChromeOverlayLayer> ChromeOverlayLayerProperty =
+            AvaloniaProperty.Register<VisualLayerManager, ChromeOverlayLayer>(nameof(ChromeOverlayLayer));
 
         public bool IsPopup { get; set; }
-        
+
         public AdornerLayer AdornerLayer
         {
             get
@@ -25,6 +30,26 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
+        public ChromeOverlayLayer ChromeOverlayLayer
+        {
+            get
+            {
+                var current = GetValue(ChromeOverlayLayerProperty);
+
+                if (current is null)
+                {
+                    var chromeOverlayLayer = new ChromeOverlayLayer();
+                    AddLayer(chromeOverlayLayer, ChromeZIndex);
+
+                    SetValue(ChromeOverlayLayerProperty, chromeOverlayLayer);
+
+                    current = chromeOverlayLayer;
+                }
+
+                return current;
+            }
+        }
+
         public OverlayLayer OverlayLayer
         {
             get
@@ -32,12 +57,33 @@ namespace Avalonia.Controls.Primitives
                 if (IsPopup)
                     return null;
                 var rv = FindLayer<OverlayLayer>();
-                if(rv == null)
+                if (rv == null)
                     AddLayer(rv = new OverlayLayer(), OverlayZIndex);
                 return rv;
             }
         }
 
+        public LightDismissOverlayLayer LightDismissOverlayLayer
+        {
+            get
+            {
+                if (IsPopup)
+                    return null;
+                var rv = FindLayer<LightDismissOverlayLayer>();
+                if (rv == null)
+                {
+                    rv = new LightDismissOverlayLayer
+                    {
+                        Background = Brushes.Transparent,
+                        IsVisible = false
+                    };
+
+                    AddLayer(rv, LightDismissOverlayZIndex);
+                }
+                return rv;
+            }
+        }
+
         T FindLayer<T>() where T : class
         {
             foreach (var layer in _layers)
@@ -53,15 +99,23 @@ namespace Avalonia.Controls.Primitives
             layer.ZIndex = zindex;
             VisualChildren.Add(layer);
             if (((ILogical)this).IsAttachedToLogicalTree)
-                ((ILogical)layer).NotifyAttachedToLogicalTree(new LogicalTreeAttachmentEventArgs(_styleRoot));
+                ((ILogical)layer).NotifyAttachedToLogicalTree(
+                    new LogicalTreeAttachmentEventArgs(_logicalRoot, layer, this));
             InvalidateArrange();
         }
-        
-        
+
+        protected override void NotifyChildResourcesChanged(ResourcesChangedEventArgs e)
+        {
+            foreach (var l in _layers)
+                ((ILogical)l).NotifyResourcesChanged(e);
+
+            base.NotifyChildResourcesChanged(e);
+        }
+
         protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
         {
             base.OnAttachedToLogicalTree(e);
-            _styleRoot = e.Root;
+            _logicalRoot = e.Root;
 
             foreach (var l in _layers)
                 ((ILogical)l).NotifyAttachedToLogicalTree(e);
@@ -69,13 +123,12 @@ namespace Avalonia.Controls.Primitives
 
         protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
         {
-            _styleRoot = null;
+            _logicalRoot = null;
             base.OnDetachedFromLogicalTree(e);
             foreach (var l in _layers)
                 ((ILogical)l).NotifyDetachedFromLogicalTree(e);
         }
 
-
         protected override Size MeasureOverride(Size availableSize)
         {
             foreach (var l in _layers)
diff --git a/src/Avalonia.Controls/ProgressBar.cs b/src/Avalonia.Controls/ProgressBar.cs
index 94898951a9..161f09d9b6 100644
--- a/src/Avalonia.Controls/ProgressBar.cs
+++ b/src/Avalonia.Controls/ProgressBar.cs
@@ -1,71 +1,169 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-
 using System;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Layout;
+using Avalonia.Media;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// A control used to indicate the progress of an operation.
     /// </summary>
+    [PseudoClasses(":vertical", ":horizontal", ":indeterminate")]
     public class ProgressBar : RangeBase
     {
+        public class ProgressBarTemplateProperties : AvaloniaObject
+        {
+            private double _container2Width;
+            private double _containerWidth;
+            private double _containerAnimationStartPosition;
+            private double _containerAnimationEndPosition;
+            private double _container2AnimationStartPosition;
+            private double _container2AnimationEndPosition;
+
+            public static readonly DirectProperty<ProgressBarTemplateProperties, double> ContainerAnimationStartPositionProperty =
+           AvaloniaProperty.RegisterDirect<ProgressBarTemplateProperties, double>(
+               nameof(ContainerAnimationStartPosition),
+               p => p.ContainerAnimationStartPosition,
+               (p, o) => p.ContainerAnimationStartPosition = o, 0d);
+
+            public static readonly DirectProperty<ProgressBarTemplateProperties, double> ContainerAnimationEndPositionProperty =
+                AvaloniaProperty.RegisterDirect<ProgressBarTemplateProperties, double>(
+                    nameof(ContainerAnimationEndPosition),
+                    p => p.ContainerAnimationEndPosition,
+                    (p, o) => p.ContainerAnimationEndPosition = o, 0d);
+
+            public static readonly DirectProperty<ProgressBarTemplateProperties, double> Container2AnimationStartPositionProperty =
+                AvaloniaProperty.RegisterDirect<ProgressBarTemplateProperties, double>(
+                    nameof(Container2AnimationStartPosition),
+                    p => p.Container2AnimationStartPosition,
+                    (p, o) => p.Container2AnimationStartPosition = o, 0d);
+
+            public static readonly DirectProperty<ProgressBarTemplateProperties, double> Container2AnimationEndPositionProperty =
+                AvaloniaProperty.RegisterDirect<ProgressBarTemplateProperties, double>(
+                    nameof(Container2AnimationEndPosition),
+                    p => p.Container2AnimationEndPosition,
+                    (p, o) => p.Container2AnimationEndPosition = o);
+
+            public static readonly DirectProperty<ProgressBarTemplateProperties, double> Container2WidthProperty =
+                AvaloniaProperty.RegisterDirect<ProgressBarTemplateProperties, double>(
+                    nameof(Container2Width),
+                    p => p.Container2Width,
+                    (p, o) => p.Container2Width = o);
+
+            public static readonly DirectProperty<ProgressBarTemplateProperties, double> ContainerWidthProperty =
+                AvaloniaProperty.RegisterDirect<ProgressBarTemplateProperties, double>(
+                    nameof(ContainerWidth),
+                    p => p.ContainerWidth,
+                    (p, o) => p.ContainerWidth = o);
+
+            public double ContainerAnimationStartPosition
+            {
+                get => _containerAnimationStartPosition;
+                set => SetAndRaise(ContainerAnimationStartPositionProperty, ref _containerAnimationStartPosition, value);
+            }
+
+            public double ContainerAnimationEndPosition
+            {
+                get => _containerAnimationEndPosition;
+                set => SetAndRaise(ContainerAnimationEndPositionProperty, ref _containerAnimationEndPosition, value);
+            }
+
+            public double Container2AnimationStartPosition
+            {
+                get => _container2AnimationStartPosition;
+                set => SetAndRaise(Container2AnimationStartPositionProperty, ref _container2AnimationStartPosition, value);
+            }
+
+            public double Container2Width
+            {
+                get => _container2Width;
+                set => SetAndRaise(Container2WidthProperty, ref _container2Width, value);
+            }
+
+            public double ContainerWidth
+            {
+                get => _containerWidth;
+                set => SetAndRaise(ContainerWidthProperty, ref _containerWidth, value);
+            }
+
+            public double Container2AnimationEndPosition
+            {
+                get => _container2AnimationEndPosition;
+                set => SetAndRaise(Container2AnimationEndPositionProperty, ref _container2AnimationEndPosition, value);
+            }
+        }
+
+        private double _indeterminateStartingOffset;
+        private double _indeterminateEndingOffset;
+        private Border _indicator;
+
         public static readonly StyledProperty<bool> IsIndeterminateProperty =
             AvaloniaProperty.Register<ProgressBar, bool>(nameof(IsIndeterminate));
 
+        public static readonly StyledProperty<bool> ShowProgressTextProperty =
+            AvaloniaProperty.Register<ProgressBar, bool>(nameof(ShowProgressText));
+
         public static readonly StyledProperty<Orientation> OrientationProperty =
             AvaloniaProperty.Register<ProgressBar, Orientation>(nameof(Orientation), Orientation.Horizontal);
 
-        private static readonly DirectProperty<ProgressBar, double> IndeterminateStartingOffsetProperty =
+        [Obsolete("To be removed when Avalonia.Themes.Default is discontinued.")]
+        public static readonly DirectProperty<ProgressBar, double> IndeterminateStartingOffsetProperty =
             AvaloniaProperty.RegisterDirect<ProgressBar, double>(
                 nameof(IndeterminateStartingOffset),
                 p => p.IndeterminateStartingOffset,
                 (p, o) => p.IndeterminateStartingOffset = o);
 
-        private static readonly DirectProperty<ProgressBar, double> IndeterminateEndingOffsetProperty =
+        [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);
 
-        private Border _indicator;
+        [Obsolete("To be removed when Avalonia.Themes.Default is discontinued.")]
+        public double IndeterminateStartingOffset
+        {
+            get => _indeterminateStartingOffset;
+            set => SetAndRaise(IndeterminateStartingOffsetProperty, ref _indeterminateStartingOffset, value);
+        }
 
-        static ProgressBar()
+        [Obsolete("To be removed when Avalonia.Themes.Default is discontinued.")]
+        public double IndeterminateEndingOffset
         {
-            PseudoClass<ProgressBar, Orientation>(OrientationProperty, o => o == Orientation.Vertical, ":vertical");
-            PseudoClass<ProgressBar, Orientation>(OrientationProperty, o => o == Orientation.Horizontal, ":horizontal");
-            PseudoClass<ProgressBar>(IsIndeterminateProperty, ":indeterminate");
+            get => _indeterminateEndingOffset;
+            set => SetAndRaise(IndeterminateEndingOffsetProperty, ref _indeterminateEndingOffset, value);
+        }
 
+        static ProgressBar()
+        {
             ValueProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e));
             IsIndeterminateProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e));
         }
 
+        public ProgressBar()
+        {
+            UpdatePseudoClasses(IsIndeterminate, Orientation);
+        }
+
+        public ProgressBarTemplateProperties TemplateProperties { get; } = new ProgressBarTemplateProperties();
+
         public bool IsIndeterminate
         {
             get => GetValue(IsIndeterminateProperty);
             set => SetValue(IsIndeterminateProperty, value);
         }
 
-        public Orientation Orientation
-        {
-            get => GetValue(OrientationProperty);
-            set => SetValue(OrientationProperty, value);
-        }
-        private double _indeterminateStartingOffset;
-        private double IndeterminateStartingOffset
+        public bool ShowProgressText
         {
-            get => _indeterminateStartingOffset;
-            set => SetAndRaise(IndeterminateStartingOffsetProperty, ref _indeterminateStartingOffset, value);
+            get => GetValue(ShowProgressTextProperty);
+            set => SetValue(ShowProgressTextProperty, value);
         }
 
-        private double _indeterminateEndingOffset;
-        private double IndeterminateEndingOffset
+        public Orientation Orientation
         {
-            get => _indeterminateEndingOffset;
-            set => SetAndRaise(IndeterminateEndingOffsetProperty, ref _indeterminateEndingOffset, value);
+            get => GetValue(OrientationProperty);
+            set => SetValue(OrientationProperty, value);
         }
 
         /// <inheritdoc/>
@@ -75,8 +173,22 @@ namespace Avalonia.Controls
             return base.ArrangeOverride(finalSize);
         }
 
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == IsIndeterminateProperty)
+            {
+                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<bool>(), null);
+            }
+            else if (change.Property == OrientationProperty)
+            {
+                UpdatePseudoClasses(null, change.NewValue.GetValueOrDefault<Orientation>());
+            }
+        }
+
         /// <inheritdoc/>
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             _indicator = e.NameScope.Get<Border>("PART_Indicator");
 
@@ -89,21 +201,33 @@ namespace Avalonia.Controls
             {
                 if (IsIndeterminate)
                 {
-                    if (Orientation == Orientation.Horizontal)
-                    {
-                        var width = bounds.Width / 5.0;
-                        IndeterminateStartingOffset = -width;
-                        _indicator.Width = width;
-                        IndeterminateEndingOffset = bounds.Width;
+                    // Pulled from ModernWPF.
 
-                    }
-                    else
-                    {
-                        var height = bounds.Height / 5.0;
-                        IndeterminateStartingOffset = -bounds.Height;
-                        _indicator.Height = height;
-                        IndeterminateEndingOffset = height;
-                    }
+                    var dim = Orientation == Orientation.Horizontal ? bounds.Width : bounds.Height;
+                    var barIndicatorWidth = dim * 0.4; // Indicator width at 40% of ProgressBar
+                    var barIndicatorWidth2 = dim * 0.6; // Indicator width at 60% of ProgressBar
+
+                    TemplateProperties.ContainerWidth = barIndicatorWidth;
+                    TemplateProperties.Container2Width = barIndicatorWidth2;
+
+                    TemplateProperties.ContainerAnimationStartPosition = barIndicatorWidth * -1.8; // Position at -180%
+                    TemplateProperties.ContainerAnimationEndPosition = barIndicatorWidth * 3.0; // Position at 300%
+
+                    TemplateProperties.Container2AnimationStartPosition = barIndicatorWidth2 * -1.5; // Position at -150%
+                    TemplateProperties.Container2AnimationEndPosition = barIndicatorWidth2 * 1.66; // Position at 166%
+
+                    // Remove these properties when we switch to fluent as default and removed the old one.
+                    IndeterminateStartingOffset = -dim;
+                    IndeterminateEndingOffset = dim;
+
+                    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)
+                            ));
                 }
                 else
                 {
@@ -121,5 +245,21 @@ namespace Avalonia.Controls
         {
             UpdateIndicator(Bounds.Size);
         }
+
+        private void UpdatePseudoClasses(
+            bool? isIndeterminate,
+            Orientation? o)
+        {
+            if (isIndeterminate.HasValue)
+            {
+                PseudoClasses.Set(":indeterminate", isIndeterminate.Value);
+            }
+
+            if (o.HasValue)
+            {
+                PseudoClasses.Set(":vertical", o == Orientation.Vertical);
+                PseudoClasses.Set(":horizontal", o == Orientation.Horizontal);
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Properties/AssemblyInfo.cs b/src/Avalonia.Controls/Properties/AssemblyInfo.cs
index c04c66a77f..5c9017f127 100644
--- a/src/Avalonia.Controls/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Controls/Properties/AssemblyInfo.cs
@@ -1,13 +1,13 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// 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;
-
+#if SIGNED_BUILD
+[assembly: InternalsVisibleTo("Avalonia.Controls.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.DesignerSupport, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+#else
 [assembly: InternalsVisibleTo("Avalonia.Controls.UnitTests")]
 [assembly: InternalsVisibleTo("Avalonia.DesignerSupport")]
-
+#endif
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Embedding")]
@@ -16,3 +16,4 @@ using Avalonia.Metadata;
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Shapes")]
 [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")]
diff --git a/src/Avalonia.Controls/RadioButton.cs b/src/Avalonia.Controls/RadioButton.cs
index 54afde7da2..4bda241497 100644
--- a/src/Avalonia.Controls/RadioButton.cs
+++ b/src/Avalonia.Controls/RadioButton.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/Avalonia.Controls/RelativePanel.AttachedProperties.cs b/src/Avalonia.Controls/RelativePanel.AttachedProperties.cs
new file mode 100644
index 0000000000..562b104b04
--- /dev/null
+++ b/src/Avalonia.Controls/RelativePanel.AttachedProperties.cs
@@ -0,0 +1,554 @@
+using Avalonia.Layout;
+
+#nullable enable
+
+namespace Avalonia.Controls
+{
+    public partial class RelativePanel
+    {
+        private static void OnAlignPropertiesChanged(AvaloniaObject d, AvaloniaPropertyChangedEventArgs e)
+        {
+            if (d is Layoutable layoutable && layoutable.Parent is Layoutable layoutableParent)
+            {
+                layoutableParent.InvalidateArrange();
+            }
+        }
+
+        static RelativePanel()
+        {
+            ClipToBoundsProperty.OverrideDefaultValue<RelativePanel>(true);
+
+            AboveProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
+            AlignBottomWithPanelProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
+            AlignBottomWithProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
+            AlignHorizontalCenterWithPanelProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
+            AlignHorizontalCenterWithProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
+            AlignLeftWithPanelProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
+            AlignLeftWithProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
+            AlignRightWithPanelProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
+            AlignRightWithProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
+            AlignTopWithPanelProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
+            AlignTopWithProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
+            AlignVerticalCenterWithPanelProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
+            AlignVerticalCenterWithProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
+            BelowProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
+            LeftOfProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
+            RightOfProperty.Changed.AddClassHandler<Layoutable>(OnAlignPropertiesChanged);
+        }
+
+        /// <summary>
+        /// Gets the value of the RelativePanel.Above XAML attached property for the target element.
+        /// </summary>
+        /// <param name="obj">The object from which the property value is read.</param>
+        /// <returns>
+        /// The RelativePanel.Above XAML attached property value of the specified object.
+        /// (The element to position this element above.)
+        /// </returns>        
+        [ResolveByName]
+        public static object GetAbove(AvaloniaObject obj)
+        {
+            return (object)obj.GetValue(AboveProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the RelativePanel.Above XAML attached property for a target element.
+        /// </summary>
+        /// <param name="obj">The object to which the property value is written.</param>
+        /// <param name="value">The value to set. (The element to position this element above.)</param>
+        [ResolveByName]
+        public static void SetAbove(AvaloniaObject obj, object value)
+        {
+            obj.SetValue(AboveProperty, value);
+        }
+
+
+        /// <summary>
+        ///  Identifies the <see cref="RelativePanel.AboveProperty"/> XAML attached property.
+        /// </summary>        
+
+        public static readonly AttachedProperty<object> AboveProperty =
+            AvaloniaProperty.RegisterAttached<Layoutable, object>("Above", typeof(RelativePanel));
+
+
+        /// <summary>
+        /// Gets the value of the RelativePanel.AlignBottomWithPanel XAML attached property for the target element.
+        /// </summary>
+        /// <param name="obj">The object from which the property value is read.</param>
+        /// <returns>
+        /// The RelativePanel.AlignBottomWithPanel XAML attached property value of the specified
+        ///    object. (true to align this element's bottom edge with the panel's bottom edge;
+        /// otherwise, false.)
+        /// </returns>
+        public static bool GetAlignBottomWithPanel(AvaloniaObject obj)
+        {
+            return (bool)obj.GetValue(AlignBottomWithPanelProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the RelativePanel.Above XAML attached property for a target element.
+        /// </summary>
+        /// <param name="obj">The object to which the property value is written.</param>
+        /// <param name="value">
+        /// The value to set. (true to align this element's bottom edge with the panel's
+        /// bottom edge; otherwise, false.)
+        /// </param>
+        public static void SetAlignBottomWithPanel(AvaloniaObject obj, bool value)
+        {
+            obj.SetValue(AlignBottomWithPanelProperty, value);
+        }
+
+        /// <summary>
+        ///  Identifies the <see cref="RelativePanel.AlignBottomWithPanelProperty"/> XAML attached property.
+        /// </summary>
+        public static readonly AttachedProperty<bool> AlignBottomWithPanelProperty =
+            AvaloniaProperty.RegisterAttached<Layoutable, bool>("AlignBottomWithPanel", typeof(RelativePanel));
+
+        /// <summary>
+        /// Gets the value of the RelativePanel.AlignBottomWith XAML attached property for the target element.
+        /// </summary>
+        /// <param name="obj">The object from which the property value is read.</param>
+        /// <returns>
+        /// The RelativePanel.AlignBottomWith XAML attached property value of the specified object.
+        /// (The element to align this element's bottom edge with.)
+        /// </returns>        
+        [ResolveByName]
+        public static object GetAlignBottomWith(AvaloniaObject obj)
+        {
+            return (object)obj.GetValue(AlignBottomWithProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the RelativePanel.Above XAML attached property for a target element.
+        /// </summary>
+        /// <param name="obj">The object to which the property value is written.</param>
+        /// <param name="value">The value to set. (The element to align this element's bottom edge with.)</param>
+        [ResolveByName]
+        public static void SetAlignBottomWith(AvaloniaObject obj, object value)
+        {
+            obj.SetValue(AlignBottomWithProperty, value);
+        }
+
+        /// <summary>
+        ///  Identifies the <see cref="RelativePanel.AlignBottomWithProperty"/> XAML attached property.
+        /// </summary>
+
+        public static readonly AttachedProperty<object> AlignBottomWithProperty =
+            AvaloniaProperty.RegisterAttached<Layoutable, object>("AlignBottomWith", typeof(RelativePanel));
+
+        /// <summary>
+        /// Gets the value of the RelativePanel.AlignHorizontalCenterWithPanel XAML attached property for the target element.
+        /// </summary>
+        /// <param name="obj">The object from which the property value is read.</param>
+        /// <returns>
+        /// The RelativePanel.AlignHorizontalCenterWithPanel XAML attached property value
+        /// of the specified object. (true to horizontally center this element in the panel;
+        /// otherwise, false.)
+        /// </returns>
+        public static bool GetAlignHorizontalCenterWithPanel(AvaloniaObject obj)
+        {
+            return (bool)obj.GetValue(AlignHorizontalCenterWithPanelProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the RelativePanel.Above XAML attached property for a target element.
+        /// </summary>
+        /// <param name="obj">The object to which the property value is written.</param>
+        /// <param name="value">
+        /// The value to set. (true to horizontally center this element in the panel; otherwise,
+        /// false.)
+        /// </param>
+        public static void SetAlignHorizontalCenterWithPanel(AvaloniaObject obj, bool value)
+        {
+            obj.SetValue(AlignHorizontalCenterWithPanelProperty, value);
+        }
+
+        /// <summary>
+        ///  Identifies the <see cref="RelativePanel.AlignHorizontalCenterWithPanelProperty"/> XAML attached property.
+        /// </summary>
+        public static readonly AttachedProperty<bool> AlignHorizontalCenterWithPanelProperty =
+            AvaloniaProperty.RegisterAttached<Layoutable, bool>("AlignHorizontalCenterWithPanel", typeof(RelativePanel), false);
+
+        /// <summary>
+        /// Gets the value of the RelativePanel.AlignHorizontalCenterWith XAML attached property for the target element.
+        /// </summary>
+        /// <param name="obj">The object from which the property value is read.</param>
+        /// <returns>
+        /// The RelativePanel.AlignHorizontalCenterWith XAML attached property value of the
+        /// specified object. (The element to align this element's horizontal center with.)
+        /// </returns>        
+        [ResolveByName]
+        public static object GetAlignHorizontalCenterWith(AvaloniaObject obj)
+        {
+            return (object)obj.GetValue(AlignHorizontalCenterWithProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the RelativePanel.Above XAML attached property for a target element.
+        /// </summary>
+        /// <param name="obj">The object to which the property value is written.</param>
+        /// <param name="value">The value to set. (The element to align this element's horizontal center with.)</param>
+        [ResolveByName]
+        public static void SetAlignHorizontalCenterWith(AvaloniaObject obj, object value)
+        {
+            obj.SetValue(AlignHorizontalCenterWithProperty, value);
+        }
+
+        /// <summary>
+        ///  Identifies the <see cref="RelativePanel.AlignHorizontalCenterWithProperty"/> XAML attached property.
+        /// </summary>
+
+        public static readonly AttachedProperty<object> AlignHorizontalCenterWithProperty =
+            AvaloniaProperty.RegisterAttached<Layoutable, object>("AlignHorizontalCenterWith", typeof(object), typeof(RelativePanel));
+
+        /// <summary>
+        /// Gets the value of the RelativePanel.AlignLeftWithPanel XAML attached property for the target element.
+        /// </summary>
+        /// <param name="obj">The object from which the property value is read.</param>
+        /// <returns>
+        /// The RelativePanel.AlignLeftWithPanel XAML attached property value of the specified
+        /// object. (true to align this element's left edge with the panel's left edge; otherwise,
+        /// false.)
+        /// </returns>
+        public static bool GetAlignLeftWithPanel(AvaloniaObject obj)
+        {
+            return (bool)obj.GetValue(AlignLeftWithPanelProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the RelativePanel.Above XAML attached property for a target element.
+        /// </summary>
+        /// <param name="obj">The object to which the property value is written.</param>
+        /// <param name="value">
+        ///  The value to set. (true to align this element's left edge with the panel's left
+        ///  edge; otherwise, false.)
+        /// </param>
+        public static void SetAlignLeftWithPanel(AvaloniaObject obj, bool value)
+        {
+            obj.SetValue(AlignLeftWithPanelProperty, value);
+        }
+
+        /// <summary>
+        ///  Identifies the <see cref="RelativePanel.AlignLeftWithPanelProperty"/> XAML attached property.
+        /// </summary>
+        public static readonly AttachedProperty<bool> AlignLeftWithPanelProperty =
+            AvaloniaProperty.RegisterAttached<Layoutable, bool>("AlignLeftWithPanel", typeof(RelativePanel), false);
+
+
+        /// <summary>
+        /// Gets the value of the RelativePanel.AlignLeftWith XAML attached property for the target element.
+        /// </summary>
+        /// <param name="obj">The object from which the property value is read.</param>
+        /// <returns>
+        /// The RelativePanel.AlignLeftWith XAML attached property value of the specified
+        /// object. (The element to align this element's left edge with.)
+        /// </returns>        
+        [ResolveByName]
+        public static object GetAlignLeftWith(AvaloniaObject obj)
+        {
+            return (object)obj.GetValue(AlignLeftWithProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the RelativePanel.Above XAML attached property for a target element.
+        /// </summary>
+        /// <param name="obj">The object to which the property value is written.</param>
+        /// <param name="value">The value to set. (The element to align this element's left edge with.)</param>
+        [ResolveByName]
+        public static void SetAlignLeftWith(AvaloniaObject obj, object value)
+        {
+            obj.SetValue(AlignLeftWithProperty, value);
+        }
+
+        /// <summary>
+        ///  Identifies the <see cref="RelativePanel.AlignLeftWithProperty"/> XAML attached property.
+        /// </summary>
+
+        public static readonly AttachedProperty<object> AlignLeftWithProperty =
+            AvaloniaProperty.RegisterAttached<RelativePanel, Layoutable, object>("AlignLeftWith");
+
+
+        /// <summary>
+        /// Gets the value of the RelativePanel.AlignRightWithPanel XAML attached property for the target element.
+        /// </summary>
+        /// <param name="obj">The object from which the property value is read.</param>
+        /// <returns>
+        /// The RelativePanel.AlignRightWithPanel XAML attached property value of the specified
+        /// object. (true to align this element's right edge with the panel's right edge;
+        /// otherwise, false.)
+        /// </returns>
+        public static bool GetAlignRightWithPanel(AvaloniaObject obj)
+        {
+            return (bool)obj.GetValue(AlignRightWithPanelProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the RelativePanel.Above XAML attached property for a target element.
+        /// </summary>
+        /// <param name="obj">The object to which the property value is written.</param>
+        /// <param name="value">
+        /// The value to set. (true to align this element's right edge with the panel's right
+        /// edge; otherwise, false.)
+        /// </param>
+        public static void SetAlignRightWithPanel(AvaloniaObject obj, bool value)
+        {
+            obj.SetValue(AlignRightWithPanelProperty, value);
+        }
+
+        /// <summary>
+        ///  Identifies the <see cref="RelativePanel.AlignRightWithPanelProperty"/> XAML attached property.
+        /// </summary>
+        public static readonly AttachedProperty<bool> AlignRightWithPanelProperty =
+            AvaloniaProperty.RegisterAttached<RelativePanel, Layoutable, bool>("AlignRightWithPanel", false);
+
+        /// <summary>
+        /// Gets the value of the RelativePanel.AlignRightWith XAML attached property for the target element.
+        /// </summary>
+        /// <param name="obj">The object from which the property value is read.</param>
+        /// <returns>
+        /// The RelativePanel.AlignRightWith XAML attached property value of the specified
+        /// object. (The element to align this element's right edge with.)
+        /// </returns>        
+        [ResolveByName]
+        public static object GetAlignRightWith(AvaloniaObject obj)
+        {
+            return (object)obj.GetValue(AlignRightWithProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the RelativePanel.AlignRightWith XAML attached property for a target element.
+        /// </summary>
+        /// <param name="obj">The object to which the property value is written.</param>
+        /// <param name="value">The value to set. (The element to align this element's right edge with.)</param>
+        [ResolveByName]
+        public static void SetAlignRightWith(AvaloniaObject obj, object value)
+        {
+            obj.SetValue(AlignRightWithProperty, value);
+        }
+
+        /// <summary>
+        ///  Identifies the <see cref="RelativePanel.AlignRightWithProperty"/> XAML attached property.
+        /// </summary>
+
+        public static readonly AttachedProperty<object> AlignRightWithProperty =
+            AvaloniaProperty.RegisterAttached<RelativePanel, Layoutable, object>("AlignRightWith");
+
+        /// <summary>
+        /// Gets the value of the RelativePanel.AlignTopWithPanel XAML attached property for the target element.
+        /// </summary>
+        /// <param name="obj">The object from which the property value is read.</param>
+        /// <returns>
+        /// The RelativePanel.AlignTopWithPanel XAML attached property value of the specified
+        /// object. (true to align this element's top edge with the panel's top edge; otherwise,
+        /// false.)
+        /// </returns>
+        public static bool GetAlignTopWithPanel(AvaloniaObject obj)
+        {
+            return (bool)obj.GetValue(AlignTopWithPanelProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the RelativePanel.AlignTopWithPanel XAML attached property for a target element.
+        /// </summary>
+        /// <param name="obj">The object to which the property value is written.</param>
+        /// <param name="value">
+        /// The value to set. (true to align this element's top edge with the panel's top
+        /// edge; otherwise, false.)
+        /// </param>
+        public static void SetAlignTopWithPanel(AvaloniaObject obj, bool value)
+        {
+            obj.SetValue(AlignTopWithPanelProperty, value);
+        }
+
+        /// <summary>
+        ///  Identifies the <see cref="RelativePanel.AlignTopWithPanelProperty"/> XAML attached property.
+        /// </summary>
+        public static readonly AttachedProperty<bool> AlignTopWithPanelProperty =
+            AvaloniaProperty.RegisterAttached<RelativePanel, Layoutable, bool>("AlignTopWithPanel", false);
+
+        /// <summary>
+        /// Gets the value of the RelativePanel.AlignTopWith XAML attached property for the target element.
+        /// </summary>
+        /// <param name="obj">The object from which the property value is read.</param>
+        /// <returns>The value to set. (The element to align this element's top edge with.)</returns>        
+        [ResolveByName]
+        public static object GetAlignTopWith(AvaloniaObject obj)
+        {
+            return (object)obj.GetValue(AlignTopWithProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the RelativePanel.AlignTopWith XAML attached property for a target element.
+        /// </summary>
+        /// <param name="obj">The object to which the property value is written.</param>
+        /// <param name="value">The value to set. (The element to align this element's top edge with.)</param>
+        [ResolveByName]
+        public static void SetAlignTopWith(AvaloniaObject obj, object value)
+        {
+            obj.SetValue(AlignTopWithProperty, value);
+        }
+
+        /// <summary>
+        ///  Identifies the <see cref="RelativePanel.AlignTopWithProperty"/> XAML attached property.
+        /// </summary>
+
+        public static readonly AttachedProperty<object> AlignTopWithProperty =
+            AvaloniaProperty.RegisterAttached<RelativePanel, Layoutable, object>("AlignTopWith");
+
+        /// <summary>
+        /// Gets the value of the RelativePanel.AlignVerticalCenterWithPanel XAML attached property for the target element.
+        /// </summary>
+        /// <param name="obj">The object from which the property value is read.</param>
+        /// <returns>
+        /// The RelativePanel.AlignVerticalCenterWithPanel XAML attached property value of
+        /// the specified object. (true to vertically center this element in the panel; otherwise,
+        /// false.)
+        /// </returns>
+        public static bool GetAlignVerticalCenterWithPanel(AvaloniaObject obj)
+        {
+            return (bool)obj.GetValue(AlignVerticalCenterWithPanelProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the RelativePanel.AlignVerticalCenterWithPanel XAML attached property for a target element.
+        /// </summary>
+        /// <param name="obj">The object to which the property value is written.</param>
+        /// <param name="value">
+        /// The value to set. (true to vertically center this element in the panel; otherwise,
+        /// false.)
+        /// </param>
+        public static void SetAlignVerticalCenterWithPanel(AvaloniaObject obj, bool value)
+        {
+            obj.SetValue(AlignVerticalCenterWithPanelProperty, value);
+        }
+
+        /// <summary>
+        ///  Identifies the <see cref="RelativePanel.AlignVerticalCenterWithPanelProperty"/> XAML attached property.
+        /// </summary>
+        public static readonly AttachedProperty<bool> AlignVerticalCenterWithPanelProperty =
+            AvaloniaProperty.RegisterAttached<RelativePanel, Layoutable, bool>("AlignVerticalCenterWithPanel", false);
+
+        /// <summary>
+        /// Gets the value of the RelativePanel.AlignVerticalCenterWith XAML attached property for the target element.
+        /// </summary>
+        /// <param name="obj">The object from which the property value is read.</param>
+        /// <returns>The value to set. (The element to align this element's vertical center with.)</returns>        
+        [ResolveByName]
+        public static object GetAlignVerticalCenterWith(AvaloniaObject obj)
+        {
+            return (object)obj.GetValue(AlignVerticalCenterWithProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the RelativePanel.AlignVerticalCenterWith XAML attached property for a target element.
+        /// </summary>
+        /// <param name="obj">The object to which the property value is written.</param>
+        /// <param name="value">The value to set. (The element to align this element's horizontal center with.)</param>        
+        [ResolveByName]
+        public static void SetAlignVerticalCenterWith(AvaloniaObject obj, object value)
+        {
+            obj.SetValue(AlignVerticalCenterWithProperty, value);
+        }
+
+        /// <summary>
+        ///  Identifies the <see cref="RelativePanel.AlignVerticalCenterWithProperty"/> XAML attached property.
+        /// </summary>
+        public static readonly AttachedProperty<object> AlignVerticalCenterWithProperty =
+            AvaloniaProperty.RegisterAttached<RelativePanel, Layoutable, object>("AlignVerticalCenterWith");
+
+        /// <summary>
+        /// Gets the value of the RelativePanel.Below XAML attached property for the target element.
+        /// </summary>
+        /// <param name="obj">The object from which the property value is read.</param>
+        /// <returns>
+        /// The RelativePanel.Below XAML attached property value of the specified object.
+        /// (The element to position this element below.)                                
+        /// </returns>       
+        [ResolveByName]
+        public static object GetBelow(AvaloniaObject obj)
+        {
+            return (object)obj.GetValue(BelowProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the RelativePanel.Above XAML attached property for a target element.
+        /// </summary>
+        /// <param name="obj">The object to which the property value is written.</param>
+        /// <param name="value">The value to set. (The element to position this element below.)</param>
+        [ResolveByName]
+        public static void SetBelow(AvaloniaObject obj, object value)
+        {
+            obj.SetValue(BelowProperty, value);
+        }
+
+        /// <summary>
+        ///  Identifies the <see cref="RelativePanel.BelowProperty"/> XAML attached property.
+        /// </summary>
+
+        public static readonly AttachedProperty<object> BelowProperty =
+            AvaloniaProperty.RegisterAttached<RelativePanel, Layoutable, object>("Below");
+
+        /// <summary>
+        /// Gets the value of the RelativePanel.LeftOf XAML attached property for the target element.
+        /// </summary>
+        /// <param name="obj">The object from which the property value is read.</param>
+        /// <returns>
+        /// The RelativePanel.LeftOf XAML attached property value of the specified object.
+        /// (The element to position this element to the left of.)                                 
+        /// </returns>        
+        [ResolveByName]
+        public static object GetLeftOf(AvaloniaObject obj)
+        {
+            return (object)obj.GetValue(LeftOfProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the RelativePanel.LeftOf XAML attached property for a target element.
+        /// </summary>
+        /// <param name="obj">The object to which the property value is written.</param>
+        /// <param name="value">The value to set. (The element to position this element to the left of.)</param>
+        [ResolveByName]
+        public static void SetLeftOf(AvaloniaObject obj, object value)
+        {
+            obj.SetValue(LeftOfProperty, value);
+        }
+
+        /// <summary>
+        ///  Identifies the <see cref="RelativePanel.LeftOfProperty"/> XAML attached property.
+        /// </summary>
+
+        public static readonly AttachedProperty<object> LeftOfProperty =
+            AvaloniaProperty.RegisterAttached<RelativePanel, Layoutable, object>("LeftOf");
+
+        /// <summary>
+        /// Gets the value of the RelativePanel.RightOf XAML attached property for the target element.
+        /// </summary>
+        /// <param name="obj">The object from which the property value is read.</param>
+        /// <returns>
+        /// The RelativePanel.RightOf XAML attached property value of the specified object.
+        /// (The element to position this element to the right of.)                                   
+        /// </returns>        
+        [ResolveByName]
+        public static object GetRightOf(AvaloniaObject obj)
+        {
+            return (object)obj.GetValue(RightOfProperty);
+        }
+
+        /// <summary>
+        /// Sets the value of the RelativePanel.RightOf XAML attached property for a target element.
+        /// </summary>
+        /// <param name="obj">The object to which the property value is written.</param>
+        /// <param name="value">The value to set. (The element to position this element to the right of.)</param>
+        [ResolveByName]
+        public static void SetRightOf(AvaloniaObject obj, object value)
+        {
+            obj.SetValue(RightOfProperty, value);
+        }
+
+        /// <summary>
+        ///  Identifies the <see cref="RelativePanel.RightOfProperty"/> XAML attached property.
+        /// </summary>
+
+        public static readonly AttachedProperty<object> RightOfProperty =
+            AvaloniaProperty.RegisterAttached<RelativePanel, Layoutable, object>("RightOf");
+    }
+}
diff --git a/src/Avalonia.Controls/RelativePanel.cs b/src/Avalonia.Controls/RelativePanel.cs
new file mode 100644
index 0000000000..27f13a3f57
--- /dev/null
+++ b/src/Avalonia.Controls/RelativePanel.cs
@@ -0,0 +1,536 @@
+// Ported from https://github.com/HandyOrg/HandyControl/blob/master/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Layout;
+
+#nullable enable
+
+namespace Avalonia.Controls
+{
+    public partial class RelativePanel : Panel
+    {
+        private readonly Graph _childGraph;
+
+        public RelativePanel() => _childGraph = new Graph();
+
+        private Layoutable? GetDependencyElement(AvaloniaProperty property, AvaloniaObject child)
+        {
+            var dependency = child.GetValue(property);
+
+            if (dependency is Layoutable layoutable)
+            {
+                if (Children.Contains((ILayoutable)layoutable))
+                    return layoutable;
+
+                throw new ArgumentException($"RelativePanel error: Element does not exist in the current context: {property.Name}");
+            }
+
+            return null;
+        }
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            _childGraph.Clear();
+            foreach (Layoutable child in Children)
+            {
+                if (child == null)
+                    continue;
+                var node = _childGraph.AddNode(child);
+
+                node.AlignLeftWithNode = _childGraph.AddLink(node, GetDependencyElement(AlignLeftWithProperty, child));
+                node.AlignTopWithNode = _childGraph.AddLink(node, GetDependencyElement(AlignTopWithProperty, child));
+                node.AlignRightWithNode = _childGraph.AddLink(node, GetDependencyElement(AlignRightWithProperty, child));
+                node.AlignBottomWithNode = _childGraph.AddLink(node, GetDependencyElement(AlignBottomWithProperty, child));
+
+                node.LeftOfNode = _childGraph.AddLink(node, GetDependencyElement(LeftOfProperty, child));
+                node.AboveNode = _childGraph.AddLink(node, GetDependencyElement(AboveProperty, child));
+                node.RightOfNode = _childGraph.AddLink(node, GetDependencyElement(RightOfProperty, child));
+                node.BelowNode = _childGraph.AddLink(node, GetDependencyElement(BelowProperty, child));
+
+                node.AlignHorizontalCenterWith = _childGraph.AddLink(node, GetDependencyElement(AlignHorizontalCenterWithProperty, child));
+                node.AlignVerticalCenterWith = _childGraph.AddLink(node, GetDependencyElement(AlignVerticalCenterWithProperty, child));
+
+            }
+            _childGraph.Measure(availableSize);
+
+            _childGraph.Reset(false);
+            var boundingSize = _childGraph.GetBoundingSize(Width.IsNaN(), Height.IsNaN());
+            _childGraph.Reset();
+            _childGraph.Measure(boundingSize);
+            return boundingSize;
+        }
+
+        protected override Size ArrangeOverride(Size arrangeSize)
+        {
+            _childGraph.GetNodes().Do(node => node.Arrange(arrangeSize));
+            return arrangeSize;
+        }
+
+        private class GraphNode
+        {
+            public bool Measured { get; set; }
+
+            public Layoutable Element { get; }
+
+            private bool HorizontalOffsetFlag { get; set; }
+
+            private bool VerticalOffsetFlag { get; set; }
+
+            private Size BoundingSize { get; set; }
+
+            public Size OriginDesiredSize { get; set; }
+
+            public double Left { get; set; } = double.NaN;
+
+            public double Top { get; set; } = double.NaN;
+
+            public double Right { get; set; } = double.NaN;
+
+            public double Bottom { get; set; } = double.NaN;
+
+            public HashSet<GraphNode> OutgoingNodes { get; }
+
+            public GraphNode? AlignLeftWithNode { get; set; }
+
+            public GraphNode? AlignTopWithNode { get; set; }
+
+            public GraphNode? AlignRightWithNode { get; set; }
+
+            public GraphNode? AlignBottomWithNode { get; set; }
+
+            public GraphNode? LeftOfNode { get; set; }
+
+            public GraphNode? AboveNode { get; set; }
+
+            public GraphNode? RightOfNode { get; set; }
+
+            public GraphNode? BelowNode { get; set; }
+
+            public GraphNode? AlignHorizontalCenterWith { get; set; }
+
+            public GraphNode? AlignVerticalCenterWith { get; set; }
+
+            public GraphNode(Layoutable element)
+            {
+                OutgoingNodes = new HashSet<GraphNode>();
+                Element = element;
+            }
+
+            public void Arrange(Size arrangeSize) => Element.Arrange(new Rect(Left, Top, Math.Max(arrangeSize.Width - Left - Right, 0), Math.Max(arrangeSize.Height - Top - Bottom, 0)));
+
+            public void Reset(bool clearPos)
+            {
+                if (clearPos)
+                {
+                    Left = double.NaN;
+                    Top = double.NaN;
+                    Right = double.NaN;
+                    Bottom = double.NaN;
+                }
+
+                Measured = false;
+            }
+
+            public Size GetBoundingSize()
+            {
+                if (Left < 0 || Top < 0) return default;
+                if (Measured)
+                    return BoundingSize;
+
+                if (!OutgoingNodes.Any())
+                {
+                    BoundingSize = Element.DesiredSize;
+                    Measured = true;
+                }
+                else
+                {
+                    BoundingSize = GetBoundingSize(this, Element.DesiredSize, OutgoingNodes);
+                    Measured = true;
+                }
+
+                return BoundingSize;
+            }
+
+            private static Size GetBoundingSize(GraphNode prevNode, Size prevSize, IEnumerable<GraphNode> nodes)
+            {
+                foreach (var node in nodes)
+                {
+                    if (node.Measured || !node.OutgoingNodes.Any())
+                    {
+                        if (prevNode.LeftOfNode != null && prevNode.LeftOfNode == node ||
+                            prevNode.RightOfNode != null && prevNode.RightOfNode == node)
+                        {
+                            prevSize = prevSize.WithWidth(prevSize.Width + node.BoundingSize.Width);
+                            if (GetAlignHorizontalCenterWithPanel(node.Element) || node.HorizontalOffsetFlag)
+                            {
+                                prevSize = prevSize.WithWidth(prevSize.Width + prevNode.OriginDesiredSize.Width);
+                                prevNode.HorizontalOffsetFlag = true;
+                            }
+                            if (node.VerticalOffsetFlag)
+                            {
+                                prevNode.VerticalOffsetFlag = true;
+                            }
+                        }
+
+                        if (prevNode.AboveNode != null && prevNode.AboveNode == node ||
+                            prevNode.BelowNode != null && prevNode.BelowNode == node)
+                        {
+                            prevSize = prevSize.WithHeight(prevSize.Height + node.BoundingSize.Height);
+                            if (GetAlignVerticalCenterWithPanel(node.Element) || node.VerticalOffsetFlag)
+                            {
+                                prevSize = prevSize.WithHeight(prevSize.Height + node.OriginDesiredSize.Height);
+                                prevNode.VerticalOffsetFlag = true;
+                            }
+                            if (node.HorizontalOffsetFlag)
+                            {
+                                prevNode.HorizontalOffsetFlag = true;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        return GetBoundingSize(node, prevSize, node.OutgoingNodes);
+                    }
+                }
+
+                return prevSize;
+            }
+        }
+
+        private class Graph
+        {
+            private readonly Dictionary<AvaloniaObject, GraphNode> _nodeDic;
+
+            private Size AvailableSize { get; set; }
+
+            public Graph() => _nodeDic = new Dictionary<AvaloniaObject, GraphNode>();
+
+            public IEnumerable<GraphNode> GetNodes() => _nodeDic.Values;
+
+            public void Clear()
+            {
+                AvailableSize = new Size();
+                _nodeDic.Clear();
+            }
+
+            public void Reset(bool clearPos = true) => _nodeDic.Values.Do(node => node.Reset(clearPos));
+
+            public GraphNode? AddLink(GraphNode from, Layoutable? to)
+            {
+                if (to == null)
+                    return null;
+
+                GraphNode nodeTo;
+                if (_nodeDic.ContainsKey(to))
+                {
+                    nodeTo = _nodeDic[to];
+                }
+                else
+                {
+                    nodeTo = new GraphNode(to);
+                    _nodeDic[to] = nodeTo;
+                }
+
+                from.OutgoingNodes.Add(nodeTo);
+                return nodeTo;
+            }
+
+            public GraphNode AddNode(Layoutable value)
+            {
+                if (!_nodeDic.ContainsKey(value))
+                {
+                    var node = new GraphNode(value);
+                    _nodeDic.Add(value, node);
+                    return node;
+                }
+
+                return _nodeDic[value];
+            }
+
+            public void Measure(Size availableSize)
+            {
+                AvailableSize = availableSize;
+                Measure(_nodeDic.Values, null);
+            }
+
+            private void Measure(IEnumerable<GraphNode> nodes, HashSet<AvaloniaObject>? set)
+            {
+                set ??= new HashSet<AvaloniaObject>();
+
+                foreach (var node in nodes)
+                {
+                    if (!node.Measured && !node.OutgoingNodes.Any())
+                    {
+                        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)
+                    {
+                        MeasureChild(node);
+                    }
+                }
+            }
+
+            private void MeasureChild(GraphNode node)
+            {
+                var child = node.Element;
+                child.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+                node.OriginDesiredSize = child.DesiredSize;
+
+                var alignLeftWithPanel = GetAlignLeftWithPanel(child);
+                var alignTopWithPanel = GetAlignTopWithPanel(child);
+                var alignRightWithPanel = GetAlignRightWithPanel(child);
+                var alignBottomWithPanel = GetAlignBottomWithPanel(child);
+
+                if (alignLeftWithPanel)
+                    node.Left = 0;
+                if (alignTopWithPanel)
+                    node.Top = 0;
+                if (alignRightWithPanel)
+                    node.Right = 0;
+                if (alignBottomWithPanel)
+                    node.Bottom = 0;
+
+                if (node.AlignLeftWithNode != null)
+                {
+                    node.Left = node.Left.IsNaN() ? node.AlignLeftWithNode.Left : node.AlignLeftWithNode.Left * 0.5;
+                }
+
+                if (node.AlignTopWithNode != null)
+                {
+                    node.Top = node.Top.IsNaN() ? node.AlignTopWithNode.Top : node.AlignTopWithNode.Top * 0.5;
+                }
+
+                if (node.AlignRightWithNode != null)
+                {
+                    node.Right = node.Right.IsNaN()
+                        ? node.AlignRightWithNode.Right
+                        : node.AlignRightWithNode.Right * 0.5;
+                }
+
+                if (node.AlignBottomWithNode != null)
+                {
+                    node.Bottom = node.Bottom.IsNaN()
+                        ? node.AlignBottomWithNode.Bottom
+                        : node.AlignBottomWithNode.Bottom * 0.5;
+                }
+
+                var availableHeight = AvailableSize.Height - node.Top - node.Bottom;
+                if (availableHeight.IsNaN())
+                {
+                    availableHeight = AvailableSize.Height;
+
+                    if (!node.Top.IsNaN() && node.Bottom.IsNaN())
+                    {
+                        availableHeight -= node.Top;
+                    }
+                    else if (node.Top.IsNaN() && !node.Bottom.IsNaN())
+                    {
+                        availableHeight -= node.Bottom;
+                    }
+                }
+
+                var availableWidth = AvailableSize.Width - node.Left - node.Right;
+                if (availableWidth.IsNaN())
+                {
+                    availableWidth = AvailableSize.Width;
+
+                    if (!node.Left.IsNaN() && node.Right.IsNaN())
+                    {
+                        availableWidth -= node.Left;
+                    }
+                    else if (node.Left.IsNaN() && !node.Right.IsNaN())
+                    {
+                        availableWidth -= node.Right;
+                    }
+                }
+
+                child.Measure(new Size(Math.Max(availableWidth, 0), Math.Max(availableHeight, 0)));
+                var childSize = child.DesiredSize;
+
+                if (node.LeftOfNode != null && node.Left.IsNaN())
+                {
+                    node.Left = node.LeftOfNode.Left - childSize.Width;
+                }
+
+                if (node.AboveNode != null && node.Top.IsNaN())
+                {
+                    node.Top = node.AboveNode.Top - childSize.Height;
+                }
+
+                if (node.RightOfNode != null)
+                {
+                    if (node.Right.IsNaN())
+                    {
+                        node.Right = node.RightOfNode.Right - childSize.Width;
+                    }
+
+                    if (node.Left.IsNaN())
+                    {
+                        node.Left = AvailableSize.Width - node.RightOfNode.Right;
+                    }
+                }
+
+                if (node.BelowNode != null)
+                {
+                    if (node.Bottom.IsNaN())
+                    {
+                        node.Bottom = node.BelowNode.Bottom - childSize.Height;
+                    }
+
+                    if (node.Top.IsNaN())
+                    {
+                        node.Top = AvailableSize.Height - node.BelowNode.Bottom;
+                    }
+                }
+
+                if (node.AlignHorizontalCenterWith != null)
+                {
+                    var halfWidthLeft = (AvailableSize.Width + node.AlignHorizontalCenterWith.Left - node.AlignHorizontalCenterWith.Right - childSize.Width) * 0.5;
+                    var halfWidthRight = (AvailableSize.Width - node.AlignHorizontalCenterWith.Left + node.AlignHorizontalCenterWith.Right - childSize.Width) * 0.5;
+
+                    if (node.Left.IsNaN())
+                        node.Left = halfWidthLeft;
+                    else
+                        node.Left = (node.Left + halfWidthLeft) * 0.5;
+
+                    if (node.Right.IsNaN())
+                        node.Right = halfWidthRight;
+                    else
+                        node.Right = (node.Right + halfWidthRight) * 0.5;
+                }
+
+                if (node.AlignVerticalCenterWith != null)
+                {
+                    var halfHeightTop = (AvailableSize.Height + node.AlignVerticalCenterWith.Top - node.AlignVerticalCenterWith.Bottom - childSize.Height) * 0.5;
+                    var halfHeightBottom = (AvailableSize.Height - node.AlignVerticalCenterWith.Top + node.AlignVerticalCenterWith.Bottom - childSize.Height) * 0.5;
+
+                    if (node.Top.IsNaN())
+                        node.Top = halfHeightTop;
+                    else
+                        node.Top = (node.Top + halfHeightTop) * 0.5;
+
+                    if (node.Bottom.IsNaN())
+                        node.Bottom = halfHeightBottom;
+                    else
+                        node.Bottom = (node.Bottom + halfHeightBottom) * 0.5;
+                }
+
+                if (GetAlignHorizontalCenterWithPanel(child))
+                {
+                    var halfSubWidth = (AvailableSize.Width - childSize.Width) * 0.5;
+
+                    if (node.Left.IsNaN())
+                        node.Left = halfSubWidth;
+                    else
+                        node.Left = (node.Left + halfSubWidth) * 0.5;
+
+                    if (node.Right.IsNaN())
+                        node.Right = halfSubWidth;
+                    else
+                        node.Right = (node.Right + halfSubWidth) * 0.5;
+                }
+
+                if (GetAlignVerticalCenterWithPanel(child))
+                {
+                    var halfSubHeight = (AvailableSize.Height - childSize.Height) * 0.5;
+
+                    if (node.Top.IsNaN())
+                        node.Top = halfSubHeight;
+                    else
+                        node.Top = (node.Top + halfSubHeight) * 0.5;
+
+                    if (node.Bottom.IsNaN())
+                        node.Bottom = halfSubHeight;
+                    else
+                        node.Bottom = (node.Bottom + halfSubHeight) * 0.5;
+                }
+
+                if (node.Left.IsNaN())
+                {
+                    if (!node.Right.IsNaN())
+                        node.Left = AvailableSize.Width - node.Right - childSize.Width;
+                    else
+                    {
+                        node.Left = 0;
+                        node.Right = AvailableSize.Width - childSize.Width;
+                    }
+                }
+                else if (!node.Left.IsNaN() && node.Right.IsNaN())
+                {
+                    node.Right = AvailableSize.Width - node.Left - childSize.Width;
+                }
+
+                if (node.Top.IsNaN())
+                {
+                    if (!node.Bottom.IsNaN())
+                        node.Top = AvailableSize.Height - node.Bottom - childSize.Height;
+                    else
+                    {
+                        node.Top = 0;
+                        node.Bottom = AvailableSize.Height - childSize.Height;
+                    }
+                }
+                else if (!node.Top.IsNaN() && node.Bottom.IsNaN())
+                {
+                    node.Bottom = AvailableSize.Height - node.Top - childSize.Height;
+                }
+
+                node.Measured = true;
+            }
+
+            public Size GetBoundingSize(bool calcWidth, bool calcHeight)
+            {
+                var boundingSize = new Size();
+
+                foreach (var node in _nodeDic.Values)
+                {
+                    var size = node.GetBoundingSize();
+                    boundingSize = boundingSize.WithWidth(Math.Max(boundingSize.Width, size.Width));
+                    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);
+                return boundingSize;
+            }
+        }
+    }
+
+    internal static partial class Extensions
+    {
+        /// <summary>
+        ///     Returns a value that indicates whether the specified value is not a number ().
+        /// </summary>
+        /// <param name="d">A double-precision floating-point number.</param>
+        /// <returns>true if  evaluates to ; otherwise, false.</returns>
+        public static bool IsNaN(this double d)
+        {
+            return double.IsNaN(d);
+        }
+
+        public static IEnumerable<TSource> Do<TSource>(this IEnumerable<TSource> source, Action<TSource> predicate)
+        {
+            var enumerable = source as IList<TSource> ?? source.ToList();
+            foreach (var item in enumerable)
+            {
+                predicate.Invoke(item);
+            }
+
+            return enumerable;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Remote/RemoteServer.cs b/src/Avalonia.Controls/Remote/RemoteServer.cs
index e116316904..4f5a7cd311 100644
--- a/src/Avalonia.Controls/Remote/RemoteServer.cs
+++ b/src/Avalonia.Controls/Remote/RemoteServer.cs
@@ -10,13 +10,13 @@ namespace Avalonia.Controls.Remote
     {
         private EmbeddableControlRoot _topLevel;
 
-        class EmbeddableRemoteServerTopLevelImpl : RemoteServerTopLevelImpl, IEmbeddableWindowImpl
+        class EmbeddableRemoteServerTopLevelImpl : RemoteServerTopLevelImpl
         {
             public EmbeddableRemoteServerTopLevelImpl(IAvaloniaRemoteTransportConnection transport) : base(transport)
             {
             }
 #pragma warning disable 67
-            public event Action LostFocus;
+            public Action LostFocus { get; set; }
 
         }
         
diff --git a/src/Avalonia.Controls/Remote/RemoteWidget.cs b/src/Avalonia.Controls/Remote/RemoteWidget.cs
index 539fe1ec4b..fabb38f87d 100644
--- a/src/Avalonia.Controls/Remote/RemoteWidget.cs
+++ b/src/Avalonia.Controls/Remote/RemoteWidget.cs
@@ -75,7 +75,11 @@ namespace Avalonia.Controls.Remote
                 var fmt = (PixelFormat) _lastFrame.Format;
                 if (_bitmap == null || _bitmap.PixelSize.Width != _lastFrame.Width ||
                     _bitmap.PixelSize.Height != _lastFrame.Height)
-                    _bitmap = new WriteableBitmap(new PixelSize(_lastFrame.Width, _lastFrame.Height), new Vector(96, 96), fmt);
+                {
+                    _bitmap?.Dispose();
+                    _bitmap = new WriteableBitmap(new PixelSize(_lastFrame.Width, _lastFrame.Height),
+                        new Vector(96, 96), fmt);
+                }
                 using (var l = _bitmap.Lock())
                 {
                     var lineLen = (fmt == PixelFormat.Rgb565 ? 2 : 4) * _lastFrame.Width;
@@ -83,7 +87,7 @@ namespace Avalonia.Controls.Remote
                         Marshal.Copy(_lastFrame.Data, y * _lastFrame.Stride,
                             new IntPtr(l.Address.ToInt64() + l.RowBytes * y), lineLen);
                 }
-                context.DrawImage(_bitmap, 1, new Rect(0, 0, _bitmap.PixelSize.Width, _bitmap.PixelSize.Height),
+                context.DrawImage(_bitmap, new Rect(0, 0, _bitmap.PixelSize.Width, _bitmap.PixelSize.Height),
                     new Rect(Bounds.Size));
             }
             base.Render(context);
diff --git a/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs b/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
index 9d70fbcf31..931c27c575 100644
--- a/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
+++ b/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
@@ -115,7 +115,7 @@ namespace Avalonia.Controls.Remote.Server
                 {
                     lock (_lock)
                     {
-                        _lastReceivedFrame = lastFrame.SequenceId;
+                        _lastReceivedFrame = Math.Max(lastFrame.SequenceId, _lastReceivedFrame);
                     }
                     Dispatcher.UIThread.Post(RenderIfNeeded);
                 }
@@ -192,7 +192,7 @@ namespace Avalonia.Controls.Remote.Server
                             GetAvaloniaInputModifiers(pressed.Modifiers)));
                     }, DispatcherPriority.Input);
                 }
-                if (obj is PointerPressedEventMessage released)
+                if (obj is PointerReleasedEventMessage released)
                 {
                     Dispatcher.UIThread.Post(() =>
                     {
@@ -298,6 +298,8 @@ namespace Avalonia.Controls.Remote.Server
                 Width = width,
                 Height = height,
                 Stride = width * bpp,
+                DpiX = _dpi.X,
+                DpiY = _dpi.Y
             };
         }
 
diff --git a/src/Avalonia.Controls/RepeatButton.cs b/src/Avalonia.Controls/RepeatButton.cs
index a982a0970c..fcd6607feb 100644
--- a/src/Avalonia.Controls/RepeatButton.cs
+++ b/src/Avalonia.Controls/RepeatButton.cs
@@ -88,7 +88,7 @@ namespace Avalonia.Controls
         {
             base.OnPointerPressed(e);
 
-            if (e.MouseButton == MouseButton.Left)
+            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
             {
                 StartTimer();
             }
diff --git a/src/Avalonia.Controls/Repeater/ElementFactory.cs b/src/Avalonia.Controls/Repeater/ElementFactory.cs
new file mode 100644
index 0000000000..644e077221
--- /dev/null
+++ b/src/Avalonia.Controls/Repeater/ElementFactory.cs
@@ -0,0 +1,27 @@
+using Avalonia.Controls.Templates;
+
+namespace Avalonia.Controls
+{
+    public abstract class ElementFactory : IElementFactory
+    {
+        public IControl Build(object data)
+        {
+            return GetElementCore(new ElementFactoryGetArgs { Data = data });
+        }
+
+        public IControl GetElement(ElementFactoryGetArgs args)
+        {
+            return GetElementCore(args);
+        }
+
+        public bool Match(object data) => true;
+
+        public void RecycleElement(ElementFactoryRecycleArgs args)
+        {
+            RecycleElementCore(args);
+        }
+
+        protected abstract IControl GetElementCore(ElementFactoryGetArgs args);
+        protected abstract void RecycleElementCore(ElementFactoryRecycleArgs args);
+    }
+}
diff --git a/src/Avalonia.Controls/Repeater/IElementFactory.cs b/src/Avalonia.Controls/Repeater/IElementFactory.cs
new file mode 100644
index 0000000000..6a899a6f26
--- /dev/null
+++ b/src/Avalonia.Controls/Repeater/IElementFactory.cs
@@ -0,0 +1,66 @@
+using Avalonia.Controls.Templates;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Represents the optional arguments to use when calling an implementation of the
+    /// <see cref="IElementFactory"/>'s <see cref="IElementFactory.GetElement"/> method.
+    /// </summary>
+    public class ElementFactoryGetArgs
+    {
+        /// <summary>
+        /// Gets or sets the data item for which an appropriate element tree should be realized
+        /// when calling <see cref="IElementFactory.GetElement"/>.
+        /// </summary>
+        public object Data { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IControl"/> that is expected to be the parent of the
+        /// realized element from <see cref="IElementFactory.GetElement"/>.
+        /// </summary>
+        public IControl Parent { get; set; }
+
+        /// <summary>
+        /// Gets or sets the index of the item that should be realized.
+        /// </summary>
+        public int Index { get; set; }
+    }
+
+    /// <summary>
+    /// Represents the optional arguments to use when calling an implementation of the
+    /// <see cref="IElementFactory"/>'s <see cref="IElementFactory.GetElement"/> method.
+    /// </summary>
+    public class ElementFactoryRecycleArgs
+    {
+        /// <summary>
+        /// Gets or sets the <see cref="IControl"/> to recycle when calling 
+        /// <see cref="IElementFactory.RecycleElement"/>.
+        /// </summary>
+        public IControl Element { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IControl"/> that is expected to be the parent of the
+        /// realized element from <see cref="IElementFactory.GetElement"/>.
+        /// </summary>
+        public IControl Parent { get; set; }
+    }
+
+    /// <summary>
+    /// A data template that supports creating and recyling elements for an <see cref="ItemsRepeater"/>.
+    /// </summary>
+    public interface IElementFactory : IDataTemplate
+    {
+        /// <summary>
+        /// Gets an <see cref="IControl"/>.
+        /// </summary>
+        /// <param name="args">The element args.</param>
+        public IControl GetElement(ElementFactoryGetArgs args);
+
+        /// <summary>
+        /// Recycles an <see cref="IControl"/> that was previously retrieved using
+        /// <see cref="GetElement"/>.
+        /// </summary>
+        /// <param name="args">The recycle args.</param>
+        public void RecycleElement(ElementFactoryRecycleArgs args);
+    }
+}
diff --git a/src/Avalonia.Controls/Repeater/ItemTemplateWrapper.cs b/src/Avalonia.Controls/Repeater/ItemTemplateWrapper.cs
index 04d859c742..dd97cde218 100644
--- a/src/Avalonia.Controls/Repeater/ItemTemplateWrapper.cs
+++ b/src/Avalonia.Controls/Repeater/ItemTemplateWrapper.cs
@@ -7,13 +7,26 @@ using Avalonia.Controls.Templates;
 
 namespace Avalonia.Controls
 {
-    internal class ItemTemplateWrapper
+    internal class ItemTemplateWrapper : IElementFactory
     {
         private readonly IDataTemplate _dataTemplate;
 
         public ItemTemplateWrapper(IDataTemplate dataTemplate) => _dataTemplate = dataTemplate;
 
-        public IControl GetElement(IControl parent, object data)
+        public IControl Build(object param) => GetElement(null, param);
+        public bool Match(object data) => _dataTemplate.Match(data);
+
+        public IControl GetElement(ElementFactoryGetArgs args)
+        {
+            return GetElement(args.Parent, args.Data);
+        }
+
+        public void RecycleElement(ElementFactoryRecycleArgs args)
+        {
+            RecycleElement(args.Parent, args.Element);
+        }
+
+        private IControl GetElement(IControl parent, object data)
         {
             var selectedTemplate = _dataTemplate;
             var recyclePool = RecyclePool.GetPoolInstance(selectedTemplate);
@@ -37,7 +50,7 @@ namespace Avalonia.Controls
             return element;
         }
 
-        public void RecycleElement(IControl parent, IControl element)
+        private void RecycleElement(IControl parent, IControl element)
         {
             var selectedTemplate = _dataTemplate;
             var recyclePool = RecyclePool.GetPoolInstance(selectedTemplate);
diff --git a/src/Avalonia.Controls/Repeater/ItemsRepeater.cs b/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
index 257c1b2399..fb2da09e73 100644
--- a/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
+++ b/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
@@ -9,6 +9,9 @@ using System.Collections.Specialized;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Layout;
+using Avalonia.Logging;
+using Avalonia.Utilities;
+using Avalonia.VisualTree;
 
 namespace Avalonia.Controls
 {
@@ -21,7 +24,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="HorizontalCacheLength"/> property.
         /// </summary>
-        public static readonly AvaloniaProperty<double> HorizontalCacheLengthProperty =
+        public static readonly StyledProperty<double> HorizontalCacheLengthProperty =
             AvaloniaProperty.Register<ItemsRepeater, double>(nameof(HorizontalCacheLength), 2.0);
 
         /// <summary>
@@ -39,16 +42,16 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="Layout"/> property.
         /// </summary>
-        public static readonly AvaloniaProperty<AttachedLayout> LayoutProperty =
+        public static readonly StyledProperty<AttachedLayout> LayoutProperty =
             AvaloniaProperty.Register<ItemsRepeater, AttachedLayout>(nameof(Layout), new StackLayout());
 
         /// <summary>
         /// Defines the <see cref="VerticalCacheLength"/> property.
         /// </summary>
-        public static readonly AvaloniaProperty<double> VerticalCacheLengthProperty =
+        public static readonly StyledProperty<double> VerticalCacheLengthProperty =
             AvaloniaProperty.Register<ItemsRepeater, double>(nameof(VerticalCacheLength), 2.0);
 
-        private static readonly AttachedProperty<VirtualizationInfo> VirtualizationInfoProperty =
+        private static readonly StyledProperty<VirtualizationInfo> VirtualizationInfoProperty =
             AvaloniaProperty.RegisterAttached<ItemsRepeater, IControl, VirtualizationInfo>("VirtualizationInfo");
 
         internal static readonly Rect InvalidRect = new Rect(-1, -1, -1, -1);
@@ -78,6 +81,7 @@ namespace Avalonia.Controls
         static ItemsRepeater()
         {
             ClipToBoundsProperty.OverrideDefaultValue<ItemsRepeater>(true);
+            RequestBringIntoViewEvent.AddClassHandler<ItemsRepeater>((x, e) => x.OnRequestBringIntoView(e));
         }
 
         /// <summary>
@@ -137,7 +141,7 @@ namespace Avalonia.Controls
         /// </summary>
         public ItemsSourceView ItemsSourceView { get; private set; }
 
-        internal ItemTemplateWrapper ItemTemplateShim { get; set; }
+        internal IElementFactory ItemTemplateShim { get; set; }
         internal Point LayoutOrigin { get; set; }
         internal object LayoutState { get; set; }
         internal IControl MadeAnchor => _viewportManager.MadeAnchor;
@@ -217,12 +221,21 @@ namespace Avalonia.Controls
         /// </returns>
         public IControl TryGetElement(int index) => GetElementFromIndexImpl(index);
 
+        /// <summary>
+        /// Retrieves the UIElement that corresponds to the item at the specified index in the
+        /// data source.
+        /// </summary>
+        /// <param name="index">The index of the item.</param>
+        /// <returns>
+        /// An <see cref="IControl"/> that corresponds to the item at the specified index. If the
+        /// item is not realized, a new UIElement is created.
+        /// </returns>
+        public IControl GetOrCreateElement(int index) => GetOrCreateElementImpl(index);
+
         internal void PinElement(IControl element) => _viewManager.UpdatePin(element, true);
 
         internal void UnpinElement(IControl element) => _viewManager.UpdatePin(element, false);
 
-        internal IControl GetOrCreateElement(int index) => GetOrCreateElementImpl(index);
-
         internal static VirtualizationInfo TryGetVirtualizationInfo(IControl element)
         {
             var value = element.GetValue(VirtualizationInfoProperty);
@@ -254,6 +267,11 @@ namespace Avalonia.Controls
             return result;
         }
 
+        private protected override void InvalidateMeasureOnChildrenChanged()
+        {
+            // Don't invalidate measure when children change.
+        }
+
         protected override Size MeasureOverride(Size availableSize)
         {
             if (_isLayoutInProgress)
@@ -294,6 +312,7 @@ namespace Avalonia.Controls
                             virtInfo.AutoRecycleCandidate &&
                             !virtInfo.KeepAlive)
                         {
+                            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "AutoClear - {Index}", virtInfo.Index);
                             ClearElementImpl(element);
                         }
                     }
@@ -350,6 +369,12 @@ namespace Avalonia.Controls
                     {
                         var newBounds = element.Bounds;
                         virtInfo.ArrangeBounds = newBounds;
+
+                        if (!virtInfo.IsRegisteredAsAnchorCandidate)
+                        {
+                            _viewportManager.RegisterScrollAnchorCandidate(element);
+                            virtInfo.IsRegisteredAsAnchorCandidate = true;
+                        }
                     }
                 }
 
@@ -374,41 +399,46 @@ namespace Avalonia.Controls
             _viewportManager.ResetScrollers();
         }
 
-        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs args)
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
         {
-            var property = args.Property;
-
-            if (property == ItemsProperty)
+            if (change.Property == ItemsProperty)
             {
-                var newValue = (IEnumerable)args.NewValue;
-                var newDataSource = newValue as ItemsSourceView;
-                if (newValue != null && newDataSource == null)
+                var oldEnumerable = change.OldValue.GetValueOrDefault<IEnumerable>();
+                var newEnumerable = change.NewValue.GetValueOrDefault<IEnumerable>();
+
+                if (oldEnumerable != newEnumerable)
                 {
-                    newDataSource = new ItemsSourceView(newValue);
-                }
+                    var newDataSource = newEnumerable as ItemsSourceView;
+                    if (newEnumerable != null && newDataSource == null)
+                    {
+                        newDataSource = new ItemsSourceView(newEnumerable);
+                    }
 
-                OnDataSourcePropertyChanged(ItemsSourceView, newDataSource);
-            }
-            else if (property == ItemTemplateProperty)
-            {
-                OnItemTemplateChanged((IDataTemplate)args.OldValue, (IDataTemplate)args.NewValue);
+                    OnDataSourcePropertyChanged(ItemsSourceView, newDataSource);
+                }
             }
-            else if (property == LayoutProperty)
+            else if (change.Property == ItemTemplateProperty)
             {
-                OnLayoutChanged((AttachedLayout)args.OldValue, (AttachedLayout)args.NewValue);
+                OnItemTemplateChanged(
+                    change.OldValue.GetValueOrDefault<IDataTemplate>(),
+                    change.NewValue.GetValueOrDefault<IDataTemplate>());
             }
-            else if (property == HorizontalCacheLengthProperty)
+            else if (change.Property == LayoutProperty)
             {
-                _viewportManager.HorizontalCacheLength = (double)args.NewValue;
+                OnLayoutChanged(
+                    change.OldValue.GetValueOrDefault<AttachedLayout>(),
+                    change.NewValue.GetValueOrDefault<AttachedLayout>());
             }
-            else if (property == VerticalCacheLengthProperty)
+            else if (change.Property == HorizontalCacheLengthProperty)
             {
-                _viewportManager.VerticalCacheLength = (double)args.NewValue;
+                _viewportManager.HorizontalCacheLength = change.NewValue.GetValueOrDefault<double>();
             }
-            else
+            else if (change.Property == VerticalCacheLengthProperty)
             {
-                base.OnPropertyChanged(args);
+                _viewportManager.VerticalCacheLength = change.NewValue.GetValueOrDefault<double>();
             }
+
+            base.OnPropertyChanged(change);
         }
 
         internal IControl GetElementImpl(int index, bool forceCreate, bool supressAutoRecycle)
@@ -434,8 +464,16 @@ namespace Avalonia.Controls
 
         private int GetElementIndexImpl(IControl element)
         {
-            var virtInfo = TryGetVirtualizationInfo(element);
-            return _viewManager.GetElementIndex(virtInfo);
+            // Verify that element is actually a child of this ItemsRepeater
+            var parent = element.GetVisualParent();
+            
+            if (parent == this)
+            {
+                var virtInfo = TryGetVirtualizationInfo(element);
+                return _viewManager.GetElementIndex(virtInfo);
+            }
+
+            return -1;
         }
 
         private IControl GetElementFromIndexImpl(int index)
@@ -488,11 +526,14 @@ namespace Avalonia.Controls
             return element;
         }
 
-        internal void OnElementPrepared(IControl element, int index)
+        internal void OnElementPrepared(IControl element, VirtualizationInfo virtInfo)
         {
-            _viewportManager.OnElementPrepared(element);
+            _viewportManager.OnElementPrepared(element, virtInfo);
+
             if (ElementPrepared != null)
             {
+                var index = virtInfo.Index;
+
                 if (_elementPreparedArgs == null)
                 {
                     _elementPreparedArgs = new ItemsRepeaterElementPreparedEventArgs(element, index);
@@ -562,23 +603,35 @@ namespace Avalonia.Controls
 
             if (Layout != null)
             {
-                if (Layout is VirtualizingLayout virtualLayout)
-                {
-                    var args = new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset);
-                    virtualLayout.OnItemsChanged(GetLayoutContext(), newValue, args);
-                }
-                else if (Layout is NonVirtualizingLayout nonVirtualLayout)
+                var args = new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset);
+
+                try
                 {
-                    // Walk through all the elements and make sure they are cleared for
-                    // non-virtualizing layouts.
-                    foreach (var element in Children)
+                    _processingItemsSourceChange = args;
+
+                    if (Layout is VirtualizingLayout virtualLayout)
                     {
-                        if (GetVirtualizationInfo(element).IsRealized)
+                        virtualLayout.OnItemsChanged(GetLayoutContext(), newValue, args);
+                    }
+                    else if (Layout is NonVirtualizingLayout nonVirtualLayout)
+                    {
+                        // Walk through all the elements and make sure they are cleared for
+                        // non-virtualizing layouts.
+                        foreach (var element in Children)
                         {
-                            ClearElementImpl(element);
+                            if (GetVirtualizationInfo(element).IsRealized)
+                            {
+                                ClearElementImpl(element);
+                            }
                         }
+
+                        Children.Clear();
                     }
                 }
+                finally
+                {
+                    _processingItemsSourceChange = null;
+                }
 
                 InvalidateMeasure();
             }
@@ -625,7 +678,7 @@ namespace Avalonia.Controls
                 }
             }
 
-            ItemTemplateShim = new ItemTemplateWrapper(newValue);
+            ItemTemplateShim = newValue as IElementFactory ?? new ItemTemplateWrapper(newValue);
 
             InvalidateMeasure();
         }
@@ -642,8 +695,15 @@ namespace Avalonia.Controls
             if (oldValue != null)
             {
                 oldValue.UninitializeForContext(LayoutContext);
-                oldValue.MeasureInvalidated -= InvalidateMeasureForLayout;
-                oldValue.ArrangeInvalidated -= InvalidateArrangeForLayout;
+
+                WeakEventHandlerManager.Unsubscribe<EventArgs, ItemsRepeater>(
+                    oldValue,
+                    nameof(AttachedLayout.MeasureInvalidated),
+                    InvalidateMeasureForLayout);
+                WeakEventHandlerManager.Unsubscribe<EventArgs, ItemsRepeater>(
+                    oldValue,
+                    nameof(AttachedLayout.ArrangeInvalidated),
+                    InvalidateArrangeForLayout);
 
                 // Walk through all the elements and make sure they are cleared
                 foreach (var element in Children)
@@ -660,8 +720,15 @@ namespace Avalonia.Controls
             if (newValue != null)
             {
                 newValue.InitializeForContext(LayoutContext);
-                newValue.MeasureInvalidated += InvalidateMeasureForLayout;
-                newValue.ArrangeInvalidated += InvalidateArrangeForLayout;
+
+                WeakEventHandlerManager.Subscribe<AttachedLayout, EventArgs, ItemsRepeater>(
+                    newValue,
+                    nameof(AttachedLayout.MeasureInvalidated),
+                    InvalidateMeasureForLayout);
+                WeakEventHandlerManager.Subscribe<AttachedLayout, EventArgs, ItemsRepeater>(
+                    newValue,
+                    nameof(AttachedLayout.ArrangeInvalidated),
+                    InvalidateArrangeForLayout);
             }
 
             bool isVirtualizingLayout = newValue != null && newValue is VirtualizingLayout;
@@ -707,6 +774,11 @@ namespace Avalonia.Controls
             }
         }
 
+        private void OnRequestBringIntoView(RequestBringIntoViewEventArgs e)
+        {
+            _viewportManager.OnBringIntoViewRequested(e);
+        }
+
         private void InvalidateMeasureForLayout(object sender, EventArgs e) => InvalidateMeasure();
 
         private void InvalidateArrangeForLayout(object sender, EventArgs e) => InvalidateArrange();
diff --git a/src/Avalonia.Controls/Repeater/ItemsRepeaterElementIndexChangedEventArgs.cs b/src/Avalonia.Controls/Repeater/ItemsRepeaterElementIndexChangedEventArgs.cs
index 7ca68140b2..9f1c32bf64 100644
--- a/src/Avalonia.Controls/Repeater/ItemsRepeaterElementIndexChangedEventArgs.cs
+++ b/src/Avalonia.Controls/Repeater/ItemsRepeaterElementIndexChangedEventArgs.cs
@@ -12,11 +12,11 @@ namespace Avalonia.Controls
     /// </summary>
     public class ItemsRepeaterElementIndexChangedEventArgs : EventArgs
     {
-        internal ItemsRepeaterElementIndexChangedEventArgs(IControl element, int newIndex, int oldIndex)
+        internal ItemsRepeaterElementIndexChangedEventArgs(IControl element, int oldIndex, int newIndex)
         {
             Element = element;
-            NewIndex = newIndex;
             OldIndex = oldIndex;
+            NewIndex = newIndex;
         }
 
         /// <summary>
@@ -34,7 +34,7 @@ namespace Avalonia.Controls
         /// </summary>
         public int OldIndex { get; private set; }
 
-        internal void Update(IControl element, int newIndex, int oldIndex)
+        internal void Update(IControl element, int oldIndex, int newIndex)
         {
             Element = element;
             NewIndex = newIndex;
diff --git a/src/Avalonia.Controls/Repeater/RecyclePool.cs b/src/Avalonia.Controls/Repeater/RecyclePool.cs
index 4e5950bdc5..28f299043c 100644
--- a/src/Avalonia.Controls/Repeater/RecyclePool.cs
+++ b/src/Avalonia.Controls/Repeater/RecyclePool.cs
@@ -11,10 +11,13 @@ using Avalonia.Controls.Templates;
 
 namespace Avalonia.Controls
 {
-    internal class RecyclePool
+    public class RecyclePool
     {
-        public static readonly AttachedProperty<IDataTemplate> OriginTemplateProperty =
-            AvaloniaProperty.RegisterAttached<Control, IDataTemplate>("OriginTemplate", typeof(RecyclePool));
+        internal static readonly AttachedProperty<IDataTemplate> OriginTemplateProperty =
+            AvaloniaProperty.RegisterAttached<RecyclePool, Control, IDataTemplate>("OriginTemplate");
+
+        internal static readonly AttachedProperty<string> ReuseKeyProperty =
+            AvaloniaProperty.RegisterAttached<RecyclePool, Control, string>("ReuseKey", string.Empty);
 
         private static ConditionalWeakTable<IDataTemplate, RecyclePool> s_pools = new ConditionalWeakTable<IDataTemplate, RecyclePool>();
         private readonly Dictionary<string, List<ElementInfo>> _elements = new Dictionary<string, List<ElementInfo>>();
@@ -77,6 +80,9 @@ namespace Avalonia.Controls
             return null;
         }
 
+        internal string GetReuseKey(IControl element) => element.GetValue(ReuseKeyProperty);
+        internal void SetReuseKey(IControl element, string value) => element.SetValue(ReuseKeyProperty, value);
+
         private IPanel EnsureOwnerIsPanelOrNull(IControl owner)
         {
             if (owner is IPanel panel)
diff --git a/src/Avalonia.Controls/Repeater/RecyclingElementFactory.cs b/src/Avalonia.Controls/Repeater/RecyclingElementFactory.cs
new file mode 100644
index 0000000000..9503239e34
--- /dev/null
+++ b/src/Avalonia.Controls/Repeater/RecyclingElementFactory.cs
@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls.Templates;
+
+#nullable enable
+
+namespace Avalonia.Controls
+{
+    public class SelectTemplateEventArgs : EventArgs
+    {
+        public string? TemplateKey { get; set; }
+        public object? DataContext { get; internal set; }
+        public IControl? Owner { get; internal set; }
+    }
+
+    public class RecyclingElementFactory : ElementFactory
+    {
+        private RecyclePool? _recyclePool;
+        private IDictionary<string, IDataTemplate>? _templates;
+        private SelectTemplateEventArgs? _args;
+
+        public RecyclingElementFactory()
+        {
+            Templates = new Dictionary<string, IDataTemplate>();
+        }
+
+        public RecyclePool RecyclePool 
+        {
+            get => _recyclePool ??= new RecyclePool();
+            set => _recyclePool = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        public IDictionary<string, IDataTemplate> Templates 
+        {
+            get => _templates ??= new Dictionary<string, IDataTemplate>();
+            set => _templates = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        public event EventHandler<SelectTemplateEventArgs>? SelectTemplateKey;
+
+        protected override IControl GetElementCore(ElementFactoryGetArgs args)
+        {
+            if (_templates == null || _templates.Count == 0)
+            {
+                throw new InvalidOperationException("Templates cannot be empty.");
+            }
+
+            var templateKey = Templates.Count == 1 ?
+                Templates.First().Key :
+                OnSelectTemplateKeyCore(args.Data, args.Parent);
+
+            if (string.IsNullOrEmpty(templateKey))
+            {
+                // Note: We could allow null/whitespace, which would work as long as
+                // the recycle pool is not shared. in order to make this work in all cases
+                // currently we validate that a valid template key is provided.
+                throw new InvalidOperationException("Template key cannot be null or empty.");
+            }
+
+            // Get an element from the Recycle Pool or create one
+            var element = RecyclePool.TryGetElement(templateKey, args.Parent);
+
+            if (element is null)
+            {
+                // No need to call HasKey if there is only one template.
+                if (Templates.Count > 1 && !Templates.ContainsKey(templateKey))
+                {
+                    var message = $"No templates of key '{templateKey}' were found in the templates collection.";
+                    throw new InvalidOperationException(message);
+                }
+
+                var dataTemplate = Templates[templateKey];
+                element = dataTemplate.Build(args.Data);
+
+                // Associate ReuseKey with element
+                RecyclePool.SetReuseKey(element, templateKey);
+            }
+
+            return element;
+        }
+
+        protected override void RecycleElementCore(ElementFactoryRecycleArgs args)
+        {
+            var element = args.Element;
+            var key = RecyclePool.GetReuseKey(element);
+            RecyclePool.PutElement(element, key, args.Parent);
+        }
+
+        protected virtual string OnSelectTemplateKeyCore(object dataContext, IControl owner)
+        {
+            if (SelectTemplateKey is object)
+            {
+                _args ??= new SelectTemplateEventArgs();
+                _args.TemplateKey = null;
+                _args.DataContext = dataContext;
+                _args.Owner = owner;
+
+                try
+                {
+                    SelectTemplateKey(this, _args);
+                }
+                finally
+                {
+                    _args.DataContext = null;
+                    _args.Owner = null;
+                }
+            }
+
+            if (string.IsNullOrEmpty(_args?.TemplateKey))
+            {
+                throw new InvalidOperationException(
+                    "Please provide a valid template identifier in the handler for the SelectTemplateKey event.");
+            }
+
+            return _args!.TemplateKey!;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Repeater/RepeaterLayoutContext.cs b/src/Avalonia.Controls/Repeater/RepeaterLayoutContext.cs
index 977d9d794c..fd33eeaf39 100644
--- a/src/Avalonia.Controls/Repeater/RepeaterLayoutContext.cs
+++ b/src/Avalonia.Controls/Repeater/RepeaterLayoutContext.cs
@@ -7,6 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using Avalonia.Layout;
+using Avalonia.Logging;
 
 namespace Avalonia.Controls
 {
@@ -58,7 +59,11 @@ namespace Avalonia.Controls
 
         protected override object GetItemAtCore(int index) => _owner.ItemsSourceView.GetAt(index);
 
-        protected override void RecycleElementCore(ILayoutable element) => _owner.ClearElementImpl((IControl)element);
+        protected override void RecycleElementCore(ILayoutable element)
+        {
+            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "RepeaterLayout - RecycleElement: {Index}", _owner.GetElementIndex((IControl)element));
+            _owner.ClearElementImpl((IControl)element);
+        }
 
         protected override Rect RealizationRectCore() => _owner.RealizationWindow;
     }
diff --git a/src/Avalonia.Controls/Repeater/ViewManager.cs b/src/Avalonia.Controls/Repeater/ViewManager.cs
index 51c14d47d6..cf2066b373 100644
--- a/src/Avalonia.Controls/Repeater/ViewManager.cs
+++ b/src/Avalonia.Controls/Repeater/ViewManager.cs
@@ -6,11 +6,10 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.Layout;
+using Avalonia.Logging;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls
@@ -25,6 +24,8 @@ namespace Avalonia.Controls
         private readonly UniqueIdElementPool _resetPool;
         private IControl _lastFocusedElement;
         private bool _isDataSourceStableResetPending;
+        private ElementFactoryGetArgs _elementFactoryGetArgs;
+        private ElementFactoryRecycleArgs _elementFactoryRecycleArgs;
         private int _firstRealizedElementIndexHeldByLayout = FirstRealizedElementIndexDefault;
         private int _lastRealizedElementIndexHeldByLayout = LastRealizedElementIndexDefault;
         private bool _eventsSubscribed;
@@ -60,11 +61,13 @@ namespace Avalonia.Controls
             if (suppressAutoRecycle)
             {
                 virtInfo.AutoRecycleCandidate = false;
+                Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "GetElement: {Index} Not AutoRecycleCandidate:", virtInfo.Index);
             }
             else
             {
                 virtInfo.AutoRecycleCandidate = true;
                 virtInfo.KeepAlive = true;
+                Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "GetElement: {Index} AutoRecycleCandidate:", virtInfo.Index);
             }
 
             return element;
@@ -107,23 +110,55 @@ namespace Avalonia.Controls
             }
         }
 
+        // We need to clear the datacontext to prevent crashes from happening,
+        //  however we only do that if we were the ones setting it.
+        // That is when one of the following is the case (numbering taken from line ~642):
+        // 1.2    No ItemTemplate, data is not a UIElement
+        // 2.1    ItemTemplate, data is not FrameworkElement
+        // 2.2.2  Itemtemplate, data is FrameworkElement, ElementFactory returned Element different to data
+        //
+        // In all of those three cases, we the ItemTemplateShim is NOT null.
+        // Luckily when we create the items, we store whether we were the once setting the DataContext.
         public void ClearElementToElementFactory(IControl element)
         {
-            var virtInfo = ItemsRepeater.GetVirtualizationInfo(element);
-            var clearedIndex = virtInfo.Index;
             _owner.OnElementClearing(element);
-            _owner.ItemTemplateShim.RecycleElement(_owner, element);
 
+            var virtInfo = ItemsRepeater.GetVirtualizationInfo(element);
             virtInfo.MoveOwnershipToElementFactory();
 
+            // During creation of this object, we were the one setting the DataContext, so clear it now.
+            if (virtInfo.MustClearDataContext)
+            {
+                element.DataContext = null;
+            }
+
+            if (_owner.ItemTemplateShim != null)
+            {
+                var context = _elementFactoryRecycleArgs ??= new ElementFactoryRecycleArgs();
+                context.Element = element;
+                context.Parent = _owner;
+
+                _owner.ItemTemplateShim.RecycleElement(context);
+
+                context.Element = null;
+                context.Parent = null;
+            }
+            else
+            {
+                // No ItemTemplate to recycle to, remove the element from the children collection.
+                if (!_owner.Children.Remove(element))
+                {
+                    throw new InvalidOperationException("ItemsRepeater's child not found in its Children collection.");
+                }
+            }
+
             if (_lastFocusedElement == element)
             {
                 // Focused element is going away. Remove the tracked last focused element
                 // and pick a reasonable next focus if we can find one within the layout 
                 // realized elements.
-                MoveFocusFromClearedIndex(clearedIndex);
+                MoveFocusFromClearedIndex(virtInfo.Index);
             }
-
         }
 
         private void MoveFocusFromClearedIndex(int clearedIndex)
@@ -190,7 +225,8 @@ namespace Avalonia.Controls
         {
             if (virtInfo == null)
             {
-                throw new ArgumentException("Element is not a child of this ItemsRepeater.");
+                //Element is not a child of this ItemsRepeater.
+                return -1;
             }
 
             return virtInfo.IsRealized || virtInfo.IsInUniqueIdResetPool ? virtInfo.Index : -1;
@@ -377,19 +413,24 @@ namespace Avalonia.Controls
                     }
 
                 case NotifyCollectionChangedAction.Reset:
-                    if (_owner.ItemsSourceView.HasKeyIndexMapping)
+                    // If we get multiple resets back to back before
+                    // running layout, we dont have to clear all the elements again.
+                    if (!_isDataSourceStableResetPending)
                     {
-                        _isDataSourceStableResetPending = true;
-                    }
+                        if (_owner.ItemsSourceView.HasKeyIndexMapping)
+                        {
+                            _isDataSourceStableResetPending = true;
+                        }
 
-                    // Walk through all the elements and make sure they are cleared, they will go into
-                    // the stable id reset pool.
-                    foreach (var element in _owner.Children)
-                    {
-                        var virtInfo = ItemsRepeater.GetVirtualizationInfo(element);
-                        if (virtInfo.IsRealized && virtInfo.AutoRecycleCandidate)
+                        // Walk through all the elements and make sure they are cleared, they will go into
+                        // the stable id reset pool.
+                        foreach (var element in _owner.Children)
                         {
-                            _owner.ClearElementImpl(element);
+                            var virtInfo = ItemsRepeater.GetVirtualizationInfo(element);
+                            if (virtInfo.IsRealized && virtInfo.AutoRecycleCandidate)
+                            {
+                                _owner.ClearElementImpl(element);
+                            }
                         }
                     }
 
@@ -430,6 +471,9 @@ namespace Avalonia.Controls
                 }
 
                 _resetPool.Clear();
+
+                // Flush the realized indices once the stable reset pool is cleared to start fresh.
+                InvalidateRealizedIndicesHeldByLayout();
             }
         }
 
@@ -487,6 +531,10 @@ namespace Avalonia.Controls
                     var virtInfo = ItemsRepeater.GetVirtualizationInfo(element);
                     virtInfo.MoveOwnershipToLayoutFromUniqueIdResetPool();
                     UpdateElementIndex(element, virtInfo, index);
+
+                    // Update realized indices
+                    _firstRealizedElementIndexHeldByLayout = Math.Min(_firstRealizedElementIndexHeldByLayout, index);
+                    _lastRealizedElementIndexHeldByLayout = Math.Max(_lastRealizedElementIndexHeldByLayout, index);
                 }
             }
 
@@ -508,6 +556,10 @@ namespace Avalonia.Controls
                     _pinnedPool.RemoveAt(i);
                     element = elementInfo.PinnedElement;
                     elementInfo.VirtualizationInfo.MoveOwnershipToLayoutFromPinnedPool();
+
+                    // Update realized indices
+                    _firstRealizedElementIndexHeldByLayout = Math.Min(_firstRealizedElementIndexHeldByLayout, index);
+                    _lastRealizedElementIndexHeldByLayout = Math.Max(_lastRealizedElementIndexHeldByLayout, index);
                     break;
                 }
             }
@@ -515,30 +567,80 @@ namespace Avalonia.Controls
             return element;
         }
 
+        // There are several cases handled here with respect to which element gets returned and when DataContext is modified.
+        //
+        // 1. If there is no ItemTemplate:
+        //    1.1 If data is an IControl -> the data is returned
+        //    1.2 If data is not an IControl -> a default DataTemplate is used to fetch element and DataContext is set to data
+        //
+        // 2. If there is an ItemTemplate:
+        //    2.1 If data is not an IControl -> Element is fetched from ElementFactory and DataContext is set to the data
+        //    2.2 If data is an IControl:
+        //        2.2.1 If Element returned by the ElementFactory is the same as the data -> Element (a.k.a. data) is returned as is
+        //        2.2.2 If Element returned by the ElementFactory is not the same as the data
+        //                 -> Element that is fetched from the ElementFactory is returned and
+        //                    DataContext is set to the data's DataContext (if it exists), otherwise it is set to the data itself
         private IControl GetElementFromElementFactory(int index)
         {
             // The view generator is the provider of last resort.
+            var data = _owner.ItemsSourceView.GetAt(index);
+            var providedElementFactory = _owner.ItemTemplateShim;
 
-            var itemTemplateFactory = _owner.ItemTemplateShim;
-            if (itemTemplateFactory == null)
+            IElementFactory GetElementFactory()
             {
-                // If no ItemTemplate was provided, use a default 
-                var factory = FuncDataTemplate.Default;
-                _owner.ItemTemplate = factory;
-                itemTemplateFactory = _owner.ItemTemplateShim;
+                if (providedElementFactory == null)
+                {
+                    var factory = FuncDataTemplate.Default;
+                    _owner.ItemTemplate = factory;
+                    return _owner.ItemTemplateShim;
+                }
+
+                return providedElementFactory;
             }
 
-            var data = _owner.ItemsSourceView.GetAt(index);
-            var element = itemTemplateFactory.GetElement(_owner, data);
+            IControl GetElement()
+            {
+                if (providedElementFactory == null)
+                {
+                    if (data is IControl dataAsElement)
+                    {
+                        return dataAsElement;
+                    }
+                }
+
+                var elementFactory = GetElementFactory();
+                var args = _elementFactoryGetArgs ??= new ElementFactoryGetArgs();
+
+                try
+                {
+                    args.Data = data;
+                    args.Parent = _owner;
+                    args.Index = index;
+                    return elementFactory.GetElement(args);
+                }
+                finally
+                {
+                    args.Data = null;
+                    args.Parent = null;
+                }
+            }
+
+            var element = GetElement();
 
             var virtInfo = ItemsRepeater.TryGetVirtualizationInfo(element);
             if (virtInfo == null)
             {
                 virtInfo = ItemsRepeater.CreateAndInitializeVirtualizationInfo(element);
             }
+            // Clear flag
+            virtInfo.MustClearDataContext = false;
 
-            // Prepare the element
-            element.DataContext = data;
+            if (data != element)
+            {
+                // Prepare the element
+                element.DataContext = data;
+                virtInfo.MustClearDataContext = true;
+            }
 
             virtInfo.MoveOwnershipToLayoutFromElementFactory(
                 index,
@@ -559,7 +661,7 @@ namespace Avalonia.Controls
                 children.Add(element);
             }
 
-            repeater.OnElementPrepared(element, index);
+            repeater.OnElementPrepared(element, virtInfo);
 
             // Update realized indices
             _firstRealizedElementIndexHeldByLayout = Math.Min(_firstRealizedElementIndexHeldByLayout, index);
@@ -650,6 +752,7 @@ namespace Avalonia.Controls
             {
                 _owner.GotFocus += OnFocusChanged;
                 _owner.LostFocus += OnFocusChanged;
+                _eventsSubscribed = true;
             }
         }
 
diff --git a/src/Avalonia.Controls/Repeater/ViewportManager.cs b/src/Avalonia.Controls/Repeater/ViewportManager.cs
index 10c11889d0..6e24408aa9 100644
--- a/src/Avalonia.Controls/Repeater/ViewportManager.cs
+++ b/src/Avalonia.Controls/Repeater/ViewportManager.cs
@@ -5,9 +5,15 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
+using Avalonia.Controls.Presenters;
+using Avalonia.Input;
 using Avalonia.Layout;
+using Avalonia.Logging;
+using Avalonia.Media;
+using Avalonia.Reactive;
 using Avalonia.Threading;
 using Avalonia.VisualTree;
 
@@ -35,16 +41,16 @@ namespace Avalonia.Controls
         // actually happened. This can happen in cases where no scrollviewer
         // in the parent chain can scroll in the shift direction.
         private Point _unshiftableShift;
-        private double _maximumHorizontalCacheLength = 0.0;
-        private double _maximumVerticalCacheLength = 0.0;
+        private double _maximumHorizontalCacheLength = 2.0;
+        private double _maximumVerticalCacheLength = 2.0;
         private double _horizontalCacheBufferPerSide;
         private double _verticalCacheBufferPerSide;
         private bool _isBringIntoViewInProgress;
         // For non-virtualizing layouts, we do not need to keep
         // updating viewports and invalidating measure often. So when
         // a non virtualizing layout is used, we stop doing all that work.
-        bool _managingViewportDisabled;
-        private IDisposable _effectiveViewportChangedRevoker;
+        private bool _managingViewportDisabled;
+        private bool _effectiveViewportChangedSubscribed;
         private bool _layoutUpdatedSubscribed;
 
         public ViewportManager(ItemsRepeater owner)
@@ -184,6 +190,9 @@ namespace Avalonia.Controls
             // We tolerate viewport imprecisions up to 1 pixel to avoid invaliding layout too much.
             if (Math.Abs(_expectedViewportShift.X) > 1 || Math.Abs(_expectedViewportShift.Y) > 1)
             {
+                Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Expecting viewport shift of ({Shift})",
+                    _owner.Layout.LayoutId, _expectedViewportShift);
+
                 // There are cases where we might be expecting a shift but not get it. We will
                 // be waiting for the effective viewport event but if the scroll viewer is not able
                 // to perform the shift (perhaps because it cannot scroll in negative offset),
@@ -219,24 +228,31 @@ namespace Avalonia.Controls
             _pendingViewportShift = default;
             _unshiftableShift = default;
 
-            _effectiveViewportChangedRevoker?.Dispose();
-
-            if (!_managingViewportDisabled)
+            if (_managingViewportDisabled && _effectiveViewportChangedSubscribed)
             {
-                _effectiveViewportChangedRevoker = SubscribeToEffectiveViewportChanged(_owner);
+                _owner.EffectiveViewportChanged -= OnEffectiveViewportChanged;
+                _effectiveViewportChangedSubscribed = false;
+            }
+            else if (!_managingViewportDisabled && !_effectiveViewportChangedSubscribed)
+            {
+                _owner.EffectiveViewportChanged += OnEffectiveViewportChanged;
+                _effectiveViewportChangedSubscribed = true;
             }
         }
 
-        public void OnElementPrepared(IControl element)
+        public void OnElementPrepared(IControl element, VirtualizationInfo virtInfo)
         {
-            // If we have an anchor element, we do not want the
-            // scroll anchor provider to start anchoring some other element.
-            ////element.CanBeScrollAnchor(true);
+            // WinUI registers the element as an anchor candidate here, but I feel that's in error:
+            // at this point the element has not yet been positioned by the arrange pass so it will
+            // have its previous position, meaning that when the arrange pass moves it into its new
+            // position, an incorrect scroll anchoring will occur. Instead signal that it's not yet
+            // registered as a scroll anchor candidate.
+            virtInfo.IsRegisteredAsAnchorCandidate = false;
         }
 
-        public void OnElementCleared(ILayoutable element)
+        public void OnElementCleared(IControl element)
         {
-            ////element.CanBeScrollAnchor(false);
+            _scroller?.UnregisterAnchorCandidate(element);
         }
 
         public void OnOwnerMeasuring()
@@ -282,6 +298,7 @@ namespace Avalonia.Controls
         private void OnLayoutUpdated(object sender, EventArgs args)
         {
             _owner.LayoutUpdated -= OnLayoutUpdated;
+            _layoutUpdatedSubscribed = false;
             if (_managingViewportDisabled)
             {
                 return;
@@ -293,6 +310,10 @@ namespace Avalonia.Controls
             // that can scroll in the direction where the shift is expected.
             if (_pendingViewportShift.X != 0 || _pendingViewportShift.Y != 0)
             {
+                Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Layout Updated with pending shift {Shift}- invalidating measure",
+                    _owner.Layout.LayoutId,
+                    _pendingViewportShift);
+
                 // Assume this is never going to come.
                 _unshiftableShift = new Point(
                     _unshiftableShift.X + _pendingViewportShift.X,
@@ -306,8 +327,11 @@ namespace Avalonia.Controls
 
         public void OnMakeAnchor(IControl anchor, bool isAnchorOutsideRealizedRange)
         {
-            _makeAnchorElement = anchor;
-            _isAnchorOutsideRealizedRange = isAnchorOutsideRealizedRange;
+            if (_makeAnchorElement != anchor)
+            {
+                _makeAnchorElement = anchor;
+                _isAnchorOutsideRealizedRange = isAnchorOutsideRealizedRange;
+            }
         }
 
         public void OnBringIntoViewRequested(RequestBringIntoViewEventArgs args)
@@ -325,29 +349,44 @@ namespace Avalonia.Controls
                 // Note that the element being brought into view could be a descendant.
                 var targetChild = GetImmediateChildOfRepeater((IControl)args.TargetObject);
 
+                if (targetChild is null)
+                {
+                    return;
+                }
+
                 // Make sure that only the target child can be the anchor during the bring into view operation.
-                foreach (var child in _owner.Children)
+                if (_scroller is object)
                 {
-                    ////if (child.CanBeScrollAnchor && child != targetChild)
-                    ////{
-                    ////    child.CanBeScrollAnchor = false;
-                    ////}
+                    foreach (var child in _owner.Children)
+                    {
+                        if (child != targetChild)
+                        {
+                            _scroller.UnregisterAnchorCandidate(child);
+                        }
+                    }
                 }
 
-                // Register to rendering event to go back to how things were before where any child can be the anchor.
-                _isBringIntoViewInProgress = true;
-                ////if (!m_renderingToken)
-                ////{
-                ////    winrt::Windows::UI::Xaml::Media::CompositionTarget compositionTarget{ nullptr };
-                ////    m_renderingToken = compositionTarget.Rendering(winrt::auto_revoke, { this, &ViewportManagerWithPlatformFeatures::OnCompositionTargetRendering });
-                ////}
+                // Register action to go back to how things were before where any child can be the anchor. Here,
+                // WinUI uses CompositionTarget.Rendering but we don't currently have that, so post an action to
+                // run *after* rendering has completed (priority needs to be lower than Render as Transformed
+                // bounds must have been set in order for OnEffectiveViewportChanged to trigger).
+                if (!_isBringIntoViewInProgress)
+                {
+                    _isBringIntoViewInProgress = true;
+                    Dispatcher.UIThread.Post(OnCompositionTargetRendering, DispatcherPriority.Loaded);
+                }
             }
         }
 
+        public void RegisterScrollAnchorCandidate(IControl element)
+        {
+            _scroller?.RegisterAnchorCandidate(element);
+        }
+
         private IControl GetImmediateChildOfRepeater(IControl descendant)
         {
             var targetChild = descendant;
-            var parent = descendant.Parent;
+            var parent = (IControl)descendant.VisualParent;
             while (parent != null && parent != _owner)
             {
                 targetChild = parent;
@@ -356,33 +395,57 @@ namespace Avalonia.Controls
 
             if (parent == null)
             {
-                throw new InvalidOperationException("OnBringIntoViewRequested called with args.target element not under the ItemsRepeater that recieved the call");
+                return null;
             }
 
             return targetChild;
         }
 
-        public void ResetScrollers()
+        private void OnCompositionTargetRendering()
         {
-            _scroller = null;
-            _effectiveViewportChangedRevoker?.Dispose();
-            _effectiveViewportChangedRevoker = null;
-            _ensuredScroller = false;
+            _isBringIntoViewInProgress = false;
+            _makeAnchorElement = null;
+
+            if (_scroller is object)
+            {
+                foreach (var child in _owner.Children)
+                {
+                    var info = ItemsRepeater.GetVirtualizationInfo(child);
+
+                    if (info.IsRealized && info.IsHeldByLayout)
+                    {
+                        _scroller.RegisterAnchorCandidate(child);
+                    }
+                }
+            }
+
+            // HACK: Invalidate measure now that the anchor has been removed so that a layout can be
+            // done with a proper realization rect. This is a hack not present upstream to try to fix
+            // https://github.com/microsoft/microsoft-ui-xaml/issues/1422
+            TryInvalidateMeasure();
         }
 
-        private void OnEffectiveViewportChanged(TransformedBounds? bounds)
+        public void ResetScrollers()
         {
-            if (!bounds.HasValue)
+            if (_scroller is object)
             {
-                return;
+                foreach (var child in _owner.Children)
+                {
+                    _scroller.UnregisterAnchorCandidate(child);
+                }
+
+                _scroller = null;
             }
 
-            var globalClip = bounds.Value.Clip;
-            var transform = _owner.GetVisualRoot().TransformToVisual(_owner).Value;
-            var clip = globalClip.TransformToAABB(transform);
-            var effectiveViewport = clip.Intersect(bounds.Value.Bounds);
+            _owner.EffectiveViewportChanged -= OnEffectiveViewportChanged;
+            _effectiveViewportChangedSubscribed = false;
+            _ensuredScroller = false;
+        }
 
-            UpdateViewport(effectiveViewport);
+        private void OnEffectiveViewportChanged(object sender, EffectiveViewportChangedEventArgs e)
+        {
+            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: EffectiveViewportChanged event callback", _owner.Layout.LayoutId);
+            UpdateViewport(e.EffectiveViewport);
 
             _pendingViewportShift = default;
             _unshiftableShift = default;
@@ -397,6 +460,7 @@ namespace Avalonia.Controls
             if (_layoutUpdatedSubscribed)
             {
                 _owner.LayoutUpdated -= OnLayoutUpdated;
+                _layoutUpdatedSubscribed = false;
             }
         }
 
@@ -418,16 +482,10 @@ namespace Avalonia.Controls
                     parent = parent.VisualParent;
                 }
 
-                if (_scroller == null)
+                if (!_managingViewportDisabled)
                 {
-                    // We usually update the viewport in the post arrange handler. But, since we don't have
-                    // a scroller, let's do it now.
-                    UpdateViewport(Rect.Empty);
-                }
-                else if (!_managingViewportDisabled)
-                {
-                    _effectiveViewportChangedRevoker?.Dispose();
-                    _effectiveViewportChangedRevoker = SubscribeToEffectiveViewportChanged(_owner);
+                    _owner.EffectiveViewportChanged += OnEffectiveViewportChanged;
+                    _effectiveViewportChangedSubscribed = true;
                 }
 
                 _ensuredScroller = true;
@@ -437,10 +495,17 @@ namespace Avalonia.Controls
         private void UpdateViewport(Rect viewport)
         {
             var currentVisibleWindow = viewport;
+            var previousVisibleWindow = _visibleWindow;
+
+            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Effective Viewport: ({Before})->({After})",
+                _owner.Layout.LayoutId,
+                previousVisibleWindow,
+                viewport);
 
             if (-currentVisibleWindow.X <= ItemsRepeater.ClearedElementsArrangePosition.X &&
                 -currentVisibleWindow.Y <= ItemsRepeater.ClearedElementsArrangePosition.Y)
             {
+                Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Viewport is invalid. visible window cleared", _owner.Layout.LayoutId);
                 // We got cleared.
                 _visibleWindow = default;
             }
@@ -449,7 +514,14 @@ namespace Avalonia.Controls
                 _visibleWindow = currentVisibleWindow;
             }
 
-            TryInvalidateMeasure();
+            if (_visibleWindow != previousVisibleWindow)
+            {
+                Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Used Viewport: ({Before})->({After})",
+                    _owner.Layout.LayoutId,
+                    previousVisibleWindow,
+                    currentVisibleWindow);
+                TryInvalidateMeasure();
+            }
         }
 
         private static void ValidateCacheLength(double cacheLength)
@@ -468,26 +540,11 @@ namespace Avalonia.Controls
                 // We invalidate measure instead of just invalidating arrange because
                 // we don't invalidate measure in UpdateViewport if the view is changing to
                 // avoid layout cycles.
+                Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Invalidating measure due to viewport change", _owner.Layout.LayoutId);
                 _owner.InvalidateMeasure();
             }
         }
 
-        private IDisposable SubscribeToEffectiveViewportChanged(IControl control)
-        {
-            // HACK: This is a bit of a hack. We need the effective viewport of the ItemsRepeater -
-            // we can get this from TransformedBounds, but this property is updated after layout has
-            // run, resulting in the UI being updated too late when scrolling quickly. We can
-            // partially remedey this by triggering also on Bounds changes, but this won't work so 
-            // well for nested ItemsRepeaters.
-            //
-            // UWP uses the EffectiveBoundsChanged event (which I think was implemented specially
-            // for this case): we need to implement that in Avalonia.
-            return control.GetObservable(Visual.TransformedBoundsProperty)
-                .Merge(control.GetObservable(Visual.BoundsProperty).Select(_ => control.TransformedBounds))
-                .Skip(1)
-                .Subscribe(OnEffectiveViewportChanged);
-        }
-
         private class ScrollerInfo
         {
             public ScrollerInfo(ScrollViewer scroller)
diff --git a/src/Avalonia.Controls/Repeater/VirtualizationInfo.cs b/src/Avalonia.Controls/Repeater/VirtualizationInfo.cs
index eb30c1b7cf..f8cfde609e 100644
--- a/src/Avalonia.Controls/Repeater/VirtualizationInfo.cs
+++ b/src/Avalonia.Controls/Repeater/VirtualizationInfo.cs
@@ -36,7 +36,9 @@ namespace Avalonia.Controls
         public bool IsHeldByLayout => Owner == ElementOwner.Layout;
         public bool IsRealized => IsHeldByLayout || Owner == ElementOwner.PinnedPool;
         public bool IsInUniqueIdResetPool => Owner == ElementOwner.UniqueIdResetPool;
+        public bool MustClearDataContext { get; set; }
         public bool KeepAlive { get; set; }
+        public bool IsRegisteredAsAnchorCandidate { get; set; }
         public ElementOwner Owner { get; private set; } = ElementOwner.ElementFactory;
         public string UniqueId { get; private set; }
 
diff --git a/src/Avalonia.Controls/RequestBringIntoViewEventArgs.cs b/src/Avalonia.Controls/RequestBringIntoViewEventArgs.cs
index 21b658632e..dd55de85d4 100644
--- a/src/Avalonia.Controls/RequestBringIntoViewEventArgs.cs
+++ b/src/Avalonia.Controls/RequestBringIntoViewEventArgs.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Interactivity;
 using Avalonia.VisualTree;
 
diff --git a/src/Avalonia.Controls/ResolveByNameAttribute.cs b/src/Avalonia.Controls/ResolveByNameAttribute.cs
new file mode 100644
index 0000000000..a13b10d630
--- /dev/null
+++ b/src/Avalonia.Controls/ResolveByNameAttribute.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Indicates that the property resolves an element by Name or x:Name.
+    /// When applying this to attached properties, ensure to put on both
+    /// the Getter and Setter methods.
+    /// </summary>
+    public class ResolveByNameAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Avalonia.Controls/RowDefinition.cs b/src/Avalonia.Controls/RowDefinition.cs
index 85e7ed6519..fac795035b 100644
--- a/src/Avalonia.Controls/RowDefinition.cs
+++ b/src/Avalonia.Controls/RowDefinition.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Controls
 {
     /// <summary>
diff --git a/src/Avalonia.Controls/RowDefinitions.cs b/src/Avalonia.Controls/RowDefinitions.cs
index cf72cc8ba3..02ab12b5af 100644
--- a/src/Avalonia.Controls/RowDefinitions.cs
+++ b/src/Avalonia.Controls/RowDefinitions.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Linq;
 using Avalonia.Collections;
 
diff --git a/src/Avalonia.Controls/ScrollChangedEventArgs.cs b/src/Avalonia.Controls/ScrollChangedEventArgs.cs
new file mode 100644
index 0000000000..fed23964f5
--- /dev/null
+++ b/src/Avalonia.Controls/ScrollChangedEventArgs.cs
@@ -0,0 +1,45 @@
+using Avalonia.Interactivity;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Describes a change in scrolling state.
+    /// </summary>
+    public class ScrollChangedEventArgs : RoutedEventArgs
+    {
+        public ScrollChangedEventArgs(
+            Vector extentDelta,
+            Vector offsetDelta,
+            Vector viewportDelta)
+            : this(ScrollViewer.ScrollChangedEvent, extentDelta, offsetDelta, viewportDelta)
+        {
+        }
+
+        public ScrollChangedEventArgs(
+            RoutedEvent routedEvent,
+            Vector extentDelta,
+            Vector offsetDelta,
+            Vector viewportDelta)
+            : base(routedEvent)
+        {
+            ExtentDelta = extentDelta;
+            OffsetDelta = offsetDelta;
+            ViewportDelta = viewportDelta;
+        }
+
+        /// <summary>
+        /// Gets the change to the value of <see cref="ScrollViewer.Extent"/>.
+        /// </summary>
+        public Vector ExtentDelta { get; }
+
+        /// <summary>
+        /// Gets the change to the value of <see cref="ScrollViewer.Offset"/>.
+        /// </summary>
+        public Vector OffsetDelta { get; }
+
+        /// <summary>
+        /// Gets the change to the value of <see cref="ScrollViewer.Viewport"/>.
+        /// </summary>
+        public Vector ViewportDelta { get; }
+    }
+}
diff --git a/src/Avalonia.Controls/ScrollViewer.cs b/src/Avalonia.Controls/ScrollViewer.cs
index cdf5010920..6b75149d62 100644
--- a/src/Avalonia.Controls/ScrollViewer.cs
+++ b/src/Avalonia.Controls/ScrollViewer.cs
@@ -1,10 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using System.Reactive.Linq;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
+using Avalonia.Interactivity;
 
 namespace Avalonia.Controls
 {
@@ -62,6 +61,22 @@ namespace Avalonia.Controls
                 o => o.Viewport,
                 (o, v) => o.Viewport = v);
 
+        /// <summary>
+        /// Defines the <see cref="LargeChange"/> property.
+        /// </summary>
+        public static readonly DirectProperty<ScrollViewer, Size> LargeChangeProperty =
+            AvaloniaProperty.RegisterDirect<ScrollViewer, Size>(
+                nameof(LargeChange),
+                o => o.LargeChange);
+
+        /// <summary>
+        /// Defines the <see cref="SmallChange"/> property.
+        /// </summary>
+        public static readonly DirectProperty<ScrollViewer, Size> SmallChangeProperty =
+            AvaloniaProperty.RegisterDirect<ScrollViewer, Size>(
+                nameof(SmallChange),
+                o => o.SmallChange);
+
         /// <summary>
         /// Defines the HorizontalScrollBarMaximum property.
         /// </summary>
@@ -152,17 +167,46 @@ namespace Avalonia.Controls
                 nameof(VerticalScrollBarVisibility),
                 ScrollBarVisibility.Auto);
 
+        /// <summary>
+        /// Defines the <see cref="IsExpandedProperty"/> property.
+        /// </summary>
+        public static readonly DirectProperty<ScrollViewer, bool> IsExpandedProperty =
+            ScrollBar.IsExpandedProperty.AddOwner<ScrollViewer>(o => o.IsExpanded);
+
+        /// <summary>
+        /// Defines the <see cref="AllowAutoHide"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> AllowAutoHideProperty =
+            ScrollBar.AllowAutoHideProperty.AddOwner<ScrollViewer>();
+
+        /// <summary>
+        /// Defines the <see cref="ScrollChanged"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<ScrollChangedEventArgs> ScrollChangedEvent =
+            RoutedEvent.Register<ScrollViewer, ScrollChangedEventArgs>(
+                nameof(ScrollChanged),
+                RoutingStrategies.Bubble);
+
+        internal const double DefaultSmallChange = 16;
+
+        private IDisposable _childSubscription;
+        private ILogicalScrollable _logicalScrollable;
         private Size _extent;
         private Vector _offset;
         private Size _viewport;
+        private Size _oldExtent;
+        private Vector _oldOffset;
+        private Size _oldViewport;
+        private Size _largeChange;
+        private Size _smallChange = new Size(DefaultSmallChange, DefaultSmallChange);
+        private bool _isExpanded;
+        private IDisposable _scrollBarExpandSubscription;
 
         /// <summary>
         /// Initializes static members of the <see cref="ScrollViewer"/> class.
         /// </summary>
         static ScrollViewer()
         {
-            AffectsValidation(ExtentProperty, OffsetProperty);
-            AffectsValidation(ViewportProperty, OffsetProperty);
             HorizontalScrollBarVisibilityProperty.Changed.AddClassHandler<ScrollViewer>((x, e) => x.ScrollBarVisibilityChanged(e));
             VerticalScrollBarVisibilityProperty.Changed.AddClassHandler<ScrollViewer>((x, e) => x.ScrollBarVisibilityChanged(e));
         }
@@ -172,6 +216,16 @@ namespace Avalonia.Controls
         /// </summary>
         public ScrollViewer()
         {
+            LayoutUpdated += OnLayoutUpdated;
+        }
+
+        /// <summary>
+        /// Occurs when changes are detected to the scroll position, extent, or viewport size.
+        /// </summary>
+        public event EventHandler<ScrollChangedEventArgs> ScrollChanged
+        {
+            add => AddHandler(ScrollChangedEvent, value);
+            remove => RemoveHandler(ScrollChangedEvent, value);
         }
 
         /// <summary>
@@ -205,9 +259,7 @@ namespace Avalonia.Controls
 
             set
             {
-                value = ValidateOffset(this, value);
-
-                if (SetAndRaise(OffsetProperty, ref _offset, value))
+                if (SetAndRaise(OffsetProperty, ref _offset, CoerceOffset(Extent, Viewport, value)))
                 {
                     CalculatedPropertiesChanged();
                 }
@@ -233,6 +285,16 @@ namespace Avalonia.Controls
             }
         }
 
+        /// <summary>
+        /// Gets the large (page) change value for the scroll viewer.
+        /// </summary>
+        public Size LargeChange => _largeChange;
+
+        /// <summary>
+        /// Gets the small (line) change value for the scroll viewer.
+        /// </summary>
+        public Size SmallChange => _smallChange;
+
         /// <summary>
         /// Gets or sets the horizontal scrollbar visibility.
         /// </summary>
@@ -267,6 +329,9 @@ namespace Avalonia.Controls
             get { return VerticalScrollBarVisibility != ScrollBarVisibility.Disabled; }
         }
 
+        /// <inheritdoc/>
+        public IControl CurrentAnchor => (Presenter as IScrollAnchorProvider)?.CurrentAnchor;
+
         /// <summary>
         /// Gets the maximum horizontal scrollbar value.
         /// </summary>
@@ -333,8 +398,103 @@ namespace Avalonia.Controls
             get { return _viewport.Height; }
         }
 
-        /// <inheritdoc/>
-        IControl IScrollAnchorProvider.CurrentAnchor => null; // TODO: Implement
+        /// <summary>
+        /// Gets a value that indicates whether any scrollbar is expanded.
+        /// </summary>
+        public bool IsExpanded
+        {
+            get => _isExpanded;
+            private set => SetAndRaise(ScrollBar.IsExpandedProperty, ref _isExpanded, value);
+        }
+
+        /// <summary>
+        /// Gets a value that indicates whether scrollbars can hide itself when user is not interacting with it.
+        /// </summary>
+        public bool AllowAutoHide
+        {
+            get => GetValue(AllowAutoHideProperty);
+            set => SetValue(AllowAutoHideProperty, value);
+        }
+
+        /// <summary>
+        /// Scrolls the content up one line.
+        /// </summary>
+        public void LineUp()
+        {
+            Offset -= new Vector(0, _smallChange.Height);
+        }
+
+        /// <summary>
+        /// Scrolls the content down one line.
+        /// </summary>
+        public void LineDown()
+        {
+            Offset += new Vector(0, _smallChange.Height);
+        }
+
+        /// <summary>
+        /// Scrolls the content left one line.
+        /// </summary>
+        public void LineLeft()
+        {
+            Offset -= new Vector(_smallChange.Width, 0);
+        }
+
+        /// <summary>
+        /// Scrolls the content right one line.
+        /// </summary>
+        public void LineRight()
+        {
+            Offset += new Vector(_smallChange.Width, 0);
+        }
+
+        /// <summary>
+        /// Scrolls the content upward by one page.
+        /// </summary>
+        public void PageUp()
+        {
+            VerticalScrollBarValue = Math.Max(_offset.Y - _viewport.Height, 0);
+        }
+
+        /// <summary>
+        /// Scrolls the content downward by one page.
+        /// </summary>
+        public void PageDown()
+        {
+            VerticalScrollBarValue = Math.Min(_offset.Y + _viewport.Height, VerticalScrollBarMaximum);
+        }
+
+        /// <summary>
+        /// Scrolls the content left by one page.
+        /// </summary>
+        public void PageLeft()
+        {
+            HorizontalScrollBarValue = Math.Max(_offset.X - _viewport.Width, 0);
+        }
+
+        /// <summary>
+        /// Scrolls the content tight by one page.
+        /// </summary>
+        public void PageRight()
+        {
+            HorizontalScrollBarValue = Math.Min(_offset.X + _viewport.Width, HorizontalScrollBarMaximum);
+        }
+
+        /// <summary>
+        /// Scrolls to the top-left corner of the content.
+        /// </summary>
+        public void ScrollToHome()
+        {
+            Offset = new Vector(double.NegativeInfinity, double.NegativeInfinity);
+        }
+
+        /// <summary>
+        /// Scrolls to the bottom-left corner of the content.
+        /// </summary>
+        public void ScrollToEnd()
+        {
+            Offset = new Vector(double.NegativeInfinity, double.PositiveInfinity);
+        }
 
         /// <summary>
         /// Gets the value of the HorizontalScrollBarVisibility attached property.
@@ -376,14 +536,32 @@ namespace Avalonia.Controls
             control.SetValue(VerticalScrollBarVisibilityProperty, value);
         }
 
-        void IScrollAnchorProvider.RegisterAnchorCandidate(IControl element)
+        /// <inheritdoc/>
+        public void RegisterAnchorCandidate(IControl element)
         {
-            // TODO: Implement
+            (Presenter as IScrollAnchorProvider)?.RegisterAnchorCandidate(element);
         }
 
-        void IScrollAnchorProvider.UnregisterAnchorCandidate(IControl element)
+        /// <inheritdoc/>
+        public void UnregisterAnchorCandidate(IControl element)
         {
-            // TODO: Implement
+            (Presenter as IScrollAnchorProvider)?.UnregisterAnchorCandidate(element);
+        }
+
+        protected override bool RegisterContentPresenter(IContentPresenter presenter)
+        {
+            _childSubscription?.Dispose();
+            _childSubscription = null;
+
+            if (base.RegisterContentPresenter(presenter))
+            {
+                _childSubscription = Presenter?
+                    .GetObservable(ContentPresenter.ChildProperty)
+                    .Subscribe(ChildChanged);
+                return true;
+            }
+
+            return false;
         }
 
         internal static Vector CoerceOffset(Size extent, Size viewport, Vector offset)
@@ -404,20 +582,26 @@ namespace Avalonia.Controls
             return double.IsNaN(result) ? 0 : result;
         }
 
-        private static Vector ValidateOffset(AvaloniaObject o, Vector value)
+        private void ChildChanged(IControl child)
         {
-            ScrollViewer scrollViewer = o as ScrollViewer;
-
-            if (scrollViewer != null)
+            if (_logicalScrollable is object)
             {
-                var extent = scrollViewer.Extent;
-                var viewport = scrollViewer.Viewport;
-                return CoerceOffset(extent, viewport, value);
+                _logicalScrollable.ScrollInvalidated -= LogicalScrollInvalidated;
+                _logicalScrollable = null;
             }
-            else
+
+            if (child is ILogicalScrollable logical)
             {
-                return value;
+                _logicalScrollable = logical;
+                logical.ScrollInvalidated += LogicalScrollInvalidated;
             }
+
+            CalculatedPropertiesChanged();
+        }
+
+        private void LogicalScrollInvalidated(object sender, EventArgs e)
+        {
+            CalculatedPropertiesChanged();
         }
 
         private void ScrollBarVisibilityChanged(AvaloniaPropertyChangedEventArgs e)
@@ -454,20 +638,112 @@ namespace Avalonia.Controls
             RaisePropertyChanged(VerticalScrollBarMaximumProperty, 0, VerticalScrollBarMaximum);
             RaisePropertyChanged(VerticalScrollBarValueProperty, 0, VerticalScrollBarValue);
             RaisePropertyChanged(VerticalScrollBarViewportSizeProperty, 0, VerticalScrollBarViewportSize);
+
+            if (_logicalScrollable?.IsLogicalScrollEnabled == true)
+            {
+                SetAndRaise(SmallChangeProperty, ref _smallChange, _logicalScrollable.ScrollSize);
+                SetAndRaise(LargeChangeProperty, ref _largeChange, _logicalScrollable.PageScrollSize);
+            }
+            else
+            {
+                SetAndRaise(SmallChangeProperty, ref _smallChange, new Size(DefaultSmallChange, DefaultSmallChange));
+                SetAndRaise(LargeChangeProperty, ref _largeChange, Viewport);
+            }
         }
 
         protected override void OnKeyDown(KeyEventArgs e)
         {
             if (e.Key == Key.PageUp)
             {
-                VerticalScrollBarValue = Math.Max(_offset.Y - _viewport.Height, 0);
+                PageUp();
                 e.Handled = true;
             }
             else if (e.Key == Key.PageDown)
             {
-                VerticalScrollBarValue = Math.Min(_offset.Y + _viewport.Height, VerticalScrollBarMaximum);
+                PageDown();
                 e.Handled = true;
             }
         }
+
+        /// <summary>
+        /// Called when a change in scrolling state is detected, such as a change in scroll
+        /// position, extent, or viewport size.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        /// <remarks>
+        /// If you override this method, call `base.OnScrollChanged(ScrollChangedEventArgs)` to
+        /// ensure that this event is raised.
+        /// </remarks>
+        protected virtual void OnScrollChanged(ScrollChangedEventArgs e)
+        {
+            RaiseEvent(e);
+        }
+
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            base.OnApplyTemplate(e);
+
+            _scrollBarExpandSubscription?.Dispose();
+
+            _scrollBarExpandSubscription = SubscribeToScrollBars(e);
+        }
+
+        private IDisposable SubscribeToScrollBars(TemplateAppliedEventArgs e)
+        {
+            static IObservable<bool> GetExpandedObservable(ScrollBar scrollBar)
+            {
+                return scrollBar?.GetObservable(ScrollBar.IsExpandedProperty);
+            }
+
+            var horizontalScrollBar = e.NameScope.Find<ScrollBar>("PART_HorizontalScrollBar");
+            var verticalScrollBar = e.NameScope.Find<ScrollBar>("PART_VerticalScrollBar");
+
+            var horizontalExpanded = GetExpandedObservable(horizontalScrollBar);
+            var verticalExpanded = GetExpandedObservable(verticalScrollBar);
+
+            IObservable<bool> actualExpanded = null;
+
+            if (horizontalExpanded != null && verticalExpanded != null)
+            {
+                actualExpanded = horizontalExpanded.CombineLatest(verticalExpanded, (h, v) => h || v);
+            }
+            else
+            {
+                if (horizontalExpanded != null)
+                {
+                    actualExpanded = horizontalExpanded;
+                }
+                else if (verticalExpanded != null)
+                {
+                    actualExpanded = verticalExpanded;
+                }
+            }
+
+            return actualExpanded?.Subscribe(OnScrollBarExpandedChanged);
+        }
+
+        private void OnScrollBarExpandedChanged(bool isExpanded)
+        {
+            IsExpanded = isExpanded;
+        }
+
+        private void OnLayoutUpdated(object sender, EventArgs e) => RaiseScrollChanged();
+
+        private void RaiseScrollChanged()
+        {
+            var extentDelta = new Vector(Extent.Width - _oldExtent.Width, Extent.Height - _oldExtent.Height);
+            var offsetDelta = Offset - _oldOffset;
+            var viewportDelta = new Vector(Viewport.Width - _oldViewport.Width, Viewport.Height - _oldViewport.Height);
+
+            if (!extentDelta.NearlyEquals(default) || !offsetDelta.NearlyEquals(default) || !viewportDelta.NearlyEquals(default))
+            {
+                var e = new ScrollChangedEventArgs(extentDelta, offsetDelta, viewportDelta);
+                OnScrollChanged(e);
+
+                _oldExtent = Extent;
+                _oldOffset = Offset;
+                _oldViewport = Viewport;
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Selection/ISelectionModel.cs b/src/Avalonia.Controls/Selection/ISelectionModel.cs
new file mode 100644
index 0000000000..3b8fd0c8b7
--- /dev/null
+++ b/src/Avalonia.Controls/Selection/ISelectionModel.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+
+#nullable enable
+
+namespace Avalonia.Controls.Selection
+{
+    public interface ISelectionModel : INotifyPropertyChanged
+    {
+        IEnumerable? Source { get; set; }
+        bool SingleSelect { get; set; }
+        int SelectedIndex { get; set; }
+        IReadOnlyList<int> SelectedIndexes { get; }
+        object? SelectedItem { get; set; }
+        IReadOnlyList<object?> SelectedItems { get; }
+        int AnchorIndex { get; set; }
+        int Count { get; }
+
+        public event EventHandler<SelectionModelIndexesChangedEventArgs>? IndexesChanged;
+        public event EventHandler<SelectionModelSelectionChangedEventArgs>? SelectionChanged;
+        public event EventHandler? LostSelection;
+        public event EventHandler? SourceReset;
+
+        public void BeginBatchUpdate();
+        public void EndBatchUpdate();
+        bool IsSelected(int index);
+        void Select(int index);
+        void Deselect(int index);
+        void SelectRange(int start, int end);
+        void DeselectRange(int start, int end);
+        void SelectAll();
+        void Clear();
+    }
+
+    public static class SelectionModelExtensions
+    {
+        public static IDisposable BatchUpdate(this ISelectionModel model)
+        {
+            return new BatchUpdateOperation(model);
+        }
+
+        public struct BatchUpdateOperation : IDisposable
+        {
+            private readonly ISelectionModel _owner;
+            private bool _isDisposed;
+
+            public BatchUpdateOperation(ISelectionModel owner)
+            {
+                _owner = owner;
+                _isDisposed = false;
+                owner.BeginBatchUpdate();
+            }
+
+            public void Dispose()
+            {
+                if (!_isDisposed)
+                {
+                    _owner?.EndBatchUpdate();
+                    _isDisposed = true;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Selection/IndexRange.cs b/src/Avalonia.Controls/Selection/IndexRange.cs
new file mode 100644
index 0000000000..fa7b44faea
--- /dev/null
+++ b/src/Avalonia.Controls/Selection/IndexRange.cs
@@ -0,0 +1,343 @@
+// 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.Generic;
+
+#nullable enable
+
+namespace Avalonia.Controls.Selection
+{
+    internal readonly struct IndexRange : IEquatable<IndexRange>
+    {
+        private static readonly IndexRange s_invalid = new IndexRange(int.MinValue, int.MinValue);
+
+        public IndexRange(int index)
+        {
+            Begin = index;
+            End = index;
+        }
+
+        public IndexRange(int begin, int end)
+        {
+            // Accept out of order begin/end pairs, just swap them.
+            if (begin > end)
+            {
+                int temp = begin;
+                begin = end;
+                end = temp;
+            }
+
+            Begin = begin;
+            End = end;
+        }
+
+        public int Begin { get; }
+        public int End { get; }
+        public int Count => (End - Begin) + 1;
+
+        public bool Contains(int index) => index >= Begin && index <= End;
+
+        public bool Split(int splitIndex, out IndexRange before, out IndexRange after)
+        {
+            bool afterIsValid;
+
+            before = new IndexRange(Begin, splitIndex);
+
+            if (splitIndex < End)
+            {
+                after = new IndexRange(splitIndex + 1, End);
+                afterIsValid = true;
+            }
+            else
+            {
+                after = new IndexRange();
+                afterIsValid = false;
+            }
+
+            return afterIsValid;
+        }
+
+        public bool Intersects(IndexRange other)
+        {
+            return (Begin <= other.End) && (End >= other.Begin);
+        }
+
+        public bool Adjacent(IndexRange other)
+        {
+            return Begin == other.End + 1 || End == other.Begin - 1;
+        }
+
+        public override bool Equals(object? obj)
+        {
+            return obj is IndexRange range && Equals(range);
+        }
+
+        public bool Equals(IndexRange other)
+        {
+            return Begin == other.Begin && End == other.End;
+        }
+
+        public override int GetHashCode()
+        {
+            var hashCode = 1903003160;
+            hashCode = hashCode * -1521134295 + Begin.GetHashCode();
+            hashCode = hashCode * -1521134295 + End.GetHashCode();
+            return hashCode;
+        }
+
+        public override string ToString() => $"[{Begin}..{End}]";
+
+        public static bool operator ==(IndexRange left, IndexRange right) => left.Equals(right);
+        public static bool operator !=(IndexRange left, IndexRange right) => !(left == right);
+
+        public static bool Contains(IReadOnlyList<IndexRange>? ranges, int index)
+        {
+            if (ranges is null || index < 0)
+            {
+                return false;
+            }
+
+            foreach (var range in ranges)
+            {
+                if (range.Contains(index))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public static int GetAt(IReadOnlyList<IndexRange> ranges, int index)
+        {
+            var currentIndex = 0;
+
+            foreach (var range in ranges)
+            {
+                var currentCount = range.Count;
+
+                if (index >= currentIndex && index < currentIndex + currentCount)
+                {
+                    return range.Begin + (index - currentIndex);
+                }
+
+                currentIndex += currentCount;
+            }
+
+            throw new IndexOutOfRangeException("The index was out of range.");
+        }
+
+        public static int Add(
+            IList<IndexRange> ranges,
+            IndexRange range,
+            IList<IndexRange>? added = null)
+        {
+            var result = 0;
+
+            for (var i = 0; i < ranges.Count && range != s_invalid; ++i)
+            {
+                var existing = ranges[i];
+
+                if (range.Intersects(existing) || range.Adjacent(existing))
+                {
+                    if (range.Begin < existing.Begin)
+                    {
+                        var add = new IndexRange(range.Begin, existing.Begin - 1);
+                        ranges[i] = new IndexRange(range.Begin, existing.End);
+                        added?.Add(add);
+                        result += add.Count;
+                    }
+
+                    range = range.End <= existing.End ?
+                        s_invalid :
+                        new IndexRange(existing.End + 1, range.End);
+                }
+                else if (range.End < existing.Begin)
+                {
+                    ranges.Insert(i, range);
+                    added?.Add(range);
+                    result += range.Count;
+                    range = s_invalid;
+                }
+            }
+
+            if (range != s_invalid)
+            {
+                ranges.Add(range);
+                added?.Add(range);
+                result += range.Count;
+            }
+
+            MergeRanges(ranges);
+            return result;
+        }
+
+        public static int Add(
+            IList<IndexRange> destination,
+            IReadOnlyList<IndexRange> source,
+            IList<IndexRange>? added = null)
+        {
+            var result = 0;
+
+            foreach (var range in source)
+            {
+                result += Add(destination, range, added);
+            }
+
+            return result;
+        }
+
+        public static int Intersect(
+            IList<IndexRange> ranges,
+            IndexRange range,
+            IList<IndexRange>? removed = null)
+        {
+            var result = 0;
+
+            for (var i = 0; i < ranges.Count && range != s_invalid; ++i)
+            {
+                var existing = ranges[i];
+
+                if (existing.End < range.Begin || existing.Begin > range.End)
+                {
+                    removed?.Add(existing);
+                    ranges.RemoveAt(i--);
+                    result += existing.Count;
+                }
+                else
+                {
+                    if (existing.Begin < range.Begin)
+                    {
+                        var except = new IndexRange(existing.Begin, range.Begin - 1);
+                        removed?.Add(except);
+                        ranges[i] = existing = new IndexRange(range.Begin, existing.End);
+                        result += except.Count;
+                    }
+
+                    if (existing.End > range.End)
+                    {
+                        var except = new IndexRange(range.End + 1, existing.End);
+                        removed?.Add(except);
+                        ranges[i] = new IndexRange(existing.Begin, range.End);
+                        result += except.Count;
+                    }
+                }
+            }
+
+            MergeRanges(ranges);
+
+            if (removed is object)
+            {
+                MergeRanges(removed);
+            }
+
+            return result;
+        }
+
+        public static int Remove(
+            IList<IndexRange>? ranges,
+            IndexRange range,
+            IList<IndexRange>? removed = null)
+        {
+            if (ranges is null)
+            {
+                return 0;
+            }
+
+            var result = 0;
+
+            for (var i = 0; i < ranges.Count; ++i)
+            {
+                var existing = ranges[i];
+
+                if (range.Intersects(existing))
+                {
+                    if (range.Begin <= existing.Begin && range.End >= existing.End)
+                    {
+                        ranges.RemoveAt(i--);
+                        removed?.Add(existing);
+                        result += existing.Count;
+                    }
+                    else if (range.Begin > existing.Begin && range.End >= existing.End)
+                    {
+                        ranges[i] = new IndexRange(existing.Begin, range.Begin - 1);
+                        removed?.Add(new IndexRange(range.Begin, existing.End));
+                        result += existing.End - (range.Begin - 1);
+                    }
+                    else if (range.Begin > existing.Begin && range.End < existing.End)
+                    {
+                        ranges[i] = new IndexRange(existing.Begin, range.Begin - 1);
+                        ranges.Insert(++i, new IndexRange(range.End + 1, existing.End));
+                        removed?.Add(range);
+                        result += range.Count;
+                    }
+                    else if (range.End <= existing.End)
+                    {
+                        var remove = new IndexRange(existing.Begin, range.End);
+                        ranges[i] = new IndexRange(range.End + 1, existing.End);
+                        removed?.Add(remove);
+                        result += remove.Count;
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        public static int Remove(
+            IList<IndexRange> destination,
+            IReadOnlyList<IndexRange> source,
+            IList<IndexRange>? added = null)
+        {
+            var result = 0;
+
+            foreach (var range in source)
+            {
+                result += Remove(destination, range, added);
+            }
+
+            return result;
+        }
+
+        public static IEnumerable<int> EnumerateIndices(IEnumerable<IndexRange> ranges)
+        {
+            foreach (var range in ranges)
+            {
+                for (var i = range.Begin; i <= range.End; ++i)
+                {
+                    yield return i;
+                }
+            }
+        }
+
+        public static int GetCount(IEnumerable<IndexRange> ranges)
+        {
+            var result = 0;
+
+            foreach (var range in ranges)
+            {
+                result += (range.End - range.Begin) + 1;
+            }
+
+            return result;
+        }
+
+        private static void MergeRanges(IList<IndexRange> ranges)
+        {
+            for (var i = ranges.Count - 2; i >= 0; --i)
+            {
+                var r = ranges[i];
+                var r1 = ranges[i + 1];
+
+                if (r.Intersects(r1) || r.End == r1.Begin - 1)
+                {
+                    ranges[i] = new IndexRange(r.Begin, r1.End);
+                    ranges.RemoveAt(i + 1);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Selection/InternalSelectionModel.cs b/src/Avalonia.Controls/Selection/InternalSelectionModel.cs
new file mode 100644
index 0000000000..fcdaf44166
--- /dev/null
+++ b/src/Avalonia.Controls/Selection/InternalSelectionModel.cs
@@ -0,0 +1,278 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using Avalonia.Collections;
+
+#nullable enable
+
+namespace Avalonia.Controls.Selection
+{
+    internal class InternalSelectionModel : SelectionModel<object?>
+    {
+        private IList? _writableSelectedItems;
+        private bool _ignoreModelChanges;
+        private bool _ignoreSelectedItemsChanges;
+
+        public InternalSelectionModel()
+        {
+            SelectionChanged += OnSelectionChanged;
+            SourceReset += OnSourceReset;
+        }
+
+        [AllowNull]
+        public IList WritableSelectedItems
+        {
+            get
+            {
+                if (_writableSelectedItems is null)
+                {
+                    _writableSelectedItems = new AvaloniaList<object?>();
+                    SubscribeToSelectedItems();
+                }
+
+                return _writableSelectedItems;
+            }
+            set
+            {
+                value ??= new AvaloniaList<object?>();
+
+                if (value.IsFixedSize)
+                {
+                    throw new NotSupportedException("Cannot assign fixed size selection to SelectedItems.");
+                }
+
+                if (_writableSelectedItems != value)
+                {
+                    UnsubscribeFromSelectedItems();
+                    _writableSelectedItems = value;
+                    SyncFromSelectedItems();
+                    SubscribeToSelectedItems();
+                    
+                    if (ItemsView is null)
+                    {
+                        SetInitSelectedItems(value);
+                    }
+
+                    RaisePropertyChanged(nameof(WritableSelectedItems));
+                }
+            }
+        }
+
+        private protected override void SetSource(IEnumerable? value)
+        {
+            if (Source == value)
+            {
+                return;
+            }
+
+            object?[]? oldSelection = null;
+
+            if (Source is object && value is object)
+            {
+                oldSelection = new object?[WritableSelectedItems.Count];
+                WritableSelectedItems.CopyTo(oldSelection, 0);
+            }
+
+            try
+            {
+                _ignoreSelectedItemsChanges = true;
+                base.SetSource(value);
+            }
+            finally
+            {
+                _ignoreSelectedItemsChanges = false;
+            }
+
+            if (oldSelection is null)
+            {
+                SyncToSelectedItems();
+            }
+            else
+            {
+                foreach (var i in oldSelection)
+                {
+                    var index = ItemsView!.IndexOf(i);
+                    Select(index);
+                }
+            }
+        }
+
+        private void SyncToSelectedItems()
+        {
+            if (_writableSelectedItems is object)
+            {
+                try
+                {
+                    _ignoreSelectedItemsChanges = true;
+                    _writableSelectedItems.Clear();
+
+                    foreach (var i in base.SelectedItems)
+                    {
+                        _writableSelectedItems.Add(i);
+                    }
+                }
+                finally
+                {
+                    _ignoreSelectedItemsChanges = false;
+                }
+            }
+        }
+
+        private void SyncFromSelectedItems()
+        {
+            if (Source is null || _writableSelectedItems is null)
+            {
+                return;
+            }
+
+            try
+            {
+                _ignoreModelChanges = true;
+
+                using (BatchUpdate())
+                {
+                    Clear();
+                    Add(_writableSelectedItems);
+                }
+            }
+            finally
+            {
+                _ignoreModelChanges = false;
+            }
+        }
+
+        private void SubscribeToSelectedItems()
+        {
+            if (_writableSelectedItems is INotifyCollectionChanged incc)
+            {
+                incc.CollectionChanged += OnSelectedItemsCollectionChanged;
+            }
+        }
+
+        private void UnsubscribeFromSelectedItems()
+        {
+            if (_writableSelectedItems is INotifyCollectionChanged incc)
+            {
+                incc.CollectionChanged += OnSelectedItemsCollectionChanged;
+            }
+        }
+
+        private void OnSelectionChanged(object sender, SelectionModelSelectionChangedEventArgs e)
+        {
+            if (_ignoreModelChanges)
+            {
+                return;
+            }
+
+            try
+            {
+                var items = WritableSelectedItems;
+                var deselected = e.DeselectedItems.ToList();
+                var selected = e.SelectedItems.ToList();
+
+                _ignoreSelectedItemsChanges = true;
+
+                foreach (var i in deselected)
+                {
+                    items.Remove(i);
+                }
+
+                foreach (var i in selected)
+                {
+                    items.Add(i);
+                }
+            }
+            finally
+            {
+                _ignoreSelectedItemsChanges = false;
+            }
+        }
+
+        private void OnSourceReset(object sender, EventArgs e) => SyncFromSelectedItems();
+
+        private void OnSelectedItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (_ignoreSelectedItemsChanges)
+            {
+                return;
+            }
+
+            if (_writableSelectedItems == null)
+            {
+                throw new AvaloniaInternalException("CollectionChanged raised but we don't have items.");
+            }
+
+            void Remove()
+            {
+                foreach (var i in e.OldItems)
+                {
+                    var index = IndexOf(Source, i);
+
+                    if (index != -1)
+                    {
+                        Deselect(index);
+                    }
+                }
+            }
+
+            try
+            {
+                using var operation = BatchUpdate();
+
+                _ignoreModelChanges = true;
+
+                switch (e.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                        Add(e.NewItems);
+                        break;
+                    case NotifyCollectionChangedAction.Remove:
+                        Remove();
+                        break;
+                    case NotifyCollectionChangedAction.Replace:
+                        Remove();
+                        Add(e.NewItems);
+                        break;
+                    case NotifyCollectionChangedAction.Reset:
+                        Clear();
+                        Add(_writableSelectedItems);
+                        break;
+                }
+            }
+            finally
+            {
+                _ignoreModelChanges = false;
+            }
+        }
+
+        private void Add(IList newItems)
+        {
+            foreach (var i in newItems)
+            {
+                var index = IndexOf(Source, i);
+
+                if (index != -1)
+                {
+                    Select(index);
+                }
+            }
+        }
+
+        private static int IndexOf(object? source, object? item)
+        {
+            if (source is IList l)
+            {
+                return l.IndexOf(item);
+            }
+            else if (source is ItemsSourceView v)
+            {
+                return v.IndexOf(item);
+            }
+
+            return -1;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Selection/SelectedIndexes.cs b/src/Avalonia.Controls/Selection/SelectedIndexes.cs
new file mode 100644
index 0000000000..36df175ed2
--- /dev/null
+++ b/src/Avalonia.Controls/Selection/SelectedIndexes.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+
+#nullable enable
+
+namespace Avalonia.Controls.Selection
+{
+    internal class SelectedIndexes<T> : IReadOnlyList<int>
+    {
+        private readonly SelectionModel<T>? _owner;
+        private readonly IReadOnlyList<IndexRange>? _ranges;
+
+        public SelectedIndexes(SelectionModel<T> owner) => _owner = owner;
+        public SelectedIndexes(IReadOnlyList<IndexRange> ranges) => _ranges = ranges;
+
+        public int this[int index]
+        {
+            get
+            {
+                if (index >= Count)
+                {
+                    throw new IndexOutOfRangeException("The index was out of range.");
+                }
+
+                if (_owner?.SingleSelect == true)
+                {
+                    return _owner.SelectedIndex;
+                }
+                else
+                {
+                    return IndexRange.GetAt(Ranges!, index);
+                }
+            }
+        }
+
+        public int Count
+        {
+            get
+            {
+                if (_owner?.SingleSelect == true)
+                {
+                    return _owner.SelectedIndex == -1 ? 0 : 1;
+                }
+                else
+                {
+                    return IndexRange.GetCount(Ranges!);
+                }
+            }
+        }
+
+        private IReadOnlyList<IndexRange> Ranges => _ranges ?? _owner!.Ranges!;
+
+        public IEnumerator<int> GetEnumerator()
+        {
+            IEnumerator<int> SingleSelect()
+            {
+                if (_owner.SelectedIndex >= 0)
+                {
+                    yield return _owner.SelectedIndex;
+                }
+            }
+
+            if (_owner?.SingleSelect == true)
+            {
+                return SingleSelect();
+            }
+            else
+            {
+                return IndexRange.EnumerateIndices(Ranges).GetEnumerator();
+            }
+        }
+
+        public static SelectedIndexes<T>? Create(IReadOnlyList<IndexRange>? ranges)
+        {
+            return ranges is object ? new SelectedIndexes<T>(ranges) : null;
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+    }
+}
diff --git a/src/Avalonia.Controls/Selection/SelectedItems.cs b/src/Avalonia.Controls/Selection/SelectedItems.cs
new file mode 100644
index 0000000000..92781fd54a
--- /dev/null
+++ b/src/Avalonia.Controls/Selection/SelectedItems.cs
@@ -0,0 +1,121 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable enable
+
+namespace Avalonia.Controls.Selection
+{
+    internal class SelectedItems<T> : IReadOnlyList<T>
+    {
+        private readonly SelectionModel<T>? _owner;
+        private readonly ItemsSourceView<T>? _items;
+        private readonly IReadOnlyList<IndexRange>? _ranges;
+
+        public SelectedItems(SelectionModel<T> owner) => _owner = owner;
+        
+        public SelectedItems(IReadOnlyList<IndexRange> ranges, ItemsSourceView<T>? items)
+        {
+            _ranges = ranges ?? throw new ArgumentNullException(nameof(ranges));
+            _items = items;
+        }
+
+        [MaybeNull]
+        public T this[int index]
+        {
+#pragma warning disable CS8766
+            get
+#pragma warning restore CS8766
+            {
+                if (index >= Count)
+                {
+                    throw new IndexOutOfRangeException("The index was out of range.");
+                }
+
+                if (_owner?.SingleSelect == true)
+                {
+                    return _owner.SelectedItem;
+                }
+                else if (Items is object)
+                {
+                    return Items[index];
+                }
+                else
+                {
+                    return default;
+                }
+            }
+        }
+
+        public int Count
+        {
+            get
+            {
+                if (_owner?.SingleSelect == true)
+                {
+                    return _owner.SelectedIndex == -1 ? 0 : 1;
+                }
+                else
+                {
+                    return Ranges is object ? IndexRange.GetCount(Ranges) : 0;
+                }
+            }
+        }
+
+        private ItemsSourceView<T>? Items => _items ?? _owner?.ItemsView;
+        private IReadOnlyList<IndexRange>? Ranges => _ranges ?? _owner!.Ranges;
+
+        public IEnumerator<T> GetEnumerator()
+        {
+            if (_owner?.SingleSelect == true)
+            {
+                if (_owner.SelectedIndex >= 0)
+                {
+#pragma warning disable CS8603
+                    yield return _owner.SelectedItem;
+#pragma warning restore CS8603
+                }
+            }
+            else
+            {
+                var items = Items;
+
+                foreach (var range in Ranges!)
+                {
+                    for (var i = range.Begin; i <= range.End; ++i)
+                    {
+#pragma warning disable CS8603
+                        yield return items is object ? items[i] : default;
+#pragma warning restore CS8603
+                    }
+                }
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+        public static SelectedItems<T>? Create(
+            IReadOnlyList<IndexRange>? ranges,
+            ItemsSourceView<T>? items)
+        {
+            return ranges is object ? new SelectedItems<T>(ranges, items) : null;
+        }
+
+        public class Untyped : IReadOnlyList<object?>
+        {
+            private readonly IReadOnlyList<T> _source;
+            public Untyped(IReadOnlyList<T> source) => _source = source;
+            public object? this[int index] => _source[index];
+            public int Count => _source.Count;
+            IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+            public IEnumerator<object?> GetEnumerator()
+            {
+                foreach (var i in _source)
+                {
+                    yield return i;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Selection/SelectionModel.cs b/src/Avalonia.Controls/Selection/SelectionModel.cs
new file mode 100644
index 0000000000..6ae53a4d59
--- /dev/null
+++ b/src/Avalonia.Controls/Selection/SelectionModel.cs
@@ -0,0 +1,788 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+
+#nullable enable
+
+namespace Avalonia.Controls.Selection
+{
+    public class SelectionModel<T> : SelectionNodeBase<T>, ISelectionModel
+    {
+        private bool _singleSelect = true;
+        private int _anchorIndex = -1;
+        private int _selectedIndex = -1;
+        private Operation? _operation;
+        private SelectedIndexes<T>? _selectedIndexes;
+        private SelectedItems<T>? _selectedItems;
+        private SelectedItems<T>.Untyped? _selectedItemsUntyped;
+        private EventHandler<SelectionModelSelectionChangedEventArgs>? _untypedSelectionChanged;
+        private IList? _initSelectedItems;
+
+        public SelectionModel()
+        {
+        }
+
+        public SelectionModel(IEnumerable<T>? source)
+        {
+            Source = source;
+        }
+
+        public new IEnumerable<T>? Source
+        {
+            get => base.Source as IEnumerable<T>;
+            set => SetSource(value);
+        }
+
+        public bool SingleSelect 
+        {
+            get => _singleSelect;
+            set
+            {
+                if (_singleSelect != value)
+                {
+                    if (value == true)
+                    {
+                        using var update = BatchUpdate();
+                        var selectedIndex = SelectedIndex;
+                        Clear();
+                        SelectedIndex = selectedIndex;
+                    }
+
+                    _singleSelect = value;
+                    RangesEnabled = !value;
+
+                    if (RangesEnabled && _selectedIndex >= 0)
+                    {
+                        CommitSelect(new IndexRange(_selectedIndex));
+                    }
+
+                    RaisePropertyChanged(nameof(SingleSelect));
+               }
+            }
+        }
+
+        public int SelectedIndex 
+        {
+            get => _selectedIndex;
+            set
+            {
+                using var update = BatchUpdate();
+                Clear();
+                Select(value);
+            }
+        }
+
+        public IReadOnlyList<int> SelectedIndexes => _selectedIndexes ??= new SelectedIndexes<T>(this);
+
+        [MaybeNull, AllowNull]
+        public T SelectedItem
+        {
+            get
+            {
+                if (ItemsView is object)
+                {
+                    return GetItemAt(_selectedIndex);
+                }
+                else if (_initSelectedItems is object && _initSelectedItems.Count > 0)
+                {
+                    return (T)_initSelectedItems[0];
+                }
+
+                return default;
+            }
+            set
+            {
+                if (ItemsView is object)
+                {
+                    SelectedIndex = ItemsView.IndexOf(value!);
+                }
+                else
+                {
+                    Clear();
+#pragma warning disable CS8601
+                    SetInitSelectedItems(new T[] { value });
+#pragma warning restore CS8601
+                }
+            }
+        }
+
+        public IReadOnlyList<T> SelectedItems
+        {
+            get
+            {
+                if (ItemsView is null && _initSelectedItems is object)
+                {
+                    return _initSelectedItems is IReadOnlyList<T> i ?
+                        i : _initSelectedItems.Cast<T>().ToList();
+                }
+
+                return _selectedItems ??= new SelectedItems<T>(this);
+            }
+        }
+
+        public int AnchorIndex 
+        {
+            get => _anchorIndex;
+            set
+            {
+                using var update = BatchUpdate();
+                var index = CoerceIndex(value);
+                update.Operation.AnchorIndex = index;
+            }
+        }
+
+        public int Count
+        {
+            get
+            {
+                if (SingleSelect)
+                {
+                    return _selectedIndex >= 0 ? 1 : 0;
+                }
+                else
+                {
+                    return IndexRange.GetCount(Ranges);
+                }
+            }
+        }
+
+        IEnumerable? ISelectionModel.Source 
+        {
+            get => Source;
+            set => SetSource(value);
+        }
+
+        object? ISelectionModel.SelectedItem
+        {
+            get => SelectedItem;
+            set
+            {
+                if (value is T t)
+                {
+                    SelectedItem = t;
+                }
+                else
+                {
+                    SelectedIndex = -1;
+                }
+            }
+                
+        }
+
+        IReadOnlyList<object?> ISelectionModel.SelectedItems 
+        {
+            get => _selectedItemsUntyped ??= new SelectedItems<T>.Untyped(SelectedItems);
+        }
+
+        public event EventHandler<SelectionModelIndexesChangedEventArgs>? IndexesChanged;
+        public event EventHandler<SelectionModelSelectionChangedEventArgs<T>>? SelectionChanged;
+        public event EventHandler? LostSelection;
+        public event EventHandler? SourceReset;
+        public event PropertyChangedEventHandler? PropertyChanged;
+
+        event EventHandler<SelectionModelSelectionChangedEventArgs>? ISelectionModel.SelectionChanged
+        {
+            add => _untypedSelectionChanged += value;
+            remove => _untypedSelectionChanged -= value;
+        }
+
+        public BatchUpdateOperation BatchUpdate() => new BatchUpdateOperation(this);
+
+        public void BeginBatchUpdate()
+        {
+            _operation ??= new Operation(this);
+            ++_operation.UpdateCount;
+        }
+
+        public void EndBatchUpdate()
+        {
+            if (_operation is null || _operation.UpdateCount == 0)
+            {
+                throw new InvalidOperationException("No batch update in progress.");
+            }
+
+            if (--_operation.UpdateCount == 0)
+            {
+                // If the collection is currently changing, commit the update when the
+                // collection change finishes.
+                if (!IsSourceCollectionChanging)
+                {
+                    CommitOperation(_operation);
+                }
+            }
+        }
+
+        public bool IsSelected(int index)
+        {
+            if (index < 0)
+            {
+                return false;
+            }
+            else if (SingleSelect)
+            {
+                return _selectedIndex == index;
+            }
+            else
+            {
+                return IndexRange.Contains(Ranges, index);
+            }
+        }
+
+        public void Select(int index) => SelectRange(index, index, false, true);
+
+        public void Deselect(int index) => DeselectRange(index, index);
+
+        public void SelectRange(int start, int end) => SelectRange(start, end, false, false);
+
+        public void DeselectRange(int start, int end)
+        {
+            using var update = BatchUpdate();
+            var o = update.Operation;
+            var range = new IndexRange(Math.Max(0, start), end);
+
+            if (RangesEnabled)
+            {
+                var selected = Ranges.ToList();
+                var deselected = new List<IndexRange>();
+                var operationDeselected = new List<IndexRange>();
+
+                o.DeselectedRanges ??= new List<IndexRange>();
+                IndexRange.Remove(o.SelectedRanges, range, operationDeselected);
+                IndexRange.Remove(selected, range, deselected);
+                IndexRange.Add(o.DeselectedRanges, deselected);
+
+                if (IndexRange.Contains(deselected, o.SelectedIndex) ||
+                    IndexRange.Contains(operationDeselected, o.SelectedIndex))
+                {
+                    o.SelectedIndex = GetFirstSelectedIndexFromRanges(except: deselected);
+                }
+            }
+            else if(range.Contains(_selectedIndex))
+            {
+                o.SelectedIndex = -1;
+            }
+
+            _initSelectedItems = null;
+        }
+
+        public void SelectAll() => SelectRange(0, int.MaxValue);
+        public void Clear() => DeselectRange(0, int.MaxValue);
+
+        protected void RaisePropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        private protected virtual void SetSource(IEnumerable? value)
+        {
+            if (base.Source != value)
+            {
+                if (_operation is object)
+                {
+                    throw new InvalidOperationException("Cannot change source while update is in progress.");
+                }
+
+                if (base.Source is object && value is object)
+                {
+                    using var update = BatchUpdate();
+                    update.Operation.SkipLostSelection = true;
+                    Clear();
+                }
+
+                base.Source = value;
+
+                using (var update = BatchUpdate())
+                {
+                    update.Operation.IsSourceUpdate = true;
+
+                    if (_initSelectedItems is object && ItemsView is object)
+                    {
+                        foreach (T i in _initSelectedItems)
+                        {
+                            Select(ItemsView.IndexOf(i));
+                        }
+
+                        _initSelectedItems = null;
+                    }
+                    else
+                    {
+                        TrimInvalidSelections(update.Operation);
+                    }
+
+                    RaisePropertyChanged(nameof(Source));
+                }
+            }
+        }
+
+        private protected override void OnIndexesChanged(int shiftIndex, int shiftDelta)
+        {
+            IndexesChanged?.Invoke(this, new SelectionModelIndexesChangedEventArgs(shiftIndex, shiftDelta));
+        }
+
+        private protected override void OnSourceReset()
+        {
+            _selectedIndex = _anchorIndex = -1;
+            CommitDeselect(new IndexRange(0, int.MaxValue));
+
+            if (SourceReset is object)
+            {
+                SourceReset.Invoke(this, EventArgs.Empty);
+            }
+            else
+            {
+                //Logger.TryGet(LogEventLevel.Warning, LogArea.Control)?.Log(
+                //    this,
+                //    "SelectionModel received Reset but no SourceReset handler was registered to handle it. " +
+                //    "Selection may be out of sync.",
+                //    typeof(SelectionModel));
+            }
+        }
+
+        private protected override void OnSelectionChanged(IReadOnlyList<T> deselectedItems)
+        {
+            // Note: We're *not* putting this in a using scope. A collection update is still in progress
+            // so the operation won't get commited by normal means: we have to commit it manually.
+            var update = BatchUpdate();
+
+            update.Operation.DeselectedItems = deselectedItems;
+
+            if (_selectedIndex == -1 && LostSelection is object)
+            {
+                LostSelection(this, EventArgs.Empty);
+            }
+
+            // Don't raise PropertyChanged events here as the OnSourceCollectionChanged event that
+            // let to this method being called will raise them if necessary.
+            CommitOperation(update.Operation, raisePropertyChanged: false);
+        }
+
+        private protected override CollectionChangeState OnItemsAdded(int index, IList items)
+        {
+            var count = items.Count;
+            var shifted = SelectedIndex >= index;
+            var shiftCount = shifted ? count : 0;
+
+            _selectedIndex += shiftCount;
+            _anchorIndex += shiftCount;
+
+            var baseResult = base.OnItemsAdded(index, items);
+            shifted |= baseResult.ShiftDelta != 0;
+
+            return new CollectionChangeState
+            {
+                ShiftIndex = index,
+                ShiftDelta = shifted ? count : 0,
+            };
+        }
+
+        private protected override CollectionChangeState OnItemsRemoved(int index, IList items)
+        {
+            var count = items.Count;
+            var removedRange = new IndexRange(index, index + count - 1);
+            var shifted = false;
+            List<T>? removed;
+
+            var baseResult = base.OnItemsRemoved(index, items);
+            shifted |= baseResult.ShiftDelta != 0;
+            removed = baseResult.RemovedItems;
+
+            if (removedRange.Contains(SelectedIndex))
+            {
+                if (SingleSelect)
+                {
+#pragma warning disable CS8604
+                    removed = new List<T> { (T)items[SelectedIndex - index] };
+#pragma warning restore CS8604
+                }
+
+                _selectedIndex = GetFirstSelectedIndexFromRanges();
+            }
+            else if (SelectedIndex >= index)
+            {
+                _selectedIndex -= count;
+                shifted = true;
+            }
+
+            if (removedRange.Contains(AnchorIndex))
+            {
+                _anchorIndex = GetFirstSelectedIndexFromRanges();
+            }
+            else if (AnchorIndex >= index)
+            {
+                _anchorIndex -= count;
+                shifted = true;
+            }
+
+            return new CollectionChangeState
+            {
+                ShiftIndex = index,
+                ShiftDelta = shifted ? -count : 0,
+                RemovedItems = removed,
+            };
+        }
+
+        private protected override void OnSourceCollectionChanged(NotifyCollectionChangedEventArgs e)
+        {
+            if (_operation?.UpdateCount > 0)
+            {
+                throw new InvalidOperationException("Source collection was modified during selection update.");
+            }
+
+            var oldAnchorIndex = _anchorIndex;
+            var oldSelectedIndex = _selectedIndex;
+
+            base.OnSourceCollectionChanged(e);
+
+            if (oldSelectedIndex != _selectedIndex)
+            {
+                RaisePropertyChanged(nameof(SelectedIndex));
+            }
+
+            if ((e.Action == NotifyCollectionChangedAction.Remove && e.OldStartingIndex <= oldSelectedIndex) ||
+                (e.Action == NotifyCollectionChangedAction.Replace && e.OldStartingIndex == oldSelectedIndex) ||
+                e.Action == NotifyCollectionChangedAction.Reset)
+            {
+                RaisePropertyChanged(nameof(SelectedItem));
+            }
+
+            if (oldAnchorIndex != _anchorIndex)
+            {
+                RaisePropertyChanged(nameof(AnchorIndex));
+            }
+        }
+
+        private protected override bool IsValidCollectionChange(NotifyCollectionChangedEventArgs e)
+        {
+            if (!base.IsValidCollectionChange(e))
+            {
+                return false;
+            }
+
+            if (ItemsView is object && e.Action == NotifyCollectionChangedAction.Add)
+            {
+                if (e.NewStartingIndex <= _selectedIndex)
+                {
+                    return _selectedIndex + e.NewItems.Count < ItemsView.Count;
+                }
+
+                if (e.NewStartingIndex <= _anchorIndex)
+                {
+                    return _anchorIndex + e.NewItems.Count < ItemsView.Count;
+                }
+            }
+
+            return true;
+        }
+
+        private protected void SetInitSelectedItems(IList items)
+        {
+            if (Source is object)
+            {
+                throw new InvalidOperationException("Cannot set init selected items when Source is set.");
+            }
+
+            _initSelectedItems = items;
+        }
+
+        protected override void OnSourceCollectionChangeFinished()
+        {
+            if (_operation is object)
+            {
+                CommitOperation(_operation);
+            }
+        }
+
+        private int GetFirstSelectedIndexFromRanges(List<IndexRange>? except = null)
+        {
+            if (RangesEnabled)
+            {
+                var count = IndexRange.GetCount(Ranges);
+                var index = 0;
+
+                while (index < count)
+                {
+                    var result = IndexRange.GetAt(Ranges, index++);
+
+                    if (!IndexRange.Contains(except, result))
+                    {
+                        return result;
+                    }
+                }
+            }
+
+            return -1;
+        }
+
+        private void SelectRange(
+            int start,
+            int end,
+            bool forceSelectedIndex,
+            bool forceAnchorIndex)
+        {
+            if (SingleSelect && start != end)
+            {
+                throw new InvalidOperationException("Cannot select range with single selection.");
+            }
+
+            var range = CoerceRange(start, end);
+
+            if (range.Begin == -1)
+            {
+                return;
+            }
+
+            using var update = BatchUpdate();
+            var o = update.Operation;
+            var selected = new List<IndexRange>();
+
+            if (RangesEnabled)
+            {
+                o.SelectedRanges ??= new List<IndexRange>();
+                IndexRange.Remove(o.DeselectedRanges, range);
+                IndexRange.Add(o.SelectedRanges, range);
+                IndexRange.Remove(o.SelectedRanges, Ranges);
+
+                if (o.SelectedIndex == -1 || forceSelectedIndex)
+                {
+                    o.SelectedIndex = range.Begin;
+                }
+
+                if (o.AnchorIndex == -1 || forceAnchorIndex)
+                {
+                    o.AnchorIndex = range.Begin;
+                }
+            }
+            else
+            {
+                o.SelectedIndex = o.AnchorIndex = start;
+            }
+
+            _initSelectedItems = null;
+        }
+
+        [return: MaybeNull]
+        private T GetItemAt(int index)
+        {
+            if (ItemsView is null || index < 0 || index >= ItemsView.Count)
+            {
+                return default;
+            }
+
+            return ItemsView[index];
+        }
+
+        private int CoerceIndex(int index)
+        {
+            index = Math.Max(index, -1);
+
+            if (ItemsView is object && index >= ItemsView.Count)
+            {
+                index = -1;
+            }
+
+            return index;
+        }
+
+        private IndexRange CoerceRange(int start, int end)
+        {
+            var max = ItemsView is object ? ItemsView.Count - 1 : int.MaxValue;
+
+            if (start > max || (start < 0 && end < 0))
+            {
+                return new IndexRange(-1);
+            }
+
+            start = Math.Max(start, 0);
+            end = Math.Min(end, max);
+
+            return new IndexRange(start, end);
+        }
+
+        private void TrimInvalidSelections(Operation operation)
+        {
+            if (ItemsView is null)
+            {
+                return;
+            }
+
+            var max = ItemsView.Count - 1;
+
+            if (operation.SelectedIndex > max)
+            {
+                operation.SelectedIndex = GetFirstSelectedIndexFromRanges();
+            }
+
+            if (operation.AnchorIndex > max)
+            {
+                operation.AnchorIndex = GetFirstSelectedIndexFromRanges();
+            }
+
+            if (RangesEnabled && Ranges.Count > 0)
+            {
+                var selected = Ranges.ToList();
+                
+                if (max < 0)
+                {
+                    operation.DeselectedRanges = selected;
+                }
+                else
+                {
+                    var valid = new IndexRange(0, max);
+                    var removed = new List<IndexRange>();
+                    IndexRange.Intersect(selected, valid, removed);
+                    operation.DeselectedRanges = removed;
+                }
+            }
+        }
+
+        private void CommitOperation(Operation operation, bool raisePropertyChanged = true)
+        {
+            try
+            {
+                var oldAnchorIndex = _anchorIndex;
+                var oldSelectedIndex = _selectedIndex;
+                var indexesChanged = false;
+
+                if (operation.SelectedIndex == -1 && LostSelection is object && !operation.SkipLostSelection)
+                {
+                    operation.UpdateCount++;
+                    LostSelection?.Invoke(this, EventArgs.Empty);
+                }
+
+                _selectedIndex = operation.SelectedIndex;
+                _anchorIndex = operation.AnchorIndex;
+
+                if (operation.SelectedRanges is object)
+                {
+                    indexesChanged |= CommitSelect(operation.SelectedRanges) > 0;
+                }
+
+                if (operation.DeselectedRanges is object)
+                {
+                    indexesChanged |= CommitDeselect(operation.DeselectedRanges) > 0;
+                }
+
+                if (SelectionChanged is object || _untypedSelectionChanged is object)
+                {
+                    IReadOnlyList<IndexRange>? deselected = operation.DeselectedRanges;
+                    IReadOnlyList<IndexRange>? selected = operation.SelectedRanges;
+
+                    if (SingleSelect && oldSelectedIndex != _selectedIndex)
+                    {
+                        if (oldSelectedIndex != -1)
+                        {
+                            deselected = new[] { new IndexRange(oldSelectedIndex) };
+                        }
+
+                        if (_selectedIndex != -1)
+                        {
+                            selected = new[] { new IndexRange(_selectedIndex) };
+                        }
+                    }
+
+                    if (deselected?.Count > 0 || selected?.Count > 0 || operation.DeselectedItems is object)
+                    {
+                        // If the operation was caused by Source being updated, then use a null source
+                        // so that the items will appear as nulls.
+                        var deselectedSource = operation.IsSourceUpdate ? null : ItemsView;
+
+                        // If the operation contains DeselectedItems then we're notifying a source
+                        // CollectionChanged event. LostFocus may have caused another item to have been
+                        // selected, but it can't have caused a deselection (as it was called due to
+                        // selection being lost) so we're ok to discard `deselected` here.
+                        var deselectedItems = operation.DeselectedItems ??
+                            SelectedItems<T>.Create(deselected, deselectedSource);
+
+                        var e = new SelectionModelSelectionChangedEventArgs<T>(
+                            SelectedIndexes<T>.Create(deselected),
+                            SelectedIndexes<T>.Create(selected),
+                            deselectedItems,
+                            SelectedItems<T>.Create(selected, ItemsView));
+                        SelectionChanged?.Invoke(this, e);
+                        _untypedSelectionChanged?.Invoke(this, e);
+                    }
+                }
+
+                if (raisePropertyChanged)
+                {
+                    if (oldSelectedIndex != _selectedIndex)
+                    {
+                        indexesChanged = true;
+                        RaisePropertyChanged(nameof(SelectedIndex));
+                    }
+
+                    if (oldSelectedIndex != _selectedIndex || operation.IsSourceUpdate)
+                    {
+                        RaisePropertyChanged(nameof(SelectedItem));
+                    }
+
+                    if (oldAnchorIndex != _anchorIndex)
+                    {
+                        indexesChanged = true;
+                        RaisePropertyChanged(nameof(AnchorIndex));
+                    }
+
+                    if (indexesChanged)
+                    {
+                        RaisePropertyChanged(nameof(SelectedIndexes));
+                    }
+
+                    if (indexesChanged || operation.IsSourceUpdate)
+                    {
+                        RaisePropertyChanged(nameof(SelectedItems));
+                    }
+                }
+            }
+            finally
+            {
+                _operation = null;
+            }
+        }
+
+        public struct BatchUpdateOperation : IDisposable
+        {
+            private readonly SelectionModel<T> _owner;
+            private bool _isDisposed;
+
+            public BatchUpdateOperation(SelectionModel<T> owner)
+            {
+                _owner = owner;
+                _isDisposed = false;
+                owner.BeginBatchUpdate();
+            }
+
+            internal Operation Operation => _owner._operation!;
+
+            public void Dispose()
+            {
+                if (!_isDisposed)
+                {
+                    _owner?.EndBatchUpdate();
+                    _isDisposed = true;
+                }
+            }
+        }
+
+        internal class Operation
+        {
+            public Operation(SelectionModel<T> owner)
+            {
+                AnchorIndex = owner.AnchorIndex;
+                SelectedIndex = owner.SelectedIndex;
+            }
+
+            public int UpdateCount { get; set; }
+            public bool IsSourceUpdate { get; set; }
+            public bool SkipLostSelection { get; set; }
+            public int AnchorIndex { get; set; }
+            public int SelectedIndex { get; set; }
+            public List<IndexRange>? SelectedRanges { get; set; }
+            public List<IndexRange>? DeselectedRanges { get; set; }
+            public IReadOnlyList<T>? DeselectedItems { get; set; }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Selection/SelectionModelIndexesChangedEventArgs.cs b/src/Avalonia.Controls/Selection/SelectionModelIndexesChangedEventArgs.cs
new file mode 100644
index 0000000000..a1fef578a2
--- /dev/null
+++ b/src/Avalonia.Controls/Selection/SelectionModelIndexesChangedEventArgs.cs
@@ -0,0 +1,18 @@
+using System;
+
+#nullable enable
+
+namespace Avalonia.Controls.Selection
+{
+    public class SelectionModelIndexesChangedEventArgs : EventArgs
+    {
+        public SelectionModelIndexesChangedEventArgs(int startIndex, int delta)
+        {
+            StartIndex = startIndex;
+            Delta = delta;
+        }
+
+        public int StartIndex { get; }
+        public int Delta { get; }
+    }
+}
diff --git a/src/Avalonia.Controls/Selection/SelectionModelSelectionChangedEventArgs.cs b/src/Avalonia.Controls/Selection/SelectionModelSelectionChangedEventArgs.cs
new file mode 100644
index 0000000000..396943592d
--- /dev/null
+++ b/src/Avalonia.Controls/Selection/SelectionModelSelectionChangedEventArgs.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Avalonia.Controls.Selection;
+
+#nullable enable
+
+namespace Avalonia.Controls.Selection
+{
+    public abstract class SelectionModelSelectionChangedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the indexes of the items that were removed from the selection.
+        /// </summary>
+        public abstract IReadOnlyList<int> DeselectedIndexes { get; }
+
+        /// <summary>
+        /// Gets the indexes of the items that were added to the selection.
+        /// </summary>
+        public abstract IReadOnlyList<int> SelectedIndexes { get; }
+
+        /// <summary>
+        /// Gets the items that were removed from the selection.
+        /// </summary>
+        public IReadOnlyList<object?> DeselectedItems => GetUntypedDeselectedItems();
+
+        /// <summary>
+        /// Gets the items that were added to the selection.
+        /// </summary>
+        public IReadOnlyList<object?> SelectedItems => GetUntypedSelectedItems();
+
+        protected abstract IReadOnlyList<object?> GetUntypedDeselectedItems();
+        protected abstract IReadOnlyList<object?> GetUntypedSelectedItems();
+    }
+
+    public class SelectionModelSelectionChangedEventArgs<T> : SelectionModelSelectionChangedEventArgs
+    {
+        private IReadOnlyList<object?>? _deselectedItems;
+        private IReadOnlyList<object?>? _selectedItems;
+
+        public SelectionModelSelectionChangedEventArgs(
+            IReadOnlyList<int>? deselectedIndices = null,
+            IReadOnlyList<int>? selectedIndices = null,
+            IReadOnlyList<T>? deselectedItems = null,
+            IReadOnlyList<T>? selectedItems = null)
+        {
+            DeselectedIndexes = deselectedIndices ?? Array.Empty<int>();
+            SelectedIndexes = selectedIndices ?? Array.Empty<int>();
+            DeselectedItems = deselectedItems ?? Array.Empty<T>();
+            SelectedItems = selectedItems ?? Array.Empty<T>();
+        }
+
+        /// <summary>
+        /// Gets the indexes of the items that were removed from the selection.
+        /// </summary>
+        public override IReadOnlyList<int> DeselectedIndexes { get; }
+
+        /// <summary>
+        /// Gets the indexes of the items that were added to the selection.
+        /// </summary>
+        public override IReadOnlyList<int> SelectedIndexes { get; }
+
+        /// <summary>
+        /// Gets the items that were removed from the selection.
+        /// </summary>
+        public new IReadOnlyList<T> DeselectedItems { get; }
+
+        /// <summary>
+        /// Gets the items that were added to the selection.
+        /// </summary>
+        public new IReadOnlyList<T> SelectedItems { get; }
+
+        protected override IReadOnlyList<object?> GetUntypedDeselectedItems()
+        {
+            return _deselectedItems ??= (DeselectedItems as IReadOnlyList<object?>) ??
+                new SelectedItems<T>.Untyped(DeselectedItems);
+        }
+
+        protected override IReadOnlyList<object?> GetUntypedSelectedItems()
+        {
+            return _selectedItems ??= (SelectedItems as IReadOnlyList<object?>) ??
+                new SelectedItems<T>.Untyped(SelectedItems);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Selection/SelectionNodeBase.cs b/src/Avalonia.Controls/Selection/SelectionNodeBase.cs
new file mode 100644
index 0000000000..230575074a
--- /dev/null
+++ b/src/Avalonia.Controls/Selection/SelectionNodeBase.cs
@@ -0,0 +1,320 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using Avalonia.Controls.Utils;
+
+#nullable enable
+
+namespace Avalonia.Controls.Selection
+{
+    public abstract class SelectionNodeBase<T> : ICollectionChangedListener
+    {
+        private IEnumerable? _source;
+        private bool _rangesEnabled;
+        private List<IndexRange>? _ranges;
+        private int _collectionChanging;
+
+        protected IEnumerable? Source
+        {
+            get => _source;
+            set
+            {
+                if (_source != value)
+                {
+                    ItemsView?.RemoveListener(this);
+                    _source = value;
+                    ItemsView = value is object ? ItemsSourceView<T>.GetOrCreate(value) : null;
+                    ItemsView?.AddListener(this);
+                }
+            }
+        }
+
+        protected bool IsSourceCollectionChanging => _collectionChanging > 0;
+
+        protected bool RangesEnabled
+        {
+            get => _rangesEnabled;
+            set
+            {
+                if (_rangesEnabled != value)
+                {
+                    _rangesEnabled = value;
+
+                    if (!_rangesEnabled)
+                    {
+                        _ranges = null;
+                    }
+                }
+            }
+        }
+
+        internal ItemsSourceView<T>? ItemsView { get; set; }
+
+        internal IReadOnlyList<IndexRange> Ranges
+        {
+            get
+            {
+                if (!RangesEnabled)
+                {
+                    throw new InvalidOperationException("Ranges not enabled.");
+                }
+
+                return _ranges ??= new List<IndexRange>();
+            }
+        }
+
+        void ICollectionChangedListener.PreChanged(INotifyCollectionChanged sender, NotifyCollectionChangedEventArgs e)
+        {
+            ++_collectionChanging;
+        }
+
+        void ICollectionChangedListener.Changed(INotifyCollectionChanged sender, NotifyCollectionChangedEventArgs e)
+        {
+            OnSourceCollectionChanged(e);
+        }
+
+        void ICollectionChangedListener.PostChanged(INotifyCollectionChanged sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (--_collectionChanging == 0)
+            {
+                OnSourceCollectionChangeFinished();
+            }
+        }
+
+        protected abstract void OnSourceCollectionChangeFinished();
+
+        private protected abstract void OnIndexesChanged(int shiftIndex, int shiftDelta);
+
+        private protected abstract void OnSourceReset();
+
+        private protected abstract void OnSelectionChanged(IReadOnlyList<T> deselectedItems);
+
+        private protected int CommitSelect(IndexRange range)
+        {
+            if (RangesEnabled)
+            {
+                _ranges ??= new List<IndexRange>();
+                return IndexRange.Add(_ranges, range);
+            }
+
+            return 0;
+        }
+
+        private protected int CommitSelect(IReadOnlyList<IndexRange> ranges)
+        {
+            if (RangesEnabled)
+            {
+                _ranges ??= new List<IndexRange>();
+                return IndexRange.Add(_ranges, ranges);
+            }
+
+            return 0;
+        }
+
+        private protected int CommitDeselect(IndexRange range)
+        {
+            if (RangesEnabled)
+            {
+                _ranges ??= new List<IndexRange>();
+                return IndexRange.Remove(_ranges, range);
+            }
+
+            return 0;
+        }
+
+        private protected int CommitDeselect(IReadOnlyList<IndexRange> ranges)
+        {
+            if (RangesEnabled && _ranges is object)
+            {
+                return IndexRange.Remove(_ranges, ranges);
+            }
+
+            return 0;
+        }
+
+        private protected virtual CollectionChangeState OnItemsAdded(int index, IList items)
+        {
+            var count = items.Count;
+            var shifted = false;
+
+            if (_ranges is object)
+            {
+                List<IndexRange>? toAdd = null;
+
+                for (var i = 0; i < Ranges!.Count; ++i)
+                {
+                    var range = Ranges[i];
+
+                    // The range is after the inserted items, need to shift the range right
+                    if (range.End >= index)
+                    {
+                        int begin = range.Begin;
+
+                        // If the index left of newIndex is inside the range,
+                        // Split the range and remember the left piece to add later
+                        if (range.Contains(index - 1))
+                        {
+                            range.Split(index - 1, out var before, out _);
+                            (toAdd ??= new List<IndexRange>()).Add(before);
+                            begin = index;
+                        }
+
+                        // Shift the range to the right
+                        _ranges[i] = new IndexRange(begin + count, range.End + count);
+                        shifted = true;
+                    }
+                }
+
+                if (toAdd is object)
+                {
+                    foreach (var range in toAdd)
+                    {
+                        IndexRange.Add(_ranges, range);
+                    }
+                }
+            }
+
+            return new CollectionChangeState
+            {
+                ShiftIndex = index,
+                ShiftDelta = shifted ? count : 0,
+            };
+        }
+
+        private protected virtual CollectionChangeState OnItemsRemoved(int index, IList items)
+        {
+            var count = items.Count;
+            var removedRange = new IndexRange(index, index + count - 1);
+            bool shifted = false;
+            List<T>? removed = null;
+
+            if (_ranges is object)
+            {
+                var deselected = new List<IndexRange>();
+
+                if (IndexRange.Remove(_ranges, removedRange, deselected) > 0)
+                {
+                    removed = new List<T>();
+
+                    foreach (var range in deselected)
+                    {
+                        for (var i = range.Begin; i <= range.End; ++i)
+                        {
+#pragma warning disable CS8604
+                            removed.Add((T)items[i - index]);
+#pragma warning restore CS8604
+                        }
+                    }
+                }
+
+                for (var i = 0; i < Ranges!.Count; ++i)
+                {
+                    var existing = Ranges[i];
+
+                    if (existing.End > removedRange.Begin)
+                    {
+                        _ranges[i] = new IndexRange(existing.Begin - count, existing.End - count);
+                        shifted = true;
+                    }
+                }
+            }
+
+            return new CollectionChangeState
+            {
+                ShiftIndex = index,
+                ShiftDelta = shifted ? -count : 0,
+                RemovedItems = removed,
+            };
+        }
+
+        private protected virtual void OnSourceCollectionChanged(NotifyCollectionChangedEventArgs e)
+        {
+            var shiftDelta = 0;
+            var shiftIndex = -1;
+            List<T>? removed = null;
+
+            if (!IsValidCollectionChange(e))
+            {
+                return;
+            }
+
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    {
+                        var change = OnItemsAdded(e.NewStartingIndex, e.NewItems);
+                        shiftIndex = change.ShiftIndex;
+                        shiftDelta = change.ShiftDelta;
+                        break;
+                    }
+                case NotifyCollectionChangedAction.Remove:
+                    {
+                        var change = OnItemsRemoved(e.OldStartingIndex, e.OldItems);
+                        shiftIndex = change.ShiftIndex;
+                        shiftDelta = change.ShiftDelta;
+                        removed = change.RemovedItems;
+                        break;
+                    }
+                case NotifyCollectionChangedAction.Replace:
+                    {
+                        var removeChange = OnItemsRemoved(e.OldStartingIndex, e.OldItems);
+                        var addChange = OnItemsAdded(e.NewStartingIndex, e.NewItems);
+                        shiftIndex = removeChange.ShiftIndex;
+                        shiftDelta = removeChange.ShiftDelta + addChange.ShiftDelta;
+                        removed = removeChange.RemovedItems;
+                    }
+                    break;
+                case NotifyCollectionChangedAction.Reset:
+                    OnSourceReset();
+                    break;
+            }
+
+            if (shiftDelta != 0)
+            {
+                OnIndexesChanged(shiftIndex, shiftDelta);
+            }
+
+            if (removed is object)
+            {
+                OnSelectionChanged(removed);
+            }
+        }
+
+        private protected virtual bool IsValidCollectionChange(NotifyCollectionChangedEventArgs e)
+        {
+            // If the selection is modified in a CollectionChanged handler before the selection
+            // model's CollectionChanged handler has had chance to run then we can end up with
+            // a selected index that refers to the *new* state of the Source intermixed with
+            // indexes that reference an old state of the source.
+            //
+            // There's not much we can do in this situation, so detect whether shifting the
+            // current selected indexes would result in an invalid index in the source, and if
+            // so bail.
+            //
+            // See unit test Handles_Selection_Made_In_CollectionChanged for more details.
+            if (ItemsView is object &&
+                RangesEnabled &&
+                Ranges.Count > 0 &&
+                e.Action == NotifyCollectionChangedAction.Add)
+            {
+                var lastIndex = Ranges.Last().End;
+
+                if (e.NewStartingIndex <= lastIndex)
+                {
+                    return lastIndex + e.NewItems.Count < ItemsView.Count;
+                }
+            }
+
+            return true;
+        }
+
+        private protected struct CollectionChangeState
+        {
+            public int ShiftIndex;
+            public int ShiftDelta;
+            public List<T>? RemovedItems;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/SelectionChangedEventArgs.cs b/src/Avalonia.Controls/SelectionChangedEventArgs.cs
index 267ddf036e..c19d868d57 100644
--- a/src/Avalonia.Controls/SelectionChangedEventArgs.cs
+++ b/src/Avalonia.Controls/SelectionChangedEventArgs.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections;
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
@@ -16,13 +13,13 @@ namespace Avalonia.Controls
         /// Initializes a new instance of the <see cref="SelectionChangedEventArgs"/> class.
         /// </summary>
         /// <param name="routedEvent">The event being raised.</param>
-        /// <param name="addedItems">The items added to the selection.</param>
         /// <param name="removedItems">The items removed from the selection.</param>
-        public SelectionChangedEventArgs(RoutedEvent routedEvent, IList addedItems, IList removedItems)
+        /// <param name="addedItems">The items added to the selection.</param>
+        public SelectionChangedEventArgs(RoutedEvent routedEvent, IList removedItems, IList addedItems)
             : base(routedEvent)
         {
-            AddedItems = addedItems;
             RemovedItems = removedItems;
+            AddedItems = addedItems;
         }
 
         /// <summary>
diff --git a/src/Avalonia.Controls/SelectionMode.cs b/src/Avalonia.Controls/SelectionMode.cs
index 6ba30b968c..07cb01ff0b 100644
--- a/src/Avalonia.Controls/SelectionMode.cs
+++ b/src/Avalonia.Controls/SelectionMode.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Controls
diff --git a/src/Avalonia.Controls/Separator.cs b/src/Avalonia.Controls/Separator.cs
index 84b2a33d7b..537af5186e 100644
--- a/src/Avalonia.Controls/Separator.cs
+++ b/src/Avalonia.Controls/Separator.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Primitives;
 
 namespace Avalonia.Controls
diff --git a/src/Avalonia.Controls/Shapes/Ellipse.cs b/src/Avalonia.Controls/Shapes/Ellipse.cs
index f80bf5d967..4d2fd238ee 100644
--- a/src/Avalonia.Controls/Shapes/Ellipse.cs
+++ b/src/Avalonia.Controls/Shapes/Ellipse.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Media;
 
 namespace Avalonia.Controls.Shapes
diff --git a/src/Avalonia.Controls/Shapes/Line.cs b/src/Avalonia.Controls/Shapes/Line.cs
index b06fe40710..e37630cbdf 100644
--- a/src/Avalonia.Controls/Shapes/Line.cs
+++ b/src/Avalonia.Controls/Shapes/Line.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Media;
 
 namespace Avalonia.Controls.Shapes
diff --git a/src/Avalonia.Controls/Shapes/Path.cs b/src/Avalonia.Controls/Shapes/Path.cs
index e0952d3e9b..d0ffc27d20 100644
--- a/src/Avalonia.Controls/Shapes/Path.cs
+++ b/src/Avalonia.Controls/Shapes/Path.cs
@@ -1,6 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using System;
 using Avalonia.Media;
 
 namespace Avalonia.Controls.Shapes
@@ -10,9 +8,12 @@ namespace Avalonia.Controls.Shapes
         public static readonly StyledProperty<Geometry> DataProperty =
             AvaloniaProperty.Register<Path, Geometry>(nameof(Data));
 
+        private EventHandler _geometryChangedHandler;
+
         static Path()
         {
             AffectsGeometry<Path>(DataProperty);
+            DataProperty.Changed.AddClassHandler<Path>((o, e) => o.DataChanged(e));
         }
 
         public Geometry Data
@@ -21,6 +22,54 @@ namespace Avalonia.Controls.Shapes
             set { SetValue(DataProperty, value); }
         }
 
+        private EventHandler GeometryChangedHandler => _geometryChangedHandler ??= GeometryChanged;
+
         protected override Geometry CreateDefiningGeometry() => Data;
+
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+
+            if (Data is object)
+            {
+                Data.Changed += GeometryChangedHandler;
+            }
+        }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnDetachedFromVisualTree(e);
+
+            if (Data is object)
+            {
+                Data.Changed -= GeometryChangedHandler;
+            }
+        }
+
+        private void DataChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (VisualRoot is null)
+            {
+                return;
+            }
+
+            var oldGeometry = (Geometry)e.OldValue;
+            var newGeometry = (Geometry)e.NewValue;
+
+            if (oldGeometry is object)
+            {
+                oldGeometry.Changed -= GeometryChangedHandler;
+            }
+
+            if (newGeometry is object)
+            {
+                newGeometry.Changed += GeometryChangedHandler;
+            }
+        }
+
+        private void GeometryChanged(object sender, EventArgs e)
+        {
+            InvalidateGeometry();
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Shapes/Polygon.cs b/src/Avalonia.Controls/Shapes/Polygon.cs
index 5b9baa94fe..70a45f3516 100644
--- a/src/Avalonia.Controls/Shapes/Polygon.cs
+++ b/src/Avalonia.Controls/Shapes/Polygon.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Generic;
 using Avalonia.Media;
 
diff --git a/src/Avalonia.Controls/Shapes/Polyline.cs b/src/Avalonia.Controls/Shapes/Polyline.cs
index c56336212c..4b4bb3ffd0 100644
--- a/src/Avalonia.Controls/Shapes/Polyline.cs
+++ b/src/Avalonia.Controls/Shapes/Polyline.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Generic;
 using Avalonia.Media;
 
diff --git a/src/Avalonia.Controls/Shapes/Rectangle.cs b/src/Avalonia.Controls/Shapes/Rectangle.cs
index b803bde588..f3db2644a9 100644
--- a/src/Avalonia.Controls/Shapes/Rectangle.cs
+++ b/src/Avalonia.Controls/Shapes/Rectangle.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Media;
 
 namespace Avalonia.Controls.Shapes
diff --git a/src/Avalonia.Controls/Shapes/Shape.cs b/src/Avalonia.Controls/Shapes/Shape.cs
index 499dfb5320..0b7595ec9a 100644
--- a/src/Avalonia.Controls/Shapes/Shape.cs
+++ b/src/Avalonia.Controls/Shapes/Shape.cs
@@ -1,43 +1,67 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Reflection;
 using Avalonia.Collections;
 using Avalonia.Media;
 
+#nullable enable
+
 namespace Avalonia.Controls.Shapes
 {
+    /// <summary>
+    /// Provides a base class for shape elements, such as <see cref="Ellipse"/>, <see cref="Polygon"/> and <see cref="Rectangle"/>.
+    /// </summary>
     public abstract class Shape : Control
     {
-        public static readonly StyledProperty<IBrush> FillProperty =
-            AvaloniaProperty.Register<Shape, IBrush>(nameof(Fill));
+        /// <summary>
+        /// Defines the <see cref="Fill"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush?> FillProperty =
+            AvaloniaProperty.Register<Shape, IBrush?>(nameof(Fill));
 
+        /// <summary>
+        /// Defines the <see cref="Stretch"/> property.
+        /// </summary>
         public static readonly StyledProperty<Stretch> StretchProperty =
             AvaloniaProperty.Register<Shape, Stretch>(nameof(Stretch));
 
-        public static readonly StyledProperty<IBrush> StrokeProperty =
-            AvaloniaProperty.Register<Shape, IBrush>(nameof(Stroke));
+        /// <summary>
+        /// Defines the <see cref="Stroke"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush?> StrokeProperty =
+            AvaloniaProperty.Register<Shape, IBrush?>(nameof(Stroke));
 
-        public static readonly StyledProperty<AvaloniaList<double>> StrokeDashArrayProperty =
-            AvaloniaProperty.Register<Shape, AvaloniaList<double>>(nameof(StrokeDashArray));
+        /// <summary>
+        /// Defines the <see cref="StrokeDashArray"/> property.
+        /// </summary>
+        public static readonly StyledProperty<AvaloniaList<double>?> StrokeDashArrayProperty =
+            AvaloniaProperty.Register<Shape, AvaloniaList<double>?>(nameof(StrokeDashArray));
 
+        /// <summary>
+        /// Defines the <see cref="StrokeDashOffset"/> property.
+        /// </summary>
         public static readonly StyledProperty<double> StrokeDashOffsetProperty =
             AvaloniaProperty.Register<Shape, double>(nameof(StrokeDashOffset));
 
+        /// <summary>
+        /// Defines the <see cref="StrokeThickness"/> property.
+        /// </summary>
         public static readonly StyledProperty<double> StrokeThicknessProperty =
             AvaloniaProperty.Register<Shape, double>(nameof(StrokeThickness));
 
+        /// <summary>
+        /// Defines the <see cref="StrokeLineCap"/> property.
+        /// </summary>
         public static readonly StyledProperty<PenLineCap> StrokeLineCapProperty =
             AvaloniaProperty.Register<Shape, PenLineCap>(nameof(StrokeLineCap), PenLineCap.Flat);
 
+        /// <summary>
+        /// Defines the <see cref="StrokeJoin"/> property.
+        /// </summary>
         public static readonly StyledProperty<PenLineJoin> StrokeJoinProperty =
             AvaloniaProperty.Register<Shape, PenLineJoin>(nameof(StrokeJoin), PenLineJoin.Miter);
 
         private Matrix _transform = Matrix.Identity;
-        private Geometry _definingGeometry;
-        private Geometry _renderedGeometry;
-        bool _calculateTransformOnArrange = false;
+        private Geometry? _definingGeometry;
+        private Geometry? _renderedGeometry;
 
         static Shape()
         {
@@ -47,7 +71,10 @@ namespace Avalonia.Controls.Shapes
                 StrokeThicknessProperty, StrokeLineCapProperty, StrokeJoinProperty);
         }
 
-        public Geometry DefiningGeometry
+        /// <summary>
+        /// Gets a value that represents the <see cref="Geometry"/> of the shape.
+        /// </summary>
+        public Geometry? DefiningGeometry
         {
             get
             {
@@ -60,13 +87,10 @@ namespace Avalonia.Controls.Shapes
             }
         }
 
-        public IBrush Fill
-        {
-            get { return GetValue(FillProperty); }
-            set { SetValue(FillProperty, value); }
-        }
-
-        public Geometry RenderedGeometry
+        /// <summary>
+        /// Gets a value that represents the final rendered <see cref="Geometry"/> of the shape.
+        /// </summary>
+        public Geometry? RenderedGeometry
         {
             get
             {
@@ -97,42 +121,72 @@ namespace Avalonia.Controls.Shapes
             }
         }
 
+        /// <summary>
+        /// Gets or sets the <see cref="IBrush"/> that specifies how the shape's interior is painted.
+        /// </summary>
+        public IBrush? Fill
+        {
+            get { return GetValue(FillProperty); }
+            set { SetValue(FillProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a <see cref="Stretch"/> enumeration value that describes how the shape fills its allocated space.
+        /// </summary>
         public Stretch Stretch
         {
             get { return GetValue(StretchProperty); }
             set { SetValue(StretchProperty, value); }
         }
 
-        public IBrush Stroke
+        /// <summary>
+        /// Gets or sets the <see cref="IBrush"/> that specifies how the shape's outline is painted.
+        /// </summary>
+        public IBrush? Stroke
         {
             get { return GetValue(StrokeProperty); }
             set { SetValue(StrokeProperty, value); }
         }
 
-        public AvaloniaList<double> StrokeDashArray
+        /// <summary>
+        /// Gets or sets a collection of <see cref="double"/> values that indicate the pattern of dashes and gaps that is used to outline shapes.
+        /// </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 width of the shape outline.
+        /// </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>
+        /// Gets or sets a <see cref="PenLineJoin"/> enumeration value that specifies the type of join that is used at the vertices of a Shape.
+        /// </summary>
         public PenLineJoin StrokeJoin
         {
             get { return GetValue(StrokeJoinProperty); }
@@ -166,74 +220,48 @@ namespace Avalonia.Controls.Shapes
             {
                 property.Changed.Subscribe(e =>
                 {
-                    var senderType = e.Sender.GetType().GetTypeInfo();
-                    var affectedType = typeof(TShape).GetTypeInfo();
-
-                    if (affectedType.IsAssignableFrom(senderType))
+                    if (e.Sender is TShape shape)
                     {
-                        AffectsGeometryInvalidate(e);
+                        AffectsGeometryInvalidate(shape, e);
                     }
                 });
             }
         }
 
-        protected abstract Geometry CreateDefiningGeometry();
+        /// <summary>
+        /// Creates the shape's defining geometry.
+        /// </summary>
+        /// <returns>Defining <see cref="Geometry"/> of the shape.</returns>
+        protected abstract Geometry? CreateDefiningGeometry();
 
+        /// <summary>
+        /// Invalidates the geometry of this shape.
+        /// </summary>
         protected void InvalidateGeometry()
         {
             _renderedGeometry = null;
             _definingGeometry = null;
+
             InvalidateMeasure();
         }
 
         protected override Size MeasureOverride(Size availableSize)
         {
-            bool deferCalculateTransform;
-            switch (Stretch)
+            if (DefiningGeometry is null)
             {
-                case Stretch.Fill:
-                case Stretch.UniformToFill:
-                    deferCalculateTransform = double.IsInfinity(availableSize.Width) || double.IsInfinity(availableSize.Height);
-                    break;
-                case Stretch.Uniform:
-                    deferCalculateTransform = double.IsInfinity(availableSize.Width) && double.IsInfinity(availableSize.Height);
-                    break;
-                case Stretch.None:
-                default:
-                    deferCalculateTransform = false;
-                    break;
+                return default;
             }
 
-            if (deferCalculateTransform)
-            {
-                _calculateTransformOnArrange = true;
-                return DefiningGeometry?.Bounds.Size ?? Size.Empty;
-            }
-            else
-            {
-                _calculateTransformOnArrange = false;
-                return CalculateShapeSizeAndSetTransform(availableSize);
-            }
+            return CalculateSizeAndTransform(availableSize, DefiningGeometry.Bounds, Stretch).size;
         }
 
         protected override Size ArrangeOverride(Size finalSize)
-        {
-            if (_calculateTransformOnArrange)
-            {
-                _calculateTransformOnArrange = false;
-                CalculateShapeSizeAndSetTransform(finalSize);
-            }
-
-            return finalSize;
-        }
-
-        private Size CalculateShapeSizeAndSetTransform(Size availableSize)
         {
             if (DefiningGeometry != null)
             {
                 // This should probably use GetRenderBounds(strokeThickness) but then the calculations
                 // will multiply the stroke thickness as well, which isn't correct.
-                var (size, transform) = CalculateSizeAndTransform(availableSize, DefiningGeometry.Bounds, Stretch);
+                var (_, transform) = CalculateSizeAndTransform(finalSize, DefiningGeometry.Bounds, Stretch);
 
                 if (_transform != transform)
                 {
@@ -241,13 +269,13 @@ namespace Avalonia.Controls.Shapes
                     _renderedGeometry = null;
                 }
 
-                return size;
+                return finalSize;
             }
 
             return Size.Empty;
         }
 
-        internal static (Size, Matrix) CalculateSizeAndTransform(Size availableSize, Rect shapeBounds, Stretch Stretch)
+        internal static (Size size, Matrix transform) CalculateSizeAndTransform(Size availableSize, Rect shapeBounds, Stretch Stretch)
         {
             Size shapeSize = new Size(shapeBounds.Right, shapeBounds.Bottom);
             Matrix translate = Matrix.Identity;
@@ -322,19 +350,14 @@ namespace Avalonia.Controls.Shapes
             return (size, transform);
         }
 
-        private static void AffectsGeometryInvalidate(AvaloniaPropertyChangedEventArgs e)
+        private static void AffectsGeometryInvalidate(Shape control, AvaloniaPropertyChangedEventArgs e)
         {
-            if (!(e.Sender is Shape control))
-            {
-                return;
-            }
-
             // If the geometry is invalidated when Bounds changes, only invalidate when the Size
             // portion changes.
             if (e.Property == BoundsProperty)
             {
-                var oldBounds = (Rect)e.OldValue;
-                var newBounds = (Rect)e.NewValue;
+                var oldBounds = (Rect)e.OldValue!;
+                var newBounds = (Rect)e.NewValue!;
 
                 if (oldBounds.Size == newBounds.Size)
                 {
diff --git a/src/Avalonia.Controls/ShutdownMode.cs b/src/Avalonia.Controls/ShutdownMode.cs
index ee593c28a8..c94567d690 100644
--- a/src/Avalonia.Controls/ShutdownMode.cs
+++ b/src/Avalonia.Controls/ShutdownMode.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.ApplicationLifetimes;
 
 namespace Avalonia.Controls
diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index f71be8d836..fe4b24099f 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -1,17 +1,47 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using Avalonia.Collections;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Primitives;
+using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
+using Avalonia.Utilities;
 
 namespace Avalonia.Controls
 {
+
+    /// <summary>
+    /// Enum which describes how to position the ticks in a <see cref="Slider"/>.
+    /// </summary>
+    public enum TickPlacement
+    {
+        /// <summary>
+        /// No tick marks will appear.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Tick marks  will appear above the track for a horizontal <see cref="Slider"/>, or to the left of the track for a vertical <see cref="Slider"/>.
+        /// </summary>
+        TopLeft,
+
+        /// <summary>
+        /// Tick marks will appear below the track for a horizontal <see cref="Slider"/>, or to the right of the track for a vertical <see cref="Slider"/>.
+        /// </summary>
+        BottomRight,
+
+        /// <summary>
+        /// Tick marks appear on both sides of either a horizontal or vertical <see cref="Slider"/>.
+        /// </summary>
+        Outside
+    }
+
     /// <summary>
     /// A control that lets the user select from a range of values by moving a Thumb control along a Track.
     /// </summary>
+    [PseudoClasses(":vertical", ":horizontal", ":pressed")]
     public class Slider : RangeBase
     {
         /// <summary>
@@ -32,22 +62,41 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<double> TickFrequencyProperty =
             AvaloniaProperty.Register<Slider, double>(nameof(TickFrequency), 0.0);
 
+        /// <summary>
+        /// Defines the <see cref="TickPlacement"/> property.
+        /// </summary>
+        public static readonly StyledProperty<TickPlacement> TickPlacementProperty =
+            AvaloniaProperty.Register<TickBar, TickPlacement>(nameof(TickPlacement), 0d);
+
+        /// <summary>
+        /// Defines the <see cref="TicksProperty"/> property.
+        /// </summary>
+        public static readonly StyledProperty<AvaloniaList<double>> TicksProperty =
+            TickBar.TicksProperty.AddOwner<Slider>();
+
         // Slider required parts
+        private bool _isDragging = false;
         private Track _track;
         private Button _decreaseButton;
         private Button _increaseButton;
+        private IDisposable _decreaseButtonPressDispose;
+        private IDisposable _decreaseButtonReleaseDispose;
+        private IDisposable _increaseButtonSubscription;
+        private IDisposable _increaseButtonReleaseDispose;
+        private IDisposable _pointerMovedDispose;
 
         /// <summary>
         /// Initializes static members of the <see cref="Slider"/> class. 
         /// </summary>
         static Slider()
         {
+            PressedMixin.Attach<Slider>();
             OrientationProperty.OverrideDefaultValue(typeof(Slider), Orientation.Horizontal);
-            PseudoClass<Slider, Orientation>(OrientationProperty, o => o == Orientation.Vertical, ":vertical");
-            PseudoClass<Slider, Orientation>(OrientationProperty, o => o == Orientation.Horizontal, ":horizontal");
             Thumb.DragStartedEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragStarted(e), RoutingStrategies.Bubble);
-            Thumb.DragDeltaEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragDelta(e), RoutingStrategies.Bubble);
-            Thumb.DragCompletedEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragCompleted(e), RoutingStrategies.Bubble);
+            Thumb.DragCompletedEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragCompleted(e),
+                RoutingStrategies.Bubble);
+            
+            ValueProperty.OverrideMetadata<Slider>(new DirectPropertyMetadata<double>(enableDataValidation: true));
         }
 
         /// <summary>
@@ -55,6 +104,16 @@ namespace Avalonia.Controls
         /// </summary>
         public Slider()
         {
+            UpdatePseudoClasses(Orientation);
+        }
+
+        /// <summary>
+        /// Defines the ticks to be drawn on the tick bar.
+        /// </summary>
+        public AvaloniaList<double> Ticks
+        {
+            get => GetValue(TicksProperty);
+            set => SetValue(TicksProperty, value);
         }
 
         /// <summary>
@@ -84,95 +143,125 @@ namespace Avalonia.Controls
             set { SetValue(TickFrequencyProperty, value); }
         }
 
-        /// <inheritdoc/>
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        /// <summary>
+        /// Gets or sets a value that indicates where to draw 
+        /// tick marks in relation to the track.
+        /// </summary>
+        public TickPlacement TickPlacement
         {
-            if (_decreaseButton != null)
-            {
-                _decreaseButton.Click -= DecreaseClick;
-            }
+            get { return GetValue(TickPlacementProperty); }
+            set { SetValue(TickPlacementProperty, value); }
+        }
 
-            if (_increaseButton != null)
-            {
-                _increaseButton.Click -= IncreaseClick;
-            }
+        /// <inheritdoc/>
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            base.OnApplyTemplate(e);
+            
+            _decreaseButtonPressDispose?.Dispose();
+            _decreaseButtonReleaseDispose?.Dispose();
+            _increaseButtonSubscription?.Dispose();
+            _increaseButtonReleaseDispose?.Dispose();
+            _pointerMovedDispose?.Dispose();
 
             _decreaseButton = e.NameScope.Find<Button>("PART_DecreaseButton");
             _track = e.NameScope.Find<Track>("PART_Track");
             _increaseButton = e.NameScope.Find<Button>("PART_IncreaseButton");
 
+            if (_track != null)
+            {
+                _track.IsThumbDragHandled = true;
+            }
+
             if (_decreaseButton != null)
             {
-                _decreaseButton.Click += DecreaseClick;
+                _decreaseButtonPressDispose = _decreaseButton.AddDisposableHandler(PointerPressedEvent, TrackPressed, RoutingStrategies.Tunnel);
+                _decreaseButtonReleaseDispose = _decreaseButton.AddDisposableHandler(PointerReleasedEvent, TrackReleased, RoutingStrategies.Tunnel);
             }
 
             if (_increaseButton != null)
             {
-                _increaseButton.Click += IncreaseClick;
+                _increaseButtonSubscription = _increaseButton.AddDisposableHandler(PointerPressedEvent, TrackPressed, RoutingStrategies.Tunnel);
+                _increaseButtonReleaseDispose = _increaseButton.AddDisposableHandler(PointerReleasedEvent, TrackReleased, RoutingStrategies.Tunnel);
             }
+
+            _pointerMovedDispose = this.AddDisposableHandler(PointerMovedEvent, TrackMoved, RoutingStrategies.Tunnel);
         }
 
-        private void DecreaseClick(object sender, RoutedEventArgs e)
+        private void TrackMoved(object sender, PointerEventArgs e)
         {
-            ChangeValueBy(-LargeChange);
+            if (_isDragging)
+            {
+                MoveToPoint(e.GetCurrentPoint(_track));
+            }
         }
 
-        private void IncreaseClick(object sender, RoutedEventArgs e)
+        private void TrackReleased(object sender, PointerReleasedEventArgs e)
         {
-            ChangeValueBy(LargeChange);
+            _isDragging = false;
         }
 
-        private void ChangeValueBy(double by)
+        private void TrackPressed(object sender, PointerPressedEventArgs e)
         {
-            if (IsSnapToTickEnabled)
+            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
             {
-                by = by < 0 ? Math.Min(-TickFrequency, by) : Math.Max(TickFrequency, by);
+                MoveToPoint(e.GetCurrentPoint(_track));
+                _isDragging = true;
             }
+        }
 
-            var value = Value;
-            var next = SnapToTick(Math.Max(Math.Min(value + by, Maximum), Minimum));
-            if (next != value)
-            {
-                Value = next;
-            }
+        private void MoveToPoint(PointerPoint x)
+        {
+            var orient = Orientation == Orientation.Horizontal;
+
+            var pointDen = orient ? _track.Bounds.Width : _track.Bounds.Height;
+            // Just add epsilon to avoid NaN in case 0/0
+            pointDen += double.Epsilon;
+
+            var pointNum = orient ? x.Position.X : x.Position.Y;
+            var logicalPos = MathUtilities.Clamp(pointNum / pointDen, 0.0d, 1.0d);
+            var invert = orient ? 0 : 1;
+            var calcVal = Math.Abs(invert - logicalPos);
+            var range = Maximum - Minimum;
+            var finalValue = calcVal * range + Minimum;
+
+            Value = IsSnapToTickEnabled ? SnapToTick(finalValue) : finalValue;
         }
 
-        /// <summary>
-        /// Called when user start dragging the <see cref="Thumb"/>.
-        /// </summary>
-        /// <param name="e"></param>
-        protected virtual void OnThumbDragStarted(VectorEventArgs e)
+        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
         {
+            if (property == ValueProperty)
+            {
+                DataValidationErrors.SetError(this, value.Error);
+            }
         }
 
-        /// <summary>
-        /// Called when user dragging the <see cref="Thumb"/>.
-        /// </summary>
-        /// <param name="e"></param>
-        protected virtual void OnThumbDragDelta(VectorEventArgs e)
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
         {
-            Thumb thumb = e.Source as Thumb;
-            if (thumb != null && _track?.Thumb == thumb)
+            base.OnPropertyChanged(change);
+
+            if (change.Property == OrientationProperty)
             {
-                MoveToNextTick(_track.Value);
+                UpdatePseudoClasses(change.NewValue.GetValueOrDefault<Orientation>());
             }
         }
 
         /// <summary>
-        /// Called when user stop dragging the <see cref="Thumb"/>.
+        /// Called when user start dragging the <see cref="Thumb"/>.
         /// </summary>
         /// <param name="e"></param>
-        protected virtual void OnThumbDragCompleted(VectorEventArgs e)
+        protected virtual void OnThumbDragStarted(VectorEventArgs e)
         {
+            _isDragging = true;
         }
 
         /// <summary>
-        /// Searches for the closest tick and sets Value to that tick.
+        /// Called when user stop dragging the <see cref="Thumb"/>.
         /// </summary>
-        /// <param name="value">Value that want to snap to closest Tick.</param>
-        private void MoveToNextTick(double value)
+        /// <param name="e"></param>
+        protected virtual void OnThumbDragCompleted(VectorEventArgs e)
         {
-            Value = SnapToTick(Math.Max(Minimum, Math.Min(Maximum, value)));
+            _isDragging = false;
         }
 
         /// <summary>
@@ -181,14 +270,54 @@ namespace Avalonia.Controls
         /// <param name="value">Value that want to snap to closest Tick.</param>
         private double SnapToTick(double value)
         {
-            if (IsSnapToTickEnabled && TickFrequency > 0.0)
+            if (IsSnapToTickEnabled)
             {
-                double previous = Minimum + (Math.Round(((value - Minimum) / TickFrequency)) * TickFrequency);
-                double next = Math.Min(Maximum, previous + TickFrequency);
-                value = value > (previous + next) * 0.5 ? next : previous;
+                double previous = Minimum;
+                double next = Maximum;
+
+                // This property is rarely set so let's try to avoid the GetValue
+                var ticks = Ticks;
+
+                // If ticks collection is available, use it.
+                // Note that ticks may be unsorted.
+                if ((ticks != null) && (ticks.Count > 0))
+                {
+                    for (int i = 0; i < ticks.Count; i++)
+                    {
+                        double tick = ticks[i];
+                        if (MathUtilities.AreClose(tick, value))
+                        {
+                            return value;
+                        }
+
+                        if (MathUtilities.LessThan(tick, value) && MathUtilities.GreaterThan(tick, previous))
+                        {
+                            previous = tick;
+                        }
+                        else if (MathUtilities.GreaterThan(tick, value) && MathUtilities.LessThan(tick, next))
+                        {
+                            next = tick;
+                        }
+                    }
+                }
+                else if (MathUtilities.GreaterThan(TickFrequency, 0.0))
+                {
+                    previous = Minimum + (Math.Round(((value - Minimum) / TickFrequency)) * TickFrequency);
+                    next = Math.Min(Maximum, previous + TickFrequency);
+                }
+
+                // Choose the closest value between previous and next. If tie, snap to 'next'.
+                value = MathUtilities.GreaterThanOrClose(value, (previous + next) * 0.5) ? next : previous;
             }
 
             return value;
         }
+
+
+        private void UpdatePseudoClasses(Orientation o)
+        {
+            PseudoClasses.Set(":vertical", o == Orientation.Vertical);
+            PseudoClasses.Set(":horizontal", o == Orientation.Horizontal);
+        }
     }
 }
diff --git a/src/Avalonia.Controls/SplitView.cs b/src/Avalonia.Controls/SplitView.cs
new file mode 100644
index 0000000000..4500d52484
--- /dev/null
+++ b/src/Avalonia.Controls/SplitView.cs
@@ -0,0 +1,464 @@
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+using Avalonia.Metadata;
+using Avalonia.Platform;
+using Avalonia.VisualTree;
+using System;
+using System.Reactive.Disposables;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Defines constants for how the SplitView Pane should display
+    /// </summary>
+    public enum SplitViewDisplayMode
+    {
+        /// <summary>
+        /// Pane is displayed next to content, and does not auto collapse
+        /// when tapped outside
+        /// </summary>
+        Inline,
+        /// <summary>
+        /// Pane is displayed next to content. When collapsed, pane is still
+        /// visible according to CompactPaneLength. Pane does not auto collapse
+        /// when tapped outside
+        /// </summary>
+        CompactInline,
+        /// <summary>
+        /// Pane is displayed above content. Pane collapses when tapped outside
+        /// </summary>
+        Overlay,
+        /// <summary>
+        /// Pane is displayed above content. When collapsed, pane is still
+        /// visible according to CompactPaneLength. Pane collapses when tapped outside
+        /// </summary>
+        CompactOverlay
+    }
+
+    /// <summary>
+    /// Defines constants for where the Pane should appear
+    /// </summary>
+    public enum SplitViewPanePlacement
+    {
+        Left,
+        Right
+    }
+
+    public class SplitViewTemplateSettings : AvaloniaObject
+    {
+        internal SplitViewTemplateSettings() { }
+
+        public static readonly StyledProperty<double> ClosedPaneWidthProperty =
+            AvaloniaProperty.Register<SplitViewTemplateSettings, double>(nameof(ClosedPaneWidth), 0d);
+
+        public static readonly StyledProperty<GridLength> PaneColumnGridLengthProperty =
+            AvaloniaProperty.Register<SplitViewTemplateSettings, GridLength>(nameof(PaneColumnGridLength));
+
+        public double ClosedPaneWidth
+        {
+            get => GetValue(ClosedPaneWidthProperty);
+            internal set => SetValue(ClosedPaneWidthProperty, value);
+        }
+
+        public GridLength PaneColumnGridLength
+        {
+            get => GetValue(PaneColumnGridLengthProperty);
+            internal set => SetValue(PaneColumnGridLengthProperty, value);
+        }
+    }
+
+    /// <summary>
+    /// A control with two views: A collapsible pane and an area for content
+    /// </summary>
+    [PseudoClasses(":open", ":closed")]
+    [PseudoClasses(":compactoverlay", ":compactinline", ":overlay", ":inline")]
+    [PseudoClasses(":left", ":right")]
+    [PseudoClasses(":lightdismiss")]
+    public class SplitView : ContentControl
+    {
+        /*
+            Pseudo classes & combos
+            :open / :closed
+            :compactoverlay :compactinline :overlay :inline
+            :left :right
+        */
+
+        /// <summary>
+        /// Defines the <see cref="CompactPaneLength"/> property
+        /// </summary>
+        public static readonly StyledProperty<double> CompactPaneLengthProperty =
+            AvaloniaProperty.Register<SplitView, double>(nameof(CompactPaneLength), defaultValue: 48);
+
+        /// <summary>
+        /// Defines the <see cref="DisplayMode"/> property
+        /// </summary>
+        public static readonly StyledProperty<SplitViewDisplayMode> DisplayModeProperty =
+            AvaloniaProperty.Register<SplitView, SplitViewDisplayMode>(nameof(DisplayMode), defaultValue: SplitViewDisplayMode.Overlay);
+
+        /// <summary>
+        /// Defines the <see cref="IsPaneOpen"/> property
+        /// </summary>
+        public static readonly DirectProperty<SplitView, bool> IsPaneOpenProperty =
+            AvaloniaProperty.RegisterDirect<SplitView, bool>(nameof(IsPaneOpen),
+                x => x.IsPaneOpen, (x, v) => x.IsPaneOpen = v);
+
+        /// <summary>
+        /// Defines the <see cref="OpenPaneLength"/> property
+        /// </summary>
+        public static readonly StyledProperty<double> OpenPaneLengthProperty =
+            AvaloniaProperty.Register<SplitView, double>(nameof(OpenPaneLength), defaultValue: 320);
+
+        /// <summary>
+        /// Defines the <see cref="PaneBackground"/> property
+        /// </summary>
+        public static readonly StyledProperty<IBrush> PaneBackgroundProperty =
+            AvaloniaProperty.Register<SplitView, IBrush>(nameof(PaneBackground));
+
+        /// <summary>
+        /// Defines the <see cref="PanePlacement"/> property
+        /// </summary>
+        public static readonly StyledProperty<SplitViewPanePlacement> PanePlacementProperty =
+            AvaloniaProperty.Register<SplitView, SplitViewPanePlacement>(nameof(PanePlacement));
+
+        /// <summary>
+        /// Defines the <see cref="Pane"/> property
+        /// </summary>
+        public static readonly StyledProperty<object?> PaneProperty =
+            AvaloniaProperty.Register<SplitView, object?>(nameof(Pane));
+
+        /// <summary>
+        /// Defines the <see cref="HeaderTemplate"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IDataTemplate?> PaneTemplateProperty =
+            AvaloniaProperty.Register<HeaderedContentControl, IDataTemplate?>(nameof(PaneTemplate));
+
+        /// <summary>
+        /// Defines the <see cref="UseLightDismissOverlayMode"/> property
+        /// </summary>
+        public static readonly StyledProperty<bool> UseLightDismissOverlayModeProperty =
+            AvaloniaProperty.Register<SplitView, bool>(nameof(UseLightDismissOverlayMode));
+
+        /// <summary>
+        /// Defines the <see cref="TemplateSettings"/> property
+        /// </summary>
+        public static readonly StyledProperty<SplitViewTemplateSettings> TemplateSettingsProperty =
+            AvaloniaProperty.Register<SplitView, SplitViewTemplateSettings>(nameof(TemplateSettings));
+
+        private bool _isPaneOpen;
+        private Panel _pane;
+        private IDisposable _pointerDisposable;
+
+        public SplitView()
+        {
+            PseudoClasses.Add(":overlay");
+            PseudoClasses.Add(":left");
+
+            TemplateSettings = new SplitViewTemplateSettings();
+        }
+
+        static SplitView()
+        {
+            UseLightDismissOverlayModeProperty.Changed.AddClassHandler<SplitView>((x, v) => x.OnUseLightDismissChanged(v));
+            CompactPaneLengthProperty.Changed.AddClassHandler<SplitView>((x, v) => x.OnCompactPaneLengthChanged(v));
+            PanePlacementProperty.Changed.AddClassHandler<SplitView>((x, v) => x.OnPanePlacementChanged(v));
+            DisplayModeProperty.Changed.AddClassHandler<SplitView>((x, v) => x.OnDisplayModeChanged(v));
+            
+        }
+
+        /// <summary>
+        /// Gets or sets the length of the pane when in <see cref="SplitViewDisplayMode.CompactOverlay"/> 
+        /// or <see cref="SplitViewDisplayMode.CompactInline"/> mode
+        /// </summary>
+        public double CompactPaneLength
+        {
+            get => GetValue(CompactPaneLengthProperty);
+            set => SetValue(CompactPaneLengthProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="SplitViewDisplayMode"/> for the SplitView
+        /// </summary>
+        public SplitViewDisplayMode DisplayMode
+        {
+            get => GetValue(DisplayModeProperty);
+            set => SetValue(DisplayModeProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets whether the pane is open or closed
+        /// </summary>
+        public bool IsPaneOpen
+        {
+            get => _isPaneOpen;
+            set
+            {
+                if (value == _isPaneOpen)
+                {
+                    return;
+                }
+
+                if (value)
+                {
+                    OnPaneOpening(this, null);
+                    SetAndRaise(IsPaneOpenProperty, ref _isPaneOpen, value);
+
+                    PseudoClasses.Add(":open");
+                    PseudoClasses.Remove(":closed");
+                    OnPaneOpened(this, null);
+                }
+                else
+                {
+                    SplitViewPaneClosingEventArgs args = new SplitViewPaneClosingEventArgs(false);
+                    OnPaneClosing(this, args);
+                    if (!args.Cancel)
+                    {
+                        SetAndRaise(IsPaneOpenProperty, ref _isPaneOpen, value);
+
+                        PseudoClasses.Add(":closed");
+                        PseudoClasses.Remove(":open");
+                        OnPaneClosed(this, null);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the length of the pane when open
+        /// </summary>
+        public double OpenPaneLength
+        {
+            get => GetValue(OpenPaneLengthProperty);
+            set => SetValue(OpenPaneLengthProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the background of the pane
+        /// </summary>
+        public IBrush PaneBackground
+        {
+            get => GetValue(PaneBackgroundProperty);
+            set => SetValue(PaneBackgroundProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="SplitViewPanePlacement"/> for the SplitView
+        /// </summary>
+        public SplitViewPanePlacement PanePlacement
+        {
+            get => GetValue(PanePlacementProperty);
+            set => SetValue(PanePlacementProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the Pane for the SplitView
+        /// </summary>
+        public object Pane
+        {
+            get => GetValue(PaneProperty);
+            set => SetValue(PaneProperty, value);
+        }
+        
+        /// <summary>
+        /// Gets or sets the data template used to display the header content of the control.
+        /// </summary>
+        public IDataTemplate? PaneTemplate
+        {
+            get => GetValue(PaneTemplateProperty);
+            set => SetValue(PaneTemplateProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets whether WinUI equivalent LightDismissOverlayMode is enabled
+        /// <para>When enabled, and the pane is open in Overlay or CompactOverlay mode,
+        /// the contents of the splitview are darkened to visually separate the open pane
+        /// and the rest of the SplitView</para>
+        /// </summary>
+        public bool UseLightDismissOverlayMode
+        {
+            get => GetValue(UseLightDismissOverlayModeProperty);
+            set => SetValue(UseLightDismissOverlayModeProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the TemplateSettings for the SplitView
+        /// </summary>
+        public SplitViewTemplateSettings TemplateSettings
+        {
+            get => GetValue(TemplateSettingsProperty);
+            set => SetValue(TemplateSettingsProperty, value);
+        }
+
+        /// <summary>
+        /// Fired when the pane is closed
+        /// </summary>
+        public event EventHandler<EventArgs> PaneClosed;
+
+        /// <summary>
+        /// Fired when the pane is closing
+        /// </summary>
+        public event EventHandler<SplitViewPaneClosingEventArgs> PaneClosing;
+
+        /// <summary>
+        /// Fired when the pane is opened
+        /// </summary>
+        public event EventHandler<EventArgs> PaneOpened;
+
+        /// <summary>
+        /// Fired when the pane is opening
+        /// </summary>
+        public event EventHandler<EventArgs> PaneOpening;
+
+        protected override bool RegisterContentPresenter(IContentPresenter presenter)
+        {
+            var result = base.RegisterContentPresenter(presenter);
+
+            if (presenter.Name == "PART_PanePresenter")
+            {
+                return true;
+            }
+            
+            return result;
+        }
+
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            base.OnApplyTemplate(e);
+            _pane = e.NameScope.Find<Panel>("PART_PaneRoot");
+        }
+
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+
+            var topLevel = this.VisualRoot;
+            if (topLevel is Window window)
+            {
+                _pointerDisposable = window.AddDisposableHandler(PointerPressedEvent, PointerPressedOutside, RoutingStrategies.Tunnel);
+            }
+        }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnDetachedFromVisualTree(e);
+            _pointerDisposable?.Dispose();
+        }
+
+        private void PointerPressedOutside(object sender, PointerPressedEventArgs e)
+        {
+            if (!IsPaneOpen)
+            {
+                return;
+            }
+
+            //If we click within the Pane, don't do anything
+            //Otherwise, ClosePane if open & using an overlay display mode
+            bool closePane = ShouldClosePane();
+            if (!closePane)
+            {
+                return;
+            }
+
+            var src = e.Source as IVisual;
+            while (src != null)
+            {
+                // Make assumption that if Popup is in visual tree,
+                // owning control is within pane
+                // This works because if pane is triggered to close
+                // when clicked anywhere else in Window, the pane 
+                // would close before the popup is opened
+                if (src == _pane || src is PopupRoot)
+                {
+                    closePane = false;
+                    break;
+                }
+
+                src = src.VisualParent;
+            }
+            if (closePane)
+            {
+                IsPaneOpen = false;
+                e.Handled = true;
+            }
+        }
+                
+        private bool ShouldClosePane()
+        {
+            return (DisplayMode == SplitViewDisplayMode.CompactOverlay || DisplayMode == SplitViewDisplayMode.Overlay);
+        }
+
+        protected virtual void OnPaneOpening(SplitView sender, EventArgs args)
+        {
+            PaneOpening?.Invoke(sender, args);
+        }
+
+        protected virtual void OnPaneOpened(SplitView sender, EventArgs args)
+        {
+            PaneOpened?.Invoke(sender, args);
+        }
+
+        protected virtual void OnPaneClosing(SplitView sender, SplitViewPaneClosingEventArgs args)
+        {
+            PaneClosing?.Invoke(sender, args);
+        }
+
+        protected virtual void OnPaneClosed(SplitView sender, EventArgs args)
+        {
+            PaneClosed?.Invoke(sender, args);
+        }
+
+        private void OnCompactPaneLengthChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var newLen = (double)e.NewValue;
+            var displayMode = DisplayMode;
+            if (displayMode == SplitViewDisplayMode.CompactInline)
+            {
+                TemplateSettings.ClosedPaneWidth = newLen;
+            }
+            else if (displayMode == SplitViewDisplayMode.CompactOverlay)
+            {
+                TemplateSettings.ClosedPaneWidth = newLen;
+                TemplateSettings.PaneColumnGridLength = new GridLength(newLen, GridUnitType.Pixel);
+            }
+        }
+
+        private void OnPanePlacementChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var oldState = e.OldValue.ToString().ToLower();
+            var newState = e.NewValue.ToString().ToLower();
+            PseudoClasses.Remove($":{oldState}");
+            PseudoClasses.Add($":{newState}");
+        }
+
+        private void OnDisplayModeChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var oldState = e.OldValue.ToString().ToLower();
+            var newState = e.NewValue.ToString().ToLower();
+
+            PseudoClasses.Remove($":{oldState}");
+            PseudoClasses.Add($":{newState}");
+
+            var (closedPaneWidth, paneColumnGridLength) = (SplitViewDisplayMode)e.NewValue switch
+            {
+                SplitViewDisplayMode.Overlay => (0, new GridLength(0, GridUnitType.Pixel)),
+                SplitViewDisplayMode.CompactOverlay => (CompactPaneLength, new GridLength(CompactPaneLength, GridUnitType.Pixel)),
+                SplitViewDisplayMode.Inline => (0, new GridLength(0, GridUnitType.Auto)),
+                SplitViewDisplayMode.CompactInline => (CompactPaneLength, new GridLength(0, GridUnitType.Auto)),
+                _ => throw new NotImplementedException(),
+            };
+            TemplateSettings.ClosedPaneWidth = closedPaneWidth;
+            TemplateSettings.PaneColumnGridLength = paneColumnGridLength;
+        }
+
+        private void OnUseLightDismissChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var mode = (bool)e.NewValue;
+            PseudoClasses.Set(":lightdismiss", mode);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/SplitViewPaneClosingEventArgs.cs b/src/Avalonia.Controls/SplitViewPaneClosingEventArgs.cs
new file mode 100644
index 0000000000..46fb2d161b
--- /dev/null
+++ b/src/Avalonia.Controls/SplitViewPaneClosingEventArgs.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace Avalonia.Controls
+{
+    public class SplitViewPaneClosingEventArgs : EventArgs
+    {
+        public bool Cancel { get; set; }
+
+        public SplitViewPaneClosingEventArgs(bool cancel)
+        {
+            Cancel = cancel;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/SystemDialog.cs b/src/Avalonia.Controls/SystemDialog.cs
index 6ccaa3c742..e74b950f23 100644
--- a/src/Avalonia.Controls/SystemDialog.cs
+++ b/src/Avalonia.Controls/SystemDialog.cs
@@ -32,7 +32,7 @@ namespace Avalonia.Controls
             if(parent == null)
                 throw new ArgumentNullException(nameof(parent));
             return ((await AvaloniaLocator.Current.GetService<ISystemDialogImpl>()
-                 .ShowFileDialogAsync(this, parent?.PlatformImpl)) ??
+                 .ShowFileDialogAsync(this, parent)) ??
              Array.Empty<string>()).FirstOrDefault();
         }
     }
@@ -45,7 +45,7 @@ namespace Avalonia.Controls
         {
             if(parent == null)
                 throw new ArgumentNullException(nameof(parent));
-            return AvaloniaLocator.Current.GetService<ISystemDialogImpl>().ShowFileDialogAsync(this, parent?.PlatformImpl);
+            return AvaloniaLocator.Current.GetService<ISystemDialogImpl>().ShowFileDialogAsync(this, parent);
         }
     }
 
@@ -61,7 +61,7 @@ namespace Avalonia.Controls
         {
             if(parent == null)
                 throw new ArgumentNullException(nameof(parent));
-            return AvaloniaLocator.Current.GetService<ISystemDialogImpl>().ShowFolderDialogAsync(this, parent?.PlatformImpl);
+            return AvaloniaLocator.Current.GetService<ISystemDialogImpl>().ShowFolderDialogAsync(this, parent);
         }
     }
 
diff --git a/src/Avalonia.Controls/TabControl.cs b/src/Avalonia.Controls/TabControl.cs
index 8b1cd48379..306a9d3e6a 100644
--- a/src/Avalonia.Controls/TabControl.cs
+++ b/src/Avalonia.Controls/TabControl.cs
@@ -1,6 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using System.ComponentModel;
 using System.Linq;
 using Avalonia.Collections;
 using Avalonia.Controls.Generators;
@@ -69,7 +67,7 @@ namespace Avalonia.Controls
             SelectionModeProperty.OverrideDefaultValue<TabControl>(SelectionMode.AlwaysSelected);
             ItemsPanelProperty.OverrideDefaultValue<TabControl>(DefaultPanel);
             AffectsMeasure<TabControl>(TabStripPlacementProperty);
-            SelectedIndexProperty.Changed.AddClassHandler<TabControl>((x, e) => x.UpdateSelectedContent(e));
+            SelectedItemProperty.Changed.AddClassHandler<TabControl>((x, e) => x.UpdateSelectedContent());
         }
 
         /// <summary>
@@ -148,55 +146,27 @@ namespace Avalonia.Controls
         protected override void OnContainersMaterialized(ItemContainerEventArgs e)
         {
             base.OnContainersMaterialized(e);
-
-            if (SelectedContent != null || SelectedIndex == -1)
-            {
-                return;
-            }
-
-            var container = (TabItem)ItemContainerGenerator.ContainerFromIndex(SelectedIndex);
-
-            if (container == null)
-            {
-                return;
-            }
-
-            UpdateSelectedContent(container);
+            UpdateSelectedContent();
         }
 
-        private void UpdateSelectedContent(AvaloniaPropertyChangedEventArgs e)
+        protected override void OnContainersRecycled(ItemContainerEventArgs e)
         {
-            var index = (int)e.NewValue;
-
-            if (index == -1)
-            {
-                SelectedContentTemplate = null;
-
-                SelectedContent = null;
-
-                return;
-            }
-
-            var container = (TabItem)ItemContainerGenerator.ContainerFromIndex(index);
-
-            if (container == null)
-            {
-                return;
-            }
-
-            UpdateSelectedContent(container);
+            base.OnContainersRecycled(e);
+            UpdateSelectedContent();
         }
 
-        private void UpdateSelectedContent(IContentControl item)
+        private void UpdateSelectedContent()
         {
-            if (SelectedContentTemplate != item.ContentTemplate)
+            if (SelectedIndex == -1)
             {
-                SelectedContentTemplate = item.ContentTemplate;
+                SelectedContent = SelectedContentTemplate = null;
             }
-
-            if (SelectedContent != item.Content)
+            else
             {
-                SelectedContent = item.Content;
+                var container = SelectedItem as IContentControl ??
+                    ItemContainerGenerator.ContainerFromIndex(SelectedIndex) as IContentControl;
+                SelectedContentTemplate = container?.ContentTemplate;
+                SelectedContent = container?.Content;
             }
         }
 
@@ -220,10 +190,8 @@ namespace Avalonia.Controls
             return new TabItemContainerGenerator(this);
         }
 
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
-            base.OnTemplateApplied(e);
-
             ItemsPresenterPart = e.NameScope.Get<ItemsPresenter>("PART_ItemsPresenter");
         }
 
@@ -243,7 +211,7 @@ namespace Avalonia.Controls
         {
             base.OnPointerPressed(e);
 
-            if (e.MouseButton == MouseButton.Left && e.Pointer.Type == PointerType.Mouse)
+            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed && e.Pointer.Type == PointerType.Mouse)
             {
                 e.Handled = UpdateSelectionFromEventSource(e.Source);
             }
diff --git a/src/Avalonia.Controls/TabItem.cs b/src/Avalonia.Controls/TabItem.cs
index e27977bf3d..593643a1eb 100644
--- a/src/Avalonia.Controls/TabItem.cs
+++ b/src/Avalonia.Controls/TabItem.cs
@@ -1,6 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Primitives;
 
@@ -9,6 +7,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// An item in  a <see cref="TabStrip"/> or <see cref="TabControl"/>.
     /// </summary>
+    [PseudoClasses(":pressed", ":selected")]
     public class TabItem : HeaderedContentControl, ISelectable
     {
         /// <summary>
@@ -29,6 +28,7 @@ namespace Avalonia.Controls
         static TabItem()
         {
             SelectableMixin.Attach<TabItem>(IsSelectedProperty);
+            PressedMixin.Attach<TabItem>();
             FocusableProperty.OverrideDefaultValue(typeof(TabItem), true);
             DataContextProperty.Changed.AddClassHandler<TabItem>((x, e) => x.UpdateHeader(e));
         }
diff --git a/src/Avalonia.Controls/Templates/DataTemplateExtensions.cs b/src/Avalonia.Controls/Templates/DataTemplateExtensions.cs
index 559cb9b776..2b115aec7e 100644
--- a/src/Avalonia.Controls/Templates/DataTemplateExtensions.cs
+++ b/src/Avalonia.Controls/Templates/DataTemplateExtensions.cs
@@ -1,9 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.Linq;
 using Avalonia.LogicalTree;
 
+#nullable enable
+
 namespace Avalonia.Controls.Templates
 {
     /// <summary>
@@ -21,21 +19,23 @@ namespace Avalonia.Controls.Templates
         /// tree are searched.
         /// </param>
         /// <returns>The data template or null if no matching data template was found.</returns>
-        public static IDataTemplate FindDataTemplate(
+        public static IDataTemplate? FindDataTemplate(
             this IControl control,
             object data,
-            IDataTemplate primary = null)
+            IDataTemplate? primary = null)
         {
             if (primary?.Match(data) == true)
             {
                 return primary;
             }
 
-            foreach (var i in control.GetSelfAndLogicalAncestors().OfType<IDataTemplateHost>())
+            var currentTemplateHost = control as ILogical;
+
+            while (currentTemplateHost != null)
             {
-                if (i.IsDataTemplatesInitialized)
+                if (currentTemplateHost is IDataTemplateHost hostCandidate && hostCandidate.IsDataTemplatesInitialized)
                 {
-                    foreach (IDataTemplate dt in i.DataTemplates)
+                    foreach (IDataTemplate dt in hostCandidate.DataTemplates)
                     {
                         if (dt.Match(data))
                         {
@@ -43,20 +43,19 @@ namespace Avalonia.Controls.Templates
                         }
                     }
                 }
+
+                currentTemplateHost = currentTemplateHost.LogicalParent;
             }
 
             IGlobalDataTemplates global = AvaloniaLocator.Current.GetService<IGlobalDataTemplates>();
 
-            if (global != null)
+            if (global != null && global.IsDataTemplatesInitialized)
             {
-                if (global.IsDataTemplatesInitialized)
+                foreach (IDataTemplate dt in global.DataTemplates)
                 {
-                    foreach (IDataTemplate dt in global.DataTemplates)
+                    if (dt.Match(data))
                     {
-                        if (dt.Match(data))
-                        {
-                            return dt;
-                        }
+                        return dt;
                     }
                 }
             }
diff --git a/src/Avalonia.Controls/Templates/DataTemplates.cs b/src/Avalonia.Controls/Templates/DataTemplates.cs
index 4011e32a07..f203539536 100644
--- a/src/Avalonia.Controls/Templates/DataTemplates.cs
+++ b/src/Avalonia.Controls/Templates/DataTemplates.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Collections;
 
 namespace Avalonia.Controls.Templates
diff --git a/src/Avalonia.Controls/Templates/FuncControlTemplate.cs b/src/Avalonia.Controls/Templates/FuncControlTemplate.cs
index 19458cc6b8..3ed7abdfef 100644
--- a/src/Avalonia.Controls/Templates/FuncControlTemplate.cs
+++ b/src/Avalonia.Controls/Templates/FuncControlTemplate.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Controls.Primitives;
 using Avalonia.Styling;
diff --git a/src/Avalonia.Controls/Templates/FuncControlTemplate`2.cs b/src/Avalonia.Controls/Templates/FuncControlTemplate`2.cs
index eec7a6030f..aad80af652 100644
--- a/src/Avalonia.Controls/Templates/FuncControlTemplate`2.cs
+++ b/src/Avalonia.Controls/Templates/FuncControlTemplate`2.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Controls.Primitives;
 using Avalonia.Styling;
diff --git a/src/Avalonia.Controls/Templates/FuncDataTemplate.cs b/src/Avalonia.Controls/Templates/FuncDataTemplate.cs
index 204540e431..5dff13997e 100644
--- a/src/Avalonia.Controls/Templates/FuncDataTemplate.cs
+++ b/src/Avalonia.Controls/Templates/FuncDataTemplate.cs
@@ -1,16 +1,13 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
-using System.Reflection;
+using Avalonia.Controls.Primitives;
 
 namespace Avalonia.Controls.Templates
 {
     /// <summary>
     /// Builds a control for a piece of data.
     /// </summary>
-    public class FuncDataTemplate : FuncTemplate<object, IControl>, IDataTemplate
+    public class FuncDataTemplate : FuncTemplate<object, IControl>, IRecyclingDataTemplate
     {
         /// <summary>
         /// The default data template used in the case where no matching data template is found.
@@ -34,10 +31,33 @@ namespace Avalonia.Controls.Templates
                 },
                 true);
 
+        /// <summary>
+        /// The default data template used in the case where no matching data template is found
+        /// but <see cref="AccessText"/> should be used.
+        /// </summary>
+        public static readonly FuncDataTemplate Access =
+            new FuncDataTemplate<object>(
+                (data, s) =>
+                {
+                    if (data != null)
+                    {
+                        var result = new AccessText();
+                        result.Bind(TextBlock.TextProperty,
+                            result.GetObservable(Control.DataContextProperty).Select(x => x?.ToString()));
+                        return result;
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                },
+                true);
+
         /// <summary>
         /// The implementation of the <see cref="Match"/> method.
         /// </summary>
         private readonly Func<object, bool> _match;
+        private readonly bool _supportsRecycling;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="FuncDataTemplate"/> class.
@@ -48,7 +68,7 @@ namespace Avalonia.Controls.Templates
         /// </param>
         /// <param name="supportsRecycling">Whether the control can be recycled.</param>
         public FuncDataTemplate(
-            Type type, 
+            Type type,
             Func<object, INameScope, IControl> build,
             bool supportsRecycling = false)
             : this(o => IsInstance(o, type), build, supportsRecycling)
@@ -74,12 +94,9 @@ namespace Avalonia.Controls.Templates
             Contract.Requires<ArgumentNullException>(match != null);
 
             _match = match;
-            SupportsRecycling = supportsRecycling;
+            _supportsRecycling = supportsRecycling;
         }
 
-        /// <inheritdoc/>
-        public bool SupportsRecycling { get; }
-
         /// <summary>
         /// Checks to see if this data template matches the specified data.
         /// </summary>
@@ -92,6 +109,24 @@ namespace Avalonia.Controls.Templates
             return _match(data);
         }
 
+        /// <summary>
+        /// Creates or recycles a control to display the specified data.
+        /// </summary>
+        /// <param name="data">The data to display.</param>
+        /// <param name="existing">An optional control to recycle.</param>
+        /// <returns>
+        /// The <paramref name="existing"/> control if supplied and applicable to
+        /// <paramref name="data"/>, otherwise a new control.
+        /// </returns>
+        /// <remarks>
+        /// The caller should ensure that any control passed to <paramref name="existing"/>
+        /// originated from the same data template.
+        /// </remarks>
+        public IControl Build(object data, IControl existing)
+        {
+            return _supportsRecycling && existing is object ? existing : Build(data);
+        }
+
         /// <summary>
         /// Determines of an object is of the specified type.
         /// </summary>
@@ -102,7 +137,7 @@ namespace Avalonia.Controls.Templates
         /// </returns>
         private static bool IsInstance(object o, Type t)
         {
-            return (o != null) && t.GetTypeInfo().IsAssignableFrom(o.GetType().GetTypeInfo());
+            return t.IsInstanceOfType(o);
         }
     }
 }
diff --git a/src/Avalonia.Controls/Templates/FuncDataTemplate`1.cs b/src/Avalonia.Controls/Templates/FuncDataTemplate`1.cs
index 68b737928d..4a6a1c6cfb 100644
--- a/src/Avalonia.Controls/Templates/FuncDataTemplate`1.cs
+++ b/src/Avalonia.Controls/Templates/FuncDataTemplate`1.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Controls.Templates
diff --git a/src/Avalonia.Controls/Templates/FuncTemplate`1.cs b/src/Avalonia.Controls/Templates/FuncTemplate`1.cs
index 88321ee1a3..e1818b07d5 100644
--- a/src/Avalonia.Controls/Templates/FuncTemplate`1.cs
+++ b/src/Avalonia.Controls/Templates/FuncTemplate`1.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Styling;
 
diff --git a/src/Avalonia.Controls/Templates/FuncTemplate`2.cs b/src/Avalonia.Controls/Templates/FuncTemplate`2.cs
index e0608d0471..cd0e3ad603 100644
--- a/src/Avalonia.Controls/Templates/FuncTemplate`2.cs
+++ b/src/Avalonia.Controls/Templates/FuncTemplate`2.cs
@@ -1,8 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
+#nullable enable
+
 namespace Avalonia.Controls.Templates
 {
     /// <summary>
@@ -21,9 +20,7 @@ namespace Avalonia.Controls.Templates
         /// <param name="func">The function used to create the control.</param>
         public FuncTemplate(Func<TParam, INameScope, TControl> func)
         {
-            Contract.Requires<ArgumentNullException>(func != null);
-
-            _func = func;
+            _func = func ?? throw new ArgumentNullException(nameof(func));
         }
 
         /// <summary>
diff --git a/src/Avalonia.Controls/Templates/FuncTreeDataTemplate.cs b/src/Avalonia.Controls/Templates/FuncTreeDataTemplate.cs
index 998ef0e9f2..4e40d87d47 100644
--- a/src/Avalonia.Controls/Templates/FuncTreeDataTemplate.cs
+++ b/src/Avalonia.Controls/Templates/FuncTreeDataTemplate.cs
@@ -1,9 +1,5 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections;
-using System.Reflection;
 using Avalonia.Data;
 
 namespace Avalonia.Controls.Templates
@@ -75,7 +71,7 @@ namespace Avalonia.Controls.Templates
         /// </returns>
         private static bool IsInstance(object o, Type t)
         {
-            return (o != null) && t.GetTypeInfo().IsAssignableFrom(o.GetType().GetTypeInfo());
+            return t.IsInstanceOfType(o);
         }
     }
 }
diff --git a/src/Avalonia.Controls/Templates/FuncTreeDataTemplate`1.cs b/src/Avalonia.Controls/Templates/FuncTreeDataTemplate`1.cs
index 41f870ab42..c366107be4 100644
--- a/src/Avalonia.Controls/Templates/FuncTreeDataTemplate`1.cs
+++ b/src/Avalonia.Controls/Templates/FuncTreeDataTemplate`1.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections;
 
diff --git a/src/Avalonia.Controls/Templates/IControlTemplate.cs b/src/Avalonia.Controls/Templates/IControlTemplate.cs
index a3ef0fa954..7414f438a1 100644
--- a/src/Avalonia.Controls/Templates/IControlTemplate.cs
+++ b/src/Avalonia.Controls/Templates/IControlTemplate.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Primitives;
 using Avalonia.Styling;
 
diff --git a/src/Avalonia.Controls/Templates/IDataTemplate.cs b/src/Avalonia.Controls/Templates/IDataTemplate.cs
index f9c97e55f3..0368748a0b 100644
--- a/src/Avalonia.Controls/Templates/IDataTemplate.cs
+++ b/src/Avalonia.Controls/Templates/IDataTemplate.cs
@@ -1,5 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
+using System;
+
+#nullable enable
 
 namespace Avalonia.Controls.Templates
 {
@@ -8,12 +9,6 @@ namespace Avalonia.Controls.Templates
     /// </summary>
     public interface IDataTemplate : ITemplate<object, IControl>
     {
-        /// <summary>
-        /// Gets a value indicating whether the data template supports recycling of the generated
-        /// control.
-        /// </summary>
-        bool SupportsRecycling { get; }
-
         /// <summary>
         /// Checks to see if this data template matches the specified data.
         /// </summary>
@@ -23,4 +18,4 @@ namespace Avalonia.Controls.Templates
         /// </returns>
         bool Match(object data);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Controls/Templates/IDataTemplateHost.cs b/src/Avalonia.Controls/Templates/IDataTemplateHost.cs
index 267938b3bd..61986a0661 100644
--- a/src/Avalonia.Controls/Templates/IDataTemplateHost.cs
+++ b/src/Avalonia.Controls/Templates/IDataTemplateHost.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-
+
 namespace Avalonia.Controls.Templates
 {
     /// <summary>
diff --git a/src/Avalonia.Controls/Templates/IRecyclingDataTemplate.cs b/src/Avalonia.Controls/Templates/IRecyclingDataTemplate.cs
new file mode 100644
index 0000000000..25956a9c9a
--- /dev/null
+++ b/src/Avalonia.Controls/Templates/IRecyclingDataTemplate.cs
@@ -0,0 +1,25 @@
+#nullable enable
+
+namespace Avalonia.Controls.Templates
+{
+    /// <summary>
+    /// An <see cref="IDataTemplate"/> that supports recycling existing elements.
+    /// </summary>
+    public interface IRecyclingDataTemplate : IDataTemplate
+    {
+        /// <summary>
+        /// Creates or recycles a control to display the specified data.
+        /// </summary>
+        /// <param name="data">The data to display.</param>
+        /// <param name="existing">An optional control to recycle.</param>
+        /// <returns>
+        /// The <paramref name="existing"/> control if supplied and applicable to
+        /// <paramref name="data"/>, otherwise a new control.
+        /// </returns>
+        /// <remarks>
+        /// The caller should ensure that any control passed to <paramref name="existing"/>
+        /// originated from the same data template.
+        /// </remarks>
+        IControl Build(object data, IControl? existing);
+    }
+}
diff --git a/src/Avalonia.Controls/Templates/ITemplate`1.cs b/src/Avalonia.Controls/Templates/ITemplate`1.cs
index 2bf4b5a285..a241a9a6e8 100644
--- a/src/Avalonia.Controls/Templates/ITemplate`1.cs
+++ b/src/Avalonia.Controls/Templates/ITemplate`1.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Styling;
 
 namespace Avalonia.Controls
diff --git a/src/Avalonia.Controls/Templates/ITemplate`2.cs b/src/Avalonia.Controls/Templates/ITemplate`2.cs
index a0c0e88eca..0e0263b785 100644
--- a/src/Avalonia.Controls/Templates/ITemplate`2.cs
+++ b/src/Avalonia.Controls/Templates/ITemplate`2.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Controls.Templates
 {
     /// <summary>
diff --git a/src/Avalonia.Controls/Templates/ITreeDataTemplate.cs b/src/Avalonia.Controls/Templates/ITreeDataTemplate.cs
index 9ed8987681..60da65304f 100644
--- a/src/Avalonia.Controls/Templates/ITreeDataTemplate.cs
+++ b/src/Avalonia.Controls/Templates/ITreeDataTemplate.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Data;
 
 namespace Avalonia.Controls.Templates
diff --git a/src/Avalonia.Controls/Templates/TemplateExtensions.cs b/src/Avalonia.Controls/Templates/TemplateExtensions.cs
index 18c8bfdeda..7656ccd9bb 100644
--- a/src/Avalonia.Controls/Templates/TemplateExtensions.cs
+++ b/src/Avalonia.Controls/Templates/TemplateExtensions.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/Avalonia.Controls/TextBlock.cs b/src/Avalonia.Controls/TextBlock.cs
index c7855ddfd1..31517ba59d 100644
--- a/src/Avalonia.Controls/TextBlock.cs
+++ b/src/Avalonia.Controls/TextBlock.cs
@@ -1,10 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reactive.Linq;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
+using Avalonia.Media.TextFormatting;
 using Avalonia.Metadata;
+using Avalonia.Layout;
 
 namespace Avalonia.Controls
 {
@@ -19,6 +18,12 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<IBrush> BackgroundProperty =
             Border.BackgroundProperty.AddOwner<TextBlock>();
 
+        /// <summary>
+        /// Defines the <see cref="Padding"/> property.
+        /// </summary>
+        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.
 
@@ -28,7 +33,7 @@ namespace Avalonia.Controls
         public static readonly AttachedProperty<FontFamily> FontFamilyProperty =
             AvaloniaProperty.RegisterAttached<TextBlock, Control, FontFamily>(
                 nameof(FontFamily),
-                defaultValue:  FontFamily.Default,
+                defaultValue: FontFamily.Default,
                 inherits: true);
 
         /// <summary>
@@ -66,6 +71,23 @@ namespace Avalonia.Controls
                 Brushes.Black,
                 inherits: true);
 
+        /// <summary>
+        /// Defines the <see cref="LineHeight"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> LineHeightProperty =
+            AvaloniaProperty.Register<TextBlock, double>(
+                nameof(LineHeight),
+                double.NaN,
+                validate: IsValidLineHeight);
+
+        /// <summary>
+        /// Defines the <see cref="MaxLines"/> property.
+        /// </summary>
+        public static readonly StyledProperty<int> MaxLinesProperty =
+            AvaloniaProperty.Register<TextBlock, int>(
+                nameof(MaxLines),
+                validate: IsValidMaxLines);
+
         /// <summary>
         /// Defines the <see cref="Text"/> property.
         /// </summary>
@@ -87,8 +109,20 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<TextWrapping> TextWrappingProperty =
             AvaloniaProperty.Register<TextBlock, TextWrapping>(nameof(TextWrapping));
 
+        /// <summary>
+        /// Defines the <see cref="TextTrimming"/> property.
+        /// </summary>
+        public static readonly StyledProperty<TextTrimming> TextTrimmingProperty =
+            AvaloniaProperty.Register<TextBlock, TextTrimming>(nameof(TextTrimming));
+
+        /// <summary>
+        /// Defines the <see cref="TextDecorations"/> property.
+        /// </summary>
+        public static readonly StyledProperty<TextDecorationCollection> TextDecorationsProperty =
+            AvaloniaProperty.Register<TextBlock, TextDecorationCollection>(nameof(TextDecorations));
+
         private string _text;
-        private FormattedText _formattedText;
+        private TextLayout _textLayout;
         private Size _constraint;
 
         /// <summary>
@@ -97,20 +131,21 @@ namespace Avalonia.Controls
         static TextBlock()
         {
             ClipToBoundsProperty.OverrideDefaultValue<TextBlock>(true);
-            AffectsRender<TextBlock>(
-                BackgroundProperty,
-                ForegroundProperty,
-                FontWeightProperty,
-                FontSizeProperty,
-                FontStyleProperty);
 
-            Observable.Merge(
-                TextProperty.Changed,
-                TextAlignmentProperty.Changed,
-                FontSizeProperty.Changed,
-                FontStyleProperty.Changed,
-                FontWeightProperty.Changed
-            ).AddClassHandler<TextBlock>((x,_) => x.OnTextPropertiesChanged());
+            AffectsRender<TextBlock>(BackgroundProperty, ForegroundProperty,
+                TextAlignmentProperty, TextDecorationsProperty);
+
+            AffectsMeasure<TextBlock>(FontSizeProperty, FontWeightProperty,
+                FontStyleProperty, TextWrappingProperty, FontFamilyProperty,
+                TextTrimmingProperty, TextProperty, PaddingProperty, LineHeightProperty, MaxLinesProperty);
+
+            Observable.Merge<AvaloniaPropertyChangedEventArgs>(TextProperty.Changed, ForegroundProperty.Changed,
+                TextAlignmentProperty.Changed, TextWrappingProperty.Changed,
+                TextTrimmingProperty.Changed, FontSizeProperty.Changed,
+                FontStyleProperty.Changed, FontWeightProperty.Changed,
+                FontFamilyProperty.Changed, TextDecorationsProperty.Changed,
+                PaddingProperty.Changed, MaxLinesProperty.Changed, LineHeightProperty.Changed
+            ).AddClassHandler<TextBlock>((x, _) => x.InvalidateTextLayout());
         }
 
         /// <summary>
@@ -121,6 +156,26 @@ namespace Avalonia.Controls
             _text = string.Empty;
         }
 
+        /// <summary>
+        /// Gets the <see cref="TextLayout"/> used to render the text.
+        /// </summary>
+        public TextLayout TextLayout
+        {
+            get
+            {
+                return _textLayout ?? (_textLayout = CreateTextLayout(_constraint, Text));
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding to place around the <see cref="Text"/>.
+        /// </summary>
+        public Thickness Padding
+        {
+            get { return GetValue(PaddingProperty); }
+            set { SetValue(PaddingProperty, value); }
+        }
+
         /// <summary>
         /// Gets or sets a brush used to paint the control's background.
         /// </summary>
@@ -186,19 +241,21 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Gets the <see cref="FormattedText"/> used to render the text.
+        /// Gets or sets the height of each line of content.
         /// </summary>
-        public FormattedText FormattedText
+        public double LineHeight
         {
-            get
-            {
-                if (_formattedText == null)
-                {
-                    _formattedText = CreateFormattedText(_constraint, Text);
-                }
+            get => GetValue(LineHeightProperty);
+            set => SetValue(LineHeightProperty, value);
+        }
 
-                return _formattedText;
-            }
+        /// <summary>
+        /// Gets or sets the maximum number of text lines.
+        /// </summary>
+        public int MaxLines
+        {
+            get => GetValue(MaxLinesProperty);
+            set => SetValue(MaxLinesProperty, value);
         }
 
         /// <summary>
@@ -210,6 +267,15 @@ namespace Avalonia.Controls
             set { SetValue(TextWrappingProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the control's text trimming mode.
+        /// </summary>
+        public TextTrimming TextTrimming
+        {
+            get { return GetValue(TextTrimmingProperty); }
+            set { SetValue(TextTrimmingProperty, value); }
+        }
+
         /// <summary>
         /// Gets or sets the text alignment.
         /// </summary>
@@ -219,6 +285,15 @@ namespace Avalonia.Controls
             set { SetValue(TextAlignmentProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the text decorations.
+        /// </summary>
+        public TextDecorationCollection TextDecorations
+        {
+            get => GetValue(TextDecorationsProperty);
+            set => SetValue(TextDecorationsProperty, value);
+        }
+
         /// <summary>
         /// Gets the value of the attached <see cref="FontFamilyProperty"/> on a control.
         /// </summary>
@@ -337,39 +412,87 @@ namespace Avalonia.Controls
                 context.FillRectangle(background, new Rect(Bounds.Size));
             }
 
-            FormattedText.Constraint = Bounds.Size;
-            context.DrawText(Foreground, new Point(), FormattedText);
+            if (TextLayout is null)
+            {
+                return;
+            }
+
+            var textAlignment = TextAlignment;
+
+            var width = Bounds.Size.Width;
+
+            var offsetX = 0.0;
+
+            switch (textAlignment)
+            {
+                case TextAlignment.Center:
+                    offsetX = (width - TextLayout.Size.Width) / 2;
+                    break;
+
+                case TextAlignment.Right:
+                    offsetX = width - TextLayout.Size.Width;
+                    break;
+            }
+
+            var padding = Padding;
+
+            var top = padding.Top;
+            var textSize = TextLayout.Size;
+
+            if (Bounds.Height < textSize.Height)
+            {
+                switch (VerticalAlignment)
+                {
+                    case VerticalAlignment.Center:
+                        top += (Bounds.Height - textSize.Height) / 2;
+                        break;
+
+                    case VerticalAlignment.Bottom:
+                        top += (Bounds.Height - textSize.Height);
+                        break;
+                }
+            }
+
+            using (context.PushPostTransform(Matrix.CreateTranslation(padding.Left + offsetX, top)))
+            {
+                TextLayout.Draw(context);
+            }
         }
 
         /// <summary>
-        /// Creates the <see cref="FormattedText"/> used to render the text.
+        /// 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="FormattedText"/> object.</returns>
-        protected virtual FormattedText CreateFormattedText(Size constraint, string text)
+        /// <returns>A <see cref="TextLayout"/> object.</returns>
+        protected virtual TextLayout CreateTextLayout(Size constraint, string text)
         {
-            return new FormattedText
+            if (constraint == Size.Empty)
             {
-                Constraint = constraint,
-                Typeface = new Typeface(FontFamily, FontWeight, FontStyle),
-                FontSize = FontSize,
-                Text = text ?? string.Empty,
-                TextAlignment = TextAlignment,
-                TextWrapping = TextWrapping,
-            };
+                return null;
+            }
+
+            return new TextLayout(
+                text ?? string.Empty,
+                new Typeface(FontFamily, FontStyle, FontWeight),
+                FontSize,
+                Foreground,
+                TextAlignment,
+                TextWrapping,
+                TextTrimming,
+                TextDecorations,
+                constraint.Width,
+                constraint.Height,
+                maxLines: MaxLines,
+                lineHeight: LineHeight);
         }
 
         /// <summary>
-        /// Invalidates <see cref="FormattedText"/>.
+        /// Invalidates <see cref="TextLayout"/>.
         /// </summary>
-        protected void InvalidateFormattedText()
+        protected void InvalidateTextLayout()
         {
-            if (_formattedText != null)
-            {
-                _constraint = _formattedText.Constraint;
-                _formattedText = null;
-            }
+            _textLayout = null;
         }
 
         /// <summary>
@@ -379,34 +502,38 @@ namespace Avalonia.Controls
         /// <returns>The desired size.</returns>
         protected override Size MeasureOverride(Size availableSize)
         {
-            if (!string.IsNullOrEmpty(Text))
+            if (string.IsNullOrEmpty(Text))
             {
-                if (TextWrapping == TextWrapping.Wrap)
-                {
-                    FormattedText.Constraint = new Size(availableSize.Width, double.PositiveInfinity);
-                }
-                else
-                {
-                    FormattedText.Constraint = Size.Infinity;
-                }
+                return new Size();
+            }
 
-                return FormattedText.Bounds.Size;
+            var padding = Padding;
+
+            availableSize = availableSize.Deflate(padding);
+
+            if (_constraint != availableSize)
+            {
+                _constraint = availableSize;
+
+                InvalidateTextLayout();
             }
 
-            return new Size();
+            var measuredSize = TextLayout?.Size ?? Size.Empty;
+
+            return measuredSize.Inflate(padding);
         }
 
         protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
         {
             base.OnAttachedToLogicalTree(e);
-            InvalidateFormattedText();
-            InvalidateMeasure();
-        }
 
-        private void OnTextPropertiesChanged()
-        {
-            InvalidateFormattedText();
+            InvalidateTextLayout();
+
             InvalidateMeasure();
         }
+
+        private static bool IsValidMaxLines(int maxLines) => maxLines >= 0;
+
+        private static bool IsValidLineHeight(double lineHeight) => double.IsNaN(lineHeight) || lineHeight > 0;
     }
 }
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 3d472fca18..28426ee70f 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Input.Platform;
 using System;
 using System.Collections.Generic;
@@ -14,12 +11,24 @@ using Avalonia.Interactivity;
 using Avalonia.Media;
 using Avalonia.Metadata;
 using Avalonia.Data;
+using Avalonia.Layout;
 using Avalonia.Utilities;
+using Avalonia.Controls.Metadata;
 
 namespace Avalonia.Controls
 {
+    [PseudoClasses(":empty")]
     public class TextBox : TemplatedControl, UndoRedoHelper<TextBox.UndoRedoState>.IUndoRedoHost
     {
+        public static KeyGesture CutGesture { get; } = AvaloniaLocator.Current
+            .GetService<PlatformHotkeyConfiguration>()?.Cut.FirstOrDefault();
+
+        public static KeyGesture CopyGesture { get; } = AvaloniaLocator.Current
+            .GetService<PlatformHotkeyConfiguration>()?.Copy.FirstOrDefault();
+
+        public static KeyGesture PasteGesture { get; } = AvaloniaLocator.Current
+            .GetService<PlatformHotkeyConfiguration>()?.Paste.FirstOrDefault();
+        
         public static readonly StyledProperty<bool> AcceptsReturnProperty =
             AvaloniaProperty.Register<TextBox, bool>(nameof(AcceptsReturn));
 
@@ -63,7 +72,7 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<TextBox, int>(nameof(MaxLength), defaultValue: 0);
 
         public static readonly DirectProperty<TextBox, string> TextProperty =
-            TextBlock.TextProperty.AddOwner<TextBox>(
+            TextBlock.TextProperty.AddOwnerWithDataValidation<TextBox>(
                 o => o.Text,
                 (o, v) => o.Text = v,
                 defaultBindingMode: BindingMode.TwoWay,
@@ -72,6 +81,18 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<TextAlignment> TextAlignmentProperty =
             TextBlock.TextAlignmentProperty.AddOwner<TextBox>();
 
+        /// <summary>
+        /// Defines the <see cref="HorizontalAlignment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<HorizontalAlignment> HorizontalContentAlignmentProperty =
+            ContentControl.HorizontalContentAlignmentProperty.AddOwner<TextBox>();
+
+        /// <summary>
+        /// Defines the <see cref="VerticalAlignment"/> property.
+        /// </summary>
+        public static readonly StyledProperty<VerticalAlignment> VerticalContentAlignmentProperty =
+            ContentControl.VerticalContentAlignmentProperty.AddOwner<TextBox>();
+
         public static readonly StyledProperty<TextWrapping> TextWrappingProperty =
             TextBlock.TextWrappingProperty.AddOwner<TextBox>();
 
@@ -85,6 +106,30 @@ namespace Avalonia.Controls
             AvaloniaProperty.RegisterDirect<TextBox, string>(nameof(NewLine),
                 textbox => textbox.NewLine, (textbox, newline) => textbox.NewLine = newline);
 
+        public static readonly StyledProperty<object> InnerLeftContentProperty =
+            AvaloniaProperty.Register<TextBox, object>(nameof(InnerLeftContent));
+
+        public static readonly StyledProperty<object> InnerRightContentProperty =
+            AvaloniaProperty.Register<TextBox, object>(nameof(InnerRightContent));
+
+        public static readonly StyledProperty<bool> RevealPasswordProperty =
+            AvaloniaProperty.Register<TextBox, bool>(nameof(RevealPassword));
+        
+        public static readonly DirectProperty<TextBox, bool> CanCutProperty =
+                    AvaloniaProperty.RegisterDirect<TextBox, bool>(
+                        nameof(CanCut),
+                        o => o.CanCut);
+
+        public static readonly DirectProperty<TextBox, bool> CanCopyProperty =
+            AvaloniaProperty.RegisterDirect<TextBox, bool>(
+                nameof(CanCopy),
+                o => o.CanCopy);
+
+        public static readonly DirectProperty<TextBox, bool> CanPasteProperty =
+                    AvaloniaProperty.RegisterDirect<TextBox, bool>(
+                        nameof(CanPaste),
+                        o => o.CanPaste);
+
         struct UndoRedoState : IEquatable<UndoRedoState>
         {
             public string Text { get; }
@@ -107,6 +152,9 @@ namespace Avalonia.Controls
         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" };
 
@@ -124,7 +172,7 @@ namespace Avalonia.Controls
                 {
                     if (acceptsReturn)
                     {
-                        return wrapping == TextWrapping.NoWrap ?
+                        return wrapping != TextWrapping.Wrap ?
                             ScrollBarVisibility.Auto :
                             ScrollBarVisibility.Disabled;
                     }
@@ -133,11 +181,13 @@ namespace Avalonia.Controls
                         return ScrollBarVisibility.Hidden;
                     }
                 });
-            Bind(
+            this.Bind(
                 ScrollViewer.HorizontalScrollBarVisibilityProperty,
                 horizontalScrollBarVisibility,
                 BindingPriority.Style);
             _undoRedoHelper = new UndoRedoHelper<UndoRedoState>(this);
+
+            UpdatePseudoclasses();
         }
 
         public bool AcceptsReturn
@@ -262,6 +312,42 @@ namespace Avalonia.Controls
             }
         }
 
+        public string SelectedText
+        {
+            get { return GetSelection(); }
+            set
+            {
+                _undoRedoHelper.Snapshot();
+                if (string.IsNullOrEmpty(value))
+                {
+                    DeleteSelection();
+                }
+                else
+                {
+                    HandleTextInput(value);
+                }
+                _undoRedoHelper.Snapshot();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the horizontal alignment of the content within the control.
+        /// </summary>
+        public HorizontalAlignment HorizontalContentAlignment
+        {
+            get { return GetValue(HorizontalContentAlignmentProperty); }
+            set { SetValue(HorizontalContentAlignmentProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the vertical alignment of the content within the control.
+        /// </summary>
+        public VerticalAlignment VerticalContentAlignment
+        {
+            get { return GetValue(VerticalContentAlignmentProperty); }
+            set { SetValue(VerticalContentAlignmentProperty, value); }
+        }
+
         public TextAlignment TextAlignment
         {
             get { return GetValue(TextAlignmentProperty); }
@@ -280,6 +366,24 @@ namespace Avalonia.Controls
             set { SetValue(UseFloatingWatermarkProperty, value); }
         }
 
+        public object InnerLeftContent
+        {
+            get { return GetValue(InnerLeftContentProperty); }
+            set { SetValue(InnerLeftContentProperty, value); }
+        }
+
+        public object InnerRightContent
+        {
+            get { return GetValue(InnerRightContentProperty); }
+            set { SetValue(InnerRightContentProperty, value); }
+        }
+
+        public bool RevealPassword
+        {
+            get { return GetValue(RevealPasswordProperty); }
+            set { SetValue(RevealPasswordProperty, value); }
+        }
+
         public TextWrapping TextWrapping
         {
             get { return GetValue(TextWrappingProperty); }
@@ -294,17 +398,72 @@ namespace Avalonia.Controls
             get { return _newLine; }
             set { SetAndRaise(NewLineProperty, ref _newLine, value); }
         }
+        
+        /// <summary>
+        /// Clears the current selection, maintaining the <see cref="CaretIndex"/>
+        /// </summary>
+        public void ClearSelection()
+        {
+            SelectionStart = SelectionEnd = CaretIndex;
+        }
+
+        /// <summary>
+        /// Property for determining if the Cut command can be executed.
+        /// </summary>
+        public bool CanCut
+        {
+            get { return _canCut; }
+            private set { SetAndRaise(CanCutProperty, ref _canCut, value); }
+        }
+
+        /// <summary>
+        /// Property for determining if the Copy command can be executed.
+        /// </summary>
+        public bool CanCopy
+        {
+            get { return _canCopy; }
+            private set { SetAndRaise(CanCopyProperty, ref _canCopy, value); }
+        }
 
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        /// <summary>
+        /// Property for determining if the Paste command can be executed.
+        /// </summary>
+        public bool CanPaste
+        {
+            get { return _canPaste; }
+            private set { SetAndRaise(CanPasteProperty, ref _canPaste, value); }
+        }
+
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             _presenter = e.NameScope.Get<TextPresenter>("PART_TextPresenter");
 
             if (IsFocused)
             {
-                DecideCaretVisibility();
+                _presenter?.ShowCaret();
+            }
+        }
+
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == TextProperty)
+            {
+                UpdatePseudoclasses();
+                UpdateCommandStates();
             }
         }
 
+        private void UpdateCommandStates()
+        {
+            var text = GetSelection();
+            var isSelectionNullOrEmpty = string.IsNullOrEmpty(text);
+            CanCopy = !IsPasswordBox && !isSelectionNullOrEmpty;
+            CanCut = !IsPasswordBox && !isSelectionNullOrEmpty && !IsReadOnly;
+            CanPaste = !IsReadOnly;
+        }
+
         protected override void OnGotFocus(GotFocusEventArgs e)
         {
             base.OnGotFocus(e);
@@ -316,25 +475,26 @@ namespace Avalonia.Controls
                 !AcceptsReturn &&
                 Text?.Length > 0)
             {
-                SelectionStart = 0;
-                SelectionEnd = Text.Length;
-            }
-            else
-            {
-                DecideCaretVisibility();
+                SelectAll();
             }
-        }
 
-        private void DecideCaretVisibility()
-        {
+            UpdateCommandStates();
+
             _presenter?.ShowCaret();
         }
 
         protected override void OnLostFocus(RoutedEventArgs e)
         {
             base.OnLostFocus(e);
-            SelectionStart = 0;
-            SelectionEnd = 0;
+
+            if (ContextMenu == null || !ContextMenu.IsOpen)
+            {
+                ClearSelection();
+                RevealPassword = false;
+            }
+
+            UpdateCommandStates();
+
             _presenter?.HideCaret();
         }
 
@@ -361,7 +521,7 @@ namespace Avalonia.Controls
                     text = Text ?? string.Empty;
                     SetTextInternal(text.Substring(0, caretIndex) + input + text.Substring(caretIndex));
                     CaretIndex += input.Length;
-                    SelectionStart = SelectionEnd = CaretIndex;
+                    ClearSelection();
                     _undoRedoHelper.DiscardRedo();
                 }
             }
@@ -377,21 +537,35 @@ namespace Avalonia.Controls
             return text;
         }
 
-        private async void Copy()
+        public async void Cut()
+        {
+            var text = GetSelection();
+            if (text is null) return;
+
+            _undoRedoHelper.Snapshot();
+            Copy();
+            DeleteSelection();
+            _undoRedoHelper.Snapshot();
+        }
+
+        public async void Copy()
         {
+            var text = GetSelection();
+            if (text is null) return;
+
             await ((IClipboard)AvaloniaLocator.Current.GetService(typeof(IClipboard)))
-                .SetTextAsync(GetSelection());
+                .SetTextAsync(text);
         }
 
-        private async void Paste()
+        public async void Paste()
         {
             var text = await ((IClipboard)AvaloniaLocator.Current.GetService(typeof(IClipboard))).GetTextAsync();
-            if (text == null)
-            {
-                return;
-            }
+
+            if (text is null) return;
+
             _undoRedoHelper.Snapshot();
             HandleTextInput(text);
+            _undoRedoHelper.Snapshot();
         }
 
         protected override void OnKeyDown(KeyEventArgs e)
@@ -401,12 +575,12 @@ namespace Avalonia.Controls
             bool movement = false;
             bool selection = false;
             bool handled = false;
-            var modifiers = e.Modifiers;
+            var modifiers = e.KeyModifiers;
 
             var keymap = AvaloniaLocator.Current.GetService<PlatformHotkeyConfiguration>();
 
             bool Match(List<KeyGesture> gestures) => gestures.Any(g => g.Matches(e));
-            bool DetectSelection() => e.Modifiers.HasFlag(keymap.SelectionModifiers);
+            bool DetectSelection() => e.KeyModifiers.HasFlag(keymap.SelectionModifiers);
 
             if (Match(keymap.SelectAll))
             {
@@ -426,21 +600,18 @@ namespace Avalonia.Controls
             {
                 if (!IsPasswordBox)
                 {
-                    Copy();
-                    DeleteSelection();
+                    Cut();
                 }
 
                 handled = true;
             }
             else if (Match(keymap.Paste))
             {
-
                 Paste();
                 handled = true;
             }
             else if (Match(keymap.Undo))
             {
-
                 try
                 {
                     _isUndoingRedoing = true;
@@ -531,15 +702,15 @@ namespace Avalonia.Controls
                 switch (e.Key)
                 {
                     case Key.Left:
-                        MoveHorizontal(-1, hasWholeWordModifiers);
-                        movement = true;
                         selection = DetectSelection();
+                        MoveHorizontal(-1, hasWholeWordModifiers, selection);
+                        movement = true;
                         break;
 
                     case Key.Right:
-                        MoveHorizontal(1, hasWholeWordModifiers);
-                        movement = true;
                         selection = DetectSelection();
+                        MoveHorizontal(1, hasWholeWordModifiers, selection);
+                        movement = true;
                         break;
 
                     case Key.Up:
@@ -553,6 +724,7 @@ namespace Avalonia.Controls
                         break;
 
                     case Key.Back:
+                        _undoRedoHelper.Snapshot();
                         if (hasWholeWordModifiers && SelectionStart == SelectionEnd)
                         {
                             SetSelectionForControlBackspace();
@@ -574,13 +746,15 @@ namespace Avalonia.Controls
                             SetTextInternal(text.Substring(0, caretIndex - removedCharacters) +
                                             text.Substring(caretIndex));
                             CaretIndex -= removedCharacters;
-                            SelectionStart = SelectionEnd = CaretIndex;
+                            ClearSelection();
                         }
+                        _undoRedoHelper.Snapshot();
 
                         handled = true;
                         break;
 
                     case Key.Delete:
+                        _undoRedoHelper.Snapshot();
                         if (hasWholeWordModifiers && SelectionStart == SelectionEnd)
                         {
                             SetSelectionForControlDelete();
@@ -602,6 +776,7 @@ namespace Avalonia.Controls
                             SetTextInternal(text.Substring(0, caretIndex) +
                                             text.Substring(caretIndex + removedCharacters));
                         }
+                        _undoRedoHelper.Snapshot();
 
                         handled = true;
                         break;
@@ -609,7 +784,9 @@ namespace Avalonia.Controls
                     case Key.Enter:
                         if (AcceptsReturn)
                         {
+                            _undoRedoHelper.Snapshot();
                             HandleTextInput(NewLine);
+                            _undoRedoHelper.Snapshot();
                             handled = true;
                         }
 
@@ -618,7 +795,9 @@ namespace Avalonia.Controls
                     case Key.Tab:
                         if (AcceptsTab)
                         {
+                            _undoRedoHelper.Snapshot();
                             HandleTextInput("\t");
+                            _undoRedoHelper.Snapshot();
                             handled = true;
                         }
                         else
@@ -640,7 +819,7 @@ namespace Avalonia.Controls
             }
             else if (movement)
             {
-                SelectionStart = SelectionEnd = CaretIndex;
+                ClearSelection();
             }
 
             if (handled || movement)
@@ -651,12 +830,13 @@ namespace Avalonia.Controls
 
         protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
-            var point = e.GetPosition(_presenter);
-            var index = CaretIndex = _presenter.GetCaretIndex(point);
             var text = Text;
 
-            if (text != null && e.MouseButton == MouseButton.Left)
+            var clickInfo = e.GetCurrentPoint(this);
+            if (text != null && clickInfo.Properties.IsLeftButtonPressed && !(clickInfo.Pointer?.Captured is Border))
             {
+                var point = e.GetPosition(_presenter);
+                var index = CaretIndex = _presenter.GetCaretIndex(point);
                 switch (e.ClickCount)
                 {
                     case 1:
@@ -671,8 +851,7 @@ namespace Avalonia.Controls
                         SelectionEnd = StringUtils.NextWord(text, index);
                         break;
                     case 3:
-                        SelectionStart = 0;
-                        SelectionEnd = text.Length;
+                        SelectAll();
                         break;
                 }
             }
@@ -683,11 +862,15 @@ namespace Avalonia.Controls
 
         protected override void OnPointerMoved(PointerEventArgs e)
         {
-            if (_presenter != null && e.Pointer.Captured == _presenter)
+            // selection should not change during pointer move if the user right clicks
+            if (_presenter != null && e.Pointer.Captured == _presenter && e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
             {
                 var point = e.GetPosition(_presenter);
 
-                point = new Point(MathUtilities.Clamp(point.X, 0, _presenter.Bounds.Width - 1), MathUtilities.Clamp(point.Y, 0, _presenter.Bounds.Height - 1));
+                point = new Point(
+                    MathUtilities.Clamp(point.X, 0, Math.Max(_presenter.Bounds.Width - 1, 0)),
+                    MathUtilities.Clamp(point.Y, 0, Math.Max(_presenter.Bounds.Height - 1, 0)));
+
                 CaretIndex = SelectionEnd = _presenter.GetCaretIndex(point);
             }
         }
@@ -696,15 +879,31 @@ namespace Avalonia.Controls
         {
             if (_presenter != null && e.Pointer.Captured == _presenter)
             {
+                if (e.InitialPressMouseButton == MouseButton.Right)
+                {
+                    var point = e.GetPosition(_presenter);
+                    var caretIndex = _presenter.GetCaretIndex(point);
+
+                    // 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)
+                    {
+                        CaretIndex = SelectionEnd = SelectionStart = caretIndex;
+                    }
+                }
                 e.Pointer.Capture(null);
             }
         }
 
-        protected override void UpdateDataValidation(AvaloniaProperty property, BindingNotification status)
+        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
         {
             if (property == TextProperty)
             {
-                DataValidationErrors.SetError(this, status.Error);
+                DataValidationErrors.SetError(this, value.Error);
             }
         }
 
@@ -736,6 +935,11 @@ namespace Avalonia.Controls
             }
         }
 
+        public void Clear()
+        {
+            Text = string.Empty;
+        }
+
         private int DeleteCharacter(int index)
         {
             var start = index + 1;
@@ -759,13 +963,21 @@ namespace Avalonia.Controls
             return result;
         }
 
-        private void MoveHorizontal(int direction, bool wholeWord)
+        private void MoveHorizontal(int direction, bool wholeWord, bool isSelecting)
         {
             var text = Text ?? string.Empty;
             var caretIndex = CaretIndex;
 
             if (!wholeWord)
             {
+                if (SelectionStart != SelectionEnd && !isSelecting)
+                {
+                    var start = Math.Min(SelectionStart, SelectionEnd);
+                    var end = Math.Max(SelectionStart, SelectionEnd);
+                    CaretIndex = direction < 0 ? start : end;
+                    return;
+                }
+
                 var index = caretIndex + direction;
 
                 if (index < 0 || index > text.Length)
@@ -894,10 +1106,14 @@ namespace Avalonia.Controls
             CaretIndex = caretIndex;
         }
 
-        private void SelectAll()
+        /// <summary>
+        /// Select all text in the TextBox
+        /// </summary>
+        public void SelectAll()
         {
             SelectionStart = 0;
             SelectionEnd = Text?.Length ?? 0;
+            CaretIndex = SelectionEnd;
         }
 
         private bool DeleteSelection()
@@ -913,7 +1129,8 @@ namespace Avalonia.Controls
                     var end = Math.Max(selectionStart, selectionEnd);
                     var text = Text;
                     SetTextInternal(text.Substring(0, start) + text.Substring(end));
-                    SelectionStart = SelectionEnd = CaretIndex = start;
+                    CaretIndex = start;
+                    ClearSelection();
                     return true;
                 }
                 else
@@ -978,17 +1195,22 @@ namespace Avalonia.Controls
         private void SetSelectionForControlBackspace()
         {
             SelectionStart = CaretIndex;
-            MoveHorizontal(-1, true);
+            MoveHorizontal(-1, true, false);
             SelectionEnd = CaretIndex;
         }
 
         private void SetSelectionForControlDelete()
         {
             SelectionStart = CaretIndex;
-            MoveHorizontal(1, true);
+            MoveHorizontal(1, true, false);
             SelectionEnd = CaretIndex;
         }
 
+        private void UpdatePseudoclasses()
+        {
+            PseudoClasses.Set(":empty", string.IsNullOrWhiteSpace(Text));
+        }
+
         private bool IsPasswordBox => PasswordChar != default(char);
 
         UndoRedoState UndoRedoHelper<UndoRedoState>.IUndoRedoHost.UndoRedoState
@@ -997,7 +1219,8 @@ namespace Avalonia.Controls
             set
             {
                 Text = value.Text;
-                SelectionStart = SelectionEnd = CaretIndex = value.CaretPosition;
+                CaretIndex = value.CaretPosition;
+                ClearSelection();
             }
         }
     }
diff --git a/src/Avalonia.Controls/TickBar.cs b/src/Avalonia.Controls/TickBar.cs
new file mode 100644
index 0000000000..6ea5277a55
--- /dev/null
+++ b/src/Avalonia.Controls/TickBar.cs
@@ -0,0 +1,407 @@
+using Avalonia.Collections;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Enum which describes how to position the TickBar.
+    /// </summary>
+    public enum TickBarPlacement
+    {
+        /// <summary>
+        /// Position this tick at the left of target element.
+        /// </summary>
+        Left,
+
+        /// <summary>
+        /// Position this tick at the top of target element.
+        /// </summary>
+        Top,
+
+        /// <summary>
+        /// Position this tick at the right of target element.
+        /// </summary>
+        Right,
+
+        /// <summary>
+        /// Position this tick at the bottom of target element.
+        /// </summary>
+        Bottom,
+    }
+
+
+    /// <summary>
+    /// An element that is used for drawing <see cref="Slider"/>'s Ticks.
+    /// </summary>
+    public class TickBar : Control
+    {
+        static TickBar()
+        {
+            AffectsRender<TickBar>(FillProperty,
+                                   IsDirectionReversedProperty,
+                                   ReservedSpaceProperty,
+                                   MaximumProperty,
+                                   MinimumProperty,
+                                   OrientationProperty,
+                                   PlacementProperty,
+                                   TickFrequencyProperty,
+                                   TicksProperty);
+        }
+
+        public TickBar() : base()
+        {
+        }
+
+        /// <summary>
+        /// Defines the <see cref="Fill"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush> FillProperty =
+            AvaloniaProperty.Register<TickBar, IBrush>(nameof(Fill));
+
+        /// <summary>
+        /// Brush used to fill the TickBar's Ticks.
+        /// </summary>
+        public IBrush Fill
+        {
+            get { return GetValue(FillProperty); }
+            set { SetValue(FillProperty, value); }
+        }
+
+        /// <summary>
+        /// Defines the <see cref="Minimum"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MinimumProperty =
+            AvaloniaProperty.Register<TickBar, double>(nameof(Minimum), 0d);
+
+        /// <summary>
+        /// Logical position where the Minimum Tick will be drawn
+        /// </summary>
+        public double Minimum
+        {
+            get { return GetValue(MinimumProperty); }
+            set
+            {
+                SetValue(MinimumProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Defines the <see cref="Maximum"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MaximumProperty =
+            AvaloniaProperty.Register<TickBar, double>(nameof(Maximum), 0d);
+
+        /// <summary>
+        /// Logical position where the Maximum Tick will be drawn
+        /// </summary>
+        public double Maximum
+        {
+            get { return GetValue(MaximumProperty); }
+            set { SetValue(MaximumProperty, value); }
+        }
+
+        /// <summary>
+        /// Defines the <see cref="TickFrequency"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> TickFrequencyProperty =
+            AvaloniaProperty.Register<TickBar, double>(nameof(TickFrequency), 0d);
+
+        /// <summary>
+        /// TickFrequency property defines how the tick will be drawn.
+        /// </summary>
+        public double TickFrequency
+        {
+            get { return GetValue(TickFrequencyProperty); }
+            set { SetValue(TickFrequencyProperty, value); }
+        }
+
+        /// <summary>
+        /// Defines the <see cref="Orientation"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Orientation> OrientationProperty =
+            AvaloniaProperty.Register<TickBar, Orientation>(nameof(Orientation));
+
+        /// <summary>
+        /// TickBar parent's orientation.
+        /// </summary>
+        public Orientation Orientation
+        {
+            get { return GetValue(OrientationProperty); }
+            set { SetValue(OrientationProperty, value); }
+        }
+
+        /// <summary>
+        /// Defines the <see cref="Ticks"/> property.
+        /// </summary>
+        public static readonly StyledProperty<AvaloniaList<double>> TicksProperty =
+            AvaloniaProperty.Register<TickBar, AvaloniaList<double>>(nameof(Ticks));
+
+        /// <summary>
+        /// The Ticks property contains collection of value of type Double which
+        /// are the logical positions use to draw the ticks.
+        /// The property value is a <see cref="AvaloniaList{T}" />.
+        /// </summary>
+        public AvaloniaList<double> Ticks
+        {
+            get { return GetValue(TicksProperty); }
+            set { SetValue(TicksProperty, value); }
+        }
+
+        /// <summary>
+        /// Defines the <see cref="IsDirectionReversed"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsDirectionReversedProperty =
+            AvaloniaProperty.Register<TickBar, bool>(nameof(IsDirectionReversed), false);
+
+        /// <summary>
+        /// The IsDirectionReversed property defines the direction of value incrementation.
+        /// By default, if Tick's orientation is Horizontal, ticks will be drawn from left to right.
+        /// (And, bottom to top for Vertical orientation).
+        /// If IsDirectionReversed is 'true' the direction of the drawing will be in opposite direction.
+        /// </summary>
+        public bool IsDirectionReversed
+        {
+            get { return GetValue(IsDirectionReversedProperty); }
+            set { SetValue(IsDirectionReversedProperty, value); }
+        }
+
+        /// <summary>
+        /// Defines the <see cref="Placement"/> property.
+        /// </summary>
+        public static readonly StyledProperty<TickBarPlacement> PlacementProperty =
+            AvaloniaProperty.Register<TickBar, TickBarPlacement>(nameof(Placement), 0d);
+
+        /// <summary>
+        /// Placement property specified how the Tick will be placed.
+        /// This property affects the way ticks are drawn.
+        /// This property has type of <see cref="TickBarPlacement" />.
+        /// </summary>
+        public TickBarPlacement Placement
+        {
+            get { return GetValue(PlacementProperty); }
+            set { SetValue(PlacementProperty, value); }
+        }
+
+        /// <summary>
+        /// Defines the <see cref="ReservedSpace"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Rect> ReservedSpaceProperty =
+            AvaloniaProperty.Register<TickBar, Rect>(nameof(ReservedSpace));
+
+        /// <summary>
+        /// TickBar will use ReservedSpaceProperty for left and right spacing (for horizontal orientation) or
+        /// top and bottom spacing (for vertical orienation).
+        /// The space on both sides of TickBar is half of specified ReservedSpace.
+        /// This property has type of <see cref="Rect" />.
+        /// </summary>
+        public Rect ReservedSpace
+        {
+            get { return GetValue(ReservedSpaceProperty); }
+            set { SetValue(ReservedSpaceProperty, value); }
+        }
+
+        /// <summary>
+        /// Draw ticks.
+        /// Ticks can be draw in 8 different ways depends on Placement property and IsDirectionReversed property.
+        ///
+        /// This function also draw selection-tick(s) if IsSelectionRangeEnabled is 'true' and
+        /// SelectionStart and SelectionEnd are valid.
+        ///
+        /// The primary ticks (for Mininum and Maximum value) height will be 100% of TickBar's render size (use Width or Height
+        /// depends on Placement property).
+        ///
+        /// The secondary ticks (all other ticks, including selection-tics) height will be 75% of TickBar's render size.
+        ///
+        /// Brush that use to fill ticks is specified by Fill property.
+        /// </summary>
+        public override void Render(DrawingContext dc)
+        {
+            var size = new Size(Bounds.Width, Bounds.Height);
+            var range = Maximum - Minimum;
+            var tickLen = 0.0d;   // Height for Primary Tick (for Mininum and Maximum value)
+            var tickLen2 = 0.0d;  // Height for Secondary Tick
+            var logicalToPhysical = 1.0;
+            var startPoint = new Point();
+            var endPoint = new Point();
+            var rSpace = Orientation == Orientation.Horizontal ? ReservedSpace.Width : ReservedSpace.Height;
+
+            // Take Thumb size in to account
+            double halfReservedSpace = rSpace * 0.5;
+
+            switch (Placement)
+            {
+                case TickBarPlacement.Top:
+                    if (MathUtilities.GreaterThanOrClose(rSpace, size.Width))
+                    {
+                        return;
+                    }
+                    size = new Size(size.Width - rSpace, size.Height);
+                    tickLen = -size.Height;
+                    startPoint = new Point(halfReservedSpace, size.Height);
+                    endPoint = new Point(halfReservedSpace + size.Width, size.Height);
+                    logicalToPhysical = size.Width / range;
+                    break;
+
+                case TickBarPlacement.Bottom:
+                    if (MathUtilities.GreaterThanOrClose(rSpace, size.Width))
+                    {
+                        return;
+                    }
+                    size = new Size(size.Width - rSpace, size.Height);
+                    tickLen = size.Height;
+                    startPoint = new Point(halfReservedSpace, 0d);
+                    endPoint = new Point(halfReservedSpace + size.Width, 0d);
+                    logicalToPhysical = size.Width / range;
+                    break;
+
+                case TickBarPlacement.Left:
+                    if (MathUtilities.GreaterThanOrClose(rSpace, size.Height))
+                    {
+                        return;
+                    }
+                    size = new Size(size.Width, size.Height - rSpace);
+
+                    tickLen = -size.Width;
+                    startPoint = new Point(size.Width, size.Height + halfReservedSpace);
+                    endPoint = new Point(size.Width, halfReservedSpace);
+                    logicalToPhysical = size.Height / range * -1;
+                    break;
+
+                case TickBarPlacement.Right:
+                    if (MathUtilities.GreaterThanOrClose(rSpace, size.Height))
+                    {
+                        return;
+                    }
+                    size = new Size(size.Width, size.Height - rSpace);
+                    tickLen = size.Width;
+                    startPoint = new Point(0d, size.Height + halfReservedSpace);
+                    endPoint = new Point(0d, halfReservedSpace);
+                    logicalToPhysical = size.Height / range * -1;
+                    break;
+            };
+
+            tickLen2 = tickLen * 0.75;
+
+            // Invert direciton of the ticks
+            if (IsDirectionReversed)
+            {
+                logicalToPhysical *= -1;
+
+                // swap startPoint & endPoint
+                var pt = startPoint;
+                startPoint = endPoint;
+                endPoint = pt;
+            }
+
+            var pen = new Pen(Fill, 1.0d);
+
+            // Is it Vertical?
+            if (Placement == TickBarPlacement.Left || Placement == TickBarPlacement.Right)
+            {
+                // Reduce tick interval if it is more than would be visible on the screen
+                double interval = TickFrequency;
+                if (interval > 0.0)
+                {
+                    double minInterval = (Maximum - Minimum) / size.Height;
+                    if (interval < minInterval)
+                    {
+                        interval = minInterval;
+                    }
+                }
+
+                // Draw Min & Max tick
+                dc.DrawLine(pen, startPoint, new Point(startPoint.X + tickLen, startPoint.Y));
+                dc.DrawLine(pen, new Point(startPoint.X, endPoint.Y),
+                                 new Point(startPoint.X + tickLen, endPoint.Y));
+
+                // This property is rarely set so let's try to avoid the GetValue
+                // caching of the mutable default value
+                var ticks = Ticks ?? null;
+
+                // Draw ticks using specified Ticks collection
+                if (ticks?.Count > 0)
+                {
+                    for (int i = 0; i < ticks.Count; i++)
+                    {
+                        if (MathUtilities.LessThanOrClose(ticks[i], Minimum) || MathUtilities.GreaterThanOrClose(ticks[i], Maximum))
+                        {
+                            continue;
+                        }
+
+                        double adjustedTick = ticks[i] - Minimum;
+
+                        double y = adjustedTick * logicalToPhysical + startPoint.Y;
+                        dc.DrawLine(pen,
+                            new Point(startPoint.X, y),
+                            new Point(startPoint.X + tickLen2, y));
+                    }
+                }
+                // Draw ticks using specified TickFrequency
+                else if (interval > 0.0)
+                {
+                    for (double i = interval; i < range; i += interval)
+                    {
+                        double y = i * logicalToPhysical + startPoint.Y;
+
+                        dc.DrawLine(pen,
+                            new Point(startPoint.X, y),
+                            new Point(startPoint.X + tickLen2, y));
+                    }
+                }
+            }
+            else  // Placement == Top || Placement == Bottom
+            {
+                // Reduce tick interval if it is more than would be visible on the screen
+                double interval = TickFrequency;
+                if (interval > 0.0)
+                {
+                    double minInterval = (Maximum - Minimum) / size.Width;
+                    if (interval < minInterval)
+                    {
+                        interval = minInterval;
+                    }
+                }
+
+                // Draw Min & Max tick
+                dc.DrawLine(pen, startPoint, new Point(startPoint.X, startPoint.Y + tickLen));
+                dc.DrawLine(pen, new Point(endPoint.X, startPoint.Y),
+                                 new Point(endPoint.X, startPoint.Y + tickLen));
+
+                // This property is rarely set so let's try to avoid the GetValue
+                // caching of the mutable default value
+                var ticks = Ticks ?? null;
+
+                // Draw ticks using specified Ticks collection
+                if (ticks?.Count > 0)
+                {
+                    for (int i = 0; i < ticks.Count; i++)
+                    {
+                        if (MathUtilities.LessThanOrClose(ticks[i], Minimum) || MathUtilities.GreaterThanOrClose(ticks[i], Maximum))
+                        {
+                            continue;
+                        }
+                        double adjustedTick = ticks[i] - Minimum;
+
+                        double x = adjustedTick * logicalToPhysical + startPoint.X;
+                        dc.DrawLine(pen,
+                            new Point(x, startPoint.Y),
+                            new Point(x, startPoint.Y + tickLen2));
+                    }
+                }
+                // Draw ticks using specified TickFrequency
+                else if (interval > 0.0)
+                {
+                    for (double i = interval; i < range; i += interval)
+                    {
+                        double x = i * logicalToPhysical + startPoint.X;
+                        dc.DrawLine(pen,
+                            new Point(x, startPoint.Y),
+                            new Point(x, startPoint.Y + tickLen2));
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/ToggleSwitch.cs b/src/Avalonia.Controls/ToggleSwitch.cs
new file mode 100644
index 0000000000..662a355dac
--- /dev/null
+++ b/src/Avalonia.Controls/ToggleSwitch.cs
@@ -0,0 +1,256 @@
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.LogicalTree;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// A Toggle Switch control.
+    /// </summary>
+    [PseudoClasses(":dragging")]
+    public class ToggleSwitch : ToggleButton
+    {
+        private Panel _knobsPanel;
+        private Panel _switchKnob;
+        private bool _knobsPanelPressed = false;
+        private Point _switchStartPoint = new Point();
+        private double _initLeft = -1;
+        private bool _isDragging = false;
+
+        static ToggleSwitch()
+        {
+            OffContentProperty.Changed.AddClassHandler<ToggleSwitch>((x, e) => x.OffContentChanged(e));
+            OnContentProperty.Changed.AddClassHandler<ToggleSwitch>((x, e) => x.OnContentChanged(e));
+            IsCheckedProperty.Changed.AddClassHandler<ToggleSwitch>((x, e) =>
+            {
+                if ((e.NewValue != null) && (e.NewValue is bool val))
+                {
+                    x.UpdateKnobPos(val);
+                }
+            });
+
+            BoundsProperty.Changed.AddClassHandler<ToggleSwitch>((x, e) =>
+            {
+                if (x.IsChecked != null)
+                {
+                    x.UpdateKnobPos(x.IsChecked.Value);
+                }
+            });
+        }
+
+        /// <summary>
+        /// Defines the <see cref="OffContent"/> property.
+        /// </summary>
+        public static readonly StyledProperty<object> OffContentProperty =
+         AvaloniaProperty.Register<ToggleSwitch, object>(nameof(OffContent), defaultValue: "Off");
+
+        /// <summary>
+        /// Defines the <see cref="OffContentTemplate"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IDataTemplate> OffContentTemplateProperty =
+            AvaloniaProperty.Register<ToggleSwitch, IDataTemplate>(nameof(OffContentTemplate));
+
+        /// <summary>
+        /// Defines the <see cref="OnContent"/> property.
+        /// </summary>
+        public static readonly StyledProperty<object> OnContentProperty =
+            AvaloniaProperty.Register<ToggleSwitch, object>(nameof(OnContent), defaultValue: "On");
+
+        /// <summary>
+        /// Defines the <see cref="OnContentTemplate"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IDataTemplate> OnContentTemplateProperty =
+            AvaloniaProperty.Register<ToggleSwitch, IDataTemplate>(nameof(OnContentTemplate));
+
+        /// <summary>
+        /// Gets or Sets the Content that is displayed when in the On State.
+        /// </summary>
+        public object OnContent
+        {
+            get { return GetValue(OnContentProperty); }
+            set { SetValue(OnContentProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or Sets the Content that is displayed when in the Off State.
+        /// </summary>
+        public object OffContent
+        {
+            get { return GetValue(OffContentProperty); }
+            set { SetValue(OffContentProperty, value); }
+        }
+
+        public IContentPresenter OffContentPresenter
+        {
+            get;
+            private set;
+        }
+
+        public IContentPresenter OnContentPresenter
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// Gets or Sets the <see cref="IDataTemplate"/> used to display the <see cref="OffContent"/>.
+        /// </summary>
+        public IDataTemplate OffContentTemplate
+        {
+            get { return GetValue(OffContentTemplateProperty); }
+            set { SetValue(OffContentTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or Sets the <see cref="IDataTemplate"/> used to display the <see cref="OnContent"/>.
+        /// </summary>
+        public IDataTemplate OnContentTemplate
+        {
+            get { return GetValue(OnContentTemplateProperty); }
+            set { SetValue(OnContentTemplateProperty, value); }
+        }
+
+        private void OffContentChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.OldValue is ILogical oldChild)
+            {
+                LogicalChildren.Remove(oldChild);
+            }
+
+            if (e.NewValue is ILogical newChild)
+            {
+                LogicalChildren.Add(newChild);
+            }
+        }
+
+        private void OnContentChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.OldValue is ILogical oldChild)
+            {
+                LogicalChildren.Remove(oldChild);
+            }
+
+            if (e.NewValue is ILogical newChild)
+            {
+                LogicalChildren.Add(newChild);
+            }
+        }
+
+        protected override bool RegisterContentPresenter(IContentPresenter presenter)
+        {
+            var result = base.RegisterContentPresenter(presenter);
+
+            if (presenter.Name == "Part_OnContentPresenter")
+            {
+                OnContentPresenter = presenter;
+                result = true;
+            }
+            else if (presenter.Name == "PART_OffContentPresenter")
+            {
+                OffContentPresenter = presenter;
+                result = true;
+            }
+
+            return result;
+        }
+
+
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            base.OnApplyTemplate(e);
+
+            _switchKnob = e.NameScope.Find<Panel>("SwitchKnob");
+            _knobsPanel = e.NameScope.Find<Panel>("MovingKnobs");
+            
+            _knobsPanel.PointerPressed += KnobsPanel_PointerPressed;
+            _knobsPanel.PointerReleased += KnobsPanel_PointerReleased;
+            _knobsPanel.PointerMoved += KnobsPanel_PointerMoved;
+
+            if (IsChecked.HasValue)
+            {
+                UpdateKnobPos(IsChecked.Value);
+            }
+        }
+        
+        private void KnobsPanel_PointerPressed(object sender, Input.PointerPressedEventArgs e)
+        {
+            _switchStartPoint = e.GetPosition(_switchKnob);
+            _initLeft = Canvas.GetLeft(_knobsPanel);
+            _isDragging = false;
+            _knobsPanelPressed = true;
+        }
+
+        private void KnobsPanel_PointerReleased(object sender, Input.PointerReleasedEventArgs e)
+        {
+            if (_isDragging)
+            {
+                bool shouldBecomeChecked = Canvas.GetLeft(_knobsPanel) >= (_switchKnob.Bounds.Width / 2);
+                _knobsPanel.ClearValue(Canvas.LeftProperty);
+
+                PseudoClasses.Set(":dragging", false);
+
+                if (shouldBecomeChecked == IsChecked)
+                {
+                    UpdateKnobPos(shouldBecomeChecked);
+                }
+                else
+                {
+                    IsChecked = shouldBecomeChecked;
+                }
+            }
+            else
+            {
+                base.Toggle();
+            }
+
+            _isDragging = false;
+
+            _knobsPanelPressed = false;
+        }
+
+        private void KnobsPanel_PointerMoved(object sender, Input.PointerEventArgs e)
+        {
+            if (_knobsPanelPressed)
+            {
+                var difference = e.GetPosition(_switchKnob) - _switchStartPoint;
+
+                if ((!_isDragging) && (System.Math.Abs(difference.X) > 3))
+                {
+                    _isDragging = true;
+                    PseudoClasses.Set(":dragging", true);
+                }
+
+                if (_isDragging)
+                {
+                    Canvas.SetLeft(_knobsPanel, System.Math.Min(_switchKnob.Bounds.Width, System.Math.Max(0, (_initLeft + difference.X))));
+                }
+            }
+        }
+
+        protected override void Toggle()
+        {
+            if ((_switchKnob != null) && (!_switchKnob.IsPointerOver))
+            {
+                base.Toggle();
+            }
+        }
+
+        protected void UpdateKnobPos(bool value)
+        {
+            if ((_switchKnob != null) && (_knobsPanel != null))
+            {
+                if (value)
+                {
+                    Canvas.SetLeft(_knobsPanel, _switchKnob.Bounds.Width);
+                }
+                else
+                {
+                    Canvas.SetLeft(_knobsPanel, 0);
+                }
+            }
+        }
+    }
+}
+
diff --git a/src/Avalonia.Controls/ToolTip.cs b/src/Avalonia.Controls/ToolTip.cs
index 5fe1e3804b..71bd0726d4 100644
--- a/src/Avalonia.Controls/ToolTip.cs
+++ b/src/Avalonia.Controls/ToolTip.cs
@@ -1,8 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.VisualTree;
 
@@ -17,6 +15,7 @@ namespace Avalonia.Controls
     /// To add a tooltip to a control, use the <see cref="TipProperty"/> attached property,
     /// assigning the content that you want displayed.
     /// </remarks>
+    [PseudoClasses(":open")]
     public class ToolTip : ContentControl
     {
         /// <summary>
@@ -58,7 +57,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Stores the current <see cref="ToolTip"/> instance in the control.
         /// </summary>
-        private static readonly AttachedProperty<ToolTip> ToolTipProperty =
+        internal static readonly AttachedProperty<ToolTip> ToolTipProperty =
             AvaloniaProperty.RegisterAttached<ToolTip, Control, ToolTip>("ToolTip");
 
         private IPopupHost _popup;
@@ -69,6 +68,7 @@ namespace Avalonia.Controls
         static ToolTip()
         {
             TipProperty.Changed.Subscribe(ToolTipService.Instance.TipChanged);
+            IsOpenProperty.Changed.Subscribe(ToolTipService.Instance.TipOpenChanged);
             IsOpenProperty.Changed.Subscribe(IsOpenChanged);
         }
 
@@ -207,13 +207,15 @@ namespace Avalonia.Controls
         private static void IsOpenChanged(AvaloniaPropertyChangedEventArgs e)
         {
             var control = (Control)e.Sender;
+            var newValue = (bool)e.NewValue;
+            ToolTip toolTip;
 
-            if ((bool)e.NewValue)
+            if (newValue)
             {
                 var tip = GetTip(control);
                 if (tip == null) return;
 
-                var toolTip = control.GetValue(ToolTipProperty);
+                toolTip = control.GetValue(ToolTipProperty);
                 if (toolTip == null || (tip != toolTip && tip != toolTip.Content))
                 {
                     toolTip?.Close();
@@ -226,9 +228,11 @@ namespace Avalonia.Controls
             }
             else
             {
-                var toolTip = control.GetValue(ToolTipProperty);
+                toolTip = control.GetValue(ToolTipProperty);
                 toolTip?.Close();
             }
+
+            toolTip?.UpdatePseudoClasses(newValue);
         }
 
         private void Open(Control control)
@@ -241,6 +245,9 @@ namespace Avalonia.Controls
             
             _popup.ConfigurePosition(control, GetPlacement(control), 
                 new Point(GetHorizontalOffset(control), GetVerticalOffset(control)));
+
+            WindowManagerAddShadowHintChanged(_popup, false);
+
             _popup.Show();
         }
 
@@ -249,9 +256,22 @@ namespace Avalonia.Controls
             if (_popup != null)
             {
                 _popup.SetChild(null);
-                _popup.Hide();
+                _popup.Dispose();
                 _popup = null;
             }
         }
+
+        private void WindowManagerAddShadowHintChanged(IPopupHost host, bool hint)
+        {
+            if (host is PopupRoot pr)
+            {
+                pr.PlatformImpl.SetWindowManagerAddShadowHint(hint);
+            }
+        }
+
+        private void UpdatePseudoClasses(bool newValue)
+        {
+            PseudoClasses.Set(":open", newValue);
+        }
     }
 }
diff --git a/src/Avalonia.Controls/ToolTipService.cs b/src/Avalonia.Controls/ToolTipService.cs
index d90729e8a5..341ab2fe81 100644
--- a/src/Avalonia.Controls/ToolTipService.cs
+++ b/src/Avalonia.Controls/ToolTipService.cs
@@ -35,6 +35,34 @@ namespace Avalonia.Controls
                 control.PointerEnter += ControlPointerEnter;
                 control.PointerLeave += ControlPointerLeave;
             }
+
+            if (ToolTip.GetIsOpen(control) && e.NewValue != e.OldValue && !(e.NewValue is ToolTip))
+            {
+                var tip = control.GetValue(ToolTip.ToolTipProperty);
+
+                tip.Content = e.NewValue;
+            }
+        }
+
+        internal void TipOpenChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            var control = (Control)e.Sender;
+
+            if (e.OldValue is false && e.NewValue is true)
+            {
+                control.DetachedFromVisualTree += ControlDetaching;
+            }
+            else if(e.OldValue is true && e.NewValue is false)
+            {
+                control.DetachedFromVisualTree -= ControlDetaching;
+            }
+        }
+        
+        private void ControlDetaching(object sender, VisualTreeAttachmentEventArgs e)
+        {
+            var control = (Control)sender;
+            control.DetachedFromVisualTree -= ControlDetaching;
+            Close(control);
         }
 
         /// <summary>
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 293809bf51..3d24f60463 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -1,16 +1,12 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Linq;
 using System.Reactive.Linq;
-using Avalonia.Controls.Notifications;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Layout;
 using Avalonia.Logging;
 using Avalonia.LogicalTree;
+using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Styling;
@@ -33,7 +29,8 @@ namespace Avalonia.Controls
         ILayoutRoot,
         IRenderRoot,
         ICloseable,
-        IStyleRoot,
+        IStyleHost,
+        ILogicalRoot,
         IWeakSubscriber<ResourcesChangedEventArgs>
     {
         /// <summary>
@@ -48,12 +45,35 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<IInputElement> PointerOverElementProperty =
             AvaloniaProperty.Register<TopLevel, IInputElement>(nameof(IInputRoot.PointerOverElement));
 
+        /// <summary>
+        /// Defines the <see cref="TransparencyLevelHint"/> property.
+        /// </summary>
+        public static readonly StyledProperty<WindowTransparencyLevel> TransparencyLevelHintProperty =
+            AvaloniaProperty.Register<TopLevel, WindowTransparencyLevel>(nameof(TransparencyLevelHint), WindowTransparencyLevel.None);
+
+        /// <summary>
+        /// Defines the <see cref="ActualTransparencyLevel"/> property.
+        /// </summary>
+        public static readonly DirectProperty<TopLevel, WindowTransparencyLevel> ActualTransparencyLevelProperty =
+            AvaloniaProperty.RegisterDirect<TopLevel, WindowTransparencyLevel>(nameof(ActualTransparencyLevel), 
+                o => o.ActualTransparencyLevel, 
+                unsetValue: WindowTransparencyLevel.None);        
+
+        /// <summary>
+        /// Defines the <see cref="TransparencyBackgroundFallbackProperty"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush> TransparencyBackgroundFallbackProperty =
+            AvaloniaProperty.Register<TopLevel, IBrush>(nameof(TransparencyBackgroundFallback), Brushes.White);
+
         private readonly IInputManager _inputManager;
         private readonly IAccessKeyHandler _accessKeyHandler;
         private readonly IKeyboardNavigationHandler _keyboardNavigationHandler;
         private readonly IPlatformRenderInterface _renderInterface;
+        private readonly IGlobalStyles _globalStyles;
         private Size _clientSize;
+        private WindowTransparencyLevel _actualTransparencyLevel;
         private ILayoutManager _layoutManager;
+        private Border _transparencyFallbackBorder;
 
         /// <summary>
         /// Initializes static members of the <see cref="TopLevel"/> class.
@@ -61,6 +81,16 @@ namespace Avalonia.Controls
         static TopLevel()
         {
             AffectsMeasure<TopLevel>(ClientSizeProperty);
+
+            TransparencyLevelHintProperty.Changed.AddClassHandler<TopLevel>(
+                (tl, e) => 
+                {
+                    if (tl.PlatformImpl != null)
+                    {
+                        tl.PlatformImpl.SetTransparencyLevelHint((WindowTransparencyLevel)e.NewValue);
+                        tl.HandleTransparencyLevelChanged(tl.PlatformImpl.TransparencyLevel);
+                    }
+                });
         }
 
         /// <summary>
@@ -89,6 +119,8 @@ namespace Avalonia.Controls
 
             PlatformImpl = impl;
 
+            _actualTransparencyLevel = PlatformImpl.TransparencyLevel;            
+
             dependencyResolver = dependencyResolver ?? AvaloniaLocator.Current;
             var styler = TryGetService<IStyler>(dependencyResolver);
 
@@ -96,6 +128,7 @@ namespace Avalonia.Controls
             _inputManager = TryGetService<IInputManager>(dependencyResolver);
             _keyboardNavigationHandler = TryGetService<IKeyboardNavigationHandler>(dependencyResolver);
             _renderInterface = TryGetService<IPlatformRenderInterface>(dependencyResolver);
+            _globalStyles = TryGetService<IGlobalStyles>(dependencyResolver);
 
             Renderer = impl.CreateRenderer(this);
 
@@ -111,9 +144,17 @@ namespace Avalonia.Controls
             impl.Paint = HandlePaint;
             impl.Resized = HandleResized;
             impl.ScalingChanged = HandleScalingChanged;
+            impl.TransparencyLevelChanged = HandleTransparencyLevelChanged;
 
             _keyboardNavigationHandler?.SetOwner(this);
             _accessKeyHandler?.SetOwner(this);
+
+            if (_globalStyles is object)
+            {
+                _globalStyles.GlobalStylesAdded += ((IStyleHost)this).StylesAdded;
+                _globalStyles.GlobalStylesRemoved += ((IStyleHost)this).StylesRemoved;
+            }
+
             styler?.ApplyStyles(this);
 
             ClientSize = impl.ClientSize;
@@ -123,13 +164,15 @@ namespace Avalonia.Controls
                     x => (x as InputElement)?.GetObservable(CursorProperty) ?? Observable.Empty<Cursor>())
                 .Switch().Subscribe(cursor => PlatformImpl?.SetCursor(cursor?.PlatformCursor));
 
-            if (((IStyleHost)this).StylingParent is IResourceProvider applicationResources)
+            if (((IStyleHost)this).StylingParent is IResourceHost applicationResources)
             {
                 WeakSubscriptionManager.Subscribe(
                     applicationResources,
-                    nameof(IResourceProvider.ResourcesChanged),
+                    nameof(IResourceHost.ResourcesChanged),
                     this);
             }
+
+            impl.LostFocus += PlatformImpl_LostFocus;
         }
 
         /// <summary>
@@ -151,6 +194,34 @@ namespace Avalonia.Controls
             protected set { SetAndRaise(ClientSizeProperty, ref _clientSize, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the <see cref="WindowTransparencyLevel"/> that the TopLevel should use when possible.
+        /// </summary>
+        public WindowTransparencyLevel TransparencyLevelHint
+        {
+            get { return GetValue(TransparencyLevelHintProperty); }
+            set { SetValue(TransparencyLevelHintProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets the acheived <see cref="WindowTransparencyLevel"/> that the platform was able to provide.
+        /// </summary>
+        public WindowTransparencyLevel ActualTransparencyLevel
+        {
+            get => _actualTransparencyLevel;
+            private set => SetAndRaise(ActualTransparencyLevelProperty, ref _actualTransparencyLevel, value);
+        }        
+
+        /// <summary>
+        /// Gets or sets the <see cref="IBrush"/> that transparency will blend with when transparency is not supported.
+        /// By default this is a solid white brush.
+        /// </summary>
+        public IBrush TransparencyBackgroundFallback
+        {
+            get => GetValue(TransparencyBackgroundFallbackProperty);
+            set => SetValue(TransparencyBackgroundFallbackProperty, value);
+        }
+
         public ILayoutManager LayoutManager
         {
             get
@@ -209,18 +280,12 @@ namespace Avalonia.Controls
         }
 
         /// <inheritdoc/>
-        Size ILayoutRoot.MaxClientSize => Size.Infinity;
-
-        /// <inheritdoc/>
-        double ILayoutRoot.LayoutScaling => PlatformImpl?.Scaling ?? 1;
+        double ILayoutRoot.LayoutScaling => PlatformImpl?.RenderScaling ?? 1;
 
         /// <inheritdoc/>
-        double IRenderRoot.RenderScaling => PlatformImpl?.Scaling ?? 1;
+        double IRenderRoot.RenderScaling => PlatformImpl?.RenderScaling ?? 1;
 
-        IStyleHost IStyleHost.StylingParent
-        {
-            get { return AvaloniaLocator.Current.GetService<IGlobalStyles>(); }
-        }
+        IStyleHost IStyleHost.StylingParent => _globalStyles;
 
         IRenderTarget IRenderRoot.CreateRenderTarget() => CreateRenderTarget();
 
@@ -253,7 +318,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Creates the layout manager for this <see cref="TopLevel" />.
         /// </summary>
-        protected virtual ILayoutManager CreateLayoutManager() => new LayoutManager();
+        protected virtual ILayoutManager CreateLayoutManager() => new LayoutManager(this);
 
         /// <summary>
         /// Handles a paint notification from <see cref="ITopLevelImpl.Resized"/>.
@@ -269,11 +334,26 @@ namespace Avalonia.Controls
         /// </summary>
         protected virtual void HandleClosed()
         {
+            if (_globalStyles is object)
+            {
+                _globalStyles.GlobalStylesAdded -= ((IStyleHost)this).StylesAdded;
+                _globalStyles.GlobalStylesRemoved -= ((IStyleHost)this).StylesRemoved;
+            }
+
+            Renderer?.Dispose();
+            Renderer = null;
+            
+            var logicalArgs = new LogicalTreeAttachmentEventArgs(this, this, null);
+            ((ILogical)this).NotifyDetachedFromLogicalTree(logicalArgs);
+
+            var visualArgs = new VisualTreeAttachmentEventArgs(this, this);
+            OnDetachedFromVisualTreeCore(visualArgs);
+
             (this as IInputRoot).MouseDevice?.TopLevelClosed(this);
             PlatformImpl = null;
             OnClosed(EventArgs.Empty);
-            Renderer?.Dispose();
-            Renderer = null;
+
+            LayoutManager?.Dispose();
         }
 
         /// <summary>
@@ -296,10 +376,40 @@ namespace Avalonia.Controls
         /// <param name="scaling">The window scaling.</param>
         protected virtual void HandleScalingChanged(double scaling)
         {
-            foreach (ILayoutable control in this.GetSelfAndVisualDescendants())
+            LayoutHelper.InvalidateSelfAndChildrenMeasure(this);
+        }
+
+        private bool TransparencyLevelsMatch (WindowTransparencyLevel requested, WindowTransparencyLevel received)
+        {
+            if(requested == received)
             {
-                control.InvalidateMeasure();
+                return true;
             }
+            else if(requested >= WindowTransparencyLevel.Blur && received >= WindowTransparencyLevel.Blur)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        protected virtual void HandleTransparencyLevelChanged(WindowTransparencyLevel transparencyLevel)
+        {
+            if(_transparencyFallbackBorder != null)
+            {
+                if(transparencyLevel == WindowTransparencyLevel.None || 
+                    TransparencyLevelHint == WindowTransparencyLevel.None || 
+                    !TransparencyLevelsMatch(TransparencyLevelHint, transparencyLevel))
+                {
+                    _transparencyFallbackBorder.Background = TransparencyBackgroundFallback;
+                }
+                else
+                {
+                    _transparencyFallbackBorder.Background = null;
+                }
+            }
+
+            ActualTransparencyLevel = transparencyLevel;
         }
 
         /// <inheritdoc/>
@@ -311,6 +421,15 @@ namespace Avalonia.Controls
                 $"Control '{GetType().Name}' is a top level control and cannot be added as a child.");
         }
 
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            base.OnApplyTemplate(e);
+
+            _transparencyFallbackBorder = e.NameScope.Find<Border>("PART_TransparencyFallback");
+
+            HandleTransparencyLevelChanged(PlatformImpl.TransparencyLevel);
+        }
+
         /// <summary>
         /// Raises the <see cref="Opened"/> event.
         /// </summary>
@@ -336,8 +455,7 @@ namespace Avalonia.Controls
 
             if (result == null)
             {
-                Logger.TryGet(LogEventLevel.Warning)?.Log(
-                    LogArea.Control,
+                Logger.TryGet(LogEventLevel.Warning, LogArea.Control)?.Log(
                     this,
                     "Could not create {Service} : maybe Application.RegisterServices() wasn't called?",
                     typeof(T));
@@ -359,5 +477,17 @@ namespace Avalonia.Controls
         {
             (this as IInputRoot).MouseDevice.SceneInvalidated(this, e.DirtyRect);
         }
+
+        void PlatformImpl_LostFocus()
+        {
+            var focused = (IVisual)FocusManager.Instance.Current;
+            if (focused == null)
+                return;
+            while (focused.VisualParent != null)
+                focused = focused.VisualParent;
+
+            if (focused == this)
+                KeyboardDevice.Instance.SetFocusedElement(null, NavigationMethod.Unspecified, KeyModifiers.None);
+        }
     }
 }
diff --git a/src/Avalonia.Controls/TreeView.cs b/src/Avalonia.Controls/TreeView.cs
index 59844be8a6..09742412d9 100644
--- a/src/Avalonia.Controls/TreeView.cs
+++ b/src/Avalonia.Controls/TreeView.cs
@@ -1,15 +1,16 @@
 
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Linq;
+using System.Reactive.Linq;
 using Avalonia.Collections;
 using Avalonia.Controls.Generators;
 using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Utils;
+using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
@@ -54,6 +55,7 @@ namespace Avalonia.Controls
         private static readonly IList Empty = Array.Empty<object>();
         private object _selectedItem;
         private IList _selectedItems;
+        private bool _syncingSelectedItems;
 
         /// <summary>
         /// Initializes static members of the <see cref="TreeView"/> class.
@@ -87,8 +89,6 @@ namespace Avalonia.Controls
             set => SetValue(AutoScrollToSelectedItemProperty, value);
         }
 
-        private bool _syncingSelectedItems;
-
         /// <summary>
         /// Gets or sets the selection mode.
         /// </summary>
@@ -101,6 +101,10 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets the selected item.
         /// </summary>
+        /// <remarks>
+        /// Note that setting this property only currently works if the item is expanded to be visible.
+        /// To select non-expanded nodes use `Selection.SelectedIndex`.
+        /// </remarks>
         public object SelectedItem
         {
             get => _selectedItem;
@@ -113,10 +117,8 @@ namespace Avalonia.Controls
                 if (value != null)
                 {
                     if (selectedItems.Count != 1 || selectedItems[0] != value)
-                    {
-                        _syncingSelectedItems = true;
-                        SelectSingleItem(value);
-                        _syncingSelectedItems = false;
+                    {                        
+                        SelectSingleItem(value);                        
                     }
                 }
                 else if (SelectedItems.Count > 0)
@@ -127,7 +129,7 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Gets the selected items.
+        /// Gets or sets the selected items.
         /// </summary>
         public IList SelectedItems
         {
@@ -215,8 +217,12 @@ namespace Avalonia.Controls
 
         private void SelectSingleItem(object item)
         {
-            SelectedItems.Clear();
+            _syncingSelectedItems = true;
+            SelectedItems.Clear();            
             SelectedItems.Add(item);
+            _syncingSelectedItems = false;
+
+            SetAndRaise(SelectedItemProperty, ref _selectedItem, item);            
         }
 
         /// <summary>
@@ -324,8 +330,8 @@ namespace Avalonia.Controls
             {
                 var changed = new SelectionChangedEventArgs(
                     SelectingItemsControl.SelectionChangedEvent,
-                    added ?? Empty,
-                    removed ?? Empty);
+                    removed ?? Empty,
+                    added ?? Empty);
                 RaiseEvent(changed);
             }
         }
@@ -365,7 +371,6 @@ namespace Avalonia.Controls
                 incc.CollectionChanged -= SelectedItemsCollectionChanged;
             }
         }
-
         (bool handled, IInputElement next) ICustomKeyboardNavigation.GetNext(IInputElement element,
             NavigationDirection direction)
         {
@@ -373,10 +378,11 @@ namespace Avalonia.Controls
             {
                 if (!this.IsVisualAncestorOf(element))
                 {
-                    IControl result = _selectedItem != null ?
+                    var result = _selectedItem != null ?
                         ItemContainerGenerator.Index.ContainerFromItem(_selectedItem) :
                         ItemContainerGenerator.ContainerFromIndex(0);
-                    return (true, result);
+                    
+                    return (result != null, result); // SelectedItem may not be in the treeview.
                 }
 
                 return (true, null);
@@ -393,8 +399,7 @@ namespace Avalonia.Controls
                 TreeViewItem.HeaderProperty,
                 TreeViewItem.ItemTemplateProperty,
                 TreeViewItem.ItemsProperty,
-                TreeViewItem.IsExpandedProperty,
-                new TreeContainerIndex());
+                TreeViewItem.IsExpandedProperty);
             result.Index.Materialized += ContainerMaterialized;
             return result;
         }
@@ -407,7 +412,7 @@ namespace Avalonia.Controls
                 e.Handled = UpdateSelectionFromEventSource(
                     e.Source,
                     true,
-                    (e.InputModifiers & InputModifiers.Shift) != 0);
+                    (e.KeyModifiers & KeyModifiers.Shift) != 0);
             }
         }
 
diff --git a/src/Avalonia.Controls/TreeViewItem.cs b/src/Avalonia.Controls/TreeViewItem.cs
index 07d5497c14..8ce258b546 100644
--- a/src/Avalonia.Controls/TreeViewItem.cs
+++ b/src/Avalonia.Controls/TreeViewItem.cs
@@ -1,8 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Linq;
 using Avalonia.Controls.Generators;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
@@ -14,6 +12,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// An item in a <see cref="TreeView"/>.
     /// </summary>
+    [PseudoClasses(":pressed", ":selected")]
     public class TreeViewItem : HeaderedItemsControl, ISelectable
     {
         /// <summary>
@@ -52,8 +51,10 @@ namespace Avalonia.Controls
         static TreeViewItem()
         {
             SelectableMixin.Attach<TreeViewItem>(IsSelectedProperty);
+            PressedMixin.Attach<TreeViewItem>();
             FocusableProperty.OverrideDefaultValue<TreeViewItem>(true);
             ItemsPanelProperty.OverrideDefaultValue<TreeViewItem>(DefaultPanel);
+            ParentProperty.Changed.AddClassHandler<TreeViewItem>((o, e) => o.OnParentChanged(e));
             RequestBringIntoViewEvent.AddClassHandler<TreeViewItem>((x, e) => x.OnRequestBringIntoView(e));
         }
 
@@ -98,17 +99,18 @@ namespace Avalonia.Controls
                 TreeViewItem.HeaderProperty,
                 TreeViewItem.ItemTemplateProperty,
                 TreeViewItem.ItemsProperty,
-                TreeViewItem.IsExpandedProperty,
-                _treeView?.ItemContainerGenerator.Index ?? new TreeContainerIndex());
+                TreeViewItem.IsExpandedProperty);
         }
 
         /// <inheritdoc/>
         protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
         {
             base.OnAttachedToLogicalTree(e);
+            
             _treeView = this.GetLogicalAncestors().OfType<TreeView>().FirstOrDefault();
-
+            
             Level = CalculateDistanceFromLogicalParent<TreeView>(this) - 1;
+            ItemContainerGenerator.UpdateIndex();
 
             if (ItemTemplate == null && _treeView?.ItemTemplate != null)
             {
@@ -119,7 +121,7 @@ namespace Avalonia.Controls
         protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
         {
             base.OnDetachedFromLogicalTree(e);
-            ItemContainerGenerator.Clear();
+            ItemContainerGenerator.UpdateIndex();
         }
 
         protected virtual void OnRequestBringIntoView(RequestBringIntoViewEventArgs e)
@@ -163,9 +165,8 @@ namespace Avalonia.Controls
             // Don't call base.OnKeyDown - let events bubble up to containing TreeView.
         }
 
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
-            base.OnTemplateApplied(e);
             _header = e.NameScope.Find<IControl>("PART_Header");
         }
 
@@ -181,5 +182,16 @@ namespace Avalonia.Controls
 
             return logical != null ? result : @default;
         }
+
+        private void OnParentChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (!((ILogical)this).IsAttachedToLogicalTree && e.NewValue is null)
+            {
+                // If we're not attached to the logical tree, then OnDetachedFromLogicalTree isn't going to be
+                // called when the item is removed. This results in the item not being removed from the index,
+                // causing #3551. In this case, update the index when Parent is changed to null.
+                ItemContainerGenerator.UpdateIndex();
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Controls/UserControl.cs b/src/Avalonia.Controls/UserControl.cs
index 4f15839821..7b9cc2da1c 100644
--- a/src/Avalonia.Controls/UserControl.cs
+++ b/src/Avalonia.Controls/UserControl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Styling;
 
diff --git a/src/Avalonia.Controls/Utils/AncestorFinder.cs b/src/Avalonia.Controls/Utils/AncestorFinder.cs
index d02202ca02..529aec1393 100644
--- a/src/Avalonia.Controls/Utils/AncestorFinder.cs
+++ b/src/Avalonia.Controls/Utils/AncestorFinder.cs
@@ -1,10 +1,8 @@
 using System;
-using System.Linq;
 using System.Reactive;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
-using System.Reflection;
 
 namespace Avalonia.Controls.Utils
 {
@@ -13,14 +11,14 @@ namespace Avalonia.Controls.Utils
         class FinderNode : IDisposable
         {
             private readonly IStyledElement _control;
-            private readonly TypeInfo _ancestorType;
+            private readonly Type _ancestorType;
             public IObservable<IStyledElement> Observable => _subject;
             private readonly Subject<IStyledElement> _subject = new Subject<IStyledElement>();
 
             private FinderNode _child;
             private IDisposable _disposable;
 
-            public FinderNode(IStyledElement control, TypeInfo ancestorType)
+            public FinderNode(IStyledElement control, Type ancestorType)
             {
                 _control = control;
                 _ancestorType = ancestorType;
@@ -33,7 +31,7 @@ namespace Avalonia.Controls.Utils
 
             private void OnValueChanged(IStyledElement next)
             {
-                if (next == null || _ancestorType.IsAssignableFrom(next.GetType().GetTypeInfo()))
+                if (next == null || _ancestorType.IsAssignableFrom(next.GetType()))
                     _subject.OnNext(next);
                 else
                 {
@@ -63,7 +61,7 @@ namespace Avalonia.Controls.Utils
         {
             return new AnonymousObservable<IStyledElement>(observer =>
             {
-                var finder = new FinderNode(control, ancestorType.GetTypeInfo());
+                var finder = new FinderNode(control, ancestorType);
                 var subscription = finder.Observable.Subscribe(observer);
                 finder.Init();
 
diff --git a/src/Avalonia.Controls/Utils/BorderRenderHelper.cs b/src/Avalonia.Controls/Utils/BorderRenderHelper.cs
index a91e6a3a48..3128753781 100644
--- a/src/Avalonia.Controls/Utils/BorderRenderHelper.cs
+++ b/src/Avalonia.Controls/Utils/BorderRenderHelper.cs
@@ -1,20 +1,31 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using Avalonia.Media;
+using Avalonia.Platform;
+using Avalonia.Utilities;
 
 namespace Avalonia.Controls.Utils
 {
     internal class BorderRenderHelper
     {
         private bool _useComplexRendering;
+        private bool? _backendSupportsIndividualCorners;
         private StreamGeometry _backgroundGeometryCache;
         private StreamGeometry _borderGeometryCache;
+        private Size _size;
+        private Thickness _borderThickness;
+        private CornerRadius _cornerRadius;
+        private bool _initialized;
 
-        public void Update(Size finalSize, Thickness borderThickness, CornerRadius cornerRadius)
+        void Update(Size finalSize, Thickness borderThickness, CornerRadius cornerRadius)
         {
-            if (borderThickness.IsUniform && cornerRadius.IsUniform)
+            _backendSupportsIndividualCorners ??= AvaloniaLocator.Current.GetService<IPlatformRenderInterface>()
+                .SupportsIndividualRoundRects;
+            _size = finalSize;
+            _borderThickness = borderThickness;
+            _cornerRadius = cornerRadius;
+            _initialized = true;
+
+            if (borderThickness.IsUniform && (cornerRadius.IsUniform || _backendSupportsIndividualCorners == true))
             {
                 _backgroundGeometryCache = null;
                 _borderGeometryCache = null;
@@ -70,7 +81,19 @@ namespace Avalonia.Controls.Utils
             }
         }
 
-        public void Render(DrawingContext context, Size size, Thickness borders, CornerRadius radii, IBrush background, IBrush borderBrush)
+        public void Render(DrawingContext context,
+            Size finalSize, Thickness borderThickness, CornerRadius cornerRadius,
+            IBrush background, IBrush borderBrush, BoxShadows boxShadows)
+        {
+            if (_size != finalSize
+                || _borderThickness != borderThickness
+                || _cornerRadius != cornerRadius
+                || !_initialized)
+                Update(finalSize, borderThickness, cornerRadius);
+            RenderCore(context, background, borderBrush, boxShadows);
+        }
+
+        void RenderCore(DrawingContext context, IBrush background, IBrush borderBrush, BoxShadows boxShadows)
         {
             if (_useComplexRendering)
             {
@@ -88,27 +111,23 @@ namespace Avalonia.Controls.Utils
             }
             else
             {
-                var borderThickness = borders.Top;
-                var top = borderThickness * 0.5;
-                var cornerRadius = (float)Math.Max(0, radii.TopLeft - borderThickness - top);
+                var borderThickness = _borderThickness.Top;
+                IPen pen = null;
 
-                if (background != null)
+                if (borderThickness > 0)
                 {
-                    var topLeft = new Point(borders.Left, borders.Top);
-                    var bottomRight = new Point(size.Width - borders.Right, size.Height - borders.Bottom);
-                    var innerRect = new Rect(topLeft, bottomRight);
-                    context.FillRectangle(background, innerRect, cornerRadius);
+                    pen = new Pen(borderBrush, borderThickness);
                 }
 
-                if (borderBrush != null && borderThickness > 0)
-                {
-                    var topLeft = new Point(top, top);
-                    var bottomRight = new Point(size.Width - top, size.Height - top);
-                    var outerRect = new Rect(topLeft, bottomRight);
-                    context.DrawRectangle(new Pen(borderBrush, borderThickness), outerRect, (float)radii.TopLeft);
-                }
+                var rect = new Rect(_size);
+                if (!MathUtilities.IsZero(borderThickness))
+                    rect = rect.Deflate(borderThickness * 0.5);
+                var rrect = new RoundedRect(rect, _cornerRadius.TopLeft, _cornerRadius.TopRight,
+                    _cornerRadius.BottomRight, _cornerRadius.BottomLeft);
+
+                context.PlatformImpl.DrawRectangle(background, pen, rrect, boxShadows);
             }
-        }    
+        }
 
         private static void CreateGeometry(StreamGeometryContext context, Rect boundRect, BorderGeometryKeypoints keypoints)
         {
@@ -122,7 +141,7 @@ namespace Avalonia.Controls.Utils
             var radiusY = keypoints.RightTop.Y - boundRect.TopRight.Y;
             if (radiusX != 0 || radiusY != 0)
             {
-                context.ArcTo(keypoints.RightTop, new Size(radiusY, radiusY), 0, false, SweepDirection.Clockwise);
+                context.ArcTo(keypoints.RightTop, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise);
             }
 
             // Right
diff --git a/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs b/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs
new file mode 100644
index 0000000000..c26c5e0513
--- /dev/null
+++ b/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs
@@ -0,0 +1,156 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using Avalonia.Threading;
+using Avalonia.Utilities;
+
+#nullable enable
+
+namespace Avalonia.Controls.Utils
+{
+    internal interface ICollectionChangedListener
+    {
+        void PreChanged(INotifyCollectionChanged sender, NotifyCollectionChangedEventArgs e);
+        void Changed(INotifyCollectionChanged sender, NotifyCollectionChangedEventArgs e);
+        void PostChanged(INotifyCollectionChanged sender, NotifyCollectionChangedEventArgs e);
+    }
+
+    internal class CollectionChangedEventManager
+    {
+        public static CollectionChangedEventManager Instance { get; } = new CollectionChangedEventManager();
+
+        private ConditionalWeakTable<INotifyCollectionChanged, Entry> _entries =
+            new ConditionalWeakTable<INotifyCollectionChanged, Entry>();
+
+        private CollectionChangedEventManager()
+        {
+        }
+
+        public void AddListener(INotifyCollectionChanged collection, ICollectionChangedListener listener)
+        {
+            collection = collection ?? throw new ArgumentNullException(nameof(collection));
+            listener = listener ?? throw new ArgumentNullException(nameof(listener));
+            Dispatcher.UIThread.VerifyAccess();
+
+            if (!_entries.TryGetValue(collection, out var entry))
+            {
+                entry = new Entry(collection);
+                _entries.Add(collection, entry);
+            }
+
+            foreach (var l in entry.Listeners)
+            {
+                if (l.TryGetTarget(out var target) && target == listener)
+                {
+                    throw new InvalidOperationException(
+                        "Collection listener already added for this collection/listener combination.");
+                }
+            }
+
+            entry.Listeners.Add(new WeakReference<ICollectionChangedListener>(listener));
+        }
+
+        public void RemoveListener(INotifyCollectionChanged collection, ICollectionChangedListener listener)
+        {
+            collection = collection ?? throw new ArgumentNullException(nameof(collection));
+            listener = listener ?? throw new ArgumentNullException(nameof(listener));
+            Dispatcher.UIThread.VerifyAccess();
+
+            if (_entries.TryGetValue(collection, out var entry))
+            {
+                var listeners = entry.Listeners;
+
+                for (var i = 0; i < listeners.Count; ++i)
+                {
+                    if (listeners[i].TryGetTarget(out var target) && target == listener)
+                    {
+                        listeners.RemoveAt(i);
+
+                        if (listeners.Count == 0)
+                        {
+                            entry.Dispose();
+                            _entries.Remove(collection);
+                        }
+
+                        return;
+                    }
+                }
+            }
+
+            throw new InvalidOperationException(
+                "Collection listener not registered for this collection/listener combination.");
+        }
+
+        private class Entry : IWeakSubscriber<NotifyCollectionChangedEventArgs>, IDisposable
+        {
+            private INotifyCollectionChanged _collection;
+
+            public Entry(INotifyCollectionChanged collection)
+            {
+                _collection = collection;
+                Listeners = new List<WeakReference<ICollectionChangedListener>>();
+                WeakSubscriptionManager.Subscribe(
+                    _collection,
+                    nameof(INotifyCollectionChanged.CollectionChanged),
+                    this);
+            }
+
+            public List<WeakReference<ICollectionChangedListener>> Listeners { get; }
+
+            public void Dispose()
+            {
+                WeakSubscriptionManager.Unsubscribe(
+                    _collection,
+                    nameof(INotifyCollectionChanged.CollectionChanged),
+                    this);
+            }
+
+            void IWeakSubscriber<NotifyCollectionChangedEventArgs>.OnEvent(object sender, NotifyCollectionChangedEventArgs e)
+            {
+                static void Notify(
+                    INotifyCollectionChanged incc,
+                    NotifyCollectionChangedEventArgs args,
+                    List<WeakReference<ICollectionChangedListener>> listeners)
+                {
+                    foreach (var l in listeners)
+                    {
+                        if (l.TryGetTarget(out var target))
+                        {
+                            target.PreChanged(incc, args);
+                        }
+                    }
+
+                    foreach (var l in listeners)
+                    {
+                        if (l.TryGetTarget(out var target))
+                        {
+                            target.Changed(incc, args);
+                        }
+                    }
+
+                    foreach (var l in listeners)
+                    {
+                        if (l.TryGetTarget(out var target))
+                        {
+                            target.PostChanged(incc, args);
+                        }
+                    }
+                }
+
+                var l = Listeners.ToList();
+
+                if (Dispatcher.UIThread.CheckAccess())
+                {
+                    Notify(_collection, e, l);
+                }
+                else
+                {
+                    var eCapture = e;
+                    Dispatcher.UIThread.Post(() => Notify(_collection, eCapture, l));
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Utils/IEnumerableUtils.cs b/src/Avalonia.Controls/Utils/IEnumerableUtils.cs
index 40ebd406c3..9614d079d9 100644
--- a/src/Avalonia.Controls/Utils/IEnumerableUtils.cs
+++ b/src/Avalonia.Controls/Utils/IEnumerableUtils.cs
@@ -1,8 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace Avalonia.Controls.Utils
@@ -18,12 +16,14 @@ namespace Avalonia.Controls.Utils
         {
             if (items != null)
             {
-                var collection = items as ICollection;
-
-                if (collection != null)
+                if (items is ICollection collection)
                 {
                     return collection.Count;
                 }
+                else if (items is IReadOnlyCollection<object> readOnly)
+                {
+                    return readOnly.Count;
+                }
                 else
                 {
                     return Enumerable.Count(items.Cast<object>());
diff --git a/src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs b/src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs
index 78361fcc8f..7f2008c739 100644
--- a/src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs
+++ b/src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs
@@ -261,7 +261,7 @@ namespace Avalonia.Controls.Utils
                     break;
 
                 case Key.Down:
-                    if ((e.Modifiers & InputModifiers.Alt) == InputModifiers.None)
+                    if ((e.KeyModifiers & KeyModifiers.Alt) == KeyModifiers.None)
                     {
                         SelectedIndexIncrement();
                         e.Handled = true;
diff --git a/src/Avalonia.Controls/Utils/StringUtils.cs b/src/Avalonia.Controls/Utils/StringUtils.cs
index 2304866a85..8cf2e836bb 100644
--- a/src/Avalonia.Controls/Utils/StringUtils.cs
+++ b/src/Avalonia.Controls/Utils/StringUtils.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Globalization;
 
 namespace Avalonia.Controls.Utils
diff --git a/src/Avalonia.Controls/VirtualizingStackPanel.cs b/src/Avalonia.Controls/VirtualizingStackPanel.cs
index 5f7b63c57a..da8bbe4fcf 100644
--- a/src/Avalonia.Controls/VirtualizingStackPanel.cs
+++ b/src/Avalonia.Controls/VirtualizingStackPanel.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Specialized;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index 1816a6c81d..ab99cfad17 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -1,20 +1,20 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
+using Avalonia.Controls.Chrome;
 using Avalonia.Controls.Platform;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
 using Avalonia.Input;
+using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Styling;
-using System.Collections.Generic;
-using System.Linq;
 using JetBrains.Annotations;
-using System.ComponentModel;
-using Avalonia.Interactivity;
 
 namespace Avalonia.Controls
 {
@@ -45,11 +45,37 @@ namespace Avalonia.Controls
         WidthAndHeight = 3,
     }
 
+    /// <summary>
+    /// Determines system decorations (title bar, border, etc) for a <see cref="Window"/>
+    /// </summary>
+    public enum SystemDecorations
+    {
+        /// <summary>
+        /// No decorations
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// Window border without titlebar
+        /// </summary>
+        BorderOnly = 1,
+
+        /// <summary>
+        /// Fully decorated (default)
+        /// </summary>
+        Full = 2
+    }
+
     /// <summary>
     /// A top-level window.
     /// </summary>
     public class Window : WindowBase, IStyleable, IFocusScope, ILayoutRoot
     {
+        private readonly List<(Window child, bool isDialog)> _children = new List<(Window, bool)>();
+        private bool _isExtendedIntoWindowDecorations;
+        private Thickness _windowDecorationMargin;
+        private Thickness _offScreenMargin;
+
         /// <summary>
         /// Defines the <see cref="SizeToContent"/> property.
         /// </summary>
@@ -59,8 +85,55 @@ namespace Avalonia.Controls
         /// <summary>
         /// Enables or disables system window decorations (title bar, buttons, etc)
         /// </summary>
-        public static readonly StyledProperty<bool> HasSystemDecorationsProperty =
-            AvaloniaProperty.Register<Window, bool>(nameof(HasSystemDecorations), true);
+        [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>
+        public static readonly StyledProperty<bool> ExtendClientAreaToDecorationsHintProperty =
+            AvaloniaProperty.Register<Window, bool>(nameof(ExtendClientAreaToDecorationsHint), false);
+
+        public static readonly StyledProperty<ExtendClientAreaChromeHints> ExtendClientAreaChromeHintsProperty =
+            AvaloniaProperty.Register<Window, ExtendClientAreaChromeHints>(nameof(ExtendClientAreaChromeHints), ExtendClientAreaChromeHints.Default);
+
+        public static readonly StyledProperty<double> ExtendClientAreaTitleBarHeightHintProperty =
+            AvaloniaProperty.Register<Window, double>(nameof(ExtendClientAreaTitleBarHeightHint), -1);
+
+        /// <summary>
+        /// Defines the <see cref="IsExtendedIntoWindowDecorations"/> property.
+        /// </summary>
+        public static readonly DirectProperty<Window, bool> IsExtendedIntoWindowDecorationsProperty =
+            AvaloniaProperty.RegisterDirect<Window, bool>(nameof(IsExtendedIntoWindowDecorations),
+                o => o.IsExtendedIntoWindowDecorations,
+                unsetValue: false);
+
+        /// <summary>
+        /// Defines the <see cref="WindowDecorationMargin"/> property.
+        /// </summary>
+        public static readonly DirectProperty<Window, Thickness> WindowDecorationMarginProperty =
+            AvaloniaProperty.RegisterDirect<Window, Thickness>(nameof(WindowDecorationMargin),
+                o => o.WindowDecorationMargin);
+
+        public static readonly DirectProperty<Window, Thickness> OffScreenMarginProperty =
+            AvaloniaProperty.RegisterDirect<Window, Thickness>(nameof(OffScreenMargin),
+                o => o.OffScreenMargin);
+
+        /// <summary>
+        /// Defines the <see cref="SystemDecorations"/> property.
+        /// </summary>
+        public static readonly StyledProperty<SystemDecorations> SystemDecorationsProperty =
+            AvaloniaProperty.Register<Window, SystemDecorations>(nameof(SystemDecorations), SystemDecorations.Full);
+
+        /// <summary>
+        /// Defines the <see cref="ShowActivated"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> ShowActivatedProperty =
+            AvaloniaProperty.Register<Window, bool>(nameof(ShowActivated), true);
 
         /// <summary>
         /// Enables or disables the taskbar icon
@@ -103,7 +176,7 @@ namespace Avalonia.Controls
         /// </summary>
         public static readonly RoutedEvent WindowClosedEvent =
             RoutedEvent.Register<Window, RoutedEventArgs>("WindowClosed", RoutingStrategies.Direct);
-        
+
         /// <summary>
         /// Routed event that can be used for global tracking of opening windows
         /// </summary>
@@ -124,23 +197,34 @@ namespace Avalonia.Controls
         {
             BackgroundProperty.OverrideDefaultValue(typeof(Window), Brushes.White);
             TitleProperty.Changed.AddClassHandler<Window>((s, e) => s.PlatformImpl?.SetTitle((string)e.NewValue));
-            HasSystemDecorationsProperty.Changed.AddClassHandler<Window>(
-                (s, e) => s.PlatformImpl?.SetSystemDecorations((bool)e.NewValue));
-
             ShowInTaskbarProperty.Changed.AddClassHandler<Window>((w, e) => w.PlatformImpl?.ShowTaskbarIcon((bool)e.NewValue));
 
-            IconProperty.Changed.AddClassHandler<Window>((s, e) => s.PlatformImpl?.SetIcon(((WindowIcon)e.NewValue).PlatformImpl));
+            IconProperty.Changed.AddClassHandler<Window>((s, e) => s.PlatformImpl?.SetIcon(((WindowIcon)e.NewValue)?.PlatformImpl));
 
             CanResizeProperty.Changed.AddClassHandler<Window>((w, e) => w.PlatformImpl?.CanResize((bool)e.NewValue));
 
             WindowStateProperty.Changed.AddClassHandler<Window>(
                 (w, e) => { if (w.PlatformImpl != null) w.PlatformImpl.WindowState = (WindowState)e.NewValue; });
-            
+
+            ExtendClientAreaToDecorationsHintProperty.Changed.AddClassHandler<Window>(
+                (w, e) => { if (w.PlatformImpl != null) w.PlatformImpl.SetExtendClientAreaToDecorationsHint((bool)e.NewValue); });
+
+            ExtendClientAreaChromeHintsProperty.Changed.AddClassHandler<Window>(
+                (w, e) =>
+                {
+                    if (w.PlatformImpl != null)
+                    {
+                        w.PlatformImpl.SetExtendClientAreaChromeHints((ExtendClientAreaChromeHints)e.NewValue);
+                    }
+                });
+
+            ExtendClientAreaTitleBarHeightHintProperty.Changed.AddClassHandler<Window>(
+                (w, e) => { if (w.PlatformImpl != null) w.PlatformImpl.SetExtendClientAreaTitleBarHeightHint((double)e.NewValue); });
+
             MinWidthProperty.Changed.AddClassHandler<Window>((w, e) => w.PlatformImpl?.SetMinMaxSize(new Size((double)e.NewValue, w.MinHeight), new Size(w.MaxWidth, w.MaxHeight)));
             MinHeightProperty.Changed.AddClassHandler<Window>((w, e) => w.PlatformImpl?.SetMinMaxSize(new Size(w.MinWidth, (double)e.NewValue), new Size(w.MaxWidth, w.MaxHeight)));
             MaxWidthProperty.Changed.AddClassHandler<Window>((w, e) => w.PlatformImpl?.SetMinMaxSize(new Size(w.MinWidth, w.MinHeight), new Size((double)e.NewValue, w.MaxHeight)));
             MaxHeightProperty.Changed.AddClassHandler<Window>((w, e) => w.PlatformImpl?.SetMinMaxSize(new Size(w.MinWidth, w.MinHeight), new Size(w.MaxWidth, (double)e.NewValue)));
-
         }
 
         /// <summary>
@@ -159,9 +243,13 @@ namespace Avalonia.Controls
             : base(impl)
         {
             impl.Closing = HandleClosing;
+            impl.GotInputWhenDisabled = OnGotInputWhenDisabled;
             impl.WindowStateChanged = HandleWindowStateChanged;
-            _maxPlatformClientSize = PlatformImpl?.MaxClientSize ?? default(Size);
+            _maxPlatformClientSize = PlatformImpl?.MaxAutoSizeHint ?? default(Size);
+            impl.ExtendClientAreaToDecorationsChanged = ExtendClientAreaToDecorationsChanged;            
             this.GetObservable(ClientSizeProperty).Skip(1).Subscribe(x => PlatformImpl?.Resize(x));
+
+            PlatformImpl?.ShowTaskbarIcon(ShowInTaskbar);
         }
 
         /// <summary>
@@ -191,11 +279,98 @@ namespace Avalonia.Controls
         /// <summary>
         /// Enables or disables system window decorations (title bar, buttons, etc)
         /// </summary>
-        /// 
+        [Obsolete("Use SystemDecorations instead")]
         public bool HasSystemDecorations
         {
-            get { return GetValue(HasSystemDecorationsProperty); }
-            set { SetValue(HasSystemDecorationsProperty, value); }
+            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>
+        public bool ExtendClientAreaToDecorationsHint
+        {
+            get { return GetValue(ExtendClientAreaToDecorationsHintProperty); }
+            set { SetValue(ExtendClientAreaToDecorationsHintProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or Sets the <see cref="Avalonia.Platform.ExtendClientAreaChromeHints"/> that control
+        /// how the chrome looks when the client area is extended.
+        /// </summary>
+        public ExtendClientAreaChromeHints ExtendClientAreaChromeHints
+        {
+            get => GetValue(ExtendClientAreaChromeHintsProperty);
+            set => SetValue(ExtendClientAreaChromeHintsProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or Sets the TitlebarHeightHint for when the client area is extended.
+        /// A value of -1 will cause the titlebar to be auto sized to the OS default.
+        /// Any other positive value will cause the titlebar to assume that height.
+        /// </summary>
+        public double ExtendClientAreaTitleBarHeightHint
+        {
+            get => GetValue(ExtendClientAreaTitleBarHeightHintProperty);
+            set => SetValue(ExtendClientAreaTitleBarHeightHintProperty, value);
+        }        
+
+        /// <summary>
+        /// Gets if the ClientArea is Extended into the Window Decorations.
+        /// </summary>
+        public bool IsExtendedIntoWindowDecorations
+        {
+            get => _isExtendedIntoWindowDecorations;
+            private set => SetAndRaise(IsExtendedIntoWindowDecorationsProperty, ref _isExtendedIntoWindowDecorations, value);
+        }        
+
+        /// <summary>
+        /// Gets the WindowDecorationMargin.
+        /// This tells you the thickness around the window that is used by borders and the titlebar.
+        /// </summary>
+        public Thickness WindowDecorationMargin
+        {
+            get => _windowDecorationMargin;
+            private set => SetAndRaise(WindowDecorationMarginProperty, ref _windowDecorationMargin, value);
+        }        
+
+        /// <summary>
+        /// Gets the window margin that is hidden off the screen area.
+        /// This is generally only the case on Windows when in Maximized where the window border
+        /// is hidden off the screen. This Margin may be used to ensure user content doesnt overlap this space.
+        /// </summary>
+        public Thickness OffScreenMargin
+        {
+            get => _offScreenMargin;
+            private set => SetAndRaise(OffScreenMarginProperty, ref _offScreenMargin, value);
+        }
+
+        /// <summary>
+        /// Sets the system decorations (title bar, border, etc)
+        /// </summary>
+        public SystemDecorations SystemDecorations
+        {
+            get { return GetValue(SystemDecorationsProperty); }
+            set { SetValue(SystemDecorationsProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value that indicates whether a window is activated when first shown. 
+        /// </summary>
+        public bool ShowActivated
+        {
+            get { return GetValue(ShowActivatedProperty); }
+            set { SetValue(ShowActivatedProperty, value); }
         }
 
         /// <summary>
@@ -257,7 +432,7 @@ namespace Avalonia.Controls
                 PlatformImpl?.Move(value);
             }
         }
-        
+
         /// <summary>
         /// Starts moving a window with left button being held. Should be called from left mouse button press event handler
         /// </summary>
@@ -268,24 +443,6 @@ namespace Avalonia.Controls
         /// Should be called from left mouse button press event handler
         /// </summary>
         public void BeginResizeDrag(WindowEdge edge, PointerPressedEventArgs e) => PlatformImpl?.BeginResizeDrag(edge, e);
-        
-        /// <summary>
-        /// Carries out the arrange pass of the window.
-        /// </summary>
-        /// <param name="finalSize">The final window size.</param>
-        /// <returns>The <paramref name="finalSize"/> parameter unchanged.</returns>
-        protected override Size ArrangeOverride(Size finalSize)
-        {
-            using (BeginAutoSizing())
-            {
-                PlatformImpl?.Resize(finalSize);
-            }
-
-            return base.ArrangeOverride(PlatformImpl?.ClientSize ?? default(Size));
-        }
-        
-        /// <inheritdoc/>
-        Size ILayoutRoot.MaxClientSize => _maxPlatformClientSize;
 
         /// <inheritdoc/>
         Type IStyleable.StyleKey => typeof(Window);
@@ -293,7 +450,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Fired before a window is closed.
         /// </summary>
-        public event EventHandler<CancelEventArgs> Closing;      
+        public event EventHandler<CancelEventArgs> Closing;
 
         /// <summary>
         /// Closes the window.
@@ -308,7 +465,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="dialogResult">The dialog result.</param>
         /// <remarks>
-        /// When the window is shown with the <see cref="ShowDialog{TResult}(IWindowImpl)"/>
+        /// When the window is shown with the <see cref="ShowDialog{TResult}(Window)"/>
         /// or <see cref="ShowDialog{TResult}(Window)"/> method, the
         /// resulting task will produce the <see cref="_dialogResult"/> value when the window
         /// is closed.
@@ -335,20 +492,59 @@ namespace Avalonia.Controls
             {
                 if (close)
                 {
-                    PlatformImpl?.Dispose();
-                    HandleClosed();
+                    CloseInternal();
                 }
             }
         }
 
+        private void CloseInternal()
+        {
+            foreach (var (child, _) in _children.ToList())
+            {
+                // if we HandleClosing() before then there will be no children.
+                child.CloseInternal();
+            }
+
+            if (Owner is Window owner)
+            {
+                owner.RemoveChild(this);
+            }
+
+            Owner = null;
+
+            PlatformImpl?.Dispose();
+        }
+
         /// <summary>
         /// Handles a closing notification from <see cref="IWindowImpl.Closing"/>.
         /// </summary>
         protected virtual bool HandleClosing()
         {
-            var args = new CancelEventArgs();
-            OnClosing(args);
-            return args.Cancel;
+            bool canClose = true;
+
+            foreach (var (child, _) in _children.ToList())
+            {
+                if (!child.HandleClosing())
+                {
+                    child.CloseInternal();
+                }
+                else
+                {
+                    canClose = false;
+                }
+            }
+
+            if (canClose)
+            {
+                var args = new CancelEventArgs();
+                OnClosing(args);
+
+                return args.Cancel;
+            }
+            else
+            {
+                return !canClose;
+            }
         }
 
         protected virtual void HandleWindowStateChanged(WindowState state)
@@ -365,6 +561,13 @@ namespace Avalonia.Controls
             }
         }
 
+        protected virtual void ExtendClientAreaToDecorationsChanged(bool isExtended)
+        {
+            IsExtendedIntoWindowDecorations = isExtended;
+            WindowDecorationMargin = PlatformImpl.ExtendedMargins;
+            OffScreenMargin = PlatformImpl.OffScreenMargin;
+        }
+
         /// <summary>
         /// Hides the window but does not close it.
         /// </summary>
@@ -378,6 +581,14 @@ namespace Avalonia.Controls
             using (BeginAutoSizing())
             {
                 Renderer?.Stop();
+
+                if (Owner is Window owner)
+                {
+                    owner.RemoveChild(this);
+                }
+
+                Owner = null;
+
                 PlatformImpl?.Hide();
             }
 
@@ -391,6 +602,28 @@ namespace Avalonia.Controls
         /// The window has already been closed.
         /// </exception>
         public override void Show()
+        {
+            ShowCore(null);
+        }
+
+        /// <summary>
+        /// Shows the window as a child of <paramref name="parent"/>.
+        /// </summary>
+        /// <param name="parent">Window that will be a parent of the shown window.</param>
+        /// <exception cref="InvalidOperationException">
+        /// The window has already been closed.
+        /// </exception>
+        public void Show(Window parent)
+        {
+            if (parent is null)
+            {
+                throw new ArgumentNullException(nameof(parent), "Showing a child window requires valid parent.");
+            }
+
+            ShowCore(parent);
+        }
+
+        private void ShowCore(Window parent)
         {
             if (PlatformImpl == null)
             {
@@ -402,18 +635,39 @@ namespace Avalonia.Controls
                 return;
             }
 
-            this.RaiseEvent(new RoutedEventArgs(WindowOpenedEvent));
+            RaiseEvent(new RoutedEventArgs(WindowOpenedEvent));
 
             EnsureInitialized();
             IsVisible = true;
-            LayoutManager.ExecuteInitialLayoutPass(this);
+
+            var initialSize = new Size(
+                double.IsNaN(Width) ? ClientSize.Width : Width,
+                double.IsNaN(Height) ? ClientSize.Height : Height);
+
+            if (initialSize != ClientSize)
+            {
+                using (BeginAutoSizing())
+                {
+                    PlatformImpl?.Resize(initialSize);
+                }
+            }
+
+            LayoutManager.ExecuteInitialLayoutPass();
 
             using (BeginAutoSizing())
             {
-                PlatformImpl?.Show();
+                if (parent != null)
+                {
+                    PlatformImpl?.SetParent(parent.PlatformImpl);
+                }
+                
+                Owner = parent;
+                parent?.AddChild(this, false);
+
+                PlatformImpl?.Show(ShowActivated);
                 Renderer?.Start();
+                SetWindowStartupLocation(Owner?.PlatformImpl);
             }
-            SetWindowStartupLocation(Owner?.PlatformImpl);
             OnOpened(EventArgs.Empty);
         }
 
@@ -442,22 +696,12 @@ namespace Avalonia.Controls
         /// <returns>.
         /// A task that can be used to retrieve the result of the dialog when it closes.
         /// </returns>
-        public Task<TResult> ShowDialog<TResult>(Window owner) => ShowDialog<TResult>(owner.PlatformImpl);
-
-        /// <summary>
-        /// Shows the window as a dialog.
-        /// </summary>
-        /// <typeparam name="TResult">
-        /// The type of the result produced by the dialog.
-        /// </typeparam>
-        /// <param name="owner">The dialog's owner window.</param>
-        /// <returns>.
-        /// A task that can be used to retrieve the result of the dialog when it closes.
-        /// </returns>
-        public Task<TResult> ShowDialog<TResult>(IWindowImpl owner)
+        public Task<TResult> ShowDialog<TResult>(Window owner)
         {
             if (owner == null)
+            {
                 throw new ArgumentNullException(nameof(owner));
+            }
 
             if (IsVisible)
             {
@@ -468,35 +712,113 @@ namespace Avalonia.Controls
 
             EnsureInitialized();
             IsVisible = true;
-            LayoutManager.ExecuteInitialLayoutPass(this);
+
+            var initialSize = new Size(
+                double.IsNaN(Width) ? ClientSize.Width : Width,
+                double.IsNaN(Height) ? ClientSize.Height : Height);
+
+            if (initialSize != ClientSize)
+            {
+                using (BeginAutoSizing())
+                {
+                    PlatformImpl?.Resize(initialSize);
+                }
+            }
+
+            LayoutManager.ExecuteInitialLayoutPass();
 
             var result = new TaskCompletionSource<TResult>();
 
             using (BeginAutoSizing())
             {
-
-                PlatformImpl?.ShowDialog(owner);
+                PlatformImpl?.SetParent(owner.PlatformImpl);
+                Owner = owner;
+                owner.AddChild(this, true);
+                PlatformImpl?.Show(ShowActivated);
 
                 Renderer?.Start();
+
                 Observable.FromEventPattern<EventHandler, EventArgs>(
-                    x => this.Closed += x,
-                    x => this.Closed -= x)
+                        x => Closed += x,
+                        x => Closed -= x)
                     .Take(1)
                     .Subscribe(_ =>
                     {
                         owner.Activate();
                         result.SetResult((TResult)(_dialogResult ?? default(TResult)));
                     });
+
                 OnOpened(EventArgs.Empty);
             }
 
-            SetWindowStartupLocation(owner);
+            SetWindowStartupLocation(owner.PlatformImpl);
+
             return result.Task;
         }
 
+        private void UpdateEnabled()
+        {
+            bool isEnabled = true;
+
+            foreach (var (_, isDialog)  in _children)
+            {
+                if (isDialog)
+                {
+                    isEnabled = false;
+                    break;
+                }
+            }
+
+            PlatformImpl.SetEnabled(isEnabled);
+        }
+
+        private void AddChild(Window window, bool isDialog)
+        {
+            _children.Add((window, isDialog));
+            UpdateEnabled();
+        }
+
+        private void RemoveChild(Window window)
+        {
+            for (int i = _children.Count - 1; i >= 0; i--)
+            {
+                var (child, _) = _children[i];
+
+                if (ReferenceEquals(child, window))
+                {
+                    _children.RemoveAt(i);
+                }
+            }
+
+            UpdateEnabled();
+        }
+
+        private void OnGotInputWhenDisabled()
+        {
+            Window firstDialogChild = null;
+
+            foreach (var (child, isDialog)  in _children)
+            {
+                if (isDialog)
+                {
+                    firstDialogChild = child;
+                    break;
+                }
+            }
+
+            if (firstDialogChild != null)
+            {
+                firstDialogChild.OnGotInputWhenDisabled();
+            }
+            else
+            {
+                Activate();
+            }
+        }
+
         private void SetWindowStartupLocation(IWindowBaseImpl owner = null)
         {
-            var scaling = owner?.Scaling ?? PlatformImpl?.Scaling ?? 1;
+            var scaling = owner?.DesktopScaling ?? PlatformImpl?.DesktopScaling ?? 1;
 
             // TODO: We really need non-client size here.
             var rect = new PixelRect(
@@ -525,43 +847,73 @@ namespace Avalonia.Controls
             }
         }
 
-        /// <inheritdoc/>
         protected override Size MeasureOverride(Size availableSize)
         {
             var sizeToContent = SizeToContent;
             var clientSize = ClientSize;
-            Size constraint = clientSize;
+            var constraint = clientSize;
+            var maxAutoSize = PlatformImpl?.MaxAutoSizeHint ?? Size.Infinity;
 
-            if ((sizeToContent & SizeToContent.Width) != 0)
+            if (sizeToContent.HasFlagCustom(SizeToContent.Width))
             {
-                constraint = constraint.WithWidth(double.PositiveInfinity);
+                constraint = constraint.WithWidth(maxAutoSize.Width);
             }
 
-            if ((sizeToContent & SizeToContent.Height) != 0)
+            if (sizeToContent.HasFlagCustom(SizeToContent.Height))
             {
-                constraint = constraint.WithHeight(double.PositiveInfinity);
+                constraint = constraint.WithHeight(maxAutoSize.Height);
             }
 
             var result = base.MeasureOverride(constraint);
 
-            if ((sizeToContent & SizeToContent.Width) == 0)
+            if (!sizeToContent.HasFlagCustom(SizeToContent.Width))
             {
-                result = result.WithWidth(clientSize.Width);
+                if (!double.IsInfinity(availableSize.Width))
+                {
+                    result = result.WithWidth(availableSize.Width);
+                }
+                else
+                {
+                    result = result.WithWidth(clientSize.Width);
+                }
             }
 
-            if ((sizeToContent & SizeToContent.Height) == 0)
+            if (!sizeToContent.HasFlagCustom(SizeToContent.Height))
             {
-                result = result.WithHeight(clientSize.Height);
+                if (!double.IsInfinity(availableSize.Height))
+                {
+                    result = result.WithHeight(availableSize.Height);
+                }
+                else
+                {
+                    result = result.WithHeight(clientSize.Height);
+                }
             }
 
             return result;
         }
 
+        protected sealed override Size ArrangeSetBounds(Size size)
+        {
+            using (BeginAutoSizing())
+            {
+                PlatformImpl?.Resize(size);
+                return ClientSize;
+            }
+        }
+
         protected sealed override void HandleClosed()
         {
             RaiseEvent(new RoutedEventArgs(WindowClosedEvent));
 
             base.HandleClosed();
+
+            if (Owner is Window owner)
+            {
+                owner.RemoveChild(this);
+            }
+
+            Owner = null;
         }
 
         /// <inheritdoc/>
@@ -572,6 +924,9 @@ namespace Avalonia.Controls
                 SizeToContent = SizeToContent.Manual;
             }
 
+            Width = clientSize.Width;
+            Height = clientSize.Height;
+
             base.HandleResized(clientSize);
         }
 
@@ -585,5 +940,25 @@ namespace Avalonia.Controls
         /// <see cref="Closing"/> event needs to be raised.
         /// </remarks>
         protected virtual void OnClosing(CancelEventArgs e) => Closing?.Invoke(this, e);
+
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        {
+            if (change.Property == SystemDecorationsProperty)
+            {
+                var typedNewValue = change.NewValue.GetValueOrDefault<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
+                }
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Controls/WindowBase.cs b/src/Avalonia.Controls/WindowBase.cs
index 196110edf7..cdcb499e98 100644
--- a/src/Avalonia.Controls/WindowBase.cs
+++ b/src/Avalonia.Controls/WindowBase.cs
@@ -39,6 +39,7 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<bool> TopmostProperty =
             AvaloniaProperty.Register<WindowBase, bool>(nameof(Topmost));
 
+        private int _autoSizing;
         private bool _hasExecutedInitialLayoutPass;
         private bool _isActive;
         private bool _ignoreVisibilityChange;
@@ -97,11 +98,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Whether an auto-size operation is in progress.
         /// </summary>
-        protected bool AutoSizing
-        {
-            get;
-            private set;
-        }
+        protected bool AutoSizing => _autoSizing > 0;
 
         /// <summary>
         /// Gets or sets the owner of the window.
@@ -109,7 +106,7 @@ namespace Avalonia.Controls
         public WindowBase Owner
         {
             get { return _owner; }
-            set { SetAndRaise(OwnerProperty, ref _owner, value); }
+            protected set { SetAndRaise(OwnerProperty, ref _owner, value); }
         }
 
         /// <summary>
@@ -162,10 +159,10 @@ namespace Avalonia.Controls
 
                 if (!_hasExecutedInitialLayoutPass)
                 {
-                    LayoutManager.ExecuteInitialLayoutPass(this);
+                    LayoutManager.ExecuteInitialLayoutPass();
                     _hasExecutedInitialLayoutPass = true;
                 }
-                PlatformImpl?.Show();
+                PlatformImpl?.Show(true);
                 Renderer?.Start();
                 OnOpened(EventArgs.Empty);
             }
@@ -186,8 +183,8 @@ namespace Avalonia.Controls
         /// </remarks>
         protected IDisposable BeginAutoSizing()
         {
-            AutoSizing = true;
-            return Disposable.Create(() => AutoSizing = false);
+            ++_autoSizing;
+            return Disposable.Create(() => --_autoSizing);
         }
 
         /// <summary>
@@ -224,16 +221,54 @@ namespace Avalonia.Controls
         /// <param name="clientSize">The new client size.</param>
         protected override void HandleResized(Size clientSize)
         {
-            if (!AutoSizing)
-            {
-                Width = clientSize.Width;
-                Height = clientSize.Height;
-            }
             ClientSize = clientSize;
             LayoutManager.ExecuteLayoutPass();
             Renderer?.Resized(clientSize);
         }
 
+        /// <summary>
+        /// Overrides the core measure logic for windows.
+        /// </summary>
+        /// <param name="availableSize">The available size.</param>
+        /// <returns>The measured size.</returns>
+        /// <remarks>
+        /// The layout logic for top-level windows is different than for other controls because
+        /// they don't have a parent, meaning that many layout properties handled by the default
+        /// MeasureCore (such as margins and alignment) make no sense.
+        /// </remarks>
+        protected override Size MeasureCore(Size availableSize)
+        {
+            ApplyStyling();
+            ApplyTemplate();
+
+            var constraint = LayoutHelper.ApplyLayoutConstraints(this, availableSize);
+
+            return MeasureOverride(constraint);
+        }
+
+        /// <summary>
+        /// Overrides the core arrange logic for windows.
+        /// </summary>
+        /// <param name="finalRect">The final arrange rect.</param>
+        /// <remarks>
+        /// The layout logic for top-level windows is different than for other controls because
+        /// they don't have a parent, meaning that many layout properties handled by the default
+        /// ArrangeCore (such as margins and alignment) make no sense.
+        /// </remarks>
+        protected override void ArrangeCore(Rect finalRect)
+        {
+            var constraint = ArrangeSetBounds(finalRect.Size);
+            var arrangeSize = ArrangeOverride(constraint);
+            Bounds = new Rect(arrangeSize);
+        }
+
+        /// <summary>
+        /// Called durung the arrange pass to set the size of the window.
+        /// </summary>
+        /// <param name="size">The requested size of the window.</param>
+        /// <returns>The actual size of the window.</returns>
+        protected virtual Size ArrangeSetBounds(Size size) => size;
+
         /// <summary>
         /// Handles a window position change notification from 
         /// <see cref="IWindowBaseImpl.PositionChanged"/>.
@@ -255,7 +290,7 @@ namespace Avalonia.Controls
 
             if (scope != null)
             {
-                FocusManager.Instance.SetFocusScope(scope);
+                FocusManager.Instance?.SetFocusScope(scope);
             }
 
             IsActive = true;
diff --git a/src/Avalonia.Controls/WindowState.cs b/src/Avalonia.Controls/WindowState.cs
index d7becddb25..777b52dc11 100644
--- a/src/Avalonia.Controls/WindowState.cs
+++ b/src/Avalonia.Controls/WindowState.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Controls
 {
     /// <summary>
@@ -22,5 +19,10 @@ namespace Avalonia.Controls
         /// The window is maximized.
         /// </summary>
         Maximized,
+
+        /// <summary>
+        /// The window is fullscreen.
+        /// </summary>
+        FullScreen,
     }
 }
diff --git a/src/Avalonia.Controls/WindowTransparencyLevel.cs b/src/Avalonia.Controls/WindowTransparencyLevel.cs
new file mode 100644
index 0000000000..ce7c03efbb
--- /dev/null
+++ b/src/Avalonia.Controls/WindowTransparencyLevel.cs
@@ -0,0 +1,25 @@
+namespace Avalonia.Controls
+{
+    public enum WindowTransparencyLevel
+    {
+        /// <summary>
+        /// The window background is Black where nothing is drawn in the window.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// The window background is Transparent where nothing is drawn in the window.
+        /// </summary>
+        Transparent,
+
+        /// <summary>
+        /// The window background is a blur-behind where nothing is drawn in the window.
+        /// </summary>
+        Blur,
+
+        /// <summary>
+        /// The window background is a blur-behind with a high blur radius. This level may fallback to Blur.
+        /// </summary>
+        AcrylicBlur
+    }
+}
diff --git a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
index 2c5aaf1a70..35bd0f97e1 100644
--- a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
+++ b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
@@ -8,8 +8,12 @@
     -->
     <Version>0.7.0</Version>
     <NoWarn>CS1591</NoWarn>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <NugetPackageName>Avalonia</NugetPackageName>
   </PropertyGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Remote\HtmlTransport\webapp\build\**\*.gz" />
+    <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" />
@@ -23,4 +27,5 @@
     <ProjectReference Include="..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>
diff --git a/src/Avalonia.DesignerSupport/DesignWindowLoader.cs b/src/Avalonia.DesignerSupport/DesignWindowLoader.cs
index f3bb0edce5..b009778f97 100644
--- a/src/Avalonia.DesignerSupport/DesignWindowLoader.cs
+++ b/src/Avalonia.DesignerSupport/DesignWindowLoader.cs
@@ -18,10 +18,11 @@ namespace Avalonia.DesignerSupport
             Control control;
             using (PlatformManager.DesignerMode())
             {
-                var loader = new AvaloniaXamlLoader() {IsDesignMode = true};
+                var loader = AvaloniaLocator.Current.GetService<AvaloniaXamlLoader.IRuntimeXamlLoader>();
                 var stream = new MemoryStream(Encoding.UTF8.GetBytes(xaml));
 
-
+                if (loader == null)
+                    throw new XamlLoadException("Runtime XAML loader is not registered");
                 
                 Uri baseUri = null;
                 if (assemblyPath != null)
@@ -34,7 +35,7 @@ namespace Avalonia.DesignerSupport
                 }
 
                 var localAsm = assemblyPath != null ? Assembly.LoadFile(Path.GetFullPath(assemblyPath)) : null;
-                var loaded = loader.Load(stream, localAsm, null, baseUri);
+                var loaded = loader.Load(stream, localAsm, null, baseUri, true);
                 var style = loaded as IStyle;
                 if (style != null)
                 {
@@ -68,6 +69,8 @@ namespace Avalonia.DesignerSupport
                     window = new Window() {Content = (Control)control};
                 }
 
+                Design.ApplyDesignModeProperties(window, control);
+
                 if (!window.IsSet(Window.SizeToContentProperty))
                 {
                     if (double.IsNaN(window.Width))
@@ -82,7 +85,6 @@ namespace Avalonia.DesignerSupport
                 }
             }
             window.Show();
-            Design.ApplyDesignModeProperties(window, control);
             return window;
         }
     }
diff --git a/src/Avalonia.DesignerSupport/Remote/DetachableTransportConnection.cs b/src/Avalonia.DesignerSupport/Remote/DetachableTransportConnection.cs
index 9c125448a0..eb91622543 100644
--- a/src/Avalonia.DesignerSupport/Remote/DetachableTransportConnection.cs
+++ b/src/Avalonia.DesignerSupport/Remote/DetachableTransportConnection.cs
@@ -35,5 +35,7 @@ namespace Avalonia.DesignerSupport.Remote
             add {}
             remove {}
         }
+
+        public void Start() => _inner?.Start();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.DesignerSupport/Remote/FileWatcherTransport.cs b/src/Avalonia.DesignerSupport/Remote/FileWatcherTransport.cs
new file mode 100644
index 0000000000..0448a5c05d
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/FileWatcherTransport.cs
@@ -0,0 +1,96 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Avalonia.Remote.Protocol;
+using Avalonia.Remote.Protocol.Designer;
+using Avalonia.Threading;
+
+namespace Avalonia.DesignerSupport.Remote
+{
+    class FileWatcherTransport : IAvaloniaRemoteTransportConnection, ITransportWithEnforcedMethod
+    {
+        private readonly string _appPath;
+        private string _path;
+        private string _lastContents;
+        private bool _disposed;
+
+        public FileWatcherTransport(Uri file, string appPath)
+        {
+            _appPath = appPath;
+            _path = file.LocalPath;
+        }
+
+        public void Dispose()
+        {
+            _disposed = true;
+        }
+
+        void Dump(object o, string pad)
+        {
+            foreach (var p in o.GetType().GetProperties())
+            {
+                Console.Write($"{pad}{p.Name}: ");
+                var v = p.GetValue(o);
+                if (v == null || v.GetType().IsPrimitive || v is string || v is Guid)
+                    Console.WriteLine(v);
+                else
+                {
+                    Console.WriteLine();
+                    Dump(v, pad + "    ");
+                }
+            }
+        }
+            
+        
+        public Task Send(object data)
+        {
+            Console.WriteLine(data.GetType().Name);
+            Dump(data, "    ");
+            return Task.CompletedTask;
+        }
+
+        private Action<IAvaloniaRemoteTransportConnection, object> _onMessage;
+        public event Action<IAvaloniaRemoteTransportConnection, object> OnMessage
+        {
+            add
+            {
+                _onMessage+=value;
+            }
+            remove { _onMessage -= value; }
+        }
+
+        public event Action<IAvaloniaRemoteTransportConnection, Exception> OnException;
+        public void Start()
+        {
+            UpdaterThread();
+        }
+
+        // I couldn't get FileSystemWatcher working on Linux, so I came up with this abomination
+        async void UpdaterThread()
+        {
+            while (!_disposed)
+            {
+                var data = File.ReadAllText(_path);
+                if (data != _lastContents)
+                {
+                    Console.WriteLine("Triggering XAML update");
+                    _lastContents = data;
+                    _onMessage?.Invoke(this, new UpdateXamlMessage
+                    {
+                        Xaml = data,
+                        AssemblyPath = _appPath
+                    });
+                }
+
+                await Task.Delay(100);
+            }
+        }
+
+        public string PreviewerMethod => RemoteDesignerEntryPoint.Methods.Html;
+    }
+
+    interface ITransportWithEnforcedMethod
+    {
+        string PreviewerMethod { get; }
+    }
+}
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/HtmlTransport.cs b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/HtmlTransport.cs
new file mode 100644
index 0000000000..804bb09510
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/HtmlTransport.cs
@@ -0,0 +1,336 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Remote.Protocol;
+using Avalonia.Remote.Protocol.Viewport;
+using InputProtocol = Avalonia.Remote.Protocol.Input;
+
+namespace Avalonia.DesignerSupport.Remote.HtmlTransport
+{
+    public class HtmlWebSocketTransport : IAvaloniaRemoteTransportConnection
+    {
+        private readonly IAvaloniaRemoteTransportConnection _signalTransport;
+        private readonly SimpleWebSocketHttpServer _simpleServer;
+        private readonly Dictionary<string, byte[]> _resources;
+        private SimpleWebSocket _pendingSocket;
+        private bool _disposed;
+        private object _lock = new object();
+        private AutoResetEvent _wakeup = new AutoResetEvent(false);
+        private FrameMessage _lastFrameMessage = null;
+        private FrameMessage _lastSentFrameMessage = null;
+        private RequestViewportResizeMessage _lastViewportRequest;
+        private Action<IAvaloniaRemoteTransportConnection, object> _onMessage;
+        private Action<IAvaloniaRemoteTransportConnection, Exception> _onException;
+        
+        private static readonly Dictionary<string, string> Mime = new Dictionary<string, string>
+        {
+            ["html"] = "text/html", ["htm"] = "text/html", ["js"] = "text/javascript", ["css"] = "text/css"
+        };
+
+        private static readonly byte[] NotFound = Encoding.UTF8.GetBytes("404 - Not Found");
+        
+
+        public HtmlWebSocketTransport(IAvaloniaRemoteTransportConnection signalTransport, Uri listenUri)
+        {
+            if (listenUri.Scheme != "http")
+                throw new ArgumentException("URI scheme is not HTTP.", nameof(listenUri));
+
+            var resourcePrefix = "Avalonia.DesignerSupport.Remote.HtmlTransport.webapp.build.";
+            _resources = typeof(HtmlWebSocketTransport).Assembly.GetManifestResourceNames()
+                .Where(r => r.StartsWith(resourcePrefix, StringComparison.OrdinalIgnoreCase)
+                         && r.EndsWith(".gz", StringComparison.OrdinalIgnoreCase))
+                .ToDictionary(
+                    r => r.Substring(resourcePrefix.Length).Substring(0,r.Length-resourcePrefix.Length-3),
+                    r =>
+                    {
+
+                        using (var s =
+                            new GZipStream(typeof(HtmlWebSocketTransport).Assembly.GetManifestResourceStream(r),
+                                CompressionMode.Decompress))
+                        {
+                            var ms = new MemoryStream();
+                            s.CopyTo(ms);
+                            return ms.ToArray();
+                        }
+                    });
+            
+            _signalTransport = signalTransport;
+            var address = IPAddress.Parse(listenUri.Host);
+            
+            _simpleServer = new SimpleWebSocketHttpServer(address, listenUri.Port);
+            _simpleServer.Listen();
+            Task.Run(AcceptWorker);
+            Task.Run(SocketWorker);
+            _signalTransport.Send(new HtmlTransportStartedMessage { Uri = "http://" + address + ":" + listenUri.Port + "/" });
+        }
+
+        async void AcceptWorker()
+        {
+            while (true)
+            {
+
+                using (var req = await _simpleServer.AcceptAsync())
+                {
+
+                    if (!req.IsWebsocketRequest)
+                    {
+
+                        var key = req.Path == "/" ? "index.html" : req.Path.TrimStart('/').Replace('/', '.');
+                        if (_resources.TryGetValue(key, out var data))
+                        {
+                            var ext = Path.GetExtension(key).Substring(1);
+                            string mime = null;
+                            if (ext == null || !Mime.TryGetValue(ext, out mime))
+                                mime = "application/octet-stream";
+                            await req.RespondAsync(200, data, mime);
+                        }
+                        else
+                        {
+                            await req.RespondAsync(404, NotFound, "text/plain");
+                        }
+                    }
+                    else
+                    {
+                        var socket = await req.AcceptWebSocket();
+                        SocketReceiveWorker(socket);
+                        lock (_lock)
+                        {
+                            _pendingSocket?.Dispose();
+                            _pendingSocket = socket;
+                        }
+                    }
+                }
+            }
+        }
+
+        async void SocketReceiveWorker(SimpleWebSocket socket)
+        {
+            try
+            {
+                while (true)
+                {
+                    var msg = await socket.ReceiveMessage().ConfigureAwait(false);
+                    if(msg != null && msg.IsText)
+                    {
+                        var message = ParseMessage(msg.AsString());
+                        if (message != null)
+                            _onMessage?.Invoke(this, message);
+                    }
+                }
+            }
+            catch(Exception e)
+            {
+                Console.Error.WriteLine(e.ToString());
+            }
+        }
+        
+        async void SocketWorker()
+        {
+            try
+            {
+                SimpleWebSocket socket = null;
+                while (true)
+                {
+                    if (_disposed)
+                    {
+                        socket?.Dispose();
+                        return;
+                    }
+
+                    FrameMessage sendNow = null;
+                    lock (_lock)
+                    {
+                        if (_pendingSocket != null)
+                        {
+                            socket?.Dispose();
+                            socket = _pendingSocket;
+                            _pendingSocket = null;
+                            _lastSentFrameMessage = null;
+                        }
+
+                        if (_lastFrameMessage != _lastSentFrameMessage)
+                            _lastSentFrameMessage = sendNow = _lastFrameMessage;
+                    }
+
+                    if (sendNow != null && socket != null)
+                    {
+                        await socket.SendMessage(
+                            $"frame:{sendNow.SequenceId}:{sendNow.Width}:{sendNow.Height}:{sendNow.Stride}:{sendNow.DpiX}:{sendNow.DpiY}");
+                        await socket.SendMessage(false, sendNow.Data);
+                    }
+
+                    _wakeup.WaitOne(TimeSpan.FromSeconds(1));
+                }
+            }
+            catch(Exception e)
+            {
+                Console.Error.WriteLine(e.ToString());
+            }
+        }
+        
+        public void Dispose()
+        {
+            _pendingSocket?.Dispose();
+            _simpleServer.Dispose();
+        }
+        
+        public Task Send(object data)
+        {
+            if (data is FrameMessage frame)
+            {
+                _lastFrameMessage = frame;
+                _wakeup.Set();
+                return Task.CompletedTask;
+            }
+            if (data is RequestViewportResizeMessage req)
+            {
+                return Task.CompletedTask;
+            }
+            return _signalTransport.Send(data);
+        }
+
+        public void Start()
+        {
+            _onMessage?.Invoke(this, new Avalonia.Remote.Protocol.Viewport.ClientSupportedPixelFormatsMessage
+            {
+                Formats = new []{PixelFormat.Rgba8888}
+            });
+            _signalTransport.Start();
+        }
+        
+        #region Forward
+        public event Action<IAvaloniaRemoteTransportConnection, object> OnMessage
+        {
+            add
+            {
+                bool subscribeToInner;
+                lock (_lock)
+                {
+                     subscribeToInner = _onMessage == null;
+                    _onMessage += value;
+                }
+
+                if (subscribeToInner)
+                    _signalTransport.OnMessage += OnSignalTransportMessage;
+            }
+            remove
+            {
+                lock (_lock)
+                {
+                    _onMessage -= value;
+                    if (_onMessage == null)
+                        _signalTransport.OnMessage -= OnSignalTransportMessage;
+                }
+            }
+        }
+        
+        private void OnSignalTransportMessage(IAvaloniaRemoteTransportConnection signal, object message) => _onMessage?.Invoke(this, message);
+
+        public event Action<IAvaloniaRemoteTransportConnection, Exception> OnException
+        {
+            add
+            {
+                lock (_lock)
+                {
+                    var subscribeToInner = _onException == null;
+                    _onException += value;
+                    if (subscribeToInner)
+                        _signalTransport.OnException += OnSignalTransportException;
+                }
+            }
+            remove
+            {
+                lock (_lock)
+                {
+                    _onException -= value;
+                    if(_onException==null)
+                        _signalTransport.OnException -= OnSignalTransportException;
+                }
+                
+            }
+        }
+
+        private void OnSignalTransportException(IAvaloniaRemoteTransportConnection arg1, Exception ex)
+        {
+            _onException?.Invoke(this, ex);
+        }
+        #endregion
+
+        private static object ParseMessage(string message)
+        {
+            var parts = message.Split(':');
+            var key = parts[0];
+            if (key.Equals("frame-received", StringComparison.OrdinalIgnoreCase))
+            {
+                return new FrameReceivedMessage { SequenceId = long.Parse(parts[1]) };
+            }
+            else if (key.Equals("pointer-released", StringComparison.OrdinalIgnoreCase))
+            {
+                return new InputProtocol.PointerReleasedEventMessage
+                {
+                    Modifiers = ParseInputModifiers(parts[1]),
+                    X = ParseDouble(parts[2]),
+                    Y = ParseDouble(parts[3]),
+                    Button = ParseMouseButton(parts[4]),
+                };
+            }
+            else if (key.Equals("pointer-pressed", StringComparison.OrdinalIgnoreCase))
+            {
+                return new InputProtocol.PointerPressedEventMessage
+                {
+                    Modifiers = ParseInputModifiers(parts[1]),
+                    X = ParseDouble(parts[2]),
+                    Y = ParseDouble(parts[3]),
+                    Button = ParseMouseButton(parts[4]),
+                };
+            }
+            else if (key.Equals("pointer-moved", StringComparison.OrdinalIgnoreCase))
+            {
+                return new InputProtocol.PointerMovedEventMessage
+                {
+                    Modifiers = ParseInputModifiers(parts[1]),
+                    X = ParseDouble(parts[2]),
+                    Y = ParseDouble(parts[3]),
+                };
+            }
+            else if (key.Equals("scroll", StringComparison.OrdinalIgnoreCase))
+            {
+                return new InputProtocol.ScrollEventMessage
+                {
+                    Modifiers = ParseInputModifiers(parts[1]),
+                    X = ParseDouble(parts[2]),
+                    Y = ParseDouble(parts[3]),
+                    DeltaX = ParseDouble(parts[4]),
+                    DeltaY = ParseDouble(parts[5]),
+                };
+            }
+            
+            return null;
+        }
+
+        private static InputProtocol.InputModifiers[] ParseInputModifiers(string modifiersText) =>
+            string.IsNullOrWhiteSpace(modifiersText)
+            ? null
+            : modifiersText
+                .Split(',')
+                .Select(x => (InputProtocol.InputModifiers)Enum.Parse(
+                    typeof(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);
+
+        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
new file mode 100644
index 0000000000..6af21bbcf5
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/SimpleWebSocketHttpServer.cs
@@ -0,0 +1,472 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Runtime.InteropServices;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Avalonia.DesignerSupport.Remote.HtmlTransport
+{
+    public class SimpleWebSocketHttpServer : IDisposable
+    {
+        private readonly IPAddress _address;
+        private readonly int _port;
+        private TcpListener _listener;
+
+        public async Task<SimpleWebSocketHttpRequest> AcceptAsync()
+        {
+            while (true)
+            {
+                var res = await AcceptAsyncImpl();
+                if (res != null)
+                    return res;
+            }
+        }
+        async Task<SimpleWebSocketHttpRequest> AcceptAsyncImpl()
+        {
+            if (_listener == null)
+                throw new InvalidOperationException("Currently not listening");
+            var socket = await _listener.AcceptSocketAsync();
+            var stream = new NetworkStream(socket);
+            bool error = true;
+            async Task<string> ReadLineAsync()
+            {
+                var readBuffer = new byte[1];
+                var lineBuffer = new byte[1024];
+                for (var c = 0; c < 1024; c++)
+                {
+                    if (await stream.ReadAsync(readBuffer, 0, 1) == 0)
+                        throw new EndOfStreamException();
+                    if (readBuffer[0] == 10)
+                    {
+                        if (c == 0)
+                            return "";
+                        if (lineBuffer[c - 1] == 13)
+                            c--;
+                        if (c == 0)
+                            return "";
+                        
+                        return Encoding.UTF8.GetString(lineBuffer, 0, c);
+                    }
+                    lineBuffer[c] = readBuffer[0];
+                }
+
+                throw new InvalidDataException("Header is too large");
+            }
+
+            var headers = new Dictionary<string, string>();
+            string line = null;
+            try
+            {
+
+                line = await ReadLineAsync();
+                var sp = line.Split(' ');
+                if (sp.Length != 3 || !sp[2].StartsWith("HTTP") || sp[0] != "GET")
+                    return null;
+                var path = sp[1];
+
+                while (true)
+                {
+                    line = await ReadLineAsync();
+                    if (line == "")
+                        break;
+                    sp = line.Split(new[] {':'}, 2);
+                    headers[sp[0]] = sp[1].TrimStart();
+                }
+
+                error = false;
+                
+                return new SimpleWebSocketHttpRequest(stream, path, headers);
+            }
+            catch
+            {
+                error = true;
+                return null;
+            }
+            finally
+            {
+                if (error)
+                    stream.Dispose();
+            }
+            
+        }
+
+        public void Listen()
+        {
+            var listener = new TcpListener(_address, _port);
+            listener.Start();
+            _listener = listener;
+        }
+        
+        public SimpleWebSocketHttpServer(IPAddress address, int port)
+        {
+            _address = address;
+            _port = port;
+        }
+
+        public void Dispose()
+        {
+            _listener?.Stop();
+            _listener = null;
+        }
+    }
+
+    
+    public class SimpleWebSocketHttpRequest : IDisposable
+    {
+        public Dictionary<string, string> Headers { get; }
+        public string Path { get; }
+        private NetworkStream _stream;
+        public bool IsWebsocketRequest { get; }
+        public IReadOnlyList<string> WebSocketProtocols { get; }
+        private string _websocketKey;
+
+        public SimpleWebSocketHttpRequest(NetworkStream stream, string path, Dictionary<string, string> headers)
+        {
+            Path = path;
+            Headers = headers;
+
+            _stream = stream;
+            if (headers.TryGetValue("Connection", out var h)
+                && h.Contains("Upgrade")
+                && headers.TryGetValue("Upgrade", out h) &&
+                h == "websocket"
+                && headers.TryGetValue("Sec-WebSocket-Key", out _websocketKey))
+            {
+                IsWebsocketRequest = true;
+                if (headers.TryGetValue("Sec-WebSocket-Protocol", out h))
+                    WebSocketProtocols = h.Split(',').Select(x => x.Trim()).ToArray();
+                else WebSocketProtocols = new string[0];
+            }
+        }
+
+        public async Task RespondAsync(int code, byte[] data, string contentType)
+        {
+            var headers = Encoding.UTF8.GetBytes($"HTTP/1.1 {code} {(HttpStatusCode)code}\r\nConnection: close\r\nContent-Type: {contentType}\r\nContent-Length: {data.Length}\r\n\r\n");
+            await _stream.WriteAsync(headers, 0, headers.Length);
+            await _stream.WriteAsync(data, 0, data.Length);
+            _stream.Dispose();
+            _stream = null;
+
+        }
+
+
+        public async Task<SimpleWebSocket> AcceptWebSocket(string protocol = null)
+        {
+            
+            var handshakeSource = _websocketKey + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+            string handshake;
+            using (var sha1 = SHA1.Create())
+                handshake = Convert.ToBase64String(sha1.ComputeHash(Encoding.UTF8.GetBytes(handshakeSource)));
+            var headers =
+                "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: "
+                + handshake + "\r\n";
+            if (protocol != null)
+                headers += protocol + "\r\n";
+            headers += "\r\n";
+            var bheaders = Encoding.UTF8.GetBytes(headers);
+            await _stream.WriteAsync(bheaders, 0, bheaders.Length);
+            
+            var s = _stream;
+            _stream = null;
+            return new SimpleWebSocket(s);
+        }
+
+        public void Dispose() => _stream?.Dispose();
+    }
+
+    
+    
+    public class SimpleWebSocket : IDisposable
+    {
+        class AsyncLock
+        {
+            private object _syncRoot = new object();
+            private Queue<TaskCompletionSource<IDisposable>> _queue = new Queue<TaskCompletionSource<IDisposable>>();
+            private bool _locked;
+            public Task<IDisposable> LockAsync()
+            {
+                lock (_syncRoot)
+                {
+                    if (!_locked)
+                    {
+                        _locked = true;
+                        return Task.FromResult<IDisposable>(new Lock(this));
+                    }
+                    else
+                    {
+                        var tcs = new TaskCompletionSource<IDisposable>();
+                        _queue.Enqueue(tcs);
+                        return tcs.Task;
+                    }
+                }
+            }
+
+            private void Unlock()
+            {
+                lock (_syncRoot)
+                {
+                    if (_queue.Count != 0)
+                        _queue.Dequeue().SetResult(new Lock(this));
+                    else
+                        _locked = false;
+                }
+            }
+
+            class Lock : IDisposable
+            {
+                private  AsyncLock _parent;
+                private object _syncRoot = new object();
+
+                public Lock(AsyncLock parent)
+                {
+                    _parent = parent;
+                }
+            
+                public void Dispose()
+                {
+                    lock (_syncRoot)
+                    {
+                        if (_parent == null)
+                            return;
+                        var p = _parent;
+                        _parent = null;
+                        p.Unlock();
+                    }
+                }
+            }
+        }
+        
+        private Stream _stream;
+        private AsyncLock _sendLock = new AsyncLock();
+        private AsyncLock _recvLock = new AsyncLock();
+        private const int WebsocketInitialHeaderLength = 2;
+        private const int WebsocketLen16Length = 4;
+        private const int WebsocketLen64Length = 10;
+
+        private const int WebsocketLen16Code = 126;
+        private const int WebsocketLen64Code = 127;
+
+        [StructLayout(LayoutKind.Explicit)]
+        struct WebSocketHeader
+        {
+            [FieldOffset(0)] public byte Mask;
+            [FieldOffset(1)] public byte Length8;
+            [FieldOffset(2)] public ushort Length16;
+            [FieldOffset(2)] public ulong Length64;
+        }
+
+        readonly byte[] _sendHeaderBuffer = new byte[10];
+        readonly MemoryStream _receiveFrameStream = new MemoryStream();
+        readonly MemoryStream _receiveMessageStream = new MemoryStream();
+        private FrameType _currentMessageFrameType;
+
+        enum FrameType
+        {
+            Continue = 0x0,
+            Text = 0x1,
+            Binary = 0x2,
+            Close = 0x8,
+            Ping = 0x9,
+            Pong = 0xA
+        }
+
+        internal SimpleWebSocket(Stream stream)
+        {
+            _stream = stream;
+        }
+
+        public void Dispose()
+        {
+            _stream?.Dispose();
+            _stream = null;
+        }
+
+        public Task SendMessage(string text)
+        {
+            var data = Encoding.UTF8.GetBytes(text);
+            return SendMessage(true, data);
+        }
+        public Task SendMessage(bool isText, byte[] data) => SendMessage(isText, data, 0, data.Length);
+
+
+        public Task SendMessage(bool isText, byte[] data, int offset, int length) 
+            => SendFrame(isText ? FrameType.Text : FrameType.Binary, data, offset, length);
+
+        async Task SendFrame(FrameType type, byte[] data, int offset, int length)
+        {
+            using (var l = await _sendLock.LockAsync())
+            {
+                var header = new WebSocketHeader();
+
+                int headerLength;
+                if (data.Length <= 125)
+                {
+                    headerLength = WebsocketInitialHeaderLength;
+                    header.Length8 = (byte) length;
+                }
+                else if (length <= 0xffff)
+                {
+                    headerLength = WebsocketLen16Length;
+                    header.Length8 = WebsocketLen16Code;
+                    header.Length16 = (ushort) IPAddress.HostToNetworkOrder((short) (ushort) length);
+
+                }
+                else
+                {
+                    headerLength = WebsocketLen64Length;
+                    header.Length8 = WebsocketLen64Code;
+                    header.Length64 = (ulong) IPAddress.HostToNetworkOrder((long) length);
+                }
+
+                var endOfMessage = true;
+                header.Mask = (byte) (((endOfMessage ? 1u : 0u) << 7) | ((byte) (type) & 0xf));
+                unsafe
+                {
+                    Marshal.Copy(new IntPtr(&header), _sendHeaderBuffer, 0, headerLength);
+                }
+
+                await _stream.WriteAsync(_sendHeaderBuffer, 0, headerLength);
+                await _stream.WriteAsync(data, offset, length);
+            }
+        }
+
+        struct Frame
+        {
+            public byte[] Data;
+            public bool EndOfMessage;
+            public FrameType FrameType;
+        }
+
+        byte[] _recvHeaderBuffer = new byte[8];
+        byte[] _maskBuffer = new byte[4];
+        async Task<Frame> ReadFrame()
+        {
+            _receiveFrameStream.Position = 0;
+            _receiveFrameStream.SetLength(0);
+            await ReadExact(_stream, _recvHeaderBuffer, 0, 2);
+            var masked = (_recvHeaderBuffer[1] & 0x80) != 0;
+            var len0 = (_recvHeaderBuffer[1] & 0x7F);
+            var endOfMessage = (_recvHeaderBuffer[0] & 0x80) != 0;
+            var frameType = (FrameType) (_recvHeaderBuffer[0] & 0xf);
+            int length;
+            if (len0 <= 125)
+                length = len0;
+            else if (len0 == WebsocketLen16Code)
+            {
+                await ReadExact(_stream, _recvHeaderBuffer, 0, 2);
+                length = (ushort) IPAddress.NetworkToHostOrder(BitConverter.ToInt16(_recvHeaderBuffer, 0));
+            }
+            
+            else
+            {
+                await ReadExact(_stream, _recvHeaderBuffer, 0, 8);
+                length = (int) (ulong) IPAddress.NetworkToHostOrder((long) BitConverter.ToUInt64(_recvHeaderBuffer, 0));
+            }
+
+            if (masked)
+                await ReadExact(_stream, _maskBuffer, 0, 4);
+            await ReadExact(_stream, _receiveFrameStream, length);
+            var data = _receiveFrameStream.ToArray();
+            if(masked)
+                for (var c = 0; c < data.Length; c++)
+                    data[c] = (byte) (data[c] ^ _maskBuffer[c % 4]);
+
+            return new Frame
+            {
+                Data = data,
+                EndOfMessage = endOfMessage,
+                FrameType = frameType
+            };
+        }
+
+       
+        public async Task<SimpleWebSocketMessage> ReceiveMessage()
+        {
+            using (await _recvLock.LockAsync())
+            {
+                while (true)
+                {
+                    var frame = await ReadFrame();
+                    
+                    if (frame.FrameType == FrameType.Close)
+                        return null;
+                    if (frame.FrameType == FrameType.Ping)
+                        await SendFrame(FrameType.Pong, frame.Data, 0, frame.Data.Length);
+                    if (frame.FrameType == FrameType.Text || frame.FrameType == FrameType.Binary)
+                    {
+                        var isText = frame.FrameType == FrameType.Text;
+                        if (_receiveMessageStream.Length == 0 && frame.EndOfMessage)
+                            return new SimpleWebSocketMessage
+                            {
+                                IsText = isText,
+                                Data = frame.Data
+                            };
+
+                        _receiveMessageStream.Write(frame.Data, 0, frame.Data.Length);
+                        _currentMessageFrameType = frame.FrameType;
+                    }
+                    if (frame.FrameType == FrameType.Continue)
+                    {
+                        frame.FrameType = _currentMessageFrameType;
+                        _receiveMessageStream.Write(frame.Data, 0, frame.Data.Length);
+                        if (frame.EndOfMessage)
+                        {
+                            var isText = frame.FrameType == FrameType.Text;
+                            var data = _receiveMessageStream.ToArray();
+                            _receiveMessageStream.Position = 0;
+                            _receiveMessageStream.SetLength(0);
+                            return new SimpleWebSocketMessage
+                            {
+                                IsText = isText,
+                                Data = data
+                            };
+                        }
+                    }
+                }
+            }
+        }
+
+
+        byte[] _readExactBuffer = new byte[4096];
+        async Task ReadExact(Stream from, MemoryStream to, int length)
+        {
+            while (length>0)
+            {
+                var toRead = Math.Min(length, _readExactBuffer.Length);
+                var read = await from.ReadAsync(_readExactBuffer, 0, toRead);
+                to.Write(_readExactBuffer, 0, read);
+                if (read <= 0)
+                    throw new EndOfStreamException();
+                length -= read;
+            }
+        }
+
+        async Task ReadExact(Stream from, byte[] to, int offset, int length)
+        {
+            while (length > 0)
+            {
+                var read = await from.ReadAsync(to, offset, length);
+                if (read <= 0)
+                    throw new EndOfStreamException();
+                length -= read;
+                offset += read;
+            }
+        }
+    }
+
+    public class SimpleWebSocketMessage
+    {
+        public bool IsText { get; set; }
+        public byte[] Data { get; set; }
+
+        public string AsString()
+        {
+            return Encoding.UTF8.GetString(Data);
+        }
+    }
+}
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/.gitignore b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/.gitignore
new file mode 100644
index 0000000000..e3fbd98336
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/.gitignore
@@ -0,0 +1,2 @@
+build
+node_modules
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/package-lock.json b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/package-lock.json
new file mode 100644
index 0000000000..028027a974
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/package-lock.json
@@ -0,0 +1,8892 @@
+{
+  "name": "simple",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@mrmlnc/readdir-enhanced": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
+      "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
+      "dev": true,
+      "requires": {
+        "call-me-maybe": "^1.0.1",
+        "glob-to-regexp": "^0.3.0"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
+      "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
+      "dev": true
+    },
+    "@samverschueren/stream-to-observable": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz",
+      "integrity": "sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==",
+      "dev": true,
+      "requires": {
+        "any-observable": "^0.3.0"
+      }
+    },
+    "@sindresorhus/is": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
+      "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==",
+      "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
+    },
+    "@types/prop-types": {
+      "version": "15.7.3",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz",
+      "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="
+    },
+    "@types/react": {
+      "version": "16.9.11",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.11.tgz",
+      "integrity": "sha512-UBT4GZ3PokTXSWmdgC/GeCGEJXE5ofWyibCcecRLUVN2ZBpXQGVgQGtG2foS7CrTKFKlQVVswLvf7Js6XA/CVQ==",
+      "requires": {
+        "@types/prop-types": "*",
+        "csstype": "^2.2.0"
+      }
+    },
+    "@types/react-dom": {
+      "version": "16.9.4",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.4.tgz",
+      "integrity": "sha512-fya9xteU/n90tda0s+FtN5Ym4tbgxpq/hb/Af24dvs6uYnYn+fspaxw5USlw0R8apDNwxsqumdRoCoKitckQqw==",
+      "requires": {
+        "@types/react": "*"
+      }
+    },
+    "@webassemblyjs/ast": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.13.tgz",
+      "integrity": "sha512-49nwvW/Hx9i+OYHg+mRhKZfAlqThr11Dqz8TsrvqGKMhdI2ijy3KBJOun2Z4770TPjrIJhR6KxChQIDaz8clDA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/helper-module-context": "1.5.13",
+        "@webassemblyjs/helper-wasm-bytecode": "1.5.13",
+        "@webassemblyjs/wast-parser": "1.5.13",
+        "debug": "^3.1.0",
+        "mamacro": "^0.0.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "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
+        }
+      }
+    },
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.13.tgz",
+      "integrity": "sha512-vrvvB18Kh4uyghSKb0NTv+2WZx871WL2NzwMj61jcq2bXkyhRC+8Q0oD7JGVf0+5i/fKQYQSBCNMMsDMRVAMqA==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-api-error": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.13.tgz",
+      "integrity": "sha512-dBh2CWYqjaDlvMmRP/kudxpdh30uXjIbpkLj9HQe+qtYlwvYjPRjdQXrq1cTAAOUSMTtzqbXIxEdEZmyKfcwsg==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.13.tgz",
+      "integrity": "sha512-v7igWf1mHcpJNbn4m7e77XOAWXCDT76Xe7Is1VQFXc4K5jRcFrl9D0NrqM4XifQ0bXiuTSkTKMYqDxu5MhNljA==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "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
+        }
+      }
+    },
+    "@webassemblyjs/helper-code-frame": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.13.tgz",
+      "integrity": "sha512-yN6ScQQDFCiAXnVctdVO/J5NQRbwyTbQzsGzEgXsAnrxhjp0xihh+nNHQTMrq5UhOqTb5LykpJAvEv9AT0jnAQ==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/wast-printer": "1.5.13"
+      }
+    },
+    "@webassemblyjs/helper-fsm": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.13.tgz",
+      "integrity": "sha512-hSIKzbXjVMRvy3Jzhgu+vDd/aswJ+UMEnLRCkZDdknZO3Z9e6rp1DAs0tdLItjCFqkz9+0BeOPK/mk3eYvVzZg==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-module-context": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.13.tgz",
+      "integrity": "sha512-zxJXULGPLB7r+k+wIlvGlXpT4CYppRz8fLUM/xobGHc9Z3T6qlmJD9ySJ2jknuktuuiR9AjnNpKYDECyaiX+QQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.1.0",
+        "mamacro": "^0.0.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "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
+        }
+      }
+    },
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.13.tgz",
+      "integrity": "sha512-0n3SoNGLvbJIZPhtMFq0XmmnA/YmQBXaZKQZcW8maGKwLpVcgjNrxpFZHEOLKjXJYVN5Il8vSfG7nRX50Zn+aw==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.13.tgz",
+      "integrity": "sha512-IJ/goicOZ5TT1axZFSnlAtz4m8KEjYr12BNOANAwGFPKXM4byEDaMNXYowHMG0yKV9a397eU/NlibFaLwr1fbw==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.5.13",
+        "@webassemblyjs/helper-buffer": "1.5.13",
+        "@webassemblyjs/helper-wasm-bytecode": "1.5.13",
+        "@webassemblyjs/wasm-gen": "1.5.13",
+        "debug": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "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
+        }
+      }
+    },
+    "@webassemblyjs/ieee754": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.5.13.tgz",
+      "integrity": "sha512-TseswvXEPpG5TCBKoLx9tT7+/GMACjC1ruo09j46ULRZWYm8XHpDWaosOjTnI7kr4SRJFzA6MWoUkAB+YCGKKg==",
+      "dev": true,
+      "requires": {
+        "ieee754": "^1.1.11"
+      }
+    },
+    "@webassemblyjs/leb128": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.5.13.tgz",
+      "integrity": "sha512-0NRMxrL+GG3eISGZBmLBLAVjphbN8Si15s7jzThaw1UE9e5BY1oH49/+MA1xBzxpf1OW5sf9OrPDOclk9wj2yg==",
+      "dev": true,
+      "requires": {
+        "long": "4.0.0"
+      },
+      "dependencies": {
+        "long": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
+          "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==",
+          "dev": true
+        }
+      }
+    },
+    "@webassemblyjs/utf8": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.5.13.tgz",
+      "integrity": "sha512-Ve1ilU2N48Ew0lVGB8FqY7V7hXjaC4+PeZM+vDYxEd+R2iQ0q+Wb3Rw8v0Ri0+rxhoz6gVGsnQNb4FjRiEH/Ng==",
+      "dev": true
+    },
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.13.tgz",
+      "integrity": "sha512-X7ZNW4+Hga4f2NmqENnHke2V/mGYK/xnybJSIXImt1ulxbCOEs/A+ZK/Km2jgihjyVxp/0z0hwIcxC6PrkWtgw==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.5.13",
+        "@webassemblyjs/helper-buffer": "1.5.13",
+        "@webassemblyjs/helper-wasm-bytecode": "1.5.13",
+        "@webassemblyjs/helper-wasm-section": "1.5.13",
+        "@webassemblyjs/wasm-gen": "1.5.13",
+        "@webassemblyjs/wasm-opt": "1.5.13",
+        "@webassemblyjs/wasm-parser": "1.5.13",
+        "@webassemblyjs/wast-printer": "1.5.13",
+        "debug": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "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
+        }
+      }
+    },
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.13.tgz",
+      "integrity": "sha512-yfv94Se8R73zmr8GAYzezFHc3lDwE/lBXQddSiIZEKZFuqy7yWtm3KMwA1uGbv5G1WphimJxboXHR80IgX1hQA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.5.13",
+        "@webassemblyjs/helper-wasm-bytecode": "1.5.13",
+        "@webassemblyjs/ieee754": "1.5.13",
+        "@webassemblyjs/leb128": "1.5.13",
+        "@webassemblyjs/utf8": "1.5.13"
+      }
+    },
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.13.tgz",
+      "integrity": "sha512-IkXSkgzVhQ0QYAdIayuCWMmXSYx0dHGU8Ah/AxJf1gBvstMWVnzJnBwLsXLyD87VSBIcsqkmZ28dVb0mOC3oBg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.5.13",
+        "@webassemblyjs/helper-buffer": "1.5.13",
+        "@webassemblyjs/wasm-gen": "1.5.13",
+        "@webassemblyjs/wasm-parser": "1.5.13",
+        "debug": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "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
+        }
+      }
+    },
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.13.tgz",
+      "integrity": "sha512-XnYoIcu2iqq8/LrtmdnN3T+bRjqYFjRHqWbqK3osD/0r/Fcv4d9ecRzjVtC29ENEuNTK4mQ9yyxCBCbK8S/cpg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.5.13",
+        "@webassemblyjs/helper-api-error": "1.5.13",
+        "@webassemblyjs/helper-wasm-bytecode": "1.5.13",
+        "@webassemblyjs/ieee754": "1.5.13",
+        "@webassemblyjs/leb128": "1.5.13",
+        "@webassemblyjs/utf8": "1.5.13"
+      }
+    },
+    "@webassemblyjs/wast-parser": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.5.13.tgz",
+      "integrity": "sha512-Lbz65T0LQ1LgzKiUytl34CwuhMNhaCLgrh0JW4rJBN6INnBB8NMwUfQM+FxTnLY9qJ+lHJL/gCM5xYhB9oWi4A==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.5.13",
+        "@webassemblyjs/floating-point-hex-parser": "1.5.13",
+        "@webassemblyjs/helper-api-error": "1.5.13",
+        "@webassemblyjs/helper-code-frame": "1.5.13",
+        "@webassemblyjs/helper-fsm": "1.5.13",
+        "long": "^3.2.0",
+        "mamacro": "^0.0.3"
+      }
+    },
+    "@webassemblyjs/wast-printer": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.13.tgz",
+      "integrity": "sha512-QcwogrdqcBh8Z+eUF8SG+ag5iwQSXxQJELBEHmLkk790wgQgnIMmntT2sMAMw53GiFNckArf5X0bsCA44j3lWQ==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.5.13",
+        "@webassemblyjs/wast-parser": "1.5.13",
+        "long": "^3.2.0"
+      }
+    },
+    "acorn": {
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+      "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+      "dev": true
+    },
+    "acorn-dynamic-import": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz",
+      "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==",
+      "dev": true,
+      "requires": {
+        "acorn": "^5.0.0"
+      }
+    },
+    "ajv": {
+      "version": "6.10.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^2.0.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ajv-errors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+      "dev": true
+    },
+    "ajv-keywords": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
+      "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
+      "dev": true
+    },
+    "ansi-escapes": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true
+    },
+    "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"
+      }
+    },
+    "any-observable": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/any-observable/-/any-observable-0.3.0.tgz",
+      "integrity": "sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==",
+      "dev": true
+    },
+    "anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "requires": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      },
+      "dependencies": {
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "dev": true,
+          "requires": {
+            "remove-trailing-separator": "^1.0.1"
+          }
+        }
+      }
+    },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true
+    },
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
+    },
+    "array-differ": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
+      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
+      "dev": true
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "^1.0.1"
+      }
+    },
+    "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
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true
+    },
+    "asn1.js": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "assert": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "dev": true,
+      "requires": {
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
+      }
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true
+    },
+    "ast-types": {
+      "version": "0.11.5",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.11.5.tgz",
+      "integrity": "sha512-oJjo+5e7/vEc2FBK8gUalV0pba4L3VdBIs2EKhOLHLcOd2FgQIVQN9xb0eZ9IjEWyAL7vq6fGJxOvVvdCHNyMw==",
+      "dev": true
+    },
+    "async": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "async-each": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+      "dev": true
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true
+    },
+    "awesome-typescript-loader": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-5.2.1.tgz",
+      "integrity": "sha512-slv66OAJB8orL+UUaTI3pKlLorwIvS4ARZzYR9iJJyGsEgOqueMfOMdKySWzZ73vIkEe3fcwFgsKMg4d8zyb1g==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.1",
+        "enhanced-resolve": "^4.0.0",
+        "loader-utils": "^1.1.0",
+        "lodash": "^4.17.5",
+        "micromatch": "^3.1.9",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.5.3",
+        "webpack-log": "^1.2.0"
+      }
+    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "js-tokens": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "babel-core": {
+      "version": "6.26.3",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
+      "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "^6.26.0",
+        "babel-generator": "^6.26.0",
+        "babel-helpers": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-register": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "convert-source-map": "^1.5.1",
+        "debug": "^2.6.9",
+        "json5": "^0.5.1",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.4",
+        "path-is-absolute": "^1.0.1",
+        "private": "^0.1.8",
+        "slash": "^1.0.0",
+        "source-map": "^0.5.7"
+      },
+      "dependencies": {
+        "babylon": {
+          "version": "6.18.0",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+          "dev": true
+        },
+        "json5": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+          "dev": true
+        }
+      }
+    },
+    "babel-generator": {
+      "version": "6.26.1",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
+      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
+      "dev": true,
+      "requires": {
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "detect-indent": "^4.0.0",
+        "jsesc": "^1.3.0",
+        "lodash": "^4.17.4",
+        "source-map": "^0.5.7",
+        "trim-right": "^1.0.1"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+          "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+          "dev": true
+        }
+      }
+    },
+    "babel-helper-bindify-decorators": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
+      "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-builder-binary-assignment-operator-visitor": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
+      "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
+      "dev": true,
+      "requires": {
+        "babel-helper-explode-assignable-expression": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-call-delegate": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
+      "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+      "dev": true,
+      "requires": {
+        "babel-helper-hoist-variables": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-define-map": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
+      "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "babel-helper-explode-assignable-expression": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
+      "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-explode-class": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
+      "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
+      "dev": true,
+      "requires": {
+        "babel-helper-bindify-decorators": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
+      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+      "dev": true,
+      "requires": {
+        "babel-helper-get-function-arity": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-get-function-arity": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
+      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-hoist-variables": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
+      "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-optimise-call-expression": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
+      "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-regex": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
+      "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "babel-helper-remap-async-to-generator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
+      "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-replace-supers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
+      "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+      "dev": true,
+      "requires": {
+        "babel-helper-optimise-call-expression": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helpers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
+      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-messages": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-check-es2015-constants": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
+      "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-syntax-async-functions": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
+      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
+      "dev": true
+    },
+    "babel-plugin-syntax-async-generators": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
+      "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
+      "dev": true
+    },
+    "babel-plugin-syntax-class-constructor-call": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",
+      "integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=",
+      "dev": true
+    },
+    "babel-plugin-syntax-class-properties": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
+      "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
+      "dev": true
+    },
+    "babel-plugin-syntax-decorators": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
+      "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
+      "dev": true
+    },
+    "babel-plugin-syntax-dynamic-import": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
+      "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
+      "dev": true
+    },
+    "babel-plugin-syntax-exponentiation-operator": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
+      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
+      "dev": true
+    },
+    "babel-plugin-syntax-export-extensions": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",
+      "integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE=",
+      "dev": true
+    },
+    "babel-plugin-syntax-flow": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
+      "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=",
+      "dev": true
+    },
+    "babel-plugin-syntax-object-rest-spread": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
+      "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
+      "dev": true
+    },
+    "babel-plugin-syntax-trailing-function-commas": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
+      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
+      "dev": true
+    },
+    "babel-plugin-transform-async-generator-functions": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
+      "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
+      "dev": true,
+      "requires": {
+        "babel-helper-remap-async-to-generator": "^6.24.1",
+        "babel-plugin-syntax-async-generators": "^6.5.0",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-async-to-generator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
+      "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
+      "dev": true,
+      "requires": {
+        "babel-helper-remap-async-to-generator": "^6.24.1",
+        "babel-plugin-syntax-async-functions": "^6.8.0",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-class-constructor-call": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.24.1.tgz",
+      "integrity": "sha1-gNwoVQWsBn3LjWxl4vbxGrd2Xvk=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-class-constructor-call": "^6.18.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-class-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz",
+      "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "^6.24.1",
+        "babel-plugin-syntax-class-properties": "^6.8.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-decorators": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
+      "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
+      "dev": true,
+      "requires": {
+        "babel-helper-explode-class": "^6.24.1",
+        "babel-plugin-syntax-decorators": "^6.13.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-arrow-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
+      "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-block-scoped-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
+      "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-block-scoping": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
+      "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "babel-plugin-transform-es2015-classes": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
+      "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
+      "dev": true,
+      "requires": {
+        "babel-helper-define-map": "^6.24.1",
+        "babel-helper-function-name": "^6.24.1",
+        "babel-helper-optimise-call-expression": "^6.24.1",
+        "babel-helper-replace-supers": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-computed-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
+      "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-destructuring": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
+      "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-duplicate-keys": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
+      "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-for-of": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
+      "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
+      "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
+      "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-amd": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
+      "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-commonjs": {
+      "version": "6.26.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz",
+      "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-strict-mode": "^6.24.1",
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-types": "^6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-systemjs": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
+      "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
+      "dev": true,
+      "requires": {
+        "babel-helper-hoist-variables": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-umd": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
+      "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-object-super": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
+      "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
+      "dev": true,
+      "requires": {
+        "babel-helper-replace-supers": "^6.24.1",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-parameters": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
+      "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
+      "dev": true,
+      "requires": {
+        "babel-helper-call-delegate": "^6.24.1",
+        "babel-helper-get-function-arity": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-shorthand-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
+      "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-spread": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
+      "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-sticky-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
+      "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-template-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
+      "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-typeof-symbol": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
+      "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-unicode-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
+      "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "regexpu-core": "^2.0.0"
+      },
+      "dependencies": {
+        "regexpu-core": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
+          "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
+          "dev": true,
+          "requires": {
+            "regenerate": "^1.2.1",
+            "regjsgen": "^0.2.0",
+            "regjsparser": "^0.1.4"
+          }
+        }
+      }
+    },
+    "babel-plugin-transform-exponentiation-operator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
+      "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
+      "dev": true,
+      "requires": {
+        "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",
+        "babel-plugin-syntax-exponentiation-operator": "^6.8.0",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-export-extensions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz",
+      "integrity": "sha1-U3OLR+deghhYnuqUbLvTkQm75lM=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-export-extensions": "^6.8.0",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-flow-strip-types": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz",
+      "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-flow": "^6.18.0",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-object-rest-spread": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz",
+      "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-object-rest-spread": "^6.8.0",
+        "babel-runtime": "^6.26.0"
+      }
+    },
+    "babel-plugin-transform-regenerator": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
+      "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "^0.10.0"
+      }
+    },
+    "babel-plugin-transform-strict-mode": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
+      "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-preset-es2015": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
+      "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-check-es2015-constants": "^6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "^6.24.1",
+        "babel-plugin-transform-es2015-classes": "^6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "^6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "^6.22.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1",
+        "babel-plugin-transform-es2015-for-of": "^6.22.0",
+        "babel-plugin-transform-es2015-function-name": "^6.24.1",
+        "babel-plugin-transform-es2015-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-umd": "^6.24.1",
+        "babel-plugin-transform-es2015-object-super": "^6.24.1",
+        "babel-plugin-transform-es2015-parameters": "^6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
+        "babel-plugin-transform-es2015-spread": "^6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "^6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0",
+        "babel-plugin-transform-es2015-unicode-regex": "^6.24.1",
+        "babel-plugin-transform-regenerator": "^6.24.1"
+      }
+    },
+    "babel-preset-stage-1": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz",
+      "integrity": "sha1-dpLNfc1oSZB+auSgqFWJz7niv7A=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-class-constructor-call": "^6.24.1",
+        "babel-plugin-transform-export-extensions": "^6.22.0",
+        "babel-preset-stage-2": "^6.24.1"
+      }
+    },
+    "babel-preset-stage-2": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
+      "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-dynamic-import": "^6.18.0",
+        "babel-plugin-transform-class-properties": "^6.24.1",
+        "babel-plugin-transform-decorators": "^6.24.1",
+        "babel-preset-stage-3": "^6.24.1"
+      }
+    },
+    "babel-preset-stage-3": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",
+      "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
+        "babel-plugin-transform-async-generator-functions": "^6.24.1",
+        "babel-plugin-transform-async-to-generator": "^6.24.1",
+        "babel-plugin-transform-exponentiation-operator": "^6.24.1",
+        "babel-plugin-transform-object-rest-spread": "^6.22.0"
+      }
+    },
+    "babel-register": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
+      "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+      "dev": true,
+      "requires": {
+        "babel-core": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "core-js": "^2.5.0",
+        "home-or-tmp": "^2.0.0",
+        "lodash": "^4.17.4",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.4.15"
+      },
+      "dependencies": {
+        "source-map-support": {
+          "version": "0.4.18",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+          "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+          "dev": true,
+          "requires": {
+            "source-map": "^0.5.6"
+          }
+        }
+      }
+    },
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "dev": true,
+      "requires": {
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
+      }
+    },
+    "babel-template": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "lodash": "^4.17.4"
+      },
+      "dependencies": {
+        "babylon": {
+          "version": "6.18.0",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+          "dev": true
+        }
+      }
+    },
+    "babel-traverse": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "^6.26.0",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "debug": "^2.6.8",
+        "globals": "^9.18.0",
+        "invariant": "^2.2.2",
+        "lodash": "^4.17.4"
+      },
+      "dependencies": {
+        "babylon": {
+          "version": "6.18.0",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+          "dev": true
+        }
+      }
+    },
+    "babel-types": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.4",
+        "to-fast-properties": "^1.0.3"
+      }
+    },
+    "babylon": {
+      "version": "7.0.0-beta.47",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.47.tgz",
+      "integrity": "sha512-+rq2cr4GDhtToEzKFD6KZZMDBXhjFAr9JjPw9pAppZACeEWqNM294j+NdBzkSHYXwzzBmVjZ3nEVJlOhbR2gOQ==",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "requires": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "base64-js": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
+      "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
+    },
+    "binary-extensions": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "dev": true
+    },
+    "binaryextensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.2.0.tgz",
+      "integrity": "sha512-bHhs98rj/7i/RZpCSJ3uk55pLXOItjIrh2sRQZSM6OoktScX+LxJzvlU+FELp9j3TdcddTmmYArLSGptCTwjuw==",
+      "dev": true
+    },
+    "bluebird": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz",
+      "integrity": "sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==",
+      "dev": true
+    },
+    "bn.js": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "dev": true
+    },
+    "body": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
+      "integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
+      "dev": true,
+      "requires": {
+        "continuable-cache": "^0.3.1",
+        "error": "^7.0.0",
+        "raw-body": "~1.1.0",
+        "safe-json-parse": "~1.0.1"
+      }
+    },
+    "boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "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": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "requires": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.1",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.2",
+        "elliptic": "^6.0.0",
+        "inherits": "^2.0.1",
+        "parse-asn1": "^5.0.0"
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "requires": {
+        "pako": "~1.0.5"
+      }
+    },
+    "buffer": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "dev": true,
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "buffer-alloc": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
+      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+      "dev": true,
+      "requires": {
+        "buffer-alloc-unsafe": "^1.1.0",
+        "buffer-fill": "^1.0.0"
+      }
+    },
+    "buffer-alloc-unsafe": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
+      "dev": true
+    },
+    "buffer-fill": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
+      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
+      "dev": true
+    },
+    "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
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "bytes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
+      "integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
+      "dev": true
+    },
+    "cacache": {
+      "version": "10.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
+      "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.5.1",
+        "chownr": "^1.0.1",
+        "glob": "^7.1.2",
+        "graceful-fs": "^4.1.11",
+        "lru-cache": "^4.1.1",
+        "mississippi": "^2.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.2",
+        "ssri": "^5.2.4",
+        "unique-filename": "^1.1.0",
+        "y18n": "^4.0.0"
+      }
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "requires": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      }
+    },
+    "cacheable-request": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz",
+      "integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=",
+      "dev": true,
+      "requires": {
+        "clone-response": "1.0.2",
+        "get-stream": "3.0.0",
+        "http-cache-semantics": "3.8.1",
+        "keyv": "3.0.0",
+        "lowercase-keys": "1.0.0",
+        "normalize-url": "2.0.1",
+        "responselike": "1.0.2"
+      },
+      "dependencies": {
+        "lowercase-keys": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
+          "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=",
+          "dev": true
+        }
+      }
+    },
+    "call-me-maybe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
+      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
+      "dev": true
+    },
+    "camel-case": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0",
+        "upper-case": "^1.1.1"
+      }
+    },
+    "camelcase": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+      "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+      "dev": true
+    },
+    "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"
+      }
+    },
+    "chardet": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
+      "dev": true
+    },
+    "chokidar": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "dev": true,
+      "requires": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "fsevents": "^1.2.7",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      }
+    },
+    "chownr": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
+      "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==",
+      "dev": true
+    },
+    "chrome-trace-event": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
+      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "clean-css": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
+      "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
+      "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": "0.1.19",
+      "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-0.1.19.tgz",
+      "integrity": "sha512-M1Li5yLHECcN2MahoreuODul5LkjohJGFxLPTjl3j1ttKrF5rgjZET1SJduuqxLAuT1gAPOdkhg03qcaaU1KeA==",
+      "dev": true,
+      "requires": {
+        "rimraf": "^2.6.1"
+      }
+    },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "^2.0.0"
+      }
+    },
+    "cli-table": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
+      "integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=",
+      "dev": true,
+      "requires": {
+        "colors": "1.0.3"
+      },
+      "dependencies": {
+        "colors": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+          "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+          "dev": true
+        }
+      }
+    },
+    "cli-truncate": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz",
+      "integrity": "sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=",
+      "dev": true,
+      "requires": {
+        "slice-ansi": "0.0.4",
+        "string-width": "^1.0.1"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "dev": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        }
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "dev": true
+    },
+    "cliui": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+      "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+      "dev": true,
+      "requires": {
+        "string-width": "^2.1.1",
+        "strip-ansi": "^4.0.0",
+        "wrap-ansi": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+          "dev": true,
+          "requires": {
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+              "dev": true
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+              "dev": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+              "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^2.0.0"
+              }
+            }
+          }
+        }
+      }
+    },
+    "clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+      "dev": true
+    },
+    "clone-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
+      "dev": true
+    },
+    "clone-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+      "dev": true,
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "clone-stats": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+      "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
+      "dev": true
+    },
+    "cloneable-readable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
+      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "process-nextick-args": "^2.0.0",
+        "readable-stream": "^2.3.5"
+      }
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "dev": true
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
+      "requires": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.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": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "dev": true
+    },
+    "commander": {
+      "version": "2.17.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+      "dev": true
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
+    "component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
+    },
+    "compression-webpack-plugin": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-2.0.0.tgz",
+      "integrity": "sha512-bDgd7oTUZC8EkRx8j0sjyCfeiO+e5sFcfgaFcjVhfQf5lLya7oY2BczxcJ7IUuVjz5m6fy8IECFmVFew3xLk8Q==",
+      "dev": true,
+      "requires": {
+        "cacache": "^11.2.0",
+        "find-cache-dir": "^2.0.0",
+        "neo-async": "^2.5.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^1.4.0",
+        "webpack-sources": "^1.0.1"
+      },
+      "dependencies": {
+        "cacache": {
+          "version": "11.3.3",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz",
+          "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.5",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.1.15",
+            "lru-cache": "^5.1.1",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.6.3",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
+          }
+        },
+        "find-cache-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+          "dev": true,
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^2.0.0",
+            "pkg-dir": "^3.0.0"
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "make-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+          "dev": true,
+          "requires": {
+            "pify": "^4.0.1",
+            "semver": "^5.6.0"
+          }
+        },
+        "mississippi": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+          "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+          "dev": true,
+          "requires": {
+            "concat-stream": "^1.5.0",
+            "duplexify": "^3.4.2",
+            "end-of-stream": "^1.1.0",
+            "flush-write-stream": "^1.0.0",
+            "from2": "^2.1.0",
+            "parallel-transform": "^1.1.0",
+            "pump": "^3.0.0",
+            "pumpify": "^1.3.3",
+            "stream-each": "^1.1.0",
+            "through2": "^2.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
+          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.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
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.0"
+          }
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        },
+        "ssri": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1"
+          }
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
+        }
+      }
+    },
+    "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
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "console-browserify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+      "dev": true
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "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
+    },
+    "convert-source-map": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "copy-concurrently": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "fs-write-stream-atomic": "^1.0.8",
+        "iferr": "^0.1.5",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.0"
+      }
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true
+    },
+    "copy-webpack-plugin": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz",
+      "integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
+      "dev": true,
+      "requires": {
+        "cacache": "^10.0.4",
+        "find-cache-dir": "^1.0.0",
+        "globby": "^7.1.1",
+        "is-glob": "^4.0.0",
+        "loader-utils": "^1.1.0",
+        "minimatch": "^3.0.4",
+        "p-limit": "^1.0.0",
+        "serialize-javascript": "^1.4.0"
+      }
+    },
+    "core-js": {
+      "version": "2.6.10",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz",
+      "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "create-ecdh": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.0.0"
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "cross-env": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.1.tgz",
+      "integrity": "sha512-1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^6.0.5"
+      }
+    },
+    "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"
+      }
+    },
+    "crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "requires": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      }
+    },
+    "css-loader": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-1.0.1.tgz",
+      "integrity": "sha512-+ZHAZm/yqvJ2kDtPne3uX0C+Vr3Zn5jFn2N4HywtS5ujwvsVkyg0VArEXpl3BgczDA8anieki1FIzhchX4yrDw==",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "^6.26.0",
+        "css-selector-tokenizer": "^0.7.0",
+        "icss-utils": "^2.1.0",
+        "loader-utils": "^1.0.2",
+        "lodash": "^4.17.11",
+        "postcss": "^6.0.23",
+        "postcss-modules-extract-imports": "^1.2.0",
+        "postcss-modules-local-by-default": "^1.2.0",
+        "postcss-modules-scope": "^1.1.0",
+        "postcss-modules-values": "^1.3.0",
+        "postcss-value-parser": "^3.3.0",
+        "source-list-map": "^2.0.0"
+      }
+    },
+    "css-select": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+      "dev": true,
+      "requires": {
+        "boolbase": "~1.0.0",
+        "css-what": "2.1",
+        "domutils": "1.5.1",
+        "nth-check": "~1.0.1"
+      }
+    },
+    "css-selector-tokenizer": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz",
+      "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==",
+      "dev": true,
+      "requires": {
+        "cssesc": "^0.1.0",
+        "fastparse": "^1.1.1",
+        "regexpu-core": "^1.0.0"
+      }
+    },
+    "css-what": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
+      "dev": true
+    },
+    "cssesc": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
+      "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
+      "dev": true
+    },
+    "csstype": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.7.tgz",
+      "integrity": "sha512-9Mcn9sFbGBAdmimWb2gLVDtFJzeKtDGIr76TUqmjZrw9LFXBMSU70lcs+C0/7fyCd6iBDqmksUcCOUIkisPHsQ=="
+    },
+    "cyclist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
+      "dev": true
+    },
+    "d": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "dev": true,
+      "requires": {
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
+      }
+    },
+    "dargs": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/dargs/-/dargs-5.1.0.tgz",
+      "integrity": "sha1-7H6lDHhWTNNsnV7Bj2Yyn63ieCk=",
+      "dev": true
+    },
+    "date-fns": {
+      "version": "1.30.1",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
+      "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==",
+      "dev": true
+    },
+    "dateformat": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
+      "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
+      "dev": true
+    },
+    "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"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true
+    },
+    "decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "dev": true,
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "dev": true
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "requires": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "des.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "detect-conflict": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/detect-conflict/-/detect-conflict-1.0.1.tgz",
+      "integrity": "sha1-CIZXpmqWHAUBnbfEIwiDsca0F24=",
+      "dev": true
+    },
+    "detect-indent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+      "dev": true,
+      "requires": {
+        "repeating": "^2.0.0"
+      }
+    },
+    "diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "dev": true
+    },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "dir-glob": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
+      "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
+      "dev": true,
+      "requires": {
+        "path-type": "^3.0.0"
+      }
+    },
+    "dom-converter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+      "dev": true,
+      "requires": {
+        "utila": "~0.4"
+      }
+    },
+    "dom-serializer": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
+          "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
+          "dev": true
+        }
+      }
+    },
+    "domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true
+    },
+    "domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+      "dev": true
+    },
+    "domhandler": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1"
+      }
+    },
+    "domutils": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+      "dev": true,
+      "requires": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+      "dev": true
+    },
+    "duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "editions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/editions/-/editions-2.2.0.tgz",
+      "integrity": "sha512-RYg3iEA2BDLCNVe8PUkD+ox5vAKxB9XS/mAhx1bdxGCF0CpX077C0pyTA9t5D6idCYA3avl5/XDHKPsHFrygfw==",
+      "dev": true,
+      "requires": {
+        "errlop": "^1.1.2",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "ejs": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.2.tgz",
+      "integrity": "sha512-rHGwtpl67oih3xAHbZlpw5rQAt+YV1mSCu2fUZ9XNrfaGEhom7E+AUiMci+ByP4aSfuAWx7hE0BPuJLMrpXwOw==",
+      "dev": true
+    },
+    "elegant-spinner": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz",
+      "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
+      "dev": true
+    },
+    "elliptic": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz",
+      "integrity": "sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
+      }
+    },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "enhanced-resolve": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
+      "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.5.0",
+        "tapable": "^1.0.0"
+      }
+    },
+    "entities": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
+      "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
+      "dev": true
+    },
+    "envinfo": {
+      "version": "5.12.1",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-5.12.1.tgz",
+      "integrity": "sha512-pwdo0/G3CIkQ0y6PCXq4RdkvId2elvtPCJMG0konqlrfkWQbf1DWeH9K2b/cvu2YgGvPPTOnonZxXM1gikFu1w==",
+      "dev": true
+    },
+    "errlop": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/errlop/-/errlop-1.3.0.tgz",
+      "integrity": "sha512-qbb3CRis7c/XouHw41umhSIt4e0KFcESXDrWvgFwIuD/neT1WBO9lKFj7sriqPgF8xEY0Vz6Ws5hMbjN4q/hsQ==",
+      "dev": true,
+      "requires": {
+        "editions": "^2.2.0"
+      }
+    },
+    "errno": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "dev": true,
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
+    "error": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/error/-/error-7.2.1.tgz",
+      "integrity": "sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==",
+      "dev": true,
+      "requires": {
+        "string-template": "~0.2.1"
+      }
+    },
+    "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.16.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz",
+      "integrity": "sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==",
+      "dev": true,
+      "requires": {
+        "es-to-primitive": "^1.2.0",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.0",
+        "is-callable": "^1.1.4",
+        "is-regex": "^1.0.4",
+        "object-inspect": "^1.6.0",
+        "object-keys": "^1.1.1",
+        "string.prototype.trimleft": "^2.1.0",
+        "string.prototype.trimright": "^2.1.0"
+      }
+    },
+    "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"
+      }
+    },
+    "es5-ext": {
+      "version": "0.10.52",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.52.tgz",
+      "integrity": "sha512-bWCbE9fbpYQY4CU6hJbJ1vSz70EClMlDgJ7BmwI+zEJhxrwjesZRPglGJlsZhu0334U3hI+gaspwksH9IGD6ag==",
+      "dev": true,
+      "requires": {
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.2",
+        "next-tick": "~1.0.0"
+      }
+    },
+    "es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "es6-symbol": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "dev": true,
+      "requires": {
+        "d": "^1.0.1",
+        "ext": "^1.1.2"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "eslint-scope": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
+    },
+    "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
+    },
+    "events": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
+      "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
+      "dev": true
+    },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
+    },
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "expand-range": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
+      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+      "dev": true,
+      "requires": {
+        "fill-range": "^2.1.0"
+      },
+      "dependencies": {
+        "fill-range": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+          "dev": true,
+          "requires": {
+            "is-number": "^2.1.0",
+            "isobject": "^2.0.0",
+            "randomatic": "^3.0.0",
+            "repeat-element": "^1.1.2",
+            "repeat-string": "^1.5.2"
+          }
+        },
+        "is-number": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+          "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          }
+        },
+        "isobject": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+          "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+          "dev": true,
+          "requires": {
+            "isarray": "1.0.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+      "dev": true,
+      "requires": {
+        "homedir-polyfill": "^1.0.1"
+      }
+    },
+    "ext": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.2.0.tgz",
+      "integrity": "sha512-0ccUQK/9e3NreLFg6K6np8aPyRgwycx+oFGtfx1dSp7Wj00Ozw9r05FgBRlzjf2XBM7LAzwgLyDscRrtSU91hA==",
+      "dev": true,
+      "requires": {
+        "type": "^2.0.0"
+      },
+      "dependencies": {
+        "type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz",
+          "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==",
+          "dev": true
+        }
+      }
+    },
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "requires": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "external-editor": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+      "dev": true,
+      "requires": {
+        "chardet": "^0.4.0",
+        "iconv-lite": "^0.4.17",
+        "tmp": "^0.0.33"
+      }
+    },
+    "extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "requires": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "fast-deep-equal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "dev": true
+    },
+    "fast-glob": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
+      "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
+      "dev": true,
+      "requires": {
+        "@mrmlnc/readdir-enhanced": "^2.2.1",
+        "@nodelib/fs.stat": "^1.1.2",
+        "glob-parent": "^3.1.0",
+        "is-glob": "^4.0.0",
+        "merge2": "^1.2.3",
+        "micromatch": "^3.1.10"
+      }
+    },
+    "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
+    },
+    "fastparse": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
+      "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
+      "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=",
+      "dev": true,
+      "requires": {
+        "websocket-driver": ">=0.5.1"
+      }
+    },
+    "figgy-pudding": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
+      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
+      "dev": true
+    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "file-loader": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
+      "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.0.2",
+        "schema-utils": "^0.4.5"
+      }
+    },
+    "filename-regex": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
+      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
+      "dev": true
+    },
+    "fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "find-cache-dir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
+      "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
+      "dev": true,
+      "requires": {
+        "commondir": "^1.0.1",
+        "make-dir": "^1.0.0",
+        "pkg-dir": "^2.0.0"
+      }
+    },
+    "find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "dev": true,
+      "requires": {
+        "locate-path": "^2.0.0"
+      }
+    },
+    "first-chunk-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz",
+      "integrity": "sha1-G97NuOCDwGZLkZRVgVd6Q6nzHXA=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "flow-parser": {
+      "version": "0.112.0",
+      "resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.112.0.tgz",
+      "integrity": "sha512-sxjnwhR76B/fUN6n/XerYzn8R1HvtVo3SM8Il3WiZ4nkAlb2BBzKe1TSVKGSyZgD6FW9Bsxom/57ktkqrqmXGA==",
+      "dev": true
+    },
+    "flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "for-own": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.1"
+      }
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
+      "requires": {
+        "map-cache": "^0.2.2"
+      }
+    },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      }
+    },
+    "fs-write-stream-atomic": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "iferr": "^0.1.5",
+        "imurmurhash": "^0.1.4",
+        "readable-stream": "1 || 2"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "^2.12.1",
+        "node-pre-gyp": "^0.12.0"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "aproba": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
+          }
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "balanced-match": "^1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "chownr": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "debug": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "deep-extend": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "fs-minipass": {
+          "version": "1.2.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": 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"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
+        "ignore-walk": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimatch": "^3.0.4"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "once": "^1.3.0",
+            "wrappy": "1"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ini": {
+          "version": "1.3.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "minipass": {
+          "version": "2.3.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.0"
+          }
+        },
+        "minizlib": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "needle": {
+          "version": "2.3.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "^4.1.0",
+            "iconv-lite": "^0.4.4",
+            "sax": "^1.2.4"
+          }
+        },
+        "node-pre-gyp": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "^1.0.2",
+            "mkdirp": "^0.5.1",
+            "needle": "^2.2.1",
+            "nopt": "^4.0.1",
+            "npm-packlist": "^1.1.6",
+            "npmlog": "^4.0.2",
+            "rc": "^1.2.7",
+            "rimraf": "^2.6.1",
+            "semver": "^5.3.0",
+            "tar": "^4"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1",
+            "osenv": "^0.1.4"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "npm-packlist": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ignore-walk": "^3.0.1",
+            "npm-bundled": "^1.0.1"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "wrappy": "1"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "^0.6.0",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "bundled": true,
+          "dev": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sax": {
+          "version": "1.2.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "semver": {
+          "version": "5.7.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "4.4.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chownr": "^1.1.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.3.4",
+            "minizlib": "^1.1.1",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "wide-align": {
+          "version": "1.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "^1.0.2 || 2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "yallist": {
+          "version": "3.0.3",
+          "bundled": true,
+          "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
+    },
+    "get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+      "dev": true
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
+    },
+    "gh-got": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/gh-got/-/gh-got-6.0.0.tgz",
+      "integrity": "sha512-F/mS+fsWQMo1zfgG9MD8KWvTWPPzzhuVwY++fhQ5Ggd+0P+CAMHtzMZhNxG+TqGfHDChJKsbh6otfMGqO2AKBw==",
+      "dev": true,
+      "requires": {
+        "got": "^7.0.0",
+        "is-plain-obj": "^1.1.0"
+      },
+      "dependencies": {
+        "got": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz",
+          "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
+          "dev": true,
+          "requires": {
+            "decompress-response": "^3.2.0",
+            "duplexer3": "^0.1.4",
+            "get-stream": "^3.0.0",
+            "is-plain-obj": "^1.1.0",
+            "is-retry-allowed": "^1.0.0",
+            "is-stream": "^1.0.0",
+            "isurl": "^1.0.0-alpha5",
+            "lowercase-keys": "^1.0.0",
+            "p-cancelable": "^0.3.0",
+            "p-timeout": "^1.1.1",
+            "safe-buffer": "^5.0.1",
+            "timed-out": "^4.0.0",
+            "url-parse-lax": "^1.0.0",
+            "url-to-options": "^1.0.1"
+          }
+        },
+        "p-cancelable": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz",
+          "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==",
+          "dev": true
+        },
+        "p-timeout": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz",
+          "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=",
+          "dev": true,
+          "requires": {
+            "p-finally": "^1.0.0"
+          }
+        },
+        "prepend-http": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+          "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+          "dev": true
+        },
+        "url-parse-lax": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+          "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+          "dev": true,
+          "requires": {
+            "prepend-http": "^1.0.1"
+          }
+        }
+      }
+    },
+    "github-username": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/github-username/-/github-username-4.1.0.tgz",
+      "integrity": "sha1-y+KABBiDIG2kISrp5LXxacML9Bc=",
+      "dev": true,
+      "requires": {
+        "gh-got": "^6.0.0"
+      }
+    },
+    "glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "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-all": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-all/-/glob-all-3.1.0.tgz",
+      "integrity": "sha1-iRPd+17hrHgSZWJBsD1SF8ZLAqs=",
+      "dev": true,
+      "requires": {
+        "glob": "^7.0.5",
+        "yargs": "~1.2.6"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz",
+          "integrity": "sha1-md9lelJXTCHJBXSX33QnkLK0wN4=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "1.2.6",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.2.6.tgz",
+          "integrity": "sha1-nHtKgv1dWVsr8Xq23MQxNUMv40s=",
+          "dev": true,
+          "requires": {
+            "minimist": "^0.1.0"
+          }
+        }
+      }
+    },
+    "glob-base": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+      "dev": true,
+      "requires": {
+        "glob-parent": "^2.0.0",
+        "is-glob": "^2.0.0"
+      },
+      "dependencies": {
+        "glob-parent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+          "dev": true,
+          "requires": {
+            "is-glob": "^2.0.0"
+          }
+        },
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        }
+      }
+    },
+    "glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "dev": true,
+      "requires": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      },
+      "dependencies": {
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.0"
+          }
+        }
+      }
+    },
+    "glob-to-regexp": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
+      "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
+      "dev": true
+    },
+    "global-modules": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "dev": true,
+      "requires": {
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
+      }
+    },
+    "global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      }
+    },
+    "globals": {
+      "version": "9.18.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+      "dev": true
+    },
+    "globby": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+      "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
+      "dev": true,
+      "requires": {
+        "array-union": "^1.0.1",
+        "dir-glob": "^2.0.0",
+        "glob": "^7.1.2",
+        "ignore": "^3.3.5",
+        "pify": "^3.0.0",
+        "slash": "^1.0.0"
+      }
+    },
+    "got": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz",
+      "integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==",
+      "dev": true,
+      "requires": {
+        "@sindresorhus/is": "^0.7.0",
+        "cacheable-request": "^2.1.1",
+        "decompress-response": "^3.3.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^3.0.0",
+        "into-stream": "^3.1.0",
+        "is-retry-allowed": "^1.1.0",
+        "isurl": "^1.0.0-alpha5",
+        "lowercase-keys": "^1.0.0",
+        "mimic-response": "^1.0.0",
+        "p-cancelable": "^0.4.0",
+        "p-timeout": "^2.0.1",
+        "pify": "^3.0.0",
+        "safe-buffer": "^5.1.1",
+        "timed-out": "^4.0.1",
+        "url-parse-lax": "^3.0.0",
+        "url-to-options": "^1.0.1"
+      }
+    },
+    "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==",
+      "dev": true
+    },
+    "grouped-queue": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/grouped-queue/-/grouped-queue-0.3.3.tgz",
+      "integrity": "sha1-wWfSpTGcWg4JZO9qJbfC34mWyFw=",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.2"
+      }
+    },
+    "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-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "has-color": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz",
+      "integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "has-symbol-support-x": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
+      "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
+      "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
+    },
+    "has-to-string-tag-x": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
+      "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
+      "dev": true,
+      "requires": {
+        "has-symbol-support-x": "^1.4.1"
+      }
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "hash-base": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "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
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "hoist-non-react-statics": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
+      "integrity": "sha512-wbg3bpgA/ZqWrZuMOeJi8+SKMhr7X9TesL/rXMjTzh0p0JUBo3II8DHboYbuIXWRlttrUFxwcu/5kygrCw8fJw==",
+      "requires": {
+        "react-is": "^16.7.0"
+      }
+    },
+    "home-or-tmp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.1"
+      }
+    },
+    "homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "dev": true,
+      "requires": {
+        "parse-passwd": "^1.0.0"
+      }
+    },
+    "hosted-git-info": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
+      "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==",
+      "dev": true
+    },
+    "html-minifier": {
+      "version": "3.5.21",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
+      "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
+      "dev": true,
+      "requires": {
+        "camel-case": "3.0.x",
+        "clean-css": "4.2.x",
+        "commander": "2.17.x",
+        "he": "1.2.x",
+        "param-case": "2.1.x",
+        "relateurl": "0.2.x",
+        "uglify-js": "3.4.x"
+      }
+    },
+    "html-webpack-plugin": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
+      "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
+      "dev": true,
+      "requires": {
+        "html-minifier": "^3.2.3",
+        "loader-utils": "^0.2.16",
+        "lodash": "^4.17.3",
+        "pretty-error": "^2.0.2",
+        "tapable": "^1.0.0",
+        "toposort": "^1.0.0",
+        "util.promisify": "1.0.0"
+      },
+      "dependencies": {
+        "big.js": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+          "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
+          "dev": true
+        },
+        "json5": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+          "dev": true
+        },
+        "loader-utils": {
+          "version": "0.2.17",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
+          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+          "dev": true,
+          "requires": {
+            "big.js": "^3.1.3",
+            "emojis-list": "^2.0.0",
+            "json5": "^0.5.0",
+            "object-assign": "^4.0.1"
+          }
+        }
+      }
+    },
+    "htmlparser2": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "^1.3.1",
+        "domhandler": "^2.3.0",
+        "domutils": "^1.5.1",
+        "entities": "^1.1.1",
+        "inherits": "^2.0.1",
+        "readable-stream": "^3.1.1"
+      },
+      "dependencies": {
+        "entities": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
+    "http-cache-semantics": {
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
+      "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
+      "dev": true
+    },
+    "http-parser-js": {
+      "version": "0.4.10",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
+      "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=",
+      "dev": true
+    },
+    "https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "icss-replace-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
+      "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
+      "dev": true
+    },
+    "icss-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz",
+      "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
+      "dev": true,
+      "requires": {
+        "postcss": "^6.0.1"
+      }
+    },
+    "ieee754": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+      "dev": true
+    },
+    "iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true
+    },
+    "ignore": {
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+      "dev": true
+    },
+    "import-local": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz",
+      "integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==",
+      "dev": true,
+      "requires": {
+        "pkg-dir": "^2.0.0",
+        "resolve-cwd": "^2.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+      "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "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
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "dev": true
+    },
+    "inquirer": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz",
+      "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^3.0.0",
+        "chalk": "^2.0.0",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^2.1.0",
+        "figures": "^2.0.0",
+        "lodash": "^4.3.0",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rxjs": "^5.5.2",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^4.0.0",
+        "through": "^2.3.6"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
+    "interpret": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
+      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
+      "dev": true
+    },
+    "into-stream": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
+      "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=",
+      "dev": true,
+      "requires": {
+        "from2": "^2.1.1",
+        "p-is-promise": "^1.1.0"
+      }
+    },
+    "invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "invert-kv": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+      "dev": true
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^1.0.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-callable": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+      "dev": true
+    },
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "dev": true
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "requires": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "is-dotfile": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
+      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
+      "dev": true
+    },
+    "is-equal-shallow": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
+      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+      "dev": true,
+      "requires": {
+        "is-primitive": "^2.0.0"
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-finite": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "^1.0.0"
+      }
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
+      "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
+      "dev": true
+    },
+    "is-observable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz",
+      "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==",
+      "dev": true,
+      "requires": {
+        "symbol-observable": "^1.1.0"
+      },
+      "dependencies": {
+        "symbol-observable": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+          "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
+          "dev": true
+        }
+      }
+    },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true
+    },
+    "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==",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "is-posix-bracket": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
+      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
+      "dev": true
+    },
+    "is-primitive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
+      "dev": true
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.1"
+      }
+    },
+    "is-retry-allowed": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
+      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
+      "dev": true
+    },
+    "is-scoped": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-scoped/-/is-scoped-1.0.0.tgz",
+      "integrity": "sha1-RJypgpnnEwOCViieyytUDcQ3yzA=",
+      "dev": true,
+      "requires": {
+        "scoped-regex": "^1.0.0"
+      }
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
+    },
+    "is-symbol": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
+      "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.0"
+      }
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "isbinaryfile": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
+      "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
+      "dev": true,
+      "requires": {
+        "buffer-alloc": "^1.2.0"
+      }
+    },
+    "isexe": {
+      "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
+    },
+    "istextorbinary": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-2.6.0.tgz",
+      "integrity": "sha512-+XRlFseT8B3L9KyjxxLjfXSLMuErKDsd8DBNrsaxoViABMEZlOSCstwmw0qpoFX3+U6yWU1yhLudAe6/lETGGA==",
+      "dev": true,
+      "requires": {
+        "binaryextensions": "^2.1.2",
+        "editions": "^2.2.0",
+        "textextensions": "^2.5.0"
+      }
+    },
+    "isurl": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
+      "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
+      "dev": true,
+      "requires": {
+        "has-to-string-tag-x": "^1.2.0",
+        "is-object": "^1.0.1"
+      }
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "jscodeshift": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.5.1.tgz",
+      "integrity": "sha512-sRMollbhbmSDrR79JMAnhEjyZJlQQVozeeY9A6/KNuV26DNcuB3mGSCWXp0hks9dcwRNOELbNOiwraZaXXRk5Q==",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-flow-strip-types": "^6.8.0",
+        "babel-preset-es2015": "^6.9.0",
+        "babel-preset-stage-1": "^6.5.0",
+        "babel-register": "^6.9.0",
+        "babylon": "^7.0.0-beta.47",
+        "colors": "^1.1.2",
+        "flow-parser": "^0.*",
+        "lodash": "^4.13.1",
+        "micromatch": "^2.3.7",
+        "neo-async": "^2.5.0",
+        "node-dir": "0.1.8",
+        "nomnom": "^1.8.1",
+        "recast": "^0.15.0",
+        "temp": "^0.8.1",
+        "write-file-atomic": "^1.2.0"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+          "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.0.1"
+          }
+        },
+        "array-unique": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+          "dev": true
+        },
+        "braces": {
+          "version": "1.8.5",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+          "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+          "dev": true,
+          "requires": {
+            "expand-range": "^1.8.1",
+            "preserve": "^0.2.0",
+            "repeat-element": "^1.1.2"
+          }
+        },
+        "expand-brackets": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+          "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+          "dev": true,
+          "requires": {
+            "is-posix-bracket": "^0.1.0"
+          }
+        },
+        "extglob": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+          "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        },
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        },
+        "micromatch": {
+          "version": "2.3.11",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+          "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^2.0.0",
+            "array-unique": "^0.2.1",
+            "braces": "^1.8.2",
+            "expand-brackets": "^0.1.4",
+            "extglob": "^0.3.1",
+            "filename-regex": "^2.0.0",
+            "is-extglob": "^1.0.0",
+            "is-glob": "^2.0.1",
+            "kind-of": "^3.0.2",
+            "normalize-path": "^2.0.1",
+            "object.omit": "^2.0.0",
+            "parse-glob": "^3.0.4",
+            "regex-cache": "^0.4.2"
+          }
+        },
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "dev": true,
+          "requires": {
+            "remove-trailing-separator": "^1.0.1"
+          }
+        }
+      }
+    },
+    "jsesc": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+      "dev": true
+    },
+    "json-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
+      "dev": true
+    },
+    "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"
+      }
+    },
+    "keyv": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz",
+      "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==",
+      "dev": true,
+      "requires": {
+        "json-buffer": "3.0.0"
+      }
+    },
+    "kind-of": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+      "dev": true
+    },
+    "lcid": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+      "dev": true,
+      "requires": {
+        "invert-kv": "^2.0.0"
+      }
+    },
+    "listr": {
+      "version": "0.14.3",
+      "resolved": "https://registry.npmjs.org/listr/-/listr-0.14.3.tgz",
+      "integrity": "sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==",
+      "dev": true,
+      "requires": {
+        "@samverschueren/stream-to-observable": "^0.3.0",
+        "is-observable": "^1.1.0",
+        "is-promise": "^2.1.0",
+        "is-stream": "^1.1.0",
+        "listr-silent-renderer": "^1.1.1",
+        "listr-update-renderer": "^0.5.0",
+        "listr-verbose-renderer": "^0.5.0",
+        "p-map": "^2.0.0",
+        "rxjs": "^6.3.3"
+      },
+      "dependencies": {
+        "rxjs": {
+          "version": "6.5.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
+          "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        }
+      }
+    },
+    "listr-silent-renderer": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz",
+      "integrity": "sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=",
+      "dev": true
+    },
+    "listr-update-renderer": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz",
+      "integrity": "sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.1.3",
+        "cli-truncate": "^0.2.1",
+        "elegant-spinner": "^1.0.1",
+        "figures": "^1.7.0",
+        "indent-string": "^3.0.0",
+        "log-symbols": "^1.0.2",
+        "log-update": "^2.3.0",
+        "strip-ansi": "^3.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "figures": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+          "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
+          "dev": true,
+          "requires": {
+            "escape-string-regexp": "^1.0.5",
+            "object-assign": "^4.1.0"
+          }
+        },
+        "log-symbols": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
+          "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
+          "dev": true,
+          "requires": {
+            "chalk": "^1.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "listr-verbose-renderer": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz",
+      "integrity": "sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.1",
+        "cli-cursor": "^2.1.0",
+        "date-fns": "^1.27.2",
+        "figures": "^2.0.0"
+      }
+    },
+    "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
+    },
+    "load-json-file": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^4.0.0",
+        "pify": "^3.0.0",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "loader-runner": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
+      "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"
+      }
+    },
+    "locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "requires": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+      "dev": true
+    },
+    "log-symbols": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.1"
+      }
+    },
+    "log-update": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz",
+      "integrity": "sha1-iDKP19HOeTiykoN0bwsbwSayRwg=",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^3.0.0",
+        "cli-cursor": "^2.0.0",
+        "wrap-ansi": "^3.0.1"
+      }
+    },
+    "loglevelnext": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/loglevelnext/-/loglevelnext-1.0.5.tgz",
+      "integrity": "sha512-V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==",
+      "dev": true,
+      "requires": {
+        "es6-symbol": "^3.1.1",
+        "object.assign": "^4.1.0"
+      }
+    },
+    "long": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
+      "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=",
+      "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": "1.1.4",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
+      "dev": true
+    },
+    "lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "dev": true,
+      "requires": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "make-dir": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+      "dev": true,
+      "requires": {
+        "pify": "^3.0.0"
+      }
+    },
+    "mamacro": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
+      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
+      "dev": true
+    },
+    "map-age-cleaner": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+      "dev": true,
+      "requires": {
+        "p-defer": "^1.0.0"
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "math-random": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
+      "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
+      "dev": true
+    },
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "mem": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+      "dev": true,
+      "requires": {
+        "map-age-cleaner": "^0.1.1",
+        "mimic-fn": "^2.0.0",
+        "p-is-promise": "^2.0.0"
+      },
+      "dependencies": {
+        "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
+        },
+        "p-is-promise": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+          "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
+          "dev": true
+        }
+      }
+    },
+    "mem-fs": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/mem-fs/-/mem-fs-1.1.3.tgz",
+      "integrity": "sha1-uK6NLj/Lb10/kWXBLUVRoGXZicw=",
+      "dev": true,
+      "requires": {
+        "through2": "^2.0.0",
+        "vinyl": "^1.1.0",
+        "vinyl-file": "^2.0.0"
+      }
+    },
+    "mem-fs-editor": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-4.0.3.tgz",
+      "integrity": "sha512-tgWmwI/+6vwu6POan82dTjxEpwAoaj0NAFnghtVo/FcLK2/7IhPUtFUUYlwou4MOY6OtjTUJtwpfH1h+eSUziw==",
+      "dev": true,
+      "requires": {
+        "commondir": "^1.0.1",
+        "deep-extend": "^0.6.0",
+        "ejs": "^2.5.9",
+        "glob": "^7.0.3",
+        "globby": "^7.1.1",
+        "isbinaryfile": "^3.0.2",
+        "mkdirp": "^0.5.0",
+        "multimatch": "^2.0.0",
+        "rimraf": "^2.2.8",
+        "through2": "^2.0.0",
+        "vinyl": "^2.0.1"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+          "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+          "dev": true
+        },
+        "clone-stats": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+          "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
+          "dev": true
+        },
+        "replace-ext": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
+          "dev": true
+        },
+        "vinyl": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
+          "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
+          "dev": true,
+          "requires": {
+            "clone": "^2.1.1",
+            "clone-buffer": "^1.0.0",
+            "clone-stats": "^1.0.0",
+            "cloneable-readable": "^1.0.0",
+            "remove-trailing-separator": "^1.0.1",
+            "replace-ext": "^1.0.0"
+          }
+        }
+      }
+    },
+    "memory-fs": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
+      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
+      "dev": true,
+      "requires": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "merge2": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz",
+      "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      }
+    },
+    "mime": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+      "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+      "dev": true
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "dev": true
+    },
+    "mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true
+    },
+    "mini-css-extract-plugin": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.5.tgz",
+      "integrity": "sha512-dqBanNfktnp2hwL2YguV9Jh91PFX7gu7nRLs4TGsbAfAG6WOtlynFRYzwDwmmeSb5uIwHo9nx1ta0f7vAZVp2w==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^1.0.0",
+        "webpack-sources": "^1.1.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "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.0",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "dev": true
+    },
+    "mississippi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
+      "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
+      "dev": true,
+      "requires": {
+        "concat-stream": "^1.5.0",
+        "duplexify": "^3.4.2",
+        "end-of-stream": "^1.1.0",
+        "flush-write-stream": "^1.0.0",
+        "from2": "^2.1.0",
+        "parallel-transform": "^1.1.0",
+        "pump": "^2.0.1",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
+      }
+    },
+    "mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "dev": true
+        }
+      }
+    },
+    "mobx": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/mobx/-/mobx-4.3.0.tgz",
+      "integrity": "sha1-UKXmP9AZeoPGgWb/g62kW2XIWfg="
+    },
+    "mobx-react": {
+      "version": "5.4.4",
+      "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-5.4.4.tgz",
+      "integrity": "sha512-2mTzpyEjVB/RGk2i6KbcmP4HWcAUFox5ZRCrGvSyz49w20I4C4qql63grPpYrS9E9GKwgydBHQlA4y665LuRCQ==",
+      "requires": {
+        "hoist-non-react-statics": "^3.0.0",
+        "react-lifecycles-compat": "^3.0.2"
+      }
+    },
+    "move-concurrently": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "multimatch": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz",
+      "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=",
+      "dev": true,
+      "requires": {
+        "array-differ": "^1.0.0",
+        "array-union": "^1.0.1",
+        "arrify": "^1.0.0",
+        "minimatch": "^3.0.0"
+      }
+    },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+      "dev": true,
+      "optional": true
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      }
+    },
+    "neo-async": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
+      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
+      "dev": true
+    },
+    "next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+      "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
+    },
+    "no-case": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "dev": true,
+      "requires": {
+        "lower-case": "^1.1.1"
+      }
+    },
+    "node-dir": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.8.tgz",
+      "integrity": "sha1-VfuN62mQcHB/tn+RpGDwRIKUx30=",
+      "dev": true
+    },
+    "node-libs-browser": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+      "dev": true,
+      "requires": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        }
+      }
+    },
+    "nomnom": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz",
+      "integrity": "sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=",
+      "dev": true,
+      "requires": {
+        "chalk": "~0.4.0",
+        "underscore": "~1.6.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz",
+          "integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
+          "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "~1.0.0",
+            "has-color": "~0.1.0",
+            "strip-ansi": "~0.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
+          "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=",
+          "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"
+      }
+    },
+    "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
+    },
+    "normalize-url": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
+      "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
+      "dev": true,
+      "requires": {
+        "prepend-http": "^2.0.0",
+        "query-string": "^5.0.1",
+        "sort-keys": "^2.0.0"
+      }
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "requires": {
+        "path-key": "^2.0.0"
+      }
+    },
+    "nth-check": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+      "dev": true,
+      "requires": {
+        "boolbase": "~1.0.0"
+      }
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "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="
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
+      "requires": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "object-inspect": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
+      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
+      "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-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.0"
+      }
+    },
+    "object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      }
+    },
+    "object.getownpropertydescriptors": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
+      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.5.1"
+      }
+    },
+    "object.omit": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+      "dev": true,
+      "requires": {
+        "for-own": "^0.1.4",
+        "is-extendable": "^0.1.1"
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "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": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true
+    },
+    "os-locale": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+      "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+      "dev": true,
+      "requires": {
+        "execa": "^1.0.0",
+        "lcid": "^2.0.0",
+        "mem": "^4.0.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
+    "p-cancelable": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
+      "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==",
+      "dev": true
+    },
+    "p-defer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
+      "dev": true
+    },
+    "p-each-series": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-1.0.0.tgz",
+      "integrity": "sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=",
+      "dev": true,
+      "requires": {
+        "p-reduce": "^1.0.0"
+      }
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true
+    },
+    "p-is-promise": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
+      "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
+      "dev": true
+    },
+    "p-lazy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-lazy/-/p-lazy-1.0.0.tgz",
+      "integrity": "sha1-7FPIAvLuOsKPFmzILQsrAt4nqDU=",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
+      "requires": {
+        "p-try": "^1.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "requires": {
+        "p-limit": "^1.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
+    },
+    "p-reduce": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz",
+      "integrity": "sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=",
+      "dev": true
+    },
+    "p-timeout": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz",
+      "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
+      "dev": true,
+      "requires": {
+        "p-finally": "^1.0.0"
+      }
+    },
+    "p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true
+    },
+    "pako": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
+      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==",
+      "dev": true
+    },
+    "parallel-transform": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
+      "dev": true,
+      "requires": {
+        "cyclist": "^1.0.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
+      }
+    },
+    "param-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
+      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0"
+      }
+    },
+    "parse-asn1": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
+      "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
+      "dev": true,
+      "requires": {
+        "asn1.js": "^4.0.0",
+        "browserify-aes": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "parse-glob": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+      "dev": true,
+      "requires": {
+        "glob-base": "^0.3.0",
+        "is-dotfile": "^1.0.0",
+        "is-extglob": "^1.0.0",
+        "is-glob": "^2.0.0"
+      },
+      "dependencies": {
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        }
+      }
+    },
+    "parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+      "dev": true,
+      "requires": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      }
+    },
+    "parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+      "dev": true
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true
+    },
+    "path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+      "dev": true
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "dev": true
+    },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "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": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
+    "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"
+      }
+    },
+    "pbkdf2": {
+      "version": "3.0.17",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
+      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
+      "dev": true,
+      "requires": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+      "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"
+      }
+    },
+    "pkg-dir": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+      "dev": true,
+      "requires": {
+        "find-up": "^2.1.0"
+      }
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true
+    },
+    "postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.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
+        }
+      }
+    },
+    "postcss-modules-extract-imports": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz",
+      "integrity": "sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw==",
+      "dev": true,
+      "requires": {
+        "postcss": "^6.0.1"
+      }
+    },
+    "postcss-modules-local-by-default": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz",
+      "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
+      "dev": true,
+      "requires": {
+        "css-selector-tokenizer": "^0.7.0",
+        "postcss": "^6.0.1"
+      }
+    },
+    "postcss-modules-scope": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz",
+      "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
+      "dev": true,
+      "requires": {
+        "css-selector-tokenizer": "^0.7.0",
+        "postcss": "^6.0.1"
+      }
+    },
+    "postcss-modules-values": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz",
+      "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
+      "dev": true,
+      "requires": {
+        "icss-replace-symbols": "^1.1.0",
+        "postcss": "^6.0.1"
+      }
+    },
+    "postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "prepend-http": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
+      "dev": true
+    },
+    "preserve": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
+      "dev": true
+    },
+    "prettier": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
+      "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==",
+      "dev": true
+    },
+    "pretty-bytes": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-4.0.2.tgz",
+      "integrity": "sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk=",
+      "dev": true
+    },
+    "pretty-error": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
+      "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
+      "dev": true,
+      "requires": {
+        "renderkid": "^2.0.1",
+        "utila": "~0.4"
+      }
+    },
+    "private": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+      "dev": true
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "dev": true
+    },
+    "prop-types": {
+      "version": "15.7.2",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+      "requires": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.8.1"
+      }
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
+    },
+    "public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "pump": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
+      "requires": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      }
+    },
+    "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.9.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz",
+      "integrity": "sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA==",
+      "dev": true
+    },
+    "query-string": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
+      "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
+      "dev": true,
+      "requires": {
+        "decode-uri-component": "^0.2.0",
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
+      }
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "dev": true
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true
+    },
+    "randomatic": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
+      "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
+      "dev": true,
+      "requires": {
+        "is-number": "^4.0.0",
+        "kind-of": "^6.0.0",
+        "math-random": "^1.0.1"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
+        }
+      }
+    },
+    "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"
+      }
+    },
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.0.5",
+        "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": "16.12.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-16.12.0.tgz",
+      "integrity": "sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2"
+      }
+    },
+    "react-dom": {
+      "version": "16.12.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.12.0.tgz",
+      "integrity": "sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2",
+        "scheduler": "^0.18.0"
+      }
+    },
+    "react-is": {
+      "version": "16.12.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz",
+      "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q=="
+    },
+    "react-lifecycles-compat": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
+      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
+    },
+    "read-chunk": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-2.1.0.tgz",
+      "integrity": "sha1-agTAkoAF7Z1C4aasVgDhnLx/9lU=",
+      "dev": true,
+      "requires": {
+        "pify": "^3.0.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "read-pkg": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+      "dev": true,
+      "requires": {
+        "load-json-file": "^4.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^3.0.0"
+      }
+    },
+    "read-pkg-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+      "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+      "dev": true,
+      "requires": {
+        "find-up": "^2.0.0",
+        "read-pkg": "^3.0.0"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "dev": true,
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "recast": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/recast/-/recast-0.15.5.tgz",
+      "integrity": "sha512-nkAYNqarh73cMWRKFiPQ8I9dOLFvFk6SnG8u/LUlOYfArDOD/EjsVRAs860TlBLrpxqAXHGET/AUAVjdEymL5w==",
+      "dev": true,
+      "requires": {
+        "ast-types": "0.11.5",
+        "esprima": "~4.0.0",
+        "private": "~0.1.5",
+        "source-map": "~0.6.1"
+      },
+      "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
+        }
+      }
+    },
+    "rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "dev": true,
+      "requires": {
+        "resolve": "^1.1.6"
+      }
+    },
+    "regenerate": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
+      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
+      "dev": true
+    },
+    "regenerator-runtime": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+      "dev": true
+    },
+    "regenerator-transform": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
+      "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.18.0",
+        "babel-types": "^6.19.0",
+        "private": "^0.1.6"
+      }
+    },
+    "regex-cache": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+      "dev": true,
+      "requires": {
+        "is-equal-shallow": "^0.1.3"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "regexpu-core": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
+      "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
+      "dev": true,
+      "requires": {
+        "regenerate": "^1.2.1",
+        "regjsgen": "^0.2.0",
+        "regjsparser": "^0.1.4"
+      }
+    },
+    "regjsgen": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+      "dev": true,
+      "requires": {
+        "jsesc": "~0.5.0"
+      }
+    },
+    "relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
+      "dev": true
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true
+    },
+    "renderkid": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz",
+      "integrity": "sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==",
+      "dev": true,
+      "requires": {
+        "css-select": "^1.1.0",
+        "dom-converter": "^0.2",
+        "htmlparser2": "^3.3.0",
+        "strip-ansi": "^3.0.0",
+        "utila": "^0.4.0"
+      }
+    },
+    "repeat-element": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "dev": true,
+      "requires": {
+        "is-finite": "^1.0.0"
+      }
+    },
+    "replace-ext": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
+      "dev": true
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+      "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+      "dev": true,
+      "requires": {
+        "path-parse": "^1.0.6"
+      }
+    },
+    "resolve-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "dev": true
+    },
+    "responselike": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+      "dev": true,
+      "requires": {
+        "lowercase-keys": "^1.0.0"
+      }
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "dev": true,
+      "requires": {
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "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"
+      }
+    },
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "dev": true,
+      "requires": {
+        "is-promise": "^2.1.0"
+      }
+    },
+    "run-queue": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1"
+      }
+    },
+    "rxjs": {
+      "version": "5.5.12",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz",
+      "integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==",
+      "dev": true,
+      "requires": {
+        "symbol-observable": "1.0.1"
+      }
+    },
+    "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
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "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.18.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.18.0.tgz",
+      "integrity": "sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
+      }
+    },
+    "schema-utils": {
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
+      "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.1.0",
+        "ajv-keywords": "^3.1.0"
+      }
+    },
+    "scoped-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/scoped-regex/-/scoped-regex-1.0.0.tgz",
+      "integrity": "sha1-o0a7Gs1CB65wvXwMfKnlZra63bg=",
+      "dev": true
+    },
+    "semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true
+    },
+    "serialize-javascript": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz",
+      "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==",
+      "dev": true
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "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": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "shelljs": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz",
+      "integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.0.0",
+        "interpret": "^1.0.0",
+        "rechoir": "^0.6.2"
+      }
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "dev": true
+    },
+    "slice-ansi": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
+      "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
+      "dev": true
+    },
+    "slide": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
+      "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=",
+      "dev": true
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "requires": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.2.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "sort-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
+      "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=",
+      "dev": true,
+      "requires": {
+        "is-plain-obj": "^1.0.0"
+      }
+    },
+    "source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true
+    },
+    "source-map-loader": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz",
+      "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==",
+      "dev": true,
+      "requires": {
+        "async": "^2.5.0",
+        "loader-utils": "^1.1.0"
+      }
+    },
+    "source-map-resolve": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "dev": true,
+      "requires": {
+        "atob": "^2.1.1",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-support": {
+      "version": "0.5.16",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
+      "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
+      "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
+        }
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+      "dev": true
+    },
+    "spdx-correct": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+      "dev": true,
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
+      "dev": true
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+      "dev": true
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "ssri": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz",
+      "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "dev": true,
+      "requires": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "stream-each": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "requires": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "stream-shift": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+      "dev": true
+    },
+    "strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
+      "dev": true
+    },
+    "string-template": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
+      "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=",
+      "dev": true
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
+    "string.prototype.trimleft": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz",
+      "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "string.prototype.trimright": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz",
+      "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "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-bom-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz",
+      "integrity": "sha1-+H217yYT9paKpUWr/h7HKLaoKco=",
+      "dev": true,
+      "requires": {
+        "first-chunk-stream": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "dependencies": {
+        "strip-bom": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+          "dev": true,
+          "requires": {
+            "is-utf8": "^0.2.0"
+          }
+        }
+      }
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true
+    },
+    "style-loader": {
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.21.0.tgz",
+      "integrity": "sha512-T+UNsAcl3Yg+BsPKs1vd22Fr8sVT+CJMtzqc6LEw9bbJZb43lm9GoeIfUcDEefBSWC0BhYbcdupV1GtI4DGzxg==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^0.4.5"
+      }
+    },
+    "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"
+      }
+    },
+    "symbol-observable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
+      "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
+      "dev": true
+    },
+    "tapable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+      "dev": true
+    },
+    "temp": {
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz",
+      "integrity": "sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==",
+      "dev": true,
+      "requires": {
+        "rimraf": "~2.6.2"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "textextensions": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-2.6.0.tgz",
+      "integrity": "sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==",
+      "dev": true
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "timed-out": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
+      "dev": true
+    },
+    "timers-browserify": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
+      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+      "dev": true,
+      "requires": {
+        "setimmediate": "^1.0.4"
+      }
+    },
+    "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.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "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
+        }
+      }
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+      "dev": true
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      }
+    },
+    "to-string-loader": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/to-string-loader/-/to-string-loader-1.1.6.tgz",
+      "integrity": "sha512-VNg62//PS1WfNwrK3n7t6wtK5Vdtx/qeYLLEioW46VMlYUwAYT6wnfB+OwS2FMTCalIHu0tk79D3RXX8ttmZTQ==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.0.0"
+      }
+    },
+    "toposort": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
+      "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=",
+      "dev": true
+    },
+    "trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "dev": true
+    },
+    "tsconfig-paths": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
+      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
+      "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.2.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.2.0.tgz",
+      "integrity": "sha512-S/gOOPOkV8rIL4LurZ1vUdYCVgo15iX9ZMJ6wx6w2OgcpT/G4wMyHB6WM+xheSqGMrWKuxFul+aXpCju3wmj/g==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.3.0",
+        "enhanced-resolve": "^4.0.0",
+        "tsconfig-paths": "^3.4.0"
+      }
+    },
+    "tslib": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
+      "dev": true
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+      "dev": true
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "typescript": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+      "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+      "dev": true
+    },
+    "uglify-js": {
+      "version": "3.4.10",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
+      "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
+      "dev": true,
+      "requires": {
+        "commander": "~2.19.0",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
+          "dev": true
+        },
+        "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
+        }
+      }
+    },
+    "uglifyjs-webpack-plugin": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz",
+      "integrity": "sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==",
+      "dev": true,
+      "requires": {
+        "cacache": "^10.0.4",
+        "find-cache-dir": "^1.0.0",
+        "schema-utils": "^0.4.5",
+        "serialize-javascript": "^1.4.0",
+        "source-map": "^0.6.1",
+        "uglify-es": "^3.3.4",
+        "webpack-sources": "^1.1.0",
+        "worker-farm": "^1.5.2"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.13.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
+          "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
+          "dev": true
+        },
+        "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
+        },
+        "uglify-es": {
+          "version": "3.3.9",
+          "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
+          "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
+          "dev": true,
+          "requires": {
+            "commander": "~2.13.0",
+            "source-map": "~0.6.1"
+          }
+        }
+      }
+    },
+    "underscore": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+      "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=",
+      "dev": true
+    },
+    "union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      }
+    },
+    "unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "dev": true,
+      "requires": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "unique-slug": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "dev": true,
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+          "dev": true
+        }
+      }
+    },
+    "untildify": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz",
+      "integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==",
+      "dev": true
+    },
+    "upath": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+      "dev": true
+    },
+    "upper-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
+      "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"
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "dev": true
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+          "dev": true
+        }
+      }
+    },
+    "url-loader": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-1.1.2.tgz",
+      "integrity": "sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "mime": "^2.0.3",
+        "schema-utils": "^1.0.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
+    "url-parse-lax": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
+      "dev": true,
+      "requires": {
+        "prepend-http": "^2.0.0"
+      }
+    },
+    "url-to-options": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
+      "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=",
+      "dev": true
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true
+    },
+    "util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "util.promisify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
+      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "object.getownpropertydescriptors": "^2.0.3"
+      }
+    },
+    "utila": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
+      "dev": true
+    },
+    "uuid": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
+      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
+      "dev": true
+    },
+    "v8-compile-cache": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
+      "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==",
+      "dev": true
+    },
+    "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"
+      }
+    },
+    "vinyl": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
+      "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
+      "dev": true,
+      "requires": {
+        "clone": "^1.0.0",
+        "clone-stats": "^0.0.1",
+        "replace-ext": "0.0.1"
+      }
+    },
+    "vinyl-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/vinyl-file/-/vinyl-file-2.0.0.tgz",
+      "integrity": "sha1-p+v1/779obfRjRQPyweyI++2dRo=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.3.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0",
+        "strip-bom-stream": "^2.0.0",
+        "vinyl": "^1.1.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
+        "strip-bom": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+          "dev": true,
+          "requires": {
+            "is-utf8": "^0.2.0"
+          }
+        }
+      }
+    },
+    "vm-browserify": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+      "dev": true
+    },
+    "watchpack": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "dev": true,
+      "requires": {
+        "chokidar": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0"
+      }
+    },
+    "webpack": {
+      "version": "4.16.5",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.16.5.tgz",
+      "integrity": "sha512-i5cHYHonzSc1zBuwB5MSzW4v9cScZFbprkHK8ZgzPDCRkQXGGpYzPmJhbus5bOrZ0tXTcQp+xyImRSvKb0b+Kw==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.5.13",
+        "@webassemblyjs/helper-module-context": "1.5.13",
+        "@webassemblyjs/wasm-edit": "1.5.13",
+        "@webassemblyjs/wasm-opt": "1.5.13",
+        "@webassemblyjs/wasm-parser": "1.5.13",
+        "acorn": "^5.6.2",
+        "acorn-dynamic-import": "^3.0.0",
+        "ajv": "^6.1.0",
+        "ajv-keywords": "^3.1.0",
+        "chrome-trace-event": "^1.0.0",
+        "enhanced-resolve": "^4.1.0",
+        "eslint-scope": "^4.0.0",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.3.0",
+        "loader-utils": "^1.1.0",
+        "memory-fs": "~0.4.1",
+        "micromatch": "^3.1.8",
+        "mkdirp": "~0.5.0",
+        "neo-async": "^2.5.0",
+        "node-libs-browser": "^2.0.0",
+        "schema-utils": "^0.4.4",
+        "tapable": "^1.0.0",
+        "uglifyjs-webpack-plugin": "^1.2.4",
+        "watchpack": "^1.5.0",
+        "webpack-sources": "^1.0.1"
+      },
+      "dependencies": {
+        "memory-fs": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+          "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+          "dev": true,
+          "requires": {
+            "errno": "^0.1.3",
+            "readable-stream": "^2.0.1"
+          }
+        }
+      }
+    },
+    "webpack-addons": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/webpack-addons/-/webpack-addons-1.1.5.tgz",
+      "integrity": "sha512-MGO0nVniCLFAQz1qv22zM02QPjcpAoJdy7ED0i3Zy7SY1IecgXCm460ib7H/Wq7e9oL5VL6S2BxaObxwIcag0g==",
+      "dev": true,
+      "requires": {
+        "jscodeshift": "^0.4.0"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+          "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.0.1"
+          }
+        },
+        "array-unique": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+          "dev": true
+        },
+        "ast-types": {
+          "version": "0.10.1",
+          "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.10.1.tgz",
+          "integrity": "sha512-UY7+9DPzlJ9VM8eY0b2TUZcZvF+1pO0hzMtAyjBYKhOmnvRlqYNYnWdtsMj0V16CGaMlpL0G1jnLbLo4AyotuQ==",
+          "dev": true
+        },
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        },
+        "babylon": {
+          "version": "6.18.0",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+          "dev": true
+        },
+        "braces": {
+          "version": "1.8.5",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+          "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+          "dev": true,
+          "requires": {
+            "expand-range": "^1.8.1",
+            "preserve": "^0.2.0",
+            "repeat-element": "^1.1.2"
+          }
+        },
+        "expand-brackets": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+          "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+          "dev": true,
+          "requires": {
+            "is-posix-bracket": "^0.1.0"
+          }
+        },
+        "extglob": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+          "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        },
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        },
+        "jscodeshift": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.4.1.tgz",
+          "integrity": "sha512-iOX6If+hsw0q99V3n31t4f5VlD1TQZddH08xbT65ZqA7T4Vkx68emrDZMUOLVvCEAJ6NpAk7DECe3fjC/t52AQ==",
+          "dev": true,
+          "requires": {
+            "async": "^1.5.0",
+            "babel-plugin-transform-flow-strip-types": "^6.8.0",
+            "babel-preset-es2015": "^6.9.0",
+            "babel-preset-stage-1": "^6.5.0",
+            "babel-register": "^6.9.0",
+            "babylon": "^6.17.3",
+            "colors": "^1.1.2",
+            "flow-parser": "^0.*",
+            "lodash": "^4.13.1",
+            "micromatch": "^2.3.7",
+            "node-dir": "0.1.8",
+            "nomnom": "^1.8.1",
+            "recast": "^0.12.5",
+            "temp": "^0.8.1",
+            "write-file-atomic": "^1.2.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        },
+        "micromatch": {
+          "version": "2.3.11",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+          "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^2.0.0",
+            "array-unique": "^0.2.1",
+            "braces": "^1.8.2",
+            "expand-brackets": "^0.1.4",
+            "extglob": "^0.3.1",
+            "filename-regex": "^2.0.0",
+            "is-extglob": "^1.0.0",
+            "is-glob": "^2.0.1",
+            "kind-of": "^3.0.2",
+            "normalize-path": "^2.0.1",
+            "object.omit": "^2.0.0",
+            "parse-glob": "^3.0.4",
+            "regex-cache": "^0.4.2"
+          }
+        },
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "dev": true,
+          "requires": {
+            "remove-trailing-separator": "^1.0.1"
+          }
+        },
+        "recast": {
+          "version": "0.12.9",
+          "resolved": "https://registry.npmjs.org/recast/-/recast-0.12.9.tgz",
+          "integrity": "sha512-y7ANxCWmMW8xLOaiopiRDlyjQ9ajKRENBH+2wjntIbk3A6ZR1+BLQttkmSHMY7Arl+AAZFwJ10grg2T6f1WI8A==",
+          "dev": true,
+          "requires": {
+            "ast-types": "0.10.1",
+            "core-js": "^2.4.1",
+            "esprima": "~4.0.0",
+            "private": "~0.1.5",
+            "source-map": "~0.6.1"
+          }
+        },
+        "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
+        }
+      }
+    },
+    "webpack-cli": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-2.1.5.tgz",
+      "integrity": "sha512-CiWQR+1JS77rmyiO6y1q8Kt/O+e8nUUC9YfJ25JtSmzDwbqJV7vIsh3+QKRHVTbTCa0DaVh8iY1LBiagUIDB3g==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.1",
+        "cross-spawn": "^6.0.5",
+        "diff": "^3.5.0",
+        "enhanced-resolve": "^4.0.0",
+        "envinfo": "^5.7.0",
+        "glob-all": "^3.1.0",
+        "global-modules": "^1.0.0",
+        "got": "^8.3.1",
+        "import-local": "^1.0.0",
+        "inquirer": "^5.2.0",
+        "interpret": "^1.1.0",
+        "jscodeshift": "^0.5.0",
+        "listr": "^0.14.1",
+        "loader-utils": "^1.1.0",
+        "lodash": "^4.17.10",
+        "log-symbols": "^2.2.0",
+        "mkdirp": "^0.5.1",
+        "p-each-series": "^1.0.0",
+        "p-lazy": "^1.0.0",
+        "prettier": "^1.12.1",
+        "supports-color": "^5.4.0",
+        "v8-compile-cache": "^2.0.0",
+        "webpack-addons": "^1.1.5",
+        "yargs": "^11.1.0",
+        "yeoman-environment": "^2.1.1",
+        "yeoman-generator": "^2.0.5"
+      }
+    },
+    "webpack-livereload-plugin": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/webpack-livereload-plugin/-/webpack-livereload-plugin-2.1.1.tgz",
+      "integrity": "sha512-W7Q55QbPvVJotpIZSjjwzmqQ22333ExYxWM3WFlHKkbPStQqVRSmJkjntUqXF9jtpdeXi8r8HLkA1RVnAP0SQA==",
+      "dev": true,
+      "requires": {
+        "tiny-lr": "^1.1.1"
+      }
+    },
+    "webpack-log": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-1.2.0.tgz",
+      "integrity": "sha512-U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.1.0",
+        "log-symbols": "^2.1.0",
+        "loglevelnext": "^1.0.1",
+        "uuid": "^3.1.0"
+      }
+    },
+    "webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "dev": true,
+      "requires": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      },
+      "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
+        }
+      }
+    },
+    "websocket-driver": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
+      "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
+      "dev": true,
+      "requires": {
+        "http-parser-js": ">=0.4.0 <0.4.11",
+        "safe-buffer": ">=5.1.0",
+        "websocket-extensions": ">=0.1.1"
+      }
+    },
+    "websocket-extensions": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
+      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
+      "dev": true
+    },
+    "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"
+      }
+    },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "worker-farm": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
+      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
+      "dev": true,
+      "requires": {
+        "errno": "~0.1.7"
+      }
+    },
+    "wrap-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz",
+      "integrity": "sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=",
+      "dev": true,
+      "requires": {
+        "string-width": "^2.1.1",
+        "strip-ansi": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "write-file-atomic": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
+      "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "imurmurhash": "^0.1.4",
+        "slide": "^1.1.5"
+      }
+    },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true
+    },
+    "y18n": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "dev": true
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "dev": true
+    },
+    "yargs": {
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.1.tgz",
+      "integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==",
+      "dev": true,
+      "requires": {
+        "cliui": "^4.0.0",
+        "decamelize": "^1.1.1",
+        "find-up": "^2.1.0",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^3.1.0",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^2.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "^9.0.2"
+      },
+      "dependencies": {
+        "y18n": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "dev": true
+        }
+      }
+    },
+    "yargs-parser": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
+      "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
+      "dev": true,
+      "requires": {
+        "camelcase": "^4.1.0"
+      }
+    },
+    "yeoman-environment": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.6.0.tgz",
+      "integrity": "sha512-Hl0LBs9/mKun8XyJ6gFiUNhZwjN/eezn+E9IFWz6KtXg/3wsnztF2lgtE8eIjfhWYtvY4yMq9iizi1Ei5JJ+7A==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.1",
+        "cross-spawn": "^6.0.5",
+        "debug": "^3.1.0",
+        "diff": "^3.5.0",
+        "escape-string-regexp": "^1.0.2",
+        "globby": "^8.0.1",
+        "grouped-queue": "^0.3.3",
+        "inquirer": "^6.0.0",
+        "is-scoped": "^1.0.0",
+        "lodash": "^4.17.10",
+        "log-symbols": "^2.2.0",
+        "mem-fs": "^1.1.0",
+        "strip-ansi": "^4.0.0",
+        "text-table": "^0.2.0",
+        "untildify": "^3.0.3"
+      },
+      "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==",
+          "dev": true
+        },
+        "chardet": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+          "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+          "dev": true
+        },
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "dir-glob": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
+          "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
+          "dev": true,
+          "requires": {
+            "arrify": "^1.0.1",
+            "path-type": "^3.0.0"
+          }
+        },
+        "external-editor": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+          "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+          "dev": true,
+          "requires": {
+            "chardet": "^0.7.0",
+            "iconv-lite": "^0.4.24",
+            "tmp": "^0.0.33"
+          }
+        },
+        "globby": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
+          "integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
+          "dev": true,
+          "requires": {
+            "array-union": "^1.0.1",
+            "dir-glob": "2.0.0",
+            "fast-glob": "^2.0.2",
+            "glob": "^7.1.2",
+            "ignore": "^3.3.5",
+            "pify": "^3.0.0",
+            "slash": "^1.0.0"
+          }
+        },
+        "inquirer": {
+          "version": "6.5.2",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
+          "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
+          "dev": true,
+          "requires": {
+            "ansi-escapes": "^3.2.0",
+            "chalk": "^2.4.2",
+            "cli-cursor": "^2.1.0",
+            "cli-width": "^2.0.0",
+            "external-editor": "^3.0.3",
+            "figures": "^2.0.0",
+            "lodash": "^4.17.12",
+            "mute-stream": "0.0.7",
+            "run-async": "^2.2.0",
+            "rxjs": "^6.4.0",
+            "string-width": "^2.1.0",
+            "strip-ansi": "^5.1.0",
+            "through": "^2.3.6"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^4.1.0"
+              }
+            }
+          }
+        },
+        "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
+        },
+        "rxjs": {
+          "version": "6.5.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
+          "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+              "dev": true
+            }
+          }
+        }
+      }
+    },
+    "yeoman-generator": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-2.0.5.tgz",
+      "integrity": "sha512-rV6tJ8oYzm4mmdF2T3wjY+Q42jKF2YiiD0VKfJ8/0ZYwmhCKC9Xs2346HVLPj/xE13i68psnFJv7iS6gWRkeAg==",
+      "dev": true,
+      "requires": {
+        "async": "^2.6.0",
+        "chalk": "^2.3.0",
+        "cli-table": "^0.3.1",
+        "cross-spawn": "^6.0.5",
+        "dargs": "^5.1.0",
+        "dateformat": "^3.0.3",
+        "debug": "^3.1.0",
+        "detect-conflict": "^1.0.0",
+        "error": "^7.0.2",
+        "find-up": "^2.1.0",
+        "github-username": "^4.0.0",
+        "istextorbinary": "^2.2.1",
+        "lodash": "^4.17.10",
+        "make-dir": "^1.1.0",
+        "mem-fs-editor": "^4.0.0",
+        "minimist": "^1.2.0",
+        "pretty-bytes": "^4.0.2",
+        "read-chunk": "^2.1.0",
+        "read-pkg-up": "^3.0.0",
+        "rimraf": "^2.6.2",
+        "run-async": "^2.0.0",
+        "shelljs": "^0.8.0",
+        "text-table": "^0.2.0",
+        "through2": "^2.0.0",
+        "yeoman-environment": "^2.0.5"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "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
+        }
+      }
+    }
+  }
+}
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/package.json b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/package.json
new file mode 100644
index 0000000000..88a2bf4881
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/package.json
@@ -0,0 +1,41 @@
+{
+  "name": "simple",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "webpack-ver": "cross-env NODE_ENV=production webpack --version",
+    "dist": "cross-env NODE_ENV=production webpack --display-error-details",
+    "watch": "cross-env NODE_ENV=development webpack --watch --display-error-details"
+  },
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "awesome-typescript-loader": "^5.0.0",
+    "clean-webpack-plugin": "^0.1.19",
+    "compression-webpack-plugin": "^2.0.0",
+    "copy-webpack-plugin": "^4.6.0",
+    "cross-env": "^5.1.6",
+    "css-loader": "^1.0.0",
+    "file-loader": "^1.1.11",
+    "html-webpack-plugin": "^3.2.0",
+    "mini-css-extract-plugin": "^0.4.1",
+    "source-map-loader": "^0.2.3",
+    "style-loader": "^0.21.0",
+    "to-string-loader": "^1.1.5",
+    "tsconfig-paths-webpack-plugin": "^3.2.0",
+    "typescript": "^2.9.2",
+    "url-loader": "^1.0.1",
+    "webpack": "~4.16.3",
+    "webpack-cli": "~2.1.3",
+    "webpack-livereload-plugin": "~2.1.1"
+  },
+  "dependencies": {
+    "@types/react": "^16.3.14",
+    "@types/react-dom": "^16.0.5",
+    "mobx": "4.3.0",
+    "mobx-react": "^5.1.2",
+    "react": "^16.3.2",
+    "react-dom": "^16.3.2"
+  }
+}
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/FramePresenter.tsx b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/FramePresenter.tsx
new file mode 100644
index 0000000000..96d2f45fdc
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/FramePresenter.tsx
@@ -0,0 +1,94 @@
+import * as React from "react";
+import {PreviewerFrame, PreviewerServerConnection} from "src/PreviewerServerConnection";
+import {PointerPressedEventMessage} from "src/Models/Input/PointerPressedEventMessage";
+import {PointerReleasedEventMessage} from "src/Models/Input/PointerReleasedEventMessage";
+import {PointerMovedEventMessage} from "src/Models/Input/PointerMovedEventMessage";
+import {ScrollEventMessage} from "src/Models/Input/ScrollEventMessage";
+
+interface PreviewerPresenterProps {
+    conn: PreviewerServerConnection;
+}
+
+export class PreviewerPresenter extends React.Component<PreviewerPresenterProps> {
+    private canvasRef: React.RefObject<HTMLCanvasElement>;
+
+    constructor(props: PreviewerPresenterProps) {
+        super(props);
+        this.state = {width: 1, height: 1};
+        this.canvasRef = React.createRef()
+        this.componentDidUpdate({
+            conn: null!
+        }, this.state);
+
+        this.handleMouseDown = this.handleMouseDown.bind(this);
+        this.handleMouseUp = this.handleMouseUp.bind(this);
+        this.handleMouseMove = this.handleMouseMove.bind(this);
+        this.handleWheel = this.handleWheel.bind(this);
+    }
+
+    componentDidMount(): void {
+        this.updateCanvas(this.canvasRef.current, this.props.conn.currentFrame);
+    }
+
+    componentDidUpdate(prevProps: Readonly<PreviewerPresenterProps>, prevState: Readonly<{}>, snapshot?: any): void {
+        if(prevProps.conn != this.props.conn)
+        {
+            if(prevProps.conn)
+                prevProps.conn.removeFrameListener(this.frameHandler);
+            if(this.props.conn)
+                this.props.conn.addFrameListener(this.frameHandler);
+        }
+    }
+
+    private frameHandler = (frame: PreviewerFrame)=>{
+        this.updateCanvas(this.canvasRef.current, frame);
+    };
+
+
+    updateCanvas(canvas: HTMLCanvasElement | null, frame: PreviewerFrame | null) {
+        if (!canvas)
+            return;
+        if (frame == null){
+            canvas.width = canvas.height = 1;
+            canvas.getContext('2d')!.clearRect(0,0,1,1);
+        }
+        else {
+            canvas.width = frame.data.width;
+            canvas.height = frame.data.height;
+            const ctx = canvas.getContext('2d')!;
+            ctx.putImageData(frame.data, 0,0);
+        }
+    }
+
+    handleMouseDown(e: React.MouseEvent) {
+        e.preventDefault();
+        const pointerPressedEventMessage = new PointerPressedEventMessage(e);
+        this.props.conn.sendMouseEvent(pointerPressedEventMessage);
+    }
+
+    handleMouseUp(e: React.MouseEvent) {
+        e.preventDefault();
+        const pointerReleasedEventMessage = new PointerReleasedEventMessage(e);
+        this.props.conn.sendMouseEvent(pointerReleasedEventMessage);
+    }
+
+    handleMouseMove(e: React.MouseEvent) {
+        e.preventDefault();
+        const pointerMovedEventMessage = new PointerMovedEventMessage(e);
+        this.props.conn.sendMouseEvent(pointerMovedEventMessage);
+    }
+
+    handleWheel(e: React.WheelEvent) {
+        e.preventDefault();
+        const scrollEventMessage = new ScrollEventMessage(e);
+        this.props.conn.sendMouseEvent(scrollEventMessage);
+    }
+
+    render() {
+        return <canvas ref={this.canvasRef}
+                       onMouseDown={this.handleMouseDown}
+                       onMouseUp={this.handleMouseUp}
+                       onMouseMove={this.handleMouseMove}
+                       onWheel={this.handleWheel} />
+    }
+}
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/InputEventMessageBase.ts b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/InputEventMessageBase.ts
new file mode 100644
index 0000000000..bfe5aad093
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/InputEventMessageBase.ts
@@ -0,0 +1,11 @@
+import * as React from "react";
+import {InputModifiers} from "./InputModifiers";
+import {getModifiers} from "./MouseEventHelpers";
+
+export abstract class InputEventMessageBase {
+    public readonly modifiers : Array<InputModifiers>;
+
+    protected constructor(e: React.MouseEvent) {
+        this.modifiers = getModifiers(e);
+    }
+}
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/InputModifiers.ts b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/InputModifiers.ts
new file mode 100644
index 0000000000..483b4c02d0
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/InputModifiers.ts
@@ -0,0 +1,9 @@
+export enum InputModifiers {
+    Alt,
+    Control,
+    Shift,
+    Windows,
+    LeftMouseButton,
+    RightMouseButton,
+    MiddleMouseButton,
+}
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/MouseButton.ts b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/MouseButton.ts
new file mode 100644
index 0000000000..880f8fb5ce
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/MouseButton.ts
@@ -0,0 +1,6 @@
+export enum MouseButton {
+    None,
+    Left,
+    Right,
+    Middle,
+}
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/MouseEventHelpers.ts b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/MouseEventHelpers.ts
new file mode 100644
index 0000000000..f2cd1f4d46
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/MouseEventHelpers.ts
@@ -0,0 +1,39 @@
+import * as React from "react";
+import {InputModifiers} from "./InputModifiers";
+import {MouseButton} from "./MouseButton";
+
+export function getModifiers(e: React.MouseEvent): Array<InputModifiers> {
+
+    let modifiers : Array<InputModifiers> = [];
+
+    if (e.altKey)
+        modifiers.push(InputModifiers.Alt);
+    if (e.ctrlKey)
+        modifiers.push(InputModifiers.Control);
+    if (e.shiftKey)
+        modifiers.push(InputModifiers.Shift);
+    if (e.metaKey)
+        modifiers.push(InputModifiers.Windows);
+    if (e.buttons != 0) {
+        if ((e.buttons & 1) != 0)
+            modifiers.push(InputModifiers.LeftMouseButton);
+        if ((e.buttons & 2) != 0)
+            modifiers.push(InputModifiers.RightMouseButton);
+        if ((e.buttons & 4) != 0)
+            modifiers.push(InputModifiers.MiddleMouseButton);
+    }
+
+    return modifiers;
+}
+
+export function getMouseButton(e: React.MouseEvent) : MouseButton {
+    if (e.button == 0) {
+        return MouseButton.Left;
+    } else if (e.button == 1) {
+        return MouseButton.Middle;
+    } else if (e.button == 2) {
+        return MouseButton.Right;
+    } else {
+        return MouseButton.None;
+    }
+}
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/PointerEventMessageBase.ts b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/PointerEventMessageBase.ts
new file mode 100644
index 0000000000..c9de132ff4
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/PointerEventMessageBase.ts
@@ -0,0 +1,13 @@
+import * as React from "react";
+import {InputEventMessageBase} from "./InputEventMessageBase";
+
+export abstract class PointerEventMessageBase extends InputEventMessageBase {
+    public readonly x: number;
+    public readonly y: number;
+
+    protected constructor(e: React.MouseEvent) {
+        super(e);
+        this.x = e.clientX;
+        this.y = e.clientY;
+    }
+}
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/PointerMovedEventMessage.ts b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/PointerMovedEventMessage.ts
new file mode 100644
index 0000000000..3f782d1d46
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/PointerMovedEventMessage.ts
@@ -0,0 +1,12 @@
+import * as React from "react";
+import {PointerEventMessageBase} from "./PointerEventMessageBase";
+
+export class PointerMovedEventMessage extends PointerEventMessageBase {
+    constructor(e: React.MouseEvent) {
+        super(e);
+    }
+
+    public toString = () : string => {
+        return `pointer-moved:${this.modifiers}:${this.x}:${this.y}`;
+    }
+}
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/PointerPressedEventMessage.ts b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/PointerPressedEventMessage.ts
new file mode 100644
index 0000000000..0ae06cc064
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/PointerPressedEventMessage.ts
@@ -0,0 +1,17 @@
+import * as React from "react";
+import {PointerEventMessageBase} from "./PointerEventMessageBase";
+import {MouseButton} from "./MouseButton";
+import {getMouseButton} from "./MouseEventHelpers";
+
+export class PointerPressedEventMessage extends PointerEventMessageBase {
+    public readonly button: MouseButton
+
+    constructor(e: React.MouseEvent) {
+        super(e);
+        this.button = getMouseButton(e);
+    }
+
+    public toString = () : string => {
+        return `pointer-pressed:${this.modifiers}:${this.x}:${this.y}:${this.button}`;
+    }
+}
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/PointerReleasedEventMessage.ts b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/PointerReleasedEventMessage.ts
new file mode 100644
index 0000000000..fb1477b554
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/PointerReleasedEventMessage.ts
@@ -0,0 +1,17 @@
+import * as React from "react";
+import {PointerEventMessageBase} from "./PointerEventMessageBase";
+import {MouseButton} from "./MouseButton";
+import {getMouseButton} from "./MouseEventHelpers";
+
+export class PointerReleasedEventMessage extends PointerEventMessageBase {
+    public readonly button: MouseButton
+
+    constructor(e: React.MouseEvent) {
+        super(e);
+        this.button = getMouseButton(e);
+    }
+
+    public toString = () : string => {
+        return `pointer-released:${this.modifiers}:${this.x}:${this.y}:${this.button}`;
+    }
+}
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/ScrollEventMessage.ts b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/ScrollEventMessage.ts
new file mode 100644
index 0000000000..b11be19d82
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/ScrollEventMessage.ts
@@ -0,0 +1,17 @@
+import * as React from "react";
+import {PointerEventMessageBase} from "./PointerEventMessageBase";
+
+export class ScrollEventMessage extends PointerEventMessageBase {
+    public readonly deltaX: number;
+    public readonly deltaY: number;
+
+    constructor(e: React.WheelEvent) {
+        super(e);
+        this.deltaX = -e.deltaX;
+        this.deltaY = -e.deltaY;
+    }
+
+    public toString = () : string => {
+        return `scroll:${this.modifiers}:${this.x}:${this.y}:${this.deltaX}:${this.deltaY}`;
+    }
+}
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/PreviewerServerConnection.ts b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/PreviewerServerConnection.ts
new file mode 100644
index 0000000000..7f1ab84f99
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/PreviewerServerConnection.ts
@@ -0,0 +1,84 @@
+import { InputEventMessageBase } from "src/Models/Input/InputEventMessageBase";
+
+export interface PreviewerFrame {
+    data: ImageData;
+    dpiX: number;
+    dpiY: number;
+}
+
+export class PreviewerServerConnection {
+    private nextFrame = {
+        width: 0,
+        height: 0,
+        stride: 0,
+        dpiX: 0,
+        dpiY: 0,
+        sequenceId: "0"
+    };
+
+    public currentFrame: PreviewerFrame | null;
+    private handlers = new Set<(frame: PreviewerFrame | null) => void>();
+    private conn: WebSocket;
+
+    public addFrameListener(listener: (frame: PreviewerFrame | null) => void) {
+        this.handlers.add(listener);
+        if (this.currentFrame)
+            listener(this.currentFrame);
+    }
+
+    public removeFrameListener(listener: (frame: PreviewerFrame | null) => void) {
+        this.handlers.delete(listener);
+    }
+
+    public sendMouseEvent(message: InputEventMessageBase) {
+        this.conn.send(message.toString());
+    }
+
+    constructor(uri: string) {
+        this.currentFrame = null;
+        var conn = this.conn = new WebSocket(uri);
+        conn.binaryType = 'arraybuffer';
+
+        const onMessage = this.onMessage;
+        conn.onmessage = msg => onMessage(msg);
+
+        const onClose = () => this.setFrame(null);
+        conn.onclose = () => onClose();
+        conn.onerror = (err: Event) => {
+            onClose();
+            console.log("Connection error: " + err);
+        }
+    }
+
+    private onMessage = (msg: MessageEvent) => {
+        if (typeof msg.data == 'string' || msg.data instanceof String) {
+            const parts = msg.data.split(':');
+            if (parts[0] == 'frame') {
+                this.nextFrame = {
+                    sequenceId: parts[1],
+                    width: parseInt(parts[2]),
+                    height: parseInt(parts[3]),
+                    stride: parseInt(parts[4]),
+                    dpiX: parseInt(parts[5]),
+                    dpiY: parseInt(parts[6])
+                }
+            }
+        } else if (msg.data instanceof ArrayBuffer) {
+            const arr = new Uint8ClampedArray(msg.data, 0);
+            const imageData = new ImageData(arr, this.nextFrame.width, this.nextFrame.height);
+            this.conn.send('frame-received:' + this.nextFrame.sequenceId);
+            this.setFrame({
+                data: imageData,
+                dpiX: this.nextFrame.dpiX,
+                dpiY: this.nextFrame.dpiY
+            });
+
+
+        }
+    };
+
+    private setFrame(frame: PreviewerFrame | null) {
+        this.currentFrame = frame;
+        this.handlers.forEach(h => h(this.currentFrame));
+    }
+}
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/index.html b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/index.html
new file mode 100644
index 0000000000..f5847cdd58
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/index.html
@@ -0,0 +1,14 @@
+<!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>
+</body>
+</html>
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/index.tsx b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/index.tsx
new file mode 100644
index 0000000000..6da4d1fc56
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/index.tsx
@@ -0,0 +1,15 @@
+import * as React from "react";
+import {PreviewerPresenter} from './FramePresenter'
+import {PreviewerServerConnection} from "src/PreviewerServerConnection";
+import * as ReactDOM from "react-dom";
+
+const loc = window.location;
+const conn = new PreviewerServerConnection((loc.protocol === "https:" ? "wss" : "ws") + "://" + loc.host + "/ws");
+
+const App = function(){
+    return <div style={{width: '100%'}}>
+        <PreviewerPresenter conn={conn}/>
+    </div>
+};
+
+ReactDOM.render(<App/>, document.getElementById("app"));
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/tsconfig.json b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/tsconfig.json
new file mode 100644
index 0000000000..f933cde76a
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/tsconfig.json
@@ -0,0 +1,35 @@
+{
+  "compilerOptions": {
+    "outDir": "build/dist",
+    "module": "esnext",
+    "target": "es5",
+    "lib": ["es6", "dom"],
+    "sourceMap": true,
+    "allowJs": true,
+    "jsx": "react",
+    "moduleResolution": "node",
+    "forceConsistentCasingInFileNames": true,
+    "noImplicitReturns": true,
+    "noImplicitThis": true,
+    "noImplicitAny": true,
+    "strictNullChecks": true,
+    "suppressImplicitAnyIndexErrors": true,
+    "noUnusedLocals": false,
+    "baseUrl": ".",
+    "experimentalDecorators": true,
+    "paths": {
+      "*": ["./node_modules/@types/*", "./node_modules/*"],
+      "src/*": ["./src/*"]
+    }
+  },
+  "include": ["./src/**/*"],
+  "exclude": [
+    "node_modules",
+    "build",
+    "scripts",
+    "acceptance-tests",
+    "webpack",
+    "jest",
+    "src/setupTests.ts"
+  ]
+}
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/webpack.config.js b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/webpack.config.js
new file mode 100644
index 0000000000..3750351165
--- /dev/null
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/webpack.config.js
@@ -0,0 +1,117 @@
+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 CopyWebpackPlugin = require('copy-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 = {
+    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: 'awesome-typescript-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([path.resolve(__dirname, 'build')], { verbose: false }),
+        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 CopyWebpackPlugin([
+            // relative path from src
+            //{ from: './src/favicon.ico' },
+            //{ from: './src/assets' }
+        ]),
+        new CompressionPlugin({
+            test: /(\?.*)?$/i
+        })
+    ]
+};
+module.exports = config;
diff --git a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
index 86e34ca6d4..787f44887f 100644
--- a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
+++ b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
@@ -10,7 +10,7 @@ using Avalonia.Threading;
 
 namespace Avalonia.DesignerSupport.Remote
 {
-    class PreviewerWindowImpl : RemoteServerTopLevelImpl, IWindowImpl, IEmbeddableWindowImpl
+    class PreviewerWindowImpl : RemoteServerTopLevelImpl, IWindowImpl
     {
         private readonly IAvaloniaRemoteTransportConnection _transport;
 
@@ -20,7 +20,7 @@ namespace Avalonia.DesignerSupport.Remote
             ClientSize = new Size(1, 1);
         }
 
-        public void Show()
+        public void Show(bool activate)
         {
         }
 
@@ -36,6 +36,7 @@ namespace Avalonia.DesignerSupport.Remote
         {
         }
 
+        public double DesktopScaling => 1.0;
         public PixelPoint Position { get; set; }
         public Action<PixelPoint> PositionChanged { get; set; }
         public Action Deactivated { get; set; }
@@ -44,12 +45,7 @@ namespace Avalonia.DesignerSupport.Remote
         public IPlatformHandle Handle { get; }
         public WindowState WindowState { get; set; }
         public Action<WindowState> WindowStateChanged { get; set; }
-        public Size MaxClientSize { get; } = new Size(4096, 4096);
-        public event Action LostFocus
-        {
-            add {}
-            remove {}
-        }
+        public Size MaxAutoSizeHint { get; } = new Size(4096, 4096);
 
         protected override void OnMessage(IAvaloniaRemoteTransportConnection transport, object obj)
         {
@@ -83,6 +79,17 @@ namespace Avalonia.DesignerSupport.Remote
         }
 
         public IScreenImpl Screen { get; } = new ScreenStub();
+        public Action GotInputWhenDisabled { get; set; }        
+        
+        public Action<bool> ExtendClientAreaToDecorationsChanged { get; set; }
+
+        public Thickness ExtendedMargins { get; } = new Thickness();
+
+        public bool IsClientAreaExtendedToDecorations { get; }
+
+        public Thickness OffScreenMargin { get; } = new Thickness();
+
+        public bool NeedsManagedDecorations => false;
 
         public void Activate()
         {
@@ -96,7 +103,7 @@ namespace Avalonia.DesignerSupport.Remote
         {
         }
 
-        public void SetSystemDecorations(bool enabled)
+        public void SetSystemDecorations(SystemDecorations enabled)
         {
         }
 
@@ -115,5 +122,25 @@ namespace Avalonia.DesignerSupport.Remote
         public void SetTopmost(bool value)
         {
         }
+
+        public void SetParent(IWindowImpl parent)
+        {
+        }
+
+        public void SetEnabled(bool enable)
+        {
+        }
+
+        public void SetExtendClientAreaToDecorationsHint(bool extendIntoClientAreaHint)
+        {            
+        }
+
+        public void SetExtendClientAreaChromeHints(ExtendClientAreaChromeHints hints)
+        {            
+        }
+
+        public void SetExtendClientAreaTitleBarHeightHint(double titleBarHeight)
+        {            
+        }
     }
 }
diff --git a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs
index dcfcd42c04..fe4c580bbb 100644
--- a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs
+++ b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs
@@ -19,7 +19,7 @@ namespace Avalonia.DesignerSupport.Remote
         
         public IWindowImpl CreateWindow() => new WindowStub();
 
-        public IEmbeddableWindowImpl CreateEmbeddableWindow()
+        public IWindowImpl CreateEmbeddableWindow()
         {
             if (s_lastWindow != null)
             {
diff --git a/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
index 617fbc8005..764fc7b332 100644
--- a/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
+++ b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
@@ -5,6 +5,7 @@ using System.Reflection;
 using System.Threading;
 using System.Xml;
 using Avalonia.Controls;
+using Avalonia.DesignerSupport.Remote.HtmlTransport;
 using Avalonia.Input;
 using Avalonia.Remote.Protocol;
 using Avalonia.Remote.Protocol.Designer;
@@ -24,15 +25,16 @@ namespace Avalonia.DesignerSupport.Remote
         {
             public string AppPath { get; set; }
             public Uri Transport { get; set; }
+            public Uri HtmlMethodListenUri { get; set; }
             public string Method { get; set; } = Methods.AvaloniaRemote;
             public string SessionId { get; set; } = Guid.NewGuid().ToString();
         }
 
-        static class Methods
+        internal static class Methods
         {
             public const string AvaloniaRemote = "avalonia-remote";
             public const string Win32 = "win32";
-
+            public const string Html = "html";
         }
 
         static Exception Die(string error)
@@ -52,6 +54,19 @@ namespace Avalonia.DesignerSupport.Remote
         {
             Console.Error.WriteLine("Usage: --transport transport_spec --session-id sid --method method app");
             Console.Error.WriteLine();
+            Console.Error.WriteLine("--transport: transport used for communication with the IDE");
+            Console.Error.WriteLine("    'tcp-bson' (e. g. 'tcp-bson://127.0.0.1:30243/') - TCP-based transport with BSON serialization of messages defined in Avalonia.Remote.Protocol");
+            Console.Error.WriteLine("    'file' (e. g. 'file://C://my/file.xaml' - pseudo-transport that triggers XAML updates on file changes, useful as a standalone previewer tool, always uses http preview method");
+            Console.Error.WriteLine();
+            Console.Error.WriteLine("--session-id: session id to be sent to IDE process");
+            Console.Error.WriteLine();
+            Console.Error.WriteLine("--method: the way the XAML is displayed");
+            Console.Error.WriteLine("    'avalonia-remote' - binary image is sent via transport connection in FrameMessage");
+            Console.Error.WriteLine("    'win32' - XAML is displayed in win32 window (handle could be obtained from UpdateXamlResultMessage), IDE is responsible to use user32!SetParent");
+            Console.Error.WriteLine("    'html' - Previewer starts an HTML server and displays XAML previewer as a web page");
+            Console.Error.WriteLine();
+            Console.Error.WriteLine("--html-url - endpoint for HTML method to listen on, e. g. http://127.0.0.1:8081");
+            Console.Error.WriteLine();
             Console.Error.WriteLine("Example: --transport tcp-bson://127.0.0.1:30243/ --session-id 123 --method avalonia-remote MyApp.exe");
             Console.Error.Flush();
             return Die(null);
@@ -74,6 +89,8 @@ namespace Avalonia.DesignerSupport.Remote
                         next = a => rv.Transport = new Uri(a, UriKind.Absolute);
                     else if (arg == "--method")
                         next = a => rv.Method = a;
+                    else if (arg == "--html-url")
+                        next = a => rv.HtmlMethodListenUri = new Uri(a, UriKind.Absolute);
                     else if (arg == "--session-id")
                         next = a => rv.SessionId = a;
                     else if (rv.AppPath == null)
@@ -89,36 +106,53 @@ namespace Avalonia.DesignerSupport.Remote
             {
                 PrintUsage();
             }
+
+            if (next != null)
+                PrintUsage();
             return rv;
         }
 
-        static IAvaloniaRemoteTransportConnection CreateTransport(Uri transport)
+        static IAvaloniaRemoteTransportConnection CreateTransport(CommandLineArgs args)
         {
+            var transport = args.Transport;
             if (transport.Scheme == "tcp-bson")
             {
                 return new BsonTcpTransport().Connect(IPAddress.Parse(transport.Host), transport.Port).Result;
             }
+
+            if (transport.Scheme == "file")
+            {
+                return new FileWatcherTransport(transport, args.AppPath);
+            }
             PrintUsage();
             return null;
         }
         
         interface IAppInitializer
         {
-            Application GetConfiguredApp(IAvaloniaRemoteTransportConnection transport, CommandLineArgs args, object obj);
+           IAvaloniaRemoteTransportConnection ConfigureApp(IAvaloniaRemoteTransportConnection transport, CommandLineArgs args, object obj);
         }
-        
+
         class AppInitializer<T> : IAppInitializer where T : AppBuilderBase<T>, new()
         {
-            public Application GetConfiguredApp(IAvaloniaRemoteTransportConnection transport,
+            public IAvaloniaRemoteTransportConnection ConfigureApp(IAvaloniaRemoteTransportConnection transport,
                 CommandLineArgs args, object obj)
             {
-                var builder = (AppBuilderBase<T>) obj;
+                var builder = (AppBuilderBase<T>)obj;
                 if (args.Method == Methods.AvaloniaRemote)
                     builder.UseWindowingSubsystem(() => PreviewerWindowingPlatform.Initialize(transport));
+                if (args.Method == Methods.Html)
+                {
+                    transport = new HtmlWebSocketTransport(transport,
+                        args.HtmlMethodListenUri ?? new Uri("http://localhost:5000"));
+                    builder.UseWindowingSubsystem(() =>
+                        PreviewerWindowingPlatform.Initialize(transport));
+                }
+
                 if (args.Method == Methods.Win32)
                     builder.UseWindowingSubsystem("Avalonia.Win32");
                 builder.SetupWithoutStarting();
-                return builder.Instance;
+                return transport;
             }
         }
 
@@ -127,7 +161,9 @@ namespace Avalonia.DesignerSupport.Remote
         public static void Main(string[] cmdline)
         {
             var args = ParseCommandLineArgs(cmdline);
-            var transport = CreateTransport(args.Transport);
+            var transport = CreateTransport(args);
+            if (transport is ITransportWithEnforcedMethod enforcedMethod)
+                args.Method = enforcedMethod.PreviewerMethod;
             var asm = Assembly.LoadFile(System.IO.Path.GetFullPath(args.AppPath));
             var entryPoint = asm.EntryPoint;
             if (entryPoint == null)
@@ -141,12 +177,14 @@ namespace Avalonia.DesignerSupport.Remote
             var appBuilder = builderMethod.Invoke(null, null);
             Log($"Initializing application in design mode");
             var initializer =(IAppInitializer)Activator.CreateInstance(typeof(AppInitializer<>).MakeGenericType(appBuilder.GetType()));
-            var app = initializer.GetConfiguredApp(transport, args, appBuilder);
+            transport = initializer.ConfigureApp(transport, args, appBuilder);
             s_transport = transport;
             transport.OnMessage += OnTransportMessage;
             transport.OnException += (t, e) => Die(e.ToString());
+            transport.Start();
             Log("Sending StartDesignerSessionMessage");
             transport.Send(new StartDesignerSessionMessage {SessionId = args.SessionId});
+            
             Dispatcher.UIThread.MainLoop(CancellationToken.None);
         }
 
@@ -197,18 +235,10 @@ namespace Avalonia.DesignerSupport.Remote
                 }
                 catch (Exception e)
                 {
-                    var xmlException = e as XmlException;
-                    
                     s_transport.Send(new UpdateXamlResultMessage
                     {
                         Error = e.ToString(),
-                        Exception = new ExceptionDetails
-                        {
-                            ExceptionType = e.GetType().FullName,
-                            Message = e.Message.ToString(),
-                            LineNumber = xmlException?.LineNumber,
-                            LinePosition = xmlException?.LinePosition,
-                        }
+                        Exception = new ExceptionDetails(e),
                     });
                 }
             }
diff --git a/src/Avalonia.DesignerSupport/Remote/Stubs.cs b/src/Avalonia.DesignerSupport/Remote/Stubs.cs
index 4bba5ef41b..f6783dc0b7 100644
--- a/src/Avalonia.DesignerSupport/Remote/Stubs.cs
+++ b/src/Avalonia.DesignerSupport/Remote/Stubs.cs
@@ -19,9 +19,10 @@ namespace Avalonia.DesignerSupport.Remote
         public Action Deactivated { get; set; }
         public Action Activated { get; set; }
         public IPlatformHandle Handle { get; }
-        public Size MaxClientSize { get; }
+        public Size MaxAutoSizeHint { get; }
         public Size ClientSize { get; }
-        public double Scaling { get; } = 1.0;
+        public double RenderScaling { get; } = 1.0;
+        public double DesktopScaling => 1.0;
         public IEnumerable<object> Surfaces { get; }
         public Action<RawInputEventArgs> Input { get; set; }
         public Action<Rect> Paint { get; set; }
@@ -29,6 +30,7 @@ namespace Avalonia.DesignerSupport.Remote
         public Action<double> ScalingChanged { get; set; }
         public Func<bool> Closing { get; set; }
         public Action Closed { get; set; }
+        public Action LostFocus { get; set; }
         public IMouseDevice MouseDevice { get; } = new MouseDevice();
         public IPopupImpl CreatePopup() => new WindowStub(this);
 
@@ -37,6 +39,14 @@ namespace Avalonia.DesignerSupport.Remote
         public WindowState WindowState { get; set; }
         public Action<WindowState> WindowStateChanged { get; set; }
 
+        public Action<WindowTransparencyLevel> TransparencyLevelChanged { get; set; }        
+
+        public Action<bool> ExtendClientAreaToDecorationsChanged { get; set; }
+
+        public Thickness ExtendedMargins { get; } = new Thickness();
+
+        public Thickness OffScreenMargin { get; } = new Thickness();
+
         public WindowStub(IWindowImpl parent = null)
         {
             if (parent != null)
@@ -67,7 +77,7 @@ namespace Avalonia.DesignerSupport.Remote
         {
         }
 
-        public void Show()
+        public void Show(bool activate)
         {
         }
 
@@ -110,7 +120,7 @@ namespace Avalonia.DesignerSupport.Remote
         {
         }
 
-        public void SetSystemDecorations(bool enabled)
+        public void SetSystemDecorations(SystemDecorations enabled)
         {
         }
 
@@ -130,7 +140,43 @@ namespace Avalonia.DesignerSupport.Remote
         {
         }
 
+        public void SetParent(IWindowImpl parent)
+        {
+        }
+
+        public void SetEnabled(bool enable)
+        {
+        }
+
+        public void SetExtendClientAreaToDecorationsHint(bool extendIntoClientAreaHint)
+        {
+        }
+
+        public void SetExtendClientAreaChromeHints(ExtendClientAreaChromeHints hints)
+        {
+        }
+
+        public void SetExtendClientAreaTitleBarHeightHint(double titleBarHeight)
+        {
+        }
+
         public IPopupPositioner PopupPositioner { get; }
+
+        public Action GotInputWhenDisabled { get; set; }
+
+        public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel) { }
+
+        public void SetWindowManagerAddShadowHint(bool enabled)
+        {
+        }
+
+        public WindowTransparencyLevel TransparencyLevel { get; private set; }
+
+        public bool IsClientAreaExtendedToDecorations { get; }
+
+        public bool NeedsManagedDecorations => false;
+        
+        public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; } = new AcrylicPlatformCompensationLevels(1, 1, 1);
     }
 
     class ClipboardStub : IClipboard
@@ -140,6 +186,10 @@ namespace Avalonia.DesignerSupport.Remote
         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(new string[0]);
+
+        public Task<object> GetDataAsync(string format) => Task.FromResult((object)null);
     }
 
     class CursorFactoryStub : IStandardCursorFactory
@@ -166,10 +216,10 @@ namespace Avalonia.DesignerSupport.Remote
 
     class SystemDialogsStub : ISystemDialogImpl
     {
-        public Task<string[]> ShowFileDialogAsync(FileDialog dialog, IWindowImpl parent) =>
+        public Task<string[]> ShowFileDialogAsync(FileDialog dialog, Window parent) =>
             Task.FromResult((string[])null);
 
-        public Task<string> ShowFolderDialogAsync(OpenFolderDialog dialog, IWindowImpl parent) =>
+        public Task<string> ShowFolderDialogAsync(OpenFolderDialog dialog, Window parent) =>
             Task.FromResult((string)null);
     }
 
diff --git a/src/Avalonia.Desktop/AppBuilderDesktopExtensions.cs b/src/Avalonia.Desktop/AppBuilderDesktopExtensions.cs
index 36f762d625..7c4a489328 100644
--- a/src/Avalonia.Desktop/AppBuilderDesktopExtensions.cs
+++ b/src/Avalonia.Desktop/AppBuilderDesktopExtensions.cs
@@ -46,10 +46,6 @@ namespace Avalonia
             where TAppBuilder : AppBuilderBase<TAppBuilder>, new()
              => builder.UseX11();
 
-        static void LoadDirect2D1<TAppBuilder>(TAppBuilder builder)
-            where TAppBuilder : AppBuilderBase<TAppBuilder>, new()
-             => builder.UseDirect2D1();
-
         static void LoadSkia<TAppBuilder>(TAppBuilder builder)
             where TAppBuilder : AppBuilderBase<TAppBuilder>, new()
              => builder.UseSkia();
diff --git a/src/Avalonia.Desktop/Avalonia.Desktop.csproj b/src/Avalonia.Desktop/Avalonia.Desktop.csproj
index f45b0c54e3..a9589b7f2b 100644
--- a/src/Avalonia.Desktop/Avalonia.Desktop.csproj
+++ b/src/Avalonia.Desktop/Avalonia.Desktop.csproj
@@ -5,11 +5,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <ProjectReference Include="../../src/Windows/Avalonia.Win32/Avalonia.Win32.csproj" />
-      <ProjectReference Include="../../src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj" />
+      <ProjectReference Include="../../src/Windows/Avalonia.Win32/Avalonia.Win32.csproj" />      
       <ProjectReference Include="../../src/Skia/Avalonia.Skia/Avalonia.Skia.csproj" />
       <ProjectReference Include="../../src/Avalonia.Native/Avalonia.Native.csproj" />
       <ProjectReference Include="../../packages/Avalonia/Avalonia.csproj" />
       <ProjectReference Include="../Avalonia.X11/Avalonia.X11.csproj" />
   </ItemGroup>
+  
+  <Import Project="..\..\build\ApiDiff.props" />  
 </Project>
diff --git a/src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj b/src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj
index c0e46416c1..805aae2d1a 100644
--- a/src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj
+++ b/src/Avalonia.DesktopRuntime/Avalonia.DesktopRuntime.csproj
@@ -17,4 +17,5 @@
   <Import Project="..\..\build\NetCore.props" />
   <Import Project="..\..\build\NetFX.props" />
   <Import Project="..\Shared\PlatformSupport\PlatformSupport.projitems" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>
diff --git a/src/Avalonia.Diagnostics/Assets/Fonts/SourceSansPro-Regular.ttf b/src/Avalonia.Diagnostics/Assets/Fonts/SourceSansPro-Regular.ttf
new file mode 100644
index 0000000000..278ad8aa0a
Binary files /dev/null and b/src/Avalonia.Diagnostics/Assets/Fonts/SourceSansPro-Regular.ttf differ
diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
index 7d0686a33f..db8684747d 100644
--- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
+++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
@@ -1,8 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace>Avalonia</RootNamespace>
+    <PackageId>Avalonia.Diagnostics</PackageId>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Update="**\*.xaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <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" />
@@ -14,8 +22,12 @@
     <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
     <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
-  </ItemGroup>  
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.4.0" />
+  </ItemGroup>
   <Import Project="..\..\build\EmbedXaml.props" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>
diff --git a/src/Avalonia.Diagnostics/DevTools.xaml b/src/Avalonia.Diagnostics/DevTools.xaml
deleted file mode 100644
index 1df0f3a097..0000000000
--- a/src/Avalonia.Diagnostics/DevTools.xaml
+++ /dev/null
@@ -1,24 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="Avalonia.Diagnostics.DevTools">
-  <Grid RowDefinitions="*,Auto" Margin="4">
-
-    <TabControl Grid.Row="0" Items="{Binding Tools}" SelectedItem="{Binding SelectedTool}">
-      <TabControl.ItemTemplate>
-        <DataTemplate>
-          <TextBlock Text="{Binding Name}" />
-        </DataTemplate>
-      </TabControl.ItemTemplate>
-    </TabControl>
-
-    <StackPanel Grid.Row="1" Spacing="4" Orientation="Horizontal">
-      <TextBlock>Hold Ctrl+Shift over a control to inspect.</TextBlock>
-      <Separator Width="8" />
-      <TextBlock>Focused:</TextBlock>
-      <TextBlock Text="{Binding FocusedControl}" />
-      <Separator Width="8" />
-      <TextBlock>Pointer Over:</TextBlock>
-      <TextBlock Text="{Binding PointerOverElement}" />
-    </StackPanel>
-  </Grid>
-</UserControl>
diff --git a/src/Avalonia.Diagnostics/DevTools.xaml.cs b/src/Avalonia.Diagnostics/DevTools.xaml.cs
deleted file mode 100644
index 037e80e372..0000000000
--- a/src/Avalonia.Diagnostics/DevTools.xaml.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Linq;
-using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-using Avalonia.Diagnostics.ViewModels;
-using Avalonia.Input;
-using Avalonia.Input.Raw;
-using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
-using Avalonia.Rendering;
-using Avalonia.VisualTree;
-
-namespace Avalonia
-{
-    public static class DevToolsExtensions
-    {
-        public static void AttachDevTools(this TopLevel control)
-        {
-            Diagnostics.DevTools.Attach(control, new KeyGesture(Key.F12));
-        }
-
-        public static void AttachDevTools(this TopLevel control, KeyGesture gesture)
-        {
-            Diagnostics.DevTools.Attach(control, gesture);
-        }
-
-        public static void OpenDevTools(this TopLevel control)
-        {
-            Diagnostics.DevTools.OpenDevTools(control);
-        }
-    }
-}
-
-namespace Avalonia.Diagnostics
-{
-    public class DevTools : UserControl
-    {
-        private static readonly Dictionary<TopLevel, Window> s_open = new Dictionary<TopLevel, Window>();
-        private static readonly HashSet<IRenderRoot> s_visualTreeRoots = new HashSet<IRenderRoot>();
-        private readonly IDisposable _keySubscription;
-
-        public DevTools(IControl root)
-        {
-            InitializeComponent();
-            Root = root;
-            DataContext = new DevToolsViewModel(root);
-
-            _keySubscription = InputManager.Instance.Process
-                .OfType<RawKeyEventArgs>()
-                .Subscribe(RawKeyDown);
-        }
-
-        // HACK: needed for XAMLIL, will fix that later
-        public DevTools()
-        {
-        }
-
-        public IControl Root { get; }
-
-        public static IDisposable Attach(TopLevel control, KeyGesture gesture)
-        {
-            void PreviewKeyDown(object sender, KeyEventArgs e)
-            {
-                if (gesture.Matches(e))
-                {
-                    OpenDevTools(control);
-                }
-            }
-
-            return control.AddHandler(
-                KeyDownEvent,
-                PreviewKeyDown,
-                RoutingStrategies.Tunnel);
-        }
-
-        internal static void OpenDevTools(TopLevel control)
-        {
-            if (s_open.TryGetValue(control, out var devToolsWindow))
-            {
-                devToolsWindow.Activate();
-            }
-            else
-            {
-                var devTools = new DevTools(control);
-
-                devToolsWindow = new Window
-                {
-                    Width = 1024,
-                    Height = 512,
-                    Content = devTools,
-                    DataTemplates = { new ViewLocator<ViewModelBase>() },
-                    Title = "Avalonia DevTools"
-                };
-
-                devToolsWindow.Closed += devTools.DevToolsClosed;
-                s_open.Add(control, devToolsWindow);
-                MarkAsDevTool(devToolsWindow);
-                devToolsWindow.Show();
-            }
-        }
-
-        private void DevToolsClosed(object sender, EventArgs e)
-        {
-            var devToolsWindow = (Window)sender;
-            var devTools = (DevTools)devToolsWindow.Content;
-            s_open.Remove((TopLevel)devTools.Root);
-            RemoveDevTool(devToolsWindow);
-            _keySubscription.Dispose();
-            devToolsWindow.Closed -= DevToolsClosed;
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-        private void RawKeyDown(RawKeyEventArgs e)
-        {
-            const RawInputModifiers modifiers = RawInputModifiers.Control | RawInputModifiers.Shift;
-
-            if (e.Modifiers == modifiers)
-            {
-                var point = (Root.VisualRoot as IInputRoot)?.MouseDevice?.GetPosition(Root) ?? default(Point);
-                var control = Root.GetVisualsAt(point, x => (!(x is AdornerLayer) && x.IsVisible))
-                    .FirstOrDefault();
-
-                if (control != null)
-                {
-                    var vm = (DevToolsViewModel)DataContext;
-                    vm.SelectControl((IControl)control);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Marks a visual as part of the DevTools, so it can be excluded from event tracking.
-        /// </summary>
-        /// <param name="visual">The visual whose root is to be marked.</param>
-        public static void MarkAsDevTool(IVisual visual)
-        {
-            s_visualTreeRoots.Add(visual.GetVisualRoot());
-        }
-
-        public static void RemoveDevTool(IVisual visual)
-        {
-            s_visualTreeRoots.Remove(visual.GetVisualRoot());
-        }
-
-        public static bool BelongsToDevTool(IVisual visual)
-        {
-            return s_visualTreeRoots.Contains(visual.GetVisualRoot());
-        }
-    }
-}
diff --git a/src/Avalonia.Diagnostics/DevToolsExtensions.cs b/src/Avalonia.Diagnostics/DevToolsExtensions.cs
new file mode 100644
index 0000000000..4bc2ca313f
--- /dev/null
+++ b/src/Avalonia.Diagnostics/DevToolsExtensions.cs
@@ -0,0 +1,31 @@
+using Avalonia.Controls;
+using Avalonia.Diagnostics;
+using Avalonia.Input;
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Extension methods for attaching DevTools..
+    /// </summary>
+    public static class DevToolsExtensions
+    {
+        /// <summary>
+        /// Attaches DevTools to a window, to be opened with the F12 key.
+        /// </summary>
+        /// <param name="root">The window to attach DevTools to.</param>
+        public static void AttachDevTools(this TopLevel root)
+        {
+            DevTools.Attach(root, new KeyGesture(Key.F12));
+        }
+
+        /// <summary>
+        /// Attaches DevTools to a window, to be opened with the specified key gesture.
+        /// </summary>
+        /// <param name="root">The window to attach DevTools to.</param>
+        /// <param name="gesture">The key gesture to open DevTools.</param>
+        public static void AttachDevTools(this TopLevel root, KeyGesture gesture)
+        {
+            DevTools.Attach(root, gesture);
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Converters/BoolToBrushConverter.cs b/src/Avalonia.Diagnostics/Diagnostics/Converters/BoolToBrushConverter.cs
new file mode 100644
index 0000000000..37ba5155fd
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Converters/BoolToBrushConverter.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+using Avalonia.Media;
+
+namespace Avalonia.Diagnostics.Converters
+{
+    internal class BoolToBrushConverter : IValueConverter
+    {
+        public IBrush Brush { get; set; }
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return (bool)value ? Brush : Brushes.Transparent;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/DevTools.cs b/src/Avalonia.Diagnostics/Diagnostics/DevTools.cs
new file mode 100644
index 0000000000..4899be2955
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/DevTools.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Reactive.Disposables;
+using Avalonia.Controls;
+using Avalonia.Diagnostics.Views;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+
+namespace Avalonia.Diagnostics
+{
+    public static class DevTools
+    {
+        private static readonly Dictionary<TopLevel, Window> s_open = new Dictionary<TopLevel, Window>();
+
+        public static IDisposable Attach(TopLevel root, KeyGesture gesture)
+        {
+            void PreviewKeyDown(object sender, KeyEventArgs e)
+            {
+                if (gesture.Matches(e))
+                {
+                    Open(root);
+                }
+            }
+
+            return root.AddDisposableHandler(
+                InputElement.KeyDownEvent,
+                PreviewKeyDown,
+                RoutingStrategies.Tunnel);
+        }
+
+        public static IDisposable Open(TopLevel root)
+        {
+            if (s_open.TryGetValue(root, out var window))
+            {
+                window.Activate();
+            }
+            else
+            {
+                window = new MainWindow
+                {
+                    Width = 1024,
+                    Height = 512,
+                    Root = root,
+                };
+
+                window.Closed += DevToolsClosed;
+                s_open.Add(root, window);
+
+                if (root is Window inspectedWindow)
+                {
+                    window.Show(inspectedWindow);
+                }
+                else
+                {
+                    window.Show();
+                }
+            }
+
+            return Disposable.Create(() => window?.Close());
+        }
+
+        private static void DevToolsClosed(object sender, EventArgs e)
+        {
+            var window = (MainWindow)sender;
+            s_open.Remove(window.Root);
+            window.Closed -= DevToolsClosed;
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Models/ConsoleContext.cs b/src/Avalonia.Diagnostics/Diagnostics/Models/ConsoleContext.cs
new file mode 100644
index 0000000000..5927bd785e
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Models/ConsoleContext.cs
@@ -0,0 +1,36 @@
+#pragma warning disable IDE1006 // Naming Styles
+
+using Avalonia.Diagnostics.ViewModels;
+
+namespace Avalonia.Diagnostics.Models
+{
+    public class ConsoleContext
+    {
+        private readonly ConsoleViewModel _owner;
+
+        internal ConsoleContext(ConsoleViewModel owner) => _owner = owner;
+
+        public readonly string help = @"Welcome to Avalonia DevTools. Here you can execute arbitrary C# code using Roslyn scripting.
+
+The following variables are available:
+
+e: The control currently selected in the logical or visual tree view
+root: The root of the visual tree
+
+The following commands are available:
+
+clear(): Clear the output history
+";
+
+        public dynamic e { get; internal set; }
+        public dynamic root { get; internal set; }
+
+        internal static object NoOutput { get; } = new object();
+
+        public object clear()
+        {
+            _owner.History.Clear();
+            return NoOutput;
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Models/ConsoleHistoryItem.cs b/src/Avalonia.Diagnostics/Diagnostics/Models/ConsoleHistoryItem.cs
new file mode 100644
index 0000000000..86da18145a
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Models/ConsoleHistoryItem.cs
@@ -0,0 +1,19 @@
+using System;
+using Avalonia.Media;
+
+namespace Avalonia.Diagnostics.Models
+{
+    internal class ConsoleHistoryItem
+    {
+        public ConsoleHistoryItem(string input, object output)
+        {
+            Input = input;
+            Output = output;
+            Foreground = output is Exception ? Brushes.Red : Brushes.Green;
+        }
+
+        public string Input { get; }
+        public object Output { get; }
+        public IBrush Foreground { get; }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Models/EventChainLink.cs b/src/Avalonia.Diagnostics/Diagnostics/Models/EventChainLink.cs
similarity index 82%
rename from src/Avalonia.Diagnostics/Models/EventChainLink.cs
rename to src/Avalonia.Diagnostics/Diagnostics/Models/EventChainLink.cs
index 464187a048..65117dc3d1 100644
--- a/src/Avalonia.Diagnostics/Models/EventChainLink.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Models/EventChainLink.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using Avalonia.Interactivity;
 
 namespace Avalonia.Diagnostics.Models
diff --git a/src/Avalonia.Diagnostics/ViewLocator.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewLocator.cs
similarity index 65%
rename from src/Avalonia.Diagnostics/ViewLocator.cs
rename to src/Avalonia.Diagnostics/Diagnostics/ViewLocator.cs
index a66703301d..be3564e781 100644
--- a/src/Avalonia.Diagnostics/ViewLocator.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewLocator.cs
@@ -1,16 +1,12 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
+using Avalonia.Diagnostics.ViewModels;
 
 namespace Avalonia.Diagnostics
 {
-    internal class ViewLocator<TViewModel> : IDataTemplate
+    internal class ViewLocator : IDataTemplate
     {
-        public bool SupportsRecycling => false;
-
         public IControl Build(object data)
         {
             var name = data.GetType().FullName.Replace("ViewModel", "View");
@@ -28,7 +24,7 @@ namespace Avalonia.Diagnostics
 
         public bool Match(object data)
         {
-            return data is TViewModel;
+            return data is ViewModelBase;
         }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs
new file mode 100644
index 0000000000..a9353eba8b
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs
@@ -0,0 +1,95 @@
+using System.ComponentModel;
+using Avalonia.Collections;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+    internal class AvaloniaPropertyViewModel : PropertyViewModel
+    {
+        private readonly AvaloniaObject _target;
+        private string _type;
+        private object _value;
+        private string _priority;
+        private string _group;
+
+        public AvaloniaPropertyViewModel(AvaloniaObject o, AvaloniaProperty property)
+        {
+            _target = o;
+            Property = property;
+
+            Name = property.IsAttached ?
+                $"[{property.OwnerType.Name}.{property.Name}]" :
+                property.Name;
+
+            if (property.IsDirect)
+            {
+                _group = "Properties";
+                Priority = "Direct";
+            }
+
+            Update();
+        }
+
+        public AvaloniaProperty Property { get; }
+        public override object Key => Property;
+        public override string Name { get; }
+        public bool IsAttached => Property.IsAttached;
+
+        public string Priority
+        {
+            get => _priority;
+            private set => RaiseAndSetIfChanged(ref _priority, value);
+        }
+
+        public override string Type => _type;
+
+        public override string Value
+        {
+            get => ConvertToString(_value);
+            set
+            {
+                try
+                {
+                    var convertedValue = ConvertFromString(value, Property.PropertyType);
+                    _target.SetValue(Property, convertedValue);
+                }
+                catch { }
+            }
+        }
+
+        public override string Group
+        {
+            get => _group;
+        }
+
+        public override void Update()
+        {
+            if (Property.IsDirect)
+            {
+                RaiseAndSetIfChanged(ref _value, _target.GetValue(Property), nameof(Value));
+                RaiseAndSetIfChanged(ref _type, _value?.GetType().Name, nameof(Type));
+            }
+            else
+            {
+                var val = _target.GetDiagnostic(Property);
+
+                RaiseAndSetIfChanged(ref _value, val?.Value, nameof(Value));
+                RaiseAndSetIfChanged(ref _type, _value?.GetType().Name, nameof(Type));
+
+                if (val != null)
+                {
+                    SetGroup(IsAttached ? "Attached Properties" : "Properties");
+                    Priority = val.Priority.ToString();
+                }
+                else
+                {
+                    SetGroup(Priority = "Unset");
+                }
+            }
+        }
+
+        private void SetGroup(string group)
+        {
+            RaiseAndSetIfChanged(ref _group, group, nameof(Group));
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs
new file mode 100644
index 0000000000..af5e254204
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs
@@ -0,0 +1,57 @@
+using System.ComponentModel;
+using System.Reflection;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+    internal class ClrPropertyViewModel : PropertyViewModel
+    {
+        private readonly object _target;
+        private string _type;
+        private object _value;
+
+        public ClrPropertyViewModel(object o, PropertyInfo property)
+        {
+            _target = o;
+            Property = property;
+
+            if (!property.DeclaringType.IsInterface)
+            {
+                Name = property.Name;
+            }
+            else
+            {
+                Name = property.DeclaringType.Name + '.' + property.Name;
+            }
+
+            Update();
+        }
+
+        public PropertyInfo Property { get; }
+        public override object Key => Name;
+        public override string Name { get; }
+        public override string Group => "CLR Properties";
+
+        public override string Type => _type;
+
+        public override string Value 
+        {
+            get => ConvertToString(_value);
+            set
+            {
+                try
+                {
+                    var convertedValue = ConvertFromString(value, Property.PropertyType);
+                    Property.SetValue(_target, convertedValue);
+                }
+                catch { }
+            }
+        }
+
+        public override void Update()
+        {
+            var val = Property.GetValue(_target);
+            RaiseAndSetIfChanged(ref _value, val, nameof(Value));
+            RaiseAndSetIfChanged(ref _type, _value?.GetType().Name, nameof(Type));
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ConsoleViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ConsoleViewModel.cs
new file mode 100644
index 0000000000..0e0c44ded8
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ConsoleViewModel.cs
@@ -0,0 +1,112 @@
+using System;
+using System.Reflection;
+using System.Threading.Tasks;
+using Avalonia.Collections;
+using Avalonia.Diagnostics.Models;
+using Microsoft.CodeAnalysis.CSharp.Scripting;
+using Microsoft.CodeAnalysis.Scripting;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+    internal class ConsoleViewModel : ViewModelBase
+    {
+        private readonly ConsoleContext _context;
+        private readonly Action<ConsoleContext> _updateContext;
+        private int _historyIndex = -1;
+        private string _input;
+        private bool _isVisible;
+        private ScriptState<object> _state;
+
+        public ConsoleViewModel(Action<ConsoleContext> updateContext)
+        {
+            _context = new ConsoleContext(this);
+            _updateContext = updateContext;
+        }
+
+        public string Input
+        {
+            get => _input;
+            set => RaiseAndSetIfChanged(ref _input, value);
+        }
+
+        public bool IsVisible
+        {
+            get => _isVisible;
+            set => RaiseAndSetIfChanged(ref _isVisible, value);
+        }
+
+        public AvaloniaList<ConsoleHistoryItem> History { get; } = new AvaloniaList<ConsoleHistoryItem>();
+
+        public async Task Execute()
+        {
+            if (string.IsNullOrWhiteSpace(Input))
+            {
+                return;
+            }
+
+            try
+            {
+                var options = ScriptOptions.Default
+                    .AddReferences(Assembly.GetAssembly(typeof(Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo)));
+
+                _updateContext(_context);
+
+                if (_state == null)
+                {
+                    _state = await CSharpScript.RunAsync(Input, options: options, globals: _context);
+                }
+                else
+                {
+                    _state = await _state.ContinueWithAsync(Input);
+                }
+
+                if (_state.ReturnValue != ConsoleContext.NoOutput)
+                {
+                    History.Add(new ConsoleHistoryItem(Input, _state.ReturnValue ?? "(null)"));
+                }
+            }
+            catch (Exception ex)
+            {
+                History.Add(new ConsoleHistoryItem(Input, ex));
+            }
+
+            Input = string.Empty;
+            _historyIndex = -1;
+        }
+
+        public void HistoryUp()
+        {
+            if (History.Count > 0)
+            {
+                if (_historyIndex == -1)
+                {
+                    _historyIndex = History.Count - 1;
+                }
+                else if (_historyIndex > 0)
+                {
+                    --_historyIndex;
+                }
+
+                Input = History[_historyIndex].Input;
+            }
+        }
+
+        public void HistoryDown()
+        {
+            if (History.Count > 0 && _historyIndex >= 0)
+            {
+                if (_historyIndex == History.Count - 1)
+                {
+                    _historyIndex = -1;
+                    Input = string.Empty;
+                }
+                else
+                {
+                    Input = History[++_historyIndex].Input;
+                }
+            }
+        }
+
+        public void ToggleVisibility() => IsVisible = !IsVisible;
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
new file mode 100644
index 0000000000..fa41eacbeb
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
@@ -0,0 +1,180 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using Avalonia.Collections;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+    internal class ControlDetailsViewModel : ViewModelBase, IDisposable
+    {
+        private readonly IVisual _control;
+        private readonly IDictionary<object, List<PropertyViewModel>> _propertyIndex;
+        private AvaloniaPropertyViewModel _selectedProperty;
+
+        public ControlDetailsViewModel(TreePageViewModel treePage, IVisual control)
+        {
+            _control = control;
+
+            TreePage = treePage;
+
+            var properties = GetAvaloniaProperties(control)
+                .Concat(GetClrProperties(control))
+                .OrderBy(x => x, PropertyComparer.Instance)
+                .ThenBy(x => x.Name)
+                .ToList();
+
+            _propertyIndex = properties.GroupBy(x => x.Key).ToDictionary(x => x.Key, x => x.ToList());
+
+            var view = new DataGridCollectionView(properties);
+            view.GroupDescriptions.Add(new DataGridPathGroupDescription(nameof(AvaloniaPropertyViewModel.Group)));
+            view.Filter = FilterProperty;
+            PropertiesView = view;
+
+            Layout = new ControlLayoutViewModel(control);
+
+            if (control is INotifyPropertyChanged inpc)
+            {
+                inpc.PropertyChanged += ControlPropertyChanged;
+            }
+
+            if (control is AvaloniaObject ao)
+            {
+                ao.PropertyChanged += ControlPropertyChanged;
+            }
+        }
+
+        public TreePageViewModel TreePage { get; }
+
+        public DataGridCollectionView PropertiesView { get; }
+
+        public AvaloniaPropertyViewModel SelectedProperty
+        {
+            get => _selectedProperty;
+            set => RaiseAndSetIfChanged(ref _selectedProperty, value);
+        }
+        
+        public ControlLayoutViewModel Layout { get; }
+
+        public void Dispose()
+        {
+            if (_control is INotifyPropertyChanged inpc)
+            {
+                inpc.PropertyChanged -= ControlPropertyChanged;
+            }
+
+            if (_control is AvaloniaObject ao)
+            {
+                ao.PropertyChanged -= ControlPropertyChanged;
+            }
+        }
+
+        private IEnumerable<PropertyViewModel> GetAvaloniaProperties(object o)
+        {
+            if (o is AvaloniaObject ao)
+            {
+                return AvaloniaPropertyRegistry.Instance.GetRegistered(ao)
+                    .Union(AvaloniaPropertyRegistry.Instance.GetRegisteredAttached(ao.GetType()))
+                    .Select(x => new AvaloniaPropertyViewModel(ao, x));
+            }
+            else
+            {
+                return Enumerable.Empty<AvaloniaPropertyViewModel>();
+            }
+        }
+
+        private IEnumerable<PropertyViewModel> GetClrProperties(object o)
+        {
+            foreach (var p in GetClrProperties(o, o.GetType()))
+            {
+                yield return p;
+            }
+
+            foreach (var i in o.GetType().GetInterfaces())
+            {
+                foreach (var p in GetClrProperties(o, i))
+                {
+                    yield return p;
+                }
+            }
+        }
+
+        private IEnumerable<PropertyViewModel> GetClrProperties(object o, Type t)
+        {
+            return t.GetProperties()
+                .Where(x => x.GetIndexParameters().Length == 0)
+                .Select(x => new ClrPropertyViewModel(o, x));
+        }
+
+        private void ControlPropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
+        {
+            if (_propertyIndex.TryGetValue(e.Property, out var properties))
+            {
+                foreach (var property in properties)
+                {
+                    property.Update();
+                }
+            }
+
+            Layout.ControlPropertyChanged(sender, e);
+        }
+
+        private void ControlPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (_propertyIndex.TryGetValue(e.PropertyName, out var properties))
+            {
+                foreach (var property in properties)
+                {
+                    property.Update();
+                }
+            }
+        }
+
+        private bool FilterProperty(object arg)
+        {
+            if (!string.IsNullOrWhiteSpace(TreePage.PropertyFilter) && arg is PropertyViewModel property)
+            {
+                if (TreePage.UseRegexFilter)
+                {
+                    return TreePage.FilterRegex?.IsMatch(property.Name) ?? true;
+                }
+
+                return property.Name.IndexOf(TreePage.PropertyFilter, StringComparison.OrdinalIgnoreCase) != -1;
+            }
+
+            return true;
+        }
+
+        private class PropertyComparer : IComparer<PropertyViewModel>
+        {
+            public static PropertyComparer Instance { get; } = new PropertyComparer();
+
+            public int Compare(PropertyViewModel x, PropertyViewModel y)
+            {
+                var groupX = GroupIndex(x.Group);
+                var groupY = GroupIndex(y.Group);
+
+                if (groupX != groupY)
+                {
+                    return groupX - groupY;
+                }
+                else
+                {
+                    return string.CompareOrdinal(x.Name, y.Name);
+                }
+            }
+
+            private int GroupIndex(string group)
+            {
+                switch (group)
+                {
+                    case "Properties": return 0;
+                    case "Attached Properties": return 1;
+                    case "CLR Properties": return 2;
+                    default: return 3;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlLayoutViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlLayoutViewModel.cs
new file mode 100644
index 0000000000..fd2e4c3355
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlLayoutViewModel.cs
@@ -0,0 +1,190 @@
+using System.ComponentModel;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+    internal class ControlLayoutViewModel : ViewModelBase
+    {
+        private readonly IVisual _control;
+        private Thickness _marginThickness;
+        private Thickness _borderThickness;
+        private Thickness _paddingThickness;
+        private double _width;
+        private double _height;
+        private string _widthConstraint;
+        private string _heightConstraint;
+        private bool _updatingFromControl;
+
+        public Thickness MarginThickness
+        {
+            get => _marginThickness;
+            set => RaiseAndSetIfChanged(ref _marginThickness, value);
+        }
+        
+        public Thickness BorderThickness
+        {
+            get => _borderThickness;
+            set => RaiseAndSetIfChanged(ref _borderThickness, value);
+        }
+        
+        public Thickness PaddingThickness
+        {
+            get => _paddingThickness;
+            set => RaiseAndSetIfChanged(ref _paddingThickness, value);
+        }
+
+        public double Width
+        {
+            get => _width;
+            private set => RaiseAndSetIfChanged(ref _width, value);
+        }
+
+        public double Height
+        {
+            get => _height;
+            private set => RaiseAndSetIfChanged(ref _height, value);
+        }
+
+        public string WidthConstraint
+        {
+            get => _widthConstraint;
+            private set => RaiseAndSetIfChanged(ref _widthConstraint, value);
+        }
+
+        public string HeightConstraint
+        {
+            get => _heightConstraint;
+            private set => RaiseAndSetIfChanged(ref _heightConstraint, value);
+        }
+
+        public bool HasPadding { get; }
+        
+        public bool HasBorder { get; }
+        
+        public ControlLayoutViewModel(IVisual control)
+        {
+            _control = control;
+
+            HasPadding = AvaloniaPropertyRegistry.Instance.IsRegistered(control, Decorator.PaddingProperty);
+            HasBorder = AvaloniaPropertyRegistry.Instance.IsRegistered(control, Border.BorderThicknessProperty);
+
+            if (control is AvaloniaObject ao)
+            {
+                MarginThickness = ao.GetValue(Layoutable.MarginProperty);
+
+                if (HasPadding)
+                {
+                    PaddingThickness = ao.GetValue(Decorator.PaddingProperty);
+                }
+
+                if (HasBorder)
+                {
+                    BorderThickness = ao.GetValue(Border.BorderThicknessProperty);
+                }
+            }
+
+            UpdateSize();
+            UpdateSizeConstraints();
+        }
+
+        private void UpdateSizeConstraints()
+        {
+            if (_control is IAvaloniaObject ao)
+            {
+                string CreateConstraintInfo(StyledProperty<double> minProperty, StyledProperty<double> maxProperty)
+                {
+                    if (ao.IsSet(minProperty) || ao.IsSet(maxProperty))
+                    {
+                        var minValue = ao.GetValue(minProperty);
+                        var maxValue = ao.GetValue(maxProperty);
+
+                        return $"{minValue} < size < {maxValue}";
+                    }
+
+                    return null;
+                }
+
+                WidthConstraint = CreateConstraintInfo(Layoutable.MinWidthProperty, Layoutable.MaxWidthProperty);
+                HeightConstraint = CreateConstraintInfo(Layoutable.MinHeightProperty, Layoutable.MaxHeightProperty);
+            }
+        }
+
+        protected override void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            base.OnPropertyChanged(e);
+
+            if (_updatingFromControl)
+            {
+                return;
+            }
+
+            if (_control is AvaloniaObject ao)
+            {
+                if (e.PropertyName == nameof(MarginThickness))
+                {
+                    ao.SetValue(Layoutable.MarginProperty, MarginThickness);
+                }
+                else if (HasPadding && e.PropertyName == nameof(PaddingThickness))
+                {
+                    ao.SetValue(Decorator.PaddingProperty, PaddingThickness);
+                }
+                else if (HasBorder && e.PropertyName == nameof(BorderThickness))
+                {
+                    ao.SetValue(Border.BorderThicknessProperty, BorderThickness);
+                }
+            }
+        }
+
+        public void ControlPropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
+        {
+            try
+            {
+                _updatingFromControl = true;
+
+                if (e.Property == Visual.BoundsProperty)
+                {
+                    UpdateSize();
+                }
+                else
+                {
+                    if (_control is IAvaloniaObject ao)
+                    {
+                        if (e.Property == Layoutable.MarginProperty)
+                        {
+                            MarginThickness = ao.GetValue(Layoutable.MarginProperty);
+                        } 
+                        else if (e.Property == Decorator.PaddingProperty)
+                        {
+                            PaddingThickness = ao.GetValue(Decorator.PaddingProperty);
+                        } 
+                        else if (e.Property == Border.BorderThicknessProperty)
+                        {
+                            BorderThickness = ao.GetValue(Border.BorderThicknessProperty);
+                        } 
+                        else if (e.Property == Layoutable.MinWidthProperty ||
+                                 e.Property == Layoutable.MaxWidthProperty ||
+                                 e.Property == Layoutable.MinHeightProperty ||
+                                 e.Property == Layoutable.MaxHeightProperty)
+                        {
+                            UpdateSizeConstraints();
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                _updatingFromControl = false;
+            }
+        }
+
+        private void UpdateSize()
+        {
+            var size = _control.Bounds;
+
+            Width = size.Width;
+            Height = size.Height;
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/ViewModels/EventOwnerTreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventOwnerTreeNode.cs
similarity index 88%
rename from src/Avalonia.Diagnostics/ViewModels/EventOwnerTreeNode.cs
rename to src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventOwnerTreeNode.cs
index 7e38749a6f..60f247ead1 100644
--- a/src/Avalonia.Diagnostics/ViewModels/EventOwnerTreeNode.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventOwnerTreeNode.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Collections;
@@ -19,7 +16,7 @@ namespace Avalonia.Diagnostics.ViewModels
             InputElement.PointerReleasedEvent, InputElement.PointerPressedEvent
         };
 
-        public EventOwnerTreeNode(Type type, IEnumerable<RoutedEvent> events, EventsViewModel vm)
+        public EventOwnerTreeNode(Type type, IEnumerable<RoutedEvent> events, EventsPageViewModel vm)
             : base(null, type.Name)
         {
             Children = new AvaloniaList<EventTreeNodeBase>(events.OrderBy(e => e.Name)
diff --git a/src/Avalonia.Diagnostics/ViewModels/EventTreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNode.cs
similarity index 84%
rename from src/Avalonia.Diagnostics/ViewModels/EventTreeNode.cs
rename to src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNode.cs
index 36f1904253..9291b3bdf7 100644
--- a/src/Avalonia.Diagnostics/ViewModels/EventTreeNode.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNode.cs
@@ -1,8 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using Avalonia.Diagnostics.Models;
+using Avalonia.Diagnostics.Views;
 using Avalonia.Interactivity;
 using Avalonia.Threading;
 using Avalonia.VisualTree;
@@ -12,11 +10,11 @@ namespace Avalonia.Diagnostics.ViewModels
     internal class EventTreeNode : EventTreeNodeBase
     {
         private readonly RoutedEvent _event;
-        private readonly EventsViewModel _parentViewModel;
+        private readonly EventsPageViewModel _parentViewModel;
         private bool _isRegistered;
         private FiredEvent _currentEvent;
 
-        public EventTreeNode(EventOwnerTreeNode parent, RoutedEvent @event, EventsViewModel vm)
+        public EventTreeNode(EventOwnerTreeNode parent, RoutedEvent @event, EventsPageViewModel vm)
             : base(parent, @event.Name)
         {
             Contract.Requires<ArgumentNullException>(@event != null);
@@ -65,7 +63,7 @@ namespace Avalonia.Diagnostics.ViewModels
         {
             if (!_isRegistered || IsEnabled == false)
                 return;
-            if (sender is IVisual v && DevTools.BelongsToDevTool(v))
+            if (sender is IVisual v && BelongsToDevTool(v))
                 return;
 
             var s = sender;
@@ -94,5 +92,20 @@ namespace Avalonia.Diagnostics.ViewModels
             else
                 handler();
         }
+
+        private static bool BelongsToDevTool(IVisual v)
+        {
+            while (v != null)
+            {
+                if (v is MainView || v is MainWindow)
+                {
+                    return true;
+                }
+
+                v = v.VisualParent;
+            }
+
+            return false;
+        }
     }
 }
diff --git a/src/Avalonia.Diagnostics/ViewModels/EventTreeNodeBase.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNodeBase.cs
similarity index 89%
rename from src/Avalonia.Diagnostics/ViewModels/EventTreeNodeBase.cs
rename to src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNodeBase.cs
index 4be4d8f74e..1bd4117f23 100644
--- a/src/Avalonia.Diagnostics/ViewModels/EventTreeNodeBase.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNodeBase.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Collections;
+using Avalonia.Collections;
 
 namespace Avalonia.Diagnostics.ViewModels
 {
diff --git a/src/Avalonia.Diagnostics/ViewModels/EventsViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventsPageViewModel.cs
similarity index 59%
rename from src/Avalonia.Diagnostics/ViewModels/EventsViewModel.cs
rename to src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventsPageViewModel.cs
index 1c868148ce..361e82bc73 100644
--- a/src/Avalonia.Diagnostics/ViewModels/EventsViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventsPageViewModel.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Linq;
@@ -12,12 +9,12 @@ using Avalonia.Media;
 
 namespace Avalonia.Diagnostics.ViewModels
 {
-    internal class EventsViewModel : ViewModelBase, IDevToolViewModel
+    internal class EventsPageViewModel : ViewModelBase
     {
         private readonly IControl _root;
         private FiredEvent _selectedEvent;
 
-        public EventsViewModel(IControl root)
+        public EventsPageViewModel(IControl root)
         {
             _root = root;
 
@@ -45,17 +42,4 @@ namespace Avalonia.Diagnostics.ViewModels
             RecordedEvents.Clear();
         }
     }
-
-    internal class BoolToBrushConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return (bool)value ? Brushes.Green : Brushes.Transparent;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
 }
diff --git a/src/Avalonia.Diagnostics/ViewModels/FiredEvent.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/FiredEvent.cs
similarity index 92%
rename from src/Avalonia.Diagnostics/ViewModels/FiredEvent.cs
rename to src/Avalonia.Diagnostics/Diagnostics/ViewModels/FiredEvent.cs
index daf8ebd0f6..ae53cf6154 100644
--- a/src/Avalonia.Diagnostics/ViewModels/FiredEvent.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/FiredEvent.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.ObjectModel;
 using Avalonia.Diagnostics.Models;
 using Avalonia.Interactivity;
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/LogicalTreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/LogicalTreeNode.cs
new file mode 100644
index 0000000000..38788ef8ee
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/LogicalTreeNode.cs
@@ -0,0 +1,48 @@
+using System;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.LogicalTree;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+    internal class LogicalTreeNode : TreeNode
+    {
+        public LogicalTreeNode(ILogical logical, TreeNode parent)
+            : base((Control)logical, parent)
+        {
+            Children = new LogicalTreeNodeCollection(this, logical);
+        }
+
+        public static LogicalTreeNode[] Create(object control)
+        {
+            var logical = control as ILogical;
+            return logical != null ? new[] { new LogicalTreeNode(logical, null) } : null;
+        }
+
+        internal class LogicalTreeNodeCollection : TreeNodeCollection
+        {
+            private readonly ILogical _control;
+            private IDisposable _subscription;
+
+            public LogicalTreeNodeCollection(TreeNode owner, ILogical control)
+                : base(owner)
+            {
+                _control = control;
+            }
+
+            public override void Dispose()
+            {
+                base.Dispose();
+                _subscription?.Dispose();
+            }
+
+            protected override void Initialize(AvaloniaList<TreeNode> nodes)
+            {
+                _subscription = _control.LogicalChildren.ForEachItem(
+                    (i, item) => nodes.Insert(i, new LogicalTreeNode(item, Owner)),
+                    (i, item) => nodes.RemoveAt(i),
+                    () => nodes.Clear());
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
new file mode 100644
index 0000000000..bf7d0e232a
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
@@ -0,0 +1,189 @@
+using System;
+using System.ComponentModel;
+using Avalonia.Controls;
+using Avalonia.Diagnostics.Models;
+using Avalonia.Input;
+using Avalonia.Threading;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+    internal class MainViewModel : ViewModelBase, IDisposable
+    {
+        private readonly TopLevel _root;
+        private readonly TreePageViewModel _logicalTree;
+        private readonly TreePageViewModel _visualTree;
+        private readonly EventsPageViewModel _events;
+        private readonly IDisposable _pointerOverSubscription;
+        private ViewModelBase _content;
+        private int _selectedTab;
+        private string _focusedControl;
+        private string _pointerOverElement;
+        private bool _shouldVisualizeMarginPadding = true;
+        private bool _shouldVisualizeDirtyRects;
+        private bool _showFpsOverlay;
+
+        public MainViewModel(TopLevel root)
+        {
+            _root = root;
+            _logicalTree = new TreePageViewModel(this, LogicalTreeNode.Create(root));
+            _visualTree = new TreePageViewModel(this, VisualTreeNode.Create(root));
+            _events = new EventsPageViewModel(root);
+
+            UpdateFocusedControl();
+            KeyboardDevice.Instance.PropertyChanged += KeyboardPropertyChanged;
+            SelectedTab = 0;
+            _pointerOverSubscription = root.GetObservable(TopLevel.PointerOverElementProperty)
+                .Subscribe(x => PointerOverElement = x?.GetType().Name);
+            Console = new ConsoleViewModel(UpdateConsoleContext);
+        }
+
+        public bool ShouldVisualizeMarginPadding
+        {
+            get => _shouldVisualizeMarginPadding;
+            set => RaiseAndSetIfChanged(ref _shouldVisualizeMarginPadding, value);
+        }
+        
+        public bool ShouldVisualizeDirtyRects
+        {
+            get => _shouldVisualizeDirtyRects;
+            set
+            {
+                _root.Renderer.DrawDirtyRects = value;
+                RaiseAndSetIfChanged(ref _shouldVisualizeDirtyRects, value);
+            }
+        }
+
+        public void ToggleVisualizeDirtyRects()
+        {
+            ShouldVisualizeDirtyRects = !ShouldVisualizeDirtyRects;
+        }
+
+        public void ToggleVisualizeMarginPadding()
+        {
+            ShouldVisualizeMarginPadding = !ShouldVisualizeMarginPadding;
+        }
+
+        public bool ShowFpsOverlay
+        {
+            get => _showFpsOverlay;
+            set
+            {
+                _root.Renderer.DrawFps = value;
+                RaiseAndSetIfChanged(ref _showFpsOverlay, value);
+            }
+        }
+
+        public void ToggleFpsOverlay()
+        {
+            ShowFpsOverlay = !ShowFpsOverlay;
+        }
+
+        public ConsoleViewModel Console { get; }
+
+        public ViewModelBase Content
+        {
+            get { return _content; }
+            private set
+            {
+                if (_content is TreePageViewModel oldTree &&
+                    value is TreePageViewModel newTree &&
+                    oldTree?.SelectedNode?.Visual is IControl control)
+                {
+                    // HACK: We want to select the currently selected control in the new tree, but
+                    // to select nested nodes in TreeView, currently the TreeView has to be able to
+                    // expand the parent nodes. Because at this point the TreeView isn't visible,
+                    // this will fail unless we schedule the selection to run after layout.
+                    DispatcherTimer.RunOnce(
+                        () =>
+                        {
+                            try
+                            {
+                                newTree.SelectControl(control);
+                            }
+                            catch { }
+                        },
+                        TimeSpan.FromMilliseconds(0),
+                        DispatcherPriority.ApplicationIdle);
+                }
+
+                RaiseAndSetIfChanged(ref _content, value);
+            }
+        }
+
+        public int SelectedTab
+        {
+            get { return _selectedTab; }
+            set
+            {
+                _selectedTab = value;
+
+                switch (value)
+                {
+                    case 0:
+                        Content = _logicalTree;
+                        break;
+                    case 1:
+                        Content = _visualTree;
+                        break;
+                    case 2:
+                        Content = _events;
+                        break;
+                }
+
+                RaisePropertyChanged();
+            }
+        }
+
+        public string FocusedControl
+        {
+            get { return _focusedControl; }
+            private set { RaiseAndSetIfChanged(ref _focusedControl, value); }
+        }
+
+        public string PointerOverElement
+        {
+            get { return _pointerOverElement; }
+            private set { RaiseAndSetIfChanged(ref _pointerOverElement, value); }
+        }
+
+        private void UpdateConsoleContext(ConsoleContext context)
+        {
+            context.root = _root;
+
+            if (Content is TreePageViewModel tree)
+            {
+                context.e = tree.SelectedNode?.Visual;
+            }
+        }
+
+        public void SelectControl(IControl control)
+        {
+            var tree = Content as TreePageViewModel;
+
+            tree?.SelectControl(control);
+        }
+
+        public void Dispose()
+        {
+            KeyboardDevice.Instance.PropertyChanged -= KeyboardPropertyChanged;
+            _pointerOverSubscription.Dispose();
+            _logicalTree.Dispose();
+            _visualTree.Dispose();
+            _root.Renderer.DrawDirtyRects = false;
+            _root.Renderer.DrawFps = false;
+        }
+
+        private void UpdateFocusedControl()
+        {
+            FocusedControl = KeyboardDevice.Instance.FocusedElement?.GetType().Name;
+        }
+
+        private void KeyboardPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(KeyboardDevice.Instance.FocusedElement))
+            {
+                UpdateFocusedControl();
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/PropertyViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/PropertyViewModel.cs
new file mode 100644
index 0000000000..e23d6f1471
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/PropertyViewModel.cs
@@ -0,0 +1,71 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using System.Reflection;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+    internal abstract class PropertyViewModel : ViewModelBase
+    {
+        private const BindingFlags PublicStatic = BindingFlags.Public | BindingFlags.Static;
+        private static readonly Type[] StringParameter = { typeof(string) };
+        private static readonly Type[] StringIFormatProviderParameters = { typeof(string), typeof(IFormatProvider) };
+
+        public abstract object Key { get; }
+        public abstract string Name { get; }
+        public abstract string Group { get; }
+        public abstract string Type { get; }
+        public abstract string Value { get; set; }
+        public abstract void Update();
+
+        protected static string ConvertToString(object value)
+        {
+            if (value is null)
+            {
+                return "(null)";
+            }
+
+            var converter = TypeDescriptor.GetConverter(value);
+
+            //CollectionConverter does not deliver any important information. It just displays "(Collection)".
+            if (!converter.CanConvertTo(typeof(string)) || 
+                converter.GetType() == typeof(CollectionConverter))
+            {
+                return value.ToString();
+            }
+
+            return converter.ConvertToString(value);
+        }
+
+        private static object InvokeParse(string s, Type targetType)
+        {
+            var method = targetType.GetMethod("Parse", PublicStatic, null, StringIFormatProviderParameters, null);
+
+            if (method != null)
+            {
+                return method.Invoke(null, new object[] { s, CultureInfo.InvariantCulture });
+            }
+
+            method = targetType.GetMethod("Parse", PublicStatic, null, StringParameter, null);
+
+            if (method != null)
+            {
+                return method.Invoke(null, new object[] { s });
+            }
+
+            throw new InvalidCastException("Unable to convert value.");
+        }
+
+        protected static object ConvertFromString(string s, Type targetType)
+        {
+            var converter = TypeDescriptor.GetConverter(targetType);
+
+            if (converter.CanConvertFrom(typeof(string)))
+            {
+                return converter.ConvertFrom(null, CultureInfo.InvariantCulture, s);
+            }
+
+            return InvokeParse(s, targetType);
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs
new file mode 100644
index 0000000000..9363c28705
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Reactive;
+using System.Reactive.Linq;
+using Avalonia.Controls;
+using Avalonia.LogicalTree;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+    internal class TreeNode : ViewModelBase, IDisposable
+    {
+        private IDisposable _classesSubscription;
+        private string _classes;
+        private bool _isExpanded;
+
+        public TreeNode(IVisual visual, TreeNode parent)
+        {
+            Parent = parent;
+            Type = visual.GetType().Name;
+            Visual = visual;
+
+            if (visual is IControl control)
+            {
+                ElementName = control.Name;
+
+                var removed = Observable.FromEventPattern<LogicalTreeAttachmentEventArgs>(
+                    x => control.DetachedFromLogicalTree += x,
+                    x => control.DetachedFromLogicalTree -= x);
+                var classesChanged = Observable.FromEventPattern<
+                        NotifyCollectionChangedEventHandler,
+                        NotifyCollectionChangedEventArgs>(
+                        x => control.Classes.CollectionChanged += x,
+                        x => control.Classes.CollectionChanged -= x)
+                    .TakeUntil(removed);
+
+                _classesSubscription = classesChanged.Select(_ => Unit.Default)
+                    .StartWith(Unit.Default)
+                    .Subscribe(_ =>
+                    {
+                        if (control.Classes.Count > 0)
+                        {
+                            Classes = "(" + string.Join(" ", control.Classes) + ")";
+                        }
+                        else
+                        {
+                            Classes = string.Empty;
+                        }
+                    });
+            }
+        }
+
+        public TreeNodeCollection Children
+        {
+            get;
+            protected set;
+        }
+
+        public string Classes
+        {
+            get { return _classes; }
+            private set { RaiseAndSetIfChanged(ref _classes, value); }
+        }
+
+        public string ElementName
+        {
+            get;
+        }
+
+        public IVisual Visual
+        {
+            get;
+        }
+
+        public bool IsExpanded
+        {
+            get { return _isExpanded; }
+            set { RaiseAndSetIfChanged(ref _isExpanded, value); }
+        }
+
+        public TreeNode Parent
+        {
+            get;
+        }
+
+        public string Type
+        {
+            get;
+            private set;
+        }
+
+        public void Dispose()
+        {
+            _classesSubscription.Dispose();
+            Children.Dispose();
+        }
+
+        private static int IndexOf(IReadOnlyList<TreeNode> collection, TreeNode item)
+        {
+            var count = collection.Count;
+
+            for (var i = 0; i < count; ++i)
+            {
+                if (collection[i] == item)
+                {
+                    return i;
+                }
+            }
+
+            throw new AvaloniaInternalException("TreeNode was not present in parent Children collection.");
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNodeCollection.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNodeCollection.cs
new file mode 100644
index 0000000000..8b4f03bd23
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNodeCollection.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using Avalonia.Collections;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+    internal abstract class TreeNodeCollection : IAvaloniaReadOnlyList<TreeNode>, IDisposable
+    {
+        private AvaloniaList<TreeNode> _inner;
+
+        public TreeNodeCollection(TreeNode owner) => Owner = owner;
+
+        public TreeNode this[int index]
+        {
+            get
+            {
+                EnsureInitialized();
+                return _inner[index];
+            }
+        }
+
+        public int Count
+        {
+            get
+            {
+                EnsureInitialized();
+                return _inner.Count;
+            }
+        }
+
+        protected TreeNode Owner { get; }
+
+        public event NotifyCollectionChangedEventHandler CollectionChanged
+        {
+            add => _inner.CollectionChanged += value;
+            remove => _inner.CollectionChanged -= value;
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged
+        {
+            add => _inner.PropertyChanged += value;
+            remove => _inner.PropertyChanged -= value;
+        }
+
+        public virtual void Dispose()
+        {
+            if (_inner is object)
+            {
+                foreach (var node in _inner)
+                {
+                    node.Dispose();
+                }
+            }
+        }
+
+        public IEnumerator<TreeNode> GetEnumerator()
+        {
+            EnsureInitialized();
+            return _inner.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+        protected abstract void Initialize(AvaloniaList<TreeNode> nodes);
+
+        private void EnsureInitialized()
+        {
+            if (_inner is null)
+            {
+                _inner = new AvaloniaList<TreeNode>();
+                Initialize(_inner);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs
new file mode 100644
index 0000000000..bd65a3b06b
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs
@@ -0,0 +1,203 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text.RegularExpressions;
+using Avalonia.Controls;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+    internal class TreePageViewModel : ViewModelBase, IDisposable, INotifyDataErrorInfo
+    {
+        private readonly Dictionary<string, string> _errors = new Dictionary<string, string>();
+        private TreeNode _selectedNode;
+        private ControlDetailsViewModel _details;
+        private string _propertyFilter = string.Empty;
+        private bool _useRegexFilter;
+
+        public TreePageViewModel(MainViewModel mainView, TreeNode[] nodes)
+        {
+            MainView = mainView;
+            Nodes = nodes;
+        }
+
+        public MainViewModel MainView { get; }
+
+        public TreeNode[] Nodes { get; protected set; }
+
+        public TreeNode SelectedNode
+        {
+            get => _selectedNode;
+            private set
+            {
+                if (RaiseAndSetIfChanged(ref _selectedNode, value))
+                {
+                    Details = value != null ?
+                        new ControlDetailsViewModel(this, value.Visual) :
+                        null;
+                }
+            }
+        }
+
+        public ControlDetailsViewModel Details
+        {
+            get => _details;
+            private set
+            {
+                var oldValue = _details;
+
+                if (RaiseAndSetIfChanged(ref _details, value))
+                {
+                    oldValue?.Dispose();
+                }
+            }
+        }
+
+        public Regex FilterRegex { get; set; }
+
+        private void UpdateFilterRegex()
+        {
+            void ClearError()
+            {
+                if (_errors.Remove(nameof(PropertyFilter)))
+                {
+                    ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(PropertyFilter)));
+                }
+            }
+
+            if (UseRegexFilter)
+            {
+                try
+                {
+                    FilterRegex = new Regex(PropertyFilter, RegexOptions.Compiled);
+                    ClearError();
+                }
+                catch (Exception exception)
+                {
+                    _errors[nameof(PropertyFilter)] = exception.Message;
+                    ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(PropertyFilter)));
+                }
+            }
+            else
+            {
+                ClearError();
+            }
+        }
+
+        public string PropertyFilter
+        {
+            get => _propertyFilter;
+            set
+            {
+                if (RaiseAndSetIfChanged(ref _propertyFilter, value))
+                {
+                    UpdateFilterRegex();
+                    Details.PropertiesView.Refresh();
+                }
+            }
+        }
+
+        public bool UseRegexFilter
+        {
+            get => _useRegexFilter;
+            set
+            {
+                if (RaiseAndSetIfChanged(ref _useRegexFilter, value))
+                {
+                    UpdateFilterRegex();
+                    Details.PropertiesView.Refresh();
+                }
+            }
+        }
+
+        public void Dispose()
+        {
+            foreach (var node in Nodes)
+            {
+                node.Dispose();
+            }
+
+            _details?.Dispose();
+        }
+
+        public TreeNode FindNode(IControl control)
+        {
+            foreach (var node in Nodes)
+            {
+                var result = FindNode(node, control);
+
+                if (result != null)
+                {
+                    return result;
+                }
+            }
+
+            return null;
+        }
+
+        public void SelectControl(IControl control)
+        {
+            var node = default(TreeNode);
+
+            while (node == null && control != null)
+            {
+                node = FindNode(control);
+
+                if (node == null)
+                {
+                    control = control.GetVisualParent<IControl>();
+                }
+            }
+
+            if (node != null)
+            {
+                SelectedNode = node;
+                ExpandNode(node.Parent);
+            }
+        }
+
+        private void ExpandNode(TreeNode node)
+        {
+            if (node != null)
+            {
+                node.IsExpanded = true;
+                ExpandNode(node.Parent);
+            }
+        }
+
+        private TreeNode FindNode(TreeNode node, IControl control)
+        {
+            if (node.Visual == control)
+            {
+                return node;
+            }
+            else
+            {
+                foreach (var child in node.Children)
+                {
+                    var result = FindNode(child, control);
+
+                    if (result != null)
+                    {
+                        return result;
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        public IEnumerable GetErrors(string propertyName)
+        {
+            if (_errors.TryGetValue(propertyName, out var error))
+            {
+                yield return error;
+            }
+        }
+
+        public bool HasErrors => _errors.Count > 0;
+
+        public event EventHandler<DataErrorsChangedEventArgs> ErrorsChanged;
+    }
+}
diff --git a/src/Avalonia.Diagnostics/ViewModels/ViewModelBase.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ViewModelBase.cs
similarity index 54%
rename from src/Avalonia.Diagnostics/ViewModels/ViewModelBase.cs
rename to src/Avalonia.Diagnostics/Diagnostics/ViewModels/ViewModelBase.cs
index a6ff4dd853..66e9c34657 100644
--- a/src/Avalonia.Diagnostics/ViewModels/ViewModelBase.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ViewModelBase.cs
@@ -1,34 +1,42 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
-using JetBrains.Annotations;
 
 namespace Avalonia.Diagnostics.ViewModels
 {
     internal class ViewModelBase : INotifyPropertyChanged
     {
-        public event PropertyChangedEventHandler PropertyChanged;
+        private PropertyChangedEventHandler _propertyChanged;
+        private List<string> events = new List<string>();
+
+        public event PropertyChangedEventHandler PropertyChanged
+        {
+            add { _propertyChanged += value; events.Add("added"); }
+            remove { _propertyChanged -= value; events.Add("removed"); }
+        }
+
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+        }
 
-        [NotifyPropertyChangedInvocator]
         protected bool RaiseAndSetIfChanged<T>(ref T field, T value, [CallerMemberName] string propertyName = null)
         {
             if (!EqualityComparer<T>.Default.Equals(field, value))
             {
                 field = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+                RaisePropertyChanged(propertyName);
                 return true;
             }
 
             return false;
         }
 
-        [NotifyPropertyChangedInvocator]
         protected void RaisePropertyChanged([CallerMemberName] string propertyName = null)
         {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            var e = new PropertyChangedEventArgs(propertyName);
+            OnPropertyChanged(e);
+            _propertyChanged?.Invoke(this, e);
         }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/VisualTreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/VisualTreeNode.cs
new file mode 100644
index 0000000000..bc40edf477
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/VisualTreeNode.cs
@@ -0,0 +1,54 @@
+using System;
+using Avalonia.Collections;
+using Avalonia.Styling;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+    internal class VisualTreeNode : TreeNode
+    {
+        public VisualTreeNode(IVisual visual, TreeNode parent)
+            : base(visual, parent)
+        {
+            Children = new VisualTreeNodeCollection(this, visual);
+
+            if ((Visual is IStyleable styleable))
+            {
+                IsInTemplate = styleable.TemplatedParent != null;
+            }
+        }
+
+        public bool IsInTemplate { get; private set; }
+
+        public static VisualTreeNode[] Create(object control)
+        {
+            var visual = control as IVisual;
+            return visual != null ? new[] { new VisualTreeNode(visual, null) } : null;
+        }
+
+        internal class VisualTreeNodeCollection : TreeNodeCollection
+        {
+            private readonly IVisual _control;
+            private IDisposable _subscription;
+
+            public VisualTreeNodeCollection(TreeNode owner, IVisual control)
+                : base(owner)
+            {
+                _control = control;
+            }
+
+            public override void Dispose()
+            {
+                _subscription?.Dispose();
+            }
+
+            protected override void Initialize(AvaloniaList<TreeNode> nodes)
+            {
+                _subscription = _control.VisualChildren.ForEachItem(
+                    (i, item) => nodes.Insert(i, new VisualTreeNode(item, Owner)),
+                    (i, item) => nodes.RemoveAt(i),
+                    () => nodes.Clear());
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml
new file mode 100644
index 0000000000..264a0de359
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml
@@ -0,0 +1,56 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="Avalonia.Diagnostics.Views.ConsoleView">
+  <UserControl.Styles>
+    <Style Selector="TextBox.console">
+      <Setter Property="FontFamily" Value="/Assets/Fonts/SourceSansPro-Regular.ttf"/>
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Name="border"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <DockPanel Margin="{TemplateBinding Padding}">
+              <TextBlock DockPanel.Dock="Left" Margin="0,0,4,0">></TextBlock>
+              <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}"/>
+            </DockPanel>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+  </UserControl.Styles>
+  
+  <DockPanel>
+    <TextBox Name="input"
+             Classes="console"
+             DockPanel.Dock="Bottom"
+             BorderThickness="0"
+             Text="{Binding Input}"/>
+    
+    <ListBox Name="historyList"
+             BorderBrush="{DynamicResource ThemeControlMidBrush}"
+             BorderThickness="0,0,0,1"
+             FontFamily="/Assets/Fonts/SourceSansPro-Regular.ttf"
+             Items="{Binding History}"
+             VirtualizationMode="None">
+      <ListBox.ItemTemplate>
+        <DataTemplate>
+          <StackPanel Orientation="Vertical">
+            <DockPanel>
+              <TextBlock DockPanel.Dock="Left" Margin="0,0,4,0">></TextBlock>
+              <TextBlock Text="{Binding Input}"/>
+            </DockPanel>
+            <TextBlock Foreground="{Binding Foreground}" Text="{Binding Output}"/>
+          </StackPanel>
+        </DataTemplate>
+      </ListBox.ItemTemplate>
+    </ListBox>
+  </DockPanel>
+</UserControl>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml.cs
new file mode 100644
index 0000000000..ae70b59fde
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Specialized;
+using Avalonia.Controls;
+using Avalonia.Diagnostics.ViewModels;
+using Avalonia.Input;
+using Avalonia.LogicalTree;
+using Avalonia.Markup.Xaml;
+using Avalonia.Threading;
+
+namespace Avalonia.Diagnostics.Views
+{
+    internal class ConsoleView : UserControl
+    {
+        private readonly ListBox _historyList;
+        private readonly TextBox _input;
+
+        public ConsoleView()
+        {
+            this.InitializeComponent();
+            _historyList = this.FindControl<ListBox>("historyList");
+            ((ILogical)_historyList).LogicalChildren.CollectionChanged += HistoryChanged;
+            _input = this.FindControl<TextBox>("input");
+            _input.KeyDown += InputKeyDown;
+        }
+
+        public void FocusInput() => _input.Focus();
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        private void HistoryChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == NotifyCollectionChangedAction.Add && e.NewItems[0] is IControl control)
+            {
+                DispatcherTimer.RunOnce(control.BringIntoView, TimeSpan.Zero);
+            }
+        }
+
+        private void InputKeyDown(object sender, KeyEventArgs e)
+        {
+            var vm = (ConsoleViewModel)DataContext;
+
+            switch (e.Key)
+            {
+                case Key.Enter:
+                    vm.Execute();
+                    e.Handled = true;
+                    break;
+                case Key.Up:
+                    vm.HistoryUp();
+                    _input.CaretIndex = _input.Text.Length;
+                    e.Handled = true;
+                    break;
+                case Key.Down:
+                    vm.HistoryDown();
+                    _input.CaretIndex = _input.Text.Length;
+                    e.Handled = true;
+                    break;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
new file mode 100644
index 0000000000..2e0b6813ba
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
@@ -0,0 +1,155 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:conv="clr-namespace:Avalonia.Diagnostics.Converters"
+             xmlns:local="clr-namespace:Avalonia.Diagnostics.Views"
+             x:Class="Avalonia.Diagnostics.Views.ControlDetailsView">
+
+  <UserControl.Resources>
+    <SolidColorBrush x:Key="ThicknessBorderBrush" Color="#666666" />
+    <SolidColorBrush x:Key="SizeGuidelineBrush" Color="#333333" />
+    <SolidColorBrush x:Key="MarginBackgroundBrush" Color="#D78965" />
+    <SolidColorBrush x:Key="BorderBackgroundBrush" Color="#E3C381" />
+    <SolidColorBrush x:Key="PaddingBackgroundBrush" Color="#B8C47F" />
+    <SolidColorBrush x:Key="SizeBackgroundBrush" Color="#88B2BD" />
+  </UserControl.Resources>
+
+  <UserControl.Styles>
+    <Style Selector="local|ThicknessEditor">
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="BorderBrush" Value="{StaticResource ThicknessBorderBrush}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border
+            Background="{TemplateBinding Background}"
+            BorderBrush="{TemplateBinding BorderBrush}"
+            BorderThickness="{TemplateBinding BorderThickness}">
+            <Grid RowDefinitions="Auto,*,Auto" ColumnDefinitions="Auto,*,Auto">
+              <Grid.Styles>
+                <Style Selector="TextBox.thickness-edit">
+                  <Setter Property="Background" Value="Transparent" />
+                  <Setter Property="BorderThickness" Value="0" />
+                  <Setter Property="Margin" Value="2" />
+                  <Setter Property="HorizontalAlignment" Value="Stretch" />
+                  <Setter Property="VerticalAlignment" Value="Stretch" />
+                  <Setter Property="HorizontalContentAlignment" Value="Center" />
+                  <Setter Property="VerticalContentAlignment" Value="Center" />
+                  <Setter Property="(ScrollViewer.HorizontalScrollBarVisibility)" Value="Disabled" />
+                  <Setter Property="(ScrollViewer.VerticalScrollBarVisibility)" Value="Disabled" />
+                  <Setter Property="IsVisible" Value="{Binding $parent[local:ThicknessEditor].IsPresent}" />
+                </Style>
+              </Grid.Styles>
+              <TextBlock IsVisible="{TemplateBinding IsPresent}" Margin="4,0,0,0" Text="{TemplateBinding Header}" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" />
+              <TextBox Grid.Row="1" Grid.Column="0" Text="{Binding Left, RelativeSource={RelativeSource TemplatedParent}}" Classes="thickness-edit" />
+              <TextBox x:Name="Right"  Grid.Row="0" Grid.Column="1" Text="{Binding Top, RelativeSource={RelativeSource TemplatedParent}}" Classes="thickness-edit" />
+              <TextBox Grid.Row="1" Grid.Column="2" Text="{Binding Right, RelativeSource={RelativeSource TemplatedParent}}"  Classes="thickness-edit" />
+              <TextBox Grid.Row="2" Grid.Column="1" Text="{Binding Bottom, RelativeSource={RelativeSource TemplatedParent}}" Classes="thickness-edit" />
+              <ContentPresenter Grid.Row="1" Grid.Column="1"
+                Name="PART_ContentPresenter"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Content="{TemplateBinding Content}"
+                                Padding="{TemplateBinding Padding}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
+            </Grid>
+          </Border>
+
+        </ControlTemplate>
+      </Setter>
+    </Style>
+    <Style Selector="local|ThicknessEditor[IsPresent=False]">
+      <Setter Property="BorderThickness" Value="0" />
+    </Style>
+  </UserControl.Styles>
+
+  <Grid ColumnDefinitions="*,Auto,280">
+
+    <Grid Grid.Column="0" ColumnDefinitions="*,Auto,Auto,Auto" RowDefinitions="Auto,*">
+
+      <TextBox Grid.Row="0" 
+               Grid.Column="0"
+               BorderThickness="0"
+               Text="{Binding TreePage.PropertyFilter}"
+               Watermark="Filter properties" />
+
+      <CheckBox Grid.Row="0"
+                Grid.Column="1"
+                Margin="0,0,4,0"
+                Content="Regex"
+                IsChecked="{Binding TreePage.UseRegexFilter}" />
+
+      <DataGrid Items="{Binding PropertiesView}"
+                Grid.Row="1"
+                Grid.Column="0"
+                Grid.ColumnSpan="2"
+                BorderThickness="0"
+                RowBackground="Transparent"
+                SelectedItem="{Binding SelectedProperty, Mode=TwoWay}"
+                CanUserResizeColumns="true">
+        <DataGrid.Columns>
+          <DataGridTextColumn Header="Property" Binding="{Binding Name}" IsReadOnly="True" />
+          <DataGridTextColumn Header="Value" Binding="{Binding Value}" />
+          <DataGridTextColumn Header="Type" Binding="{Binding Type}" />
+          <DataGridTextColumn Header="Priority" Binding="{Binding Priority}" IsReadOnly="True" />
+        </DataGrid.Columns>
+
+        <DataGrid.Styles>
+          <Style Selector="DataGridRow TextBox">
+            <Setter Property="SelectionBrush" Value="LightBlue" />
+          </Style>
+        </DataGrid.Styles>
+      </DataGrid>
+
+    </Grid>
+
+    <GridSplitter Grid.Column="1" />
+
+    <Grid Grid.Column="2" RowDefinitions="Auto,*" >
+      <TextBlock Grid.Row="0" Text="Layout Visualizer" Margin="4" />
+      
+      <Grid Grid.Row="1" x:Name="LayoutRoot" Margin="8,0,8,8" RowDefinitions="Auto,Auto" ColumnDefinitions="Auto,Auto">
+
+        <Border x:Name="VerticalSize" Grid.Row="0" Grid.Column="1" >
+          <TextBlock VerticalAlignment="Center" FontWeight="Bold"
+                     TextDecorations="{Binding Layout.HeightConstraint, Converter={x:Static local:Converters.HasConstraintConverter}}"
+                     Text="{Binding Layout.Height}"
+                     ToolTip.Tip="{Binding Layout.HeightConstraint}" />
+        </Border>
+        
+        <Border x:Name="HorizontalSize" Grid.Row="1" Grid.Column="0" >
+          <TextBlock HorizontalAlignment="Center" FontWeight="Bold" 
+                     TextDecorations="{Binding Layout.WidthConstraint, Converter={x:Static local:Converters.HasConstraintConverter}}"
+                     Text="{Binding Layout.Width}" 
+                     ToolTip.Tip="{Binding Layout.WidthConstraint}" />
+        </Border>
+        
+        <local:ThicknessEditor Grid.Row="0" Grid.Column="0" Header="margin" VerticalAlignment="Top" HorizontalAlignment="Center" Background="{StaticResource MarginBackgroundBrush}" Thickness="{Binding Layout.MarginThickness}">
+          <local:ThicknessEditor x:Name="BorderArea" Header="border" Background="{StaticResource BorderBackgroundBrush}" Thickness="{Binding Layout.BorderThickness}" IsPresent="{Binding Layout.HasBorder}">
+            <local:ThicknessEditor x:Name="PaddingArea" Header="padding" Background="{StaticResource PaddingBackgroundBrush}" Thickness="{Binding Layout.PaddingThickness}" IsPresent="{Binding Layout.HasPadding}">
+              <Border x:Name="ContentArea" BorderThickness="1" BorderBrush="{StaticResource ThicknessBorderBrush}" MinWidth="100" MinHeight="16" Background="{StaticResource SizeBackgroundBrush}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                <TextBlock Margin="2" HorizontalAlignment="Center" VerticalAlignment="Center" Text="content" />
+              </Border>
+            </local:ThicknessEditor>
+          </local:ThicknessEditor>
+        </local:ThicknessEditor>
+
+        <Canvas Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" Grid.ColumnSpan="2">
+          <Canvas.Styles>
+            <Style Selector="Rectangle">
+              <Setter Property="StrokeDashArray" Value="1,3" />
+              <Setter Property="Stroke" Value="{StaticResource SizeGuidelineBrush}" />
+              <Setter Property="StrokeThickness" Value="1" />
+            </Style>
+          </Canvas.Styles>
+          <Rectangle x:Name="HorizontalSizeBegin" />
+          <Rectangle x:Name="HorizontalSizeEnd" />
+          <Rectangle x:Name="VerticalSizeBegin" />
+          <Rectangle x:Name="VerticalSizeEnd" />
+        </Canvas>
+      </Grid>
+      
+    </Grid>
+  </Grid>
+
+</UserControl>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
new file mode 100644
index 0000000000..c9568509f6
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
@@ -0,0 +1,127 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.Markup.Xaml;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Diagnostics.Views
+{
+    internal class ControlDetailsView : UserControl
+    {
+        private ThicknessEditor _borderArea;
+        private ThicknessEditor _paddingArea;
+        private Rectangle _horizontalSizeBegin;
+        private Rectangle _horizontalSizeEnd;
+        private Rectangle _verticalSizeBegin;
+        private Rectangle _verticalSizeEnd;
+        private Grid _layoutRoot;
+        private Border _horizontalSize;
+        private Border _verticalSize;
+        private Border _contentArea;
+
+        public ControlDetailsView()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+
+            _borderArea = this.FindControl<ThicknessEditor>("BorderArea");
+            _paddingArea = this.FindControl<ThicknessEditor>("PaddingArea");
+
+            _horizontalSizeBegin = this.FindControl<Rectangle>("HorizontalSizeBegin");
+            _horizontalSizeEnd = this.FindControl<Rectangle>("HorizontalSizeEnd");
+            _verticalSizeBegin = this.FindControl<Rectangle>("VerticalSizeBegin");
+            _verticalSizeEnd = this.FindControl<Rectangle>("VerticalSizeEnd");
+
+            _horizontalSize = this.FindControl<Border>("HorizontalSize");
+            _verticalSize = this.FindControl<Border>("VerticalSize");
+
+            _contentArea = this.FindControl<Border>("ContentArea");
+
+            _layoutRoot = this.FindControl<Grid>("LayoutRoot");
+
+            void SubscribeToBounds(Visual visual)
+            {
+                visual.GetPropertyChangedObservable(TransformedBoundsProperty)
+                    .Subscribe(UpdateSizeGuidelines);
+            }
+
+            SubscribeToBounds(_borderArea);
+            SubscribeToBounds(_paddingArea);
+            SubscribeToBounds(_contentArea);
+        }
+
+        private void UpdateSizeGuidelines(AvaloniaPropertyChangedEventArgs e)
+        {
+            void UpdateGuidelines(Visual area)
+            {
+                if (area.TransformedBounds is TransformedBounds bounds)
+                {
+                    // Horizontal guideline
+                    {
+                        var sizeArea = TranslateToRoot((_horizontalSize.TransformedBounds ?? default).Bounds.BottomLeft,
+                            _horizontalSize);
+
+                        var start = TranslateToRoot(bounds.Bounds.BottomLeft, area);
+
+                        SetPosition(_horizontalSizeBegin, start);
+
+                        var end = TranslateToRoot(bounds.Bounds.BottomRight, area);
+
+                        SetPosition(_horizontalSizeEnd, end.WithX(end.X - 1));
+
+                        var height = sizeArea.Y - start.Y + 2;
+
+                        _horizontalSizeBegin.Height = height;
+                        _horizontalSizeEnd.Height = height;
+                    }
+
+                    // Vertical guideline
+                    {
+                        var sizeArea = TranslateToRoot((_verticalSize.TransformedBounds ?? default).Bounds.TopRight, _verticalSize);
+
+                        var start = TranslateToRoot(bounds.Bounds.TopRight, area);
+
+                        SetPosition(_verticalSizeBegin, start);
+
+                        var end = TranslateToRoot(bounds.Bounds.BottomRight, area);
+
+                        SetPosition(_verticalSizeEnd, end.WithY(end.Y - 1));
+
+                        var width = sizeArea.X - start.X + 2;
+
+                        _verticalSizeBegin.Width = width;
+                        _verticalSizeEnd.Width = width;
+                    }
+                }
+            }
+
+            Point TranslateToRoot(Point point, IVisual from)
+            {
+                return from.TranslatePoint(point, _layoutRoot) ?? default;
+            }
+
+            static void SetPosition(Rectangle rect, Point start)
+            {
+                Canvas.SetLeft(rect, start.X);
+                Canvas.SetTop(rect, start.Y);
+            }
+
+            if (_borderArea.IsPresent)
+            {
+                UpdateGuidelines(_borderArea);
+            } 
+            else if (_paddingArea.IsPresent)
+            {
+                UpdateGuidelines(_paddingArea);
+            }
+            else
+            {
+                UpdateGuidelines(_contentArea);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Views/EventsView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml
similarity index 92%
rename from src/Avalonia.Diagnostics/Views/EventsView.xaml
rename to src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml
index 406dd433a2..b7f0860e70 100644
--- a/src/Avalonia.Diagnostics/Views/EventsView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml
@@ -1,9 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="clr-namespace:Avalonia.Diagnostics.ViewModels"
-             x:Class="Avalonia.Diagnostics.Views.EventsView">
+             xmlns:conv="clr-namespace:Avalonia.Diagnostics.Converters"
+             x:Class="Avalonia.Diagnostics.Views.EventsPageView">
   <UserControl.Resources>
-    <vm:BoolToBrushConverter x:Key="boolToBrush" />
+    <conv:BoolToBrushConverter x:Key="boolToBrush" Brush="#d9ffdc"/>
   </UserControl.Resources>
   <Grid ColumnDefinitions="*,4,3*">
     <TreeView Name="tree" Items="{Binding Nodes}" SelectedItem="{Binding SelectedNode, Mode=TwoWay}"
diff --git a/src/Avalonia.Diagnostics/Views/EventsView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml.cs
similarity index 72%
rename from src/Avalonia.Diagnostics/Views/EventsView.xaml.cs
rename to src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml.cs
index 41d74659ca..c1c78d38f6 100644
--- a/src/Avalonia.Diagnostics/Views/EventsView.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml.cs
@@ -1,18 +1,15 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.Linq;
+using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Diagnostics.ViewModels;
 using Avalonia.Markup.Xaml;
 
 namespace Avalonia.Diagnostics.Views
 {
-    public class EventsView : UserControl
+    internal class EventsPageView : UserControl
     {
         private readonly ListBox _events;
 
-        public EventsView()
+        public EventsPageView()
         {
             InitializeComponent();
             _events = this.FindControl<ListBox>("events");
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
new file mode 100644
index 0000000000..8c4db33f91
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
@@ -0,0 +1,78 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:views="clr-namespace:Avalonia.Diagnostics.Views"
+             x:Class="Avalonia.Diagnostics.Views.MainView">
+  <Grid Name="rootGrid" RowDefinitions="Auto,Auto,*,Auto,0,Auto">
+    <Menu>
+      <MenuItem Header="_File">
+        <MenuItem Header="E_xit" Command="{Binding $parent[Window].Close}"/>
+      </MenuItem>
+      <MenuItem Header="_View">
+        <MenuItem Header="_Console" Command="{Binding $parent[UserControl].ToggleConsole}">
+          <MenuItem.Icon>
+            <CheckBox BorderThickness="0"
+                      IsChecked="{Binding Console.IsVisible}"
+                      IsEnabled="False"/>
+          </MenuItem.Icon>
+        </MenuItem>
+      </MenuItem>
+      <MenuItem Header="_Options">
+        <MenuItem Header="Visualize margin/padding" Command="{Binding ToggleVisualizeMarginPadding}">
+          <MenuItem.Icon>
+            <CheckBox BorderThickness="0"
+                      IsChecked="{Binding ShouldVisualizeMarginPadding}"
+                      IsEnabled="False"/>
+          </MenuItem.Icon>
+        </MenuItem>
+        <MenuItem Header="Visualize dirty rects" Command="{Binding ToggleVisualizeDirtyRects}">
+          <MenuItem.Icon>
+            <CheckBox BorderThickness="0"
+                      IsChecked="{Binding ShouldVisualizeDirtyRects}"
+                      IsEnabled="False"/>
+          </MenuItem.Icon>
+        </MenuItem>
+         <MenuItem Header="Show fps overlay" Command="{Binding ToggleFpsOverlay}">
+          <MenuItem.Icon>
+            <CheckBox BorderThickness="0"
+                      IsChecked="{Binding ShowFpsOverlay}"
+                      IsEnabled="False"/>
+          </MenuItem.Icon>
+        </MenuItem>
+      </MenuItem>
+    </Menu>
+    
+    <TabStrip Grid.Row="1" SelectedIndex="{Binding SelectedTab, Mode=TwoWay}">
+      <TabStripItem Content="Logical Tree"/>
+      <TabStripItem Content="Visual Tree"/>
+      <TabStripItem Content="Events"/>
+    </TabStrip>
+
+    <ContentControl Grid.Row="2"
+                    BorderBrush="{DynamicResource ThemeControlMidBrush}"
+                    BorderThickness="0,1,0,0"
+                    Content="{Binding Content}"/>
+
+    <GridSplitter Name="consoleSplitter" Grid.Row="3" Height="1"
+                  Background="{DynamicResource ThemeControlMidBrush}"
+                  IsVisible="False"/>
+    
+    <views:ConsoleView Name="console"
+                       Grid.Row="4"
+                       DataContext="{Binding Console}"
+                       IsVisible="{Binding IsVisible}"/>
+
+    <Border Grid.Row="5"
+            BorderBrush="{DynamicResource ThemeControlMidBrush}"
+            BorderThickness="0,1,0,0">
+      <StackPanel Spacing="4" Orientation="Horizontal">
+        <TextBlock>Hold Ctrl+Shift over a control to inspect.</TextBlock>
+        <Separator Width="8"/>
+        <TextBlock>Focused:</TextBlock>
+        <TextBlock Text="{Binding FocusedControl}"/>
+        <Separator Width="8"/>
+        <TextBlock>Pointer Over:</TextBlock>
+        <TextBlock Text="{Binding PointerOverElement}"/>
+      </StackPanel>
+    </Border>
+  </Grid>
+</UserControl>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml.cs
new file mode 100644
index 0000000000..783709e54b
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml.cs
@@ -0,0 +1,66 @@
+using Avalonia.Controls;
+using Avalonia.Diagnostics.ViewModels;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using Avalonia.Threading;
+
+namespace Avalonia.Diagnostics.Views
+{
+    internal class MainView : UserControl
+    {
+        private readonly ConsoleView _console;
+        private readonly GridSplitter _consoleSplitter;
+        private readonly Grid _rootGrid;
+        private readonly int _consoleRow;
+        private double _consoleHeight = -1;
+
+        public MainView()
+        {
+            InitializeComponent();
+            AddHandler(KeyDownEvent, PreviewKeyDown, RoutingStrategies.Tunnel);
+            _console = this.FindControl<ConsoleView>("console");
+            _consoleSplitter = this.FindControl<GridSplitter>("consoleSplitter");
+            _rootGrid = this.FindControl<Grid>("rootGrid");
+            _consoleRow = Grid.GetRow(_console);
+        }
+
+        public void ToggleConsole()
+        {
+            var vm = (MainViewModel)DataContext;
+
+            if (_consoleHeight == -1)
+            {
+                _consoleHeight = Bounds.Height / 3;
+            }
+
+            vm.Console.ToggleVisibility();
+            _consoleSplitter.IsVisible = vm.Console.IsVisible;
+
+            if (vm.Console.IsVisible)
+            {
+                _rootGrid.RowDefinitions[_consoleRow].Height = new GridLength(_consoleHeight, GridUnitType.Pixel);
+                Dispatcher.UIThread.Post(() => _console.FocusInput(), DispatcherPriority.Background);
+            }
+            else
+            {
+                _consoleHeight = _rootGrid.RowDefinitions[_consoleRow].Height.Value;
+                _rootGrid.RowDefinitions[_consoleRow].Height = new GridLength(0, GridUnitType.Pixel);
+            }
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        private void PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                ToggleConsole();
+                e.Handled = true;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
new file mode 100644
index 0000000000..7dd4ed0832
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
@@ -0,0 +1,21 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:views="clr-namespace:Avalonia.Diagnostics.Views"
+        xmlns:diag="clr-namespace:Avalonia.Diagnostics"
+        Title="Avalonia DevTools"
+        x:Class="Avalonia.Diagnostics.Views.MainWindow">
+  <Window.DataTemplates>
+    <diag:ViewLocator/>
+  </Window.DataTemplates>
+  
+  <Window.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"/>
+    <StyleInclude Source="resm:Avalonia.Controls.DataGrid.Themes.Default.xaml?assembly=Avalonia.Controls.DataGrid"/>
+    <Style Selector="DataGrid ContextMenu">
+      <Setter Property="Foreground" Value="Black"/>
+    </Style>
+  </Window.Styles>
+  
+  <views:MainView/>
+</Window>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
new file mode 100644
index 0000000000..c4f9185728
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
@@ -0,0 +1,98 @@
+using System;
+using System.Linq;
+using System.Reactive.Linq;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Diagnostics.ViewModels;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Markup.Xaml;
+using Avalonia.Styling;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Diagnostics.Views
+{
+    internal class MainWindow : Window, IStyleHost
+    {
+        private readonly IDisposable _keySubscription;
+        private TopLevel _root;
+
+        public MainWindow()
+        {
+            InitializeComponent();
+
+            _keySubscription = InputManager.Instance.Process
+                .OfType<RawKeyEventArgs>()
+                .Subscribe(RawKeyDown);
+        }
+
+        public TopLevel Root
+        {
+            get => _root;
+            set
+            {
+                if (_root != value)
+                {
+                    if (_root != null)
+                    {
+                        _root.Closed -= RootClosed;
+                    }
+
+                    _root = value;
+
+                    if (_root != null)
+                    {
+                        _root.Closed += RootClosed;
+                        DataContext = new MainViewModel(value);
+                    }
+                    else
+                    {
+                        DataContext = null;
+                    }
+                }
+            }
+        }
+
+        IStyleHost IStyleHost.StylingParent => null;
+
+        protected override void OnClosed(EventArgs e)
+        {
+            base.OnClosed(e);
+            _keySubscription.Dispose();
+            _root.Closed -= RootClosed;
+            _root = null;
+            ((MainViewModel)DataContext)?.Dispose();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        private void RawKeyDown(RawKeyEventArgs e)
+        {
+            const RawInputModifiers modifiers = RawInputModifiers.Control | RawInputModifiers.Shift;
+
+            if (e.Modifiers == modifiers)
+            {
+                var point = (Root as IInputRoot)?.MouseDevice?.GetPosition(Root) ?? default;
+                
+                var control = Root.GetVisualsAt(point, x =>
+                    {
+                        if (x is AdornerLayer || !x.IsVisible) return false;
+                        if (!(x is IInputElement ie)) return true;
+                        return ie.IsHitTestVisible;
+                    })
+                    .FirstOrDefault();
+
+                if (control != null)
+                {
+                    var vm = (MainViewModel)DataContext;
+                    vm.SelectControl((IControl)control);
+                }
+            }
+        }
+
+        private void RootClosed(object sender, EventArgs e) => Close();
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ThicknessEditor.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/ThicknessEditor.cs
new file mode 100644
index 0000000000..c7611c8c46
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ThicknessEditor.cs
@@ -0,0 +1,130 @@
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Data.Converters;
+using Avalonia.Media;
+
+namespace Avalonia.Diagnostics.Views
+{
+    internal static class Converters
+    {
+        public static IValueConverter HasConstraintConverter =
+            new FuncValueConverter<object, TextDecorationCollection>(ConvertToDecoration);
+
+        private static TextDecorationCollection ConvertToDecoration(object arg)
+        {
+            return arg != null ? TextDecorations.Underline : null;
+        }
+    }
+
+    internal class ThicknessEditor : ContentControl
+    {
+        public static readonly DirectProperty<ThicknessEditor, Thickness> ThicknessProperty =
+            AvaloniaProperty.RegisterDirect<ThicknessEditor, Thickness>(nameof(Thickness), o => o.Thickness,
+                (o, v) => o.Thickness = v, defaultBindingMode: BindingMode.TwoWay);
+
+        public static readonly DirectProperty<ThicknessEditor, string> HeaderProperty =
+            AvaloniaProperty.RegisterDirect<ThicknessEditor, string>(nameof(Header), o => o.Header,
+                (o, v) => o.Header = v);
+
+        public static readonly DirectProperty<ThicknessEditor, bool> IsPresentProperty =
+            AvaloniaProperty.RegisterDirect<ThicknessEditor, bool>(nameof(Header), o => o.IsPresent,
+                (o, v) => o.IsPresent = v);
+
+        public static readonly DirectProperty<ThicknessEditor, double> LeftProperty =
+            AvaloniaProperty.RegisterDirect<ThicknessEditor, double>(nameof(Left), o => o.Left, (o, v) => o.Left = v);
+
+        public static readonly DirectProperty<ThicknessEditor, double> TopProperty =
+            AvaloniaProperty.RegisterDirect<ThicknessEditor, double>(nameof(Top), o => o.Top, (o, v) => o.Top = v);
+
+        public static readonly DirectProperty<ThicknessEditor, double> RightProperty =
+            AvaloniaProperty.RegisterDirect<ThicknessEditor, double>(nameof(Right), o => o.Right,
+                (o, v) => o.Right = v);
+
+        public static readonly DirectProperty<ThicknessEditor, double> BottomProperty =
+            AvaloniaProperty.RegisterDirect<ThicknessEditor, double>(nameof(Bottom), o => o.Bottom,
+                (o, v) => o.Bottom = v);
+
+        
+        private Thickness _thickness;
+        private string _header;
+        private bool _isPresent = true;
+        private double _left;
+        private double _top;
+        private double _right;
+        private double _bottom;
+
+        private bool _isUpdatingThickness;
+
+        public Thickness Thickness
+        {
+            get => _thickness;
+            set => SetAndRaise(ThicknessProperty, ref _thickness, value);
+        }
+
+        public string Header
+        {
+            get => _header;
+            set => SetAndRaise(HeaderProperty, ref _header, value);
+        }
+
+        public bool IsPresent
+        {
+            get => _isPresent;
+            set => SetAndRaise(IsPresentProperty, ref _isPresent, value);
+        }
+
+        public double Left
+        {
+            get => _left;
+            set => SetAndRaise(LeftProperty, ref _left, value);
+        }
+
+        public double Top
+        {
+            get => _top;
+            set => SetAndRaise(TopProperty, ref _top, value);
+        }
+
+        public double Right
+        {
+            get => _right;
+            set => SetAndRaise(RightProperty, ref _right, value);
+        }
+
+        public double Bottom
+        {
+            get => _bottom;
+            set => SetAndRaise(BottomProperty, ref _bottom, value);
+        }
+
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == ThicknessProperty)
+            {
+                try
+                {
+                    _isUpdatingThickness = true;
+
+                    var value = change.NewValue.GetValueOrDefault<Thickness>();
+
+                    Left = value.Left;
+                    Top = value.Top;
+                    Right = value.Right;
+                    Bottom = value.Bottom;
+                }
+                finally
+                {
+                    _isUpdatingThickness = false;
+                }
+            }
+            else if (!_isUpdatingThickness &&
+                     (change.Property == LeftProperty || change.Property == TopProperty ||
+                      change.Property == RightProperty || change.Property == BottomProperty))
+            {
+                Thickness = new Thickness(Left, Top, Right, Bottom);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/Views/TreePageView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml
similarity index 57%
rename from src/Avalonia.Diagnostics/Views/TreePageView.xaml
rename to src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml
index 2619fd744a..86137dfc57 100644
--- a/src/Avalonia.Diagnostics/Views/TreePageView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml
@@ -1,26 +1,30 @@
 <UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:vm="clr-namespace:Avalonia.Diagnostics.ViewModels"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:vm="clr-namespace:Avalonia.Diagnostics.ViewModels"
              x:Class="Avalonia.Diagnostics.Views.TreePageView">
-  <Grid ColumnDefinitions="*,Auto,3*">
-    <TreeView Name="tree" Items="{Binding Nodes}" SelectedItem="{Binding SelectedNode, Mode=TwoWay}">
+  <Grid ColumnDefinitions="0.4*,4,0.6*">    
+    <TreeView Name="tree"
+              BorderThickness="0"
+              Items="{Binding Nodes}"
+              SelectedItem="{Binding SelectedNode, Mode=TwoWay}">
       <TreeView.DataTemplates>
         <TreeDataTemplate DataType="vm:TreeNode"
                           ItemsSource="{Binding Children}">
           <StackPanel Orientation="Horizontal" Spacing="8">
-            <TextBlock Text="{Binding Type}" />
-            <TextBlock Text="{Binding Classes}" />
+            <TextBlock Text="{Binding Type}"/>
+            <TextBlock Text="{Binding Classes}"/>
+            <TextBlock Foreground="Gray" Text="{Binding ElementName}"/>
           </StackPanel>
         </TreeDataTemplate>
       </TreeView.DataTemplates>
       <TreeView.Styles>
         <Style Selector="TreeViewItem">
-          <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
+          <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
         </Style>
       </TreeView.Styles>
     </TreeView>
 
-    <GridSplitter Grid.Column="1" />
-    <ContentControl Content="{Binding Details}" Grid.Column="2" />
+    <GridSplitter Background="{DynamicResource ThemeControlMidBrush}" Width="1" Grid.Column="1"/>
+    <ContentControl Content="{Binding Details}" Grid.Column="2"/>
   </Grid>
 </UserControl>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs
new file mode 100644
index 0000000000..1b61986ce6
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs
@@ -0,0 +1,112 @@
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Controls.Generators;
+using Avalonia.Controls.Primitives;
+using Avalonia.Diagnostics.ViewModels;
+using Avalonia.Input;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+
+namespace Avalonia.Diagnostics.Views
+{
+    internal class TreePageView : UserControl
+    {
+        private readonly Panel _adorner;
+        private AdornerLayer _currentLayer;
+        private TreeView _tree;
+
+        public TreePageView()
+        {
+            InitializeComponent();
+            _tree.ItemContainerGenerator.Index.Materialized += TreeViewItemMaterialized;
+
+            _adorner = new Panel
+            {
+                ClipToBounds = false,
+                Children =
+                {
+                    //Padding frame
+                    new Border { BorderBrush = new SolidColorBrush(Colors.Green, 0.5) },
+                    //Content frame
+                    new Border { Background = new SolidColorBrush(Color.FromRgb(160, 197, 232), 0.5) },
+                    //Margin frame
+                    new Border { BorderBrush = new SolidColorBrush(Colors.Yellow, 0.5) }
+                },
+            };
+        }
+
+        protected void AddAdorner(object sender, PointerEventArgs e)
+        {
+            var node = (TreeNode)((Control)sender).DataContext;
+            var visual = (Visual)node.Visual;
+
+            _currentLayer = AdornerLayer.GetAdornerLayer(visual);
+
+            if (_currentLayer == null ||
+                _currentLayer.Children.Contains(_adorner))
+            {
+                return;
+            }
+
+            _currentLayer.Children.Add(_adorner);
+            AdornerLayer.SetAdornedElement(_adorner, visual);
+
+            var vm = (TreePageViewModel) DataContext;
+
+            if (vm.MainView.ShouldVisualizeMarginPadding)
+            {
+                var paddingBorder = (Border)_adorner.Children[0];
+                paddingBorder.BorderThickness = visual.GetValue(PaddingProperty);
+
+                var contentBorder = (Border)_adorner.Children[1];
+                contentBorder.Margin = visual.GetValue(PaddingProperty);
+
+                var marginBorder = (Border)_adorner.Children[2];
+                marginBorder.BorderThickness = visual.GetValue(MarginProperty);
+                marginBorder.Margin = InvertThickness(visual.GetValue(MarginProperty));
+            }
+        }
+
+        private static Thickness InvertThickness(Thickness input)
+        {
+            return new Thickness(-input.Left, -input.Top, -input.Right, -input.Bottom);
+        }
+
+        protected void RemoveAdorner(object sender, PointerEventArgs e)
+        {
+            foreach (var border in _adorner.Children.OfType<Border>())
+            {
+                border.Margin = default;
+                border.Padding = default;
+                border.BorderThickness = default;
+            }
+
+            _currentLayer?.Children.Remove(_adorner);
+            _currentLayer = null;
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+            _tree = this.FindControl<TreeView>("tree");
+        }
+
+        private void TreeViewItemMaterialized(object sender, ItemContainerEventArgs e)
+        {
+            var item = (TreeViewItem)e.Containers[0].ContainerControl;
+            item.TemplateApplied += TreeViewItemTemplateApplied;
+        }
+
+        private void TreeViewItemTemplateApplied(object sender, TemplateAppliedEventArgs e)
+        {
+            var item = (TreeViewItem)sender;
+            var headerPresenter = item.HeaderPresenter;
+            headerPresenter.ApplyTemplate();
+
+            var header = headerPresenter.Child;
+            header.PointerEnter += AddAdorner;
+            header.PointerLeave += RemoveAdorner;
+            item.TemplateApplied -= TreeViewItemTemplateApplied;
+        }
+    }
+}
diff --git a/src/Avalonia.Diagnostics/VisualTreeDebug.cs b/src/Avalonia.Diagnostics/Diagnostics/VisualTreeDebug.cs
similarity index 92%
rename from src/Avalonia.Diagnostics/VisualTreeDebug.cs
rename to src/Avalonia.Diagnostics/Diagnostics/VisualTreeDebug.cs
index 47511e0508..6f699339e7 100644
--- a/src/Avalonia.Diagnostics/VisualTreeDebug.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/VisualTreeDebug.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Text;
 using Avalonia.Controls;
diff --git a/src/Avalonia.Diagnostics/ViewModels/ControlDetailsViewModel.cs b/src/Avalonia.Diagnostics/ViewModels/ControlDetailsViewModel.cs
deleted file mode 100644
index 4b832f7ce6..0000000000
--- a/src/Avalonia.Diagnostics/ViewModels/ControlDetailsViewModel.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Diagnostics.ViewModels
-{
-    internal class ControlDetailsViewModel : ViewModelBase
-    {
-        public ControlDetailsViewModel(IVisual control)
-        {
-            if (control is AvaloniaObject avaloniaObject)
-            {
-                Properties = AvaloniaPropertyRegistry.Instance.GetRegistered(avaloniaObject)
-                    .Select(x => new PropertyDetails(avaloniaObject, x))
-                    .OrderBy(x => x.IsAttached)
-                    .ThenBy(x => x.Name);
-            }
-        }
-
-        public IEnumerable<PropertyDetails> Properties { get; }
-    }
-}
diff --git a/src/Avalonia.Diagnostics/ViewModels/DevToolsViewModel.cs b/src/Avalonia.Diagnostics/ViewModels/DevToolsViewModel.cs
deleted file mode 100644
index 9f524a21eb..0000000000
--- a/src/Avalonia.Diagnostics/ViewModels/DevToolsViewModel.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Collections.ObjectModel;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Input;
-
-namespace Avalonia.Diagnostics.ViewModels
-{
-    internal class DevToolsViewModel : ViewModelBase
-    {
-        private IDevToolViewModel _selectedTool;
-        private string _focusedControl;
-        private string _pointerOverElement;
-
-        public DevToolsViewModel(IControl root)
-        {
-            Tools = new ObservableCollection<IDevToolViewModel>
-            {
-                new TreePageViewModel(LogicalTreeNode.Create(root), "Logical Tree"),
-                new TreePageViewModel(VisualTreeNode.Create(root), "Visual Tree"),
-                new EventsViewModel(root)
-            };
-
-            SelectedTool = Tools.First();
-
-            UpdateFocusedControl();
-
-            KeyboardDevice.Instance.PropertyChanged += (s, e) =>
-            {
-                if (e.PropertyName == nameof(KeyboardDevice.Instance.FocusedElement))
-                {
-                    UpdateFocusedControl();
-                }
-            };
-
-            root.GetObservable(TopLevel.PointerOverElementProperty)
-                .Subscribe(x => PointerOverElement = x?.GetType().Name);
-        }
-
-        public IDevToolViewModel SelectedTool
-        {
-            get => _selectedTool;
-            set => RaiseAndSetIfChanged(ref _selectedTool, value);
-        }
-
-        public ObservableCollection<IDevToolViewModel> Tools { get; }
-
-        public string FocusedControl
-        {
-            get => _focusedControl;
-            private set => RaiseAndSetIfChanged(ref _focusedControl, value);
-        }
-
-        public string PointerOverElement
-        {
-            get => _pointerOverElement;
-            private set => RaiseAndSetIfChanged(ref _pointerOverElement, value);
-        }
-
-        public void SelectControl(IControl control)
-        {
-            if (SelectedTool is TreePageViewModel tree)
-            {
-                tree.SelectControl(control);
-            }
-        }
-
-        private void UpdateFocusedControl()
-        {
-            FocusedControl = KeyboardDevice.Instance.FocusedElement?.GetType().Name;
-        }
-    }
-}
diff --git a/src/Avalonia.Diagnostics/ViewModels/IDevToolViewModel.cs b/src/Avalonia.Diagnostics/ViewModels/IDevToolViewModel.cs
deleted file mode 100644
index 0434230a63..0000000000
--- a/src/Avalonia.Diagnostics/ViewModels/IDevToolViewModel.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Diagnostics.ViewModels
-{
-    /// <summary>
-    /// View model interface for tool showing up in DevTools
-    /// </summary>
-    public interface IDevToolViewModel
-    {
-        /// <summary>
-        /// Name of a tool.
-        /// </summary>
-        string Name { get; }
-    }
-}
diff --git a/src/Avalonia.Diagnostics/ViewModels/LogicalTreeNode.cs b/src/Avalonia.Diagnostics/ViewModels/LogicalTreeNode.cs
deleted file mode 100644
index 0b9bd85b4f..0000000000
--- a/src/Avalonia.Diagnostics/ViewModels/LogicalTreeNode.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Collections;
-using Avalonia.Controls;
-using Avalonia.LogicalTree;
-
-namespace Avalonia.Diagnostics.ViewModels
-{
-    internal class LogicalTreeNode : TreeNode
-    {
-        public LogicalTreeNode(ILogical logical, TreeNode parent)
-            : base((Control)logical, parent)
-        {
-            Children = logical.LogicalChildren.CreateDerivedList(x => new LogicalTreeNode(x, this));
-        }
-
-        public static LogicalTreeNode[] Create(object control)
-        {
-            return control is ILogical logical ? new[] { new LogicalTreeNode(logical, null) } : null;
-        }
-    }
-}
diff --git a/src/Avalonia.Diagnostics/ViewModels/PropertyDetails.cs b/src/Avalonia.Diagnostics/ViewModels/PropertyDetails.cs
deleted file mode 100644
index 523be406c8..0000000000
--- a/src/Avalonia.Diagnostics/ViewModels/PropertyDetails.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using Avalonia.Data;
-
-namespace Avalonia.Diagnostics.ViewModels
-{
-    internal class PropertyDetails : ViewModelBase
-    {
-        private object _value;
-        private string _priority;
-        private string _diagnostic;
-
-        public PropertyDetails(AvaloniaObject o, AvaloniaProperty property)
-        {
-            Name = property.IsAttached ?
-                $"[{property.OwnerType.Name}.{property.Name}]" :
-                property.Name;
-            IsAttached = property.IsAttached;
-
-            // TODO: Unsubscribe when view model is deactivated.
-            o.GetObservable(property).Subscribe(x =>
-            {
-                var diagnostic = o.GetDiagnostic(property);
-                Value = diagnostic.Value ?? "(null)";
-                Priority = (diagnostic.Priority != BindingPriority.Unset) ?
-                    diagnostic.Priority.ToString() :
-                    diagnostic.Property.Inherits ?
-                        "Inherited" :
-                        "Unset";
-                Diagnostic = diagnostic.Diagnostic;
-            });
-        }
-
-        public string Name { get; }
-
-        public bool IsAttached { get; }
-
-        public string Priority
-        {
-            get => _priority;
-            private set => RaiseAndSetIfChanged(ref _priority, value);
-        }
-
-        public string Diagnostic
-        {
-            get => _diagnostic;
-            private set => RaiseAndSetIfChanged(ref _diagnostic, value);
-        }
-
-        public object Value
-        {
-            get => _value;
-            private set => RaiseAndSetIfChanged(ref _value, value);
-        }
-    }
-}
diff --git a/src/Avalonia.Diagnostics/ViewModels/TreeNode.cs b/src/Avalonia.Diagnostics/ViewModels/TreeNode.cs
deleted file mode 100644
index 902eb81bd9..0000000000
--- a/src/Avalonia.Diagnostics/ViewModels/TreeNode.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Collections.Specialized;
-using System.Reactive;
-using System.Reactive.Linq;
-using Avalonia.Collections;
-using Avalonia.Styling;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Diagnostics.ViewModels
-{
-    internal class TreeNode : ViewModelBase
-    {
-        private string _classes;
-        private bool _isExpanded;
-
-        public TreeNode(IVisual visual, TreeNode parent)
-        {
-            Parent = parent;
-            Type = visual.GetType().Name;
-            Visual = visual;
-
-            if (visual is IStyleable styleable)
-            {
-                var classesChanged = Observable.FromEventPattern<
-                        NotifyCollectionChangedEventHandler,
-                        NotifyCollectionChangedEventArgs>(
-                        x => styleable.Classes.CollectionChanged += x,
-                        x => styleable.Classes.CollectionChanged -= x)
-                    .TakeUntil(styleable.StyleDetach);
-
-                classesChanged.Select(_ => Unit.Default)
-                    .StartWith(Unit.Default)
-                    .Subscribe(_ =>
-                    {
-                        if (styleable.Classes.Count > 0)
-                        {
-                            Classes = "(" + string.Join(" ", styleable.Classes) + ")";
-                        }
-                        else
-                        {
-                            Classes = string.Empty;
-                        }
-                    });
-            }
-        }
-
-        public IAvaloniaReadOnlyList<TreeNode> Children
-        {
-            get;
-            protected set;
-        }
-
-        public string Classes
-        {
-            get => _classes;
-            private set => RaiseAndSetIfChanged(ref _classes, value);
-        }
-
-        public IVisual Visual
-        {
-            get;
-        }
-
-        public bool IsExpanded
-        {
-            get => _isExpanded;
-            set => RaiseAndSetIfChanged(ref _isExpanded, value);
-        }
-
-        public TreeNode Parent
-        {
-            get;
-        }
-
-        public string Type
-        {
-            get;
-        }
-    }
-}
diff --git a/src/Avalonia.Diagnostics/ViewModels/TreePageViewModel.cs b/src/Avalonia.Diagnostics/ViewModels/TreePageViewModel.cs
deleted file mode 100644
index b2b1aaa723..0000000000
--- a/src/Avalonia.Diagnostics/ViewModels/TreePageViewModel.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Controls;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Diagnostics.ViewModels
-{
-    internal class TreePageViewModel : ViewModelBase, IDevToolViewModel
-    {
-        private TreeNode _selected;
-        private ControlDetailsViewModel _details;
-
-        public TreePageViewModel(TreeNode[] nodes, string name)
-        {
-            Nodes = nodes;
-            Name = name;
-        }
-
-        public string Name { get; }
-
-        public TreeNode[] Nodes { get; protected set; }
-
-        public TreeNode SelectedNode
-        {
-            get => _selected;
-            set
-            {
-                if (RaiseAndSetIfChanged(ref _selected, value))
-                {
-                    Details = value != null ? new ControlDetailsViewModel(value.Visual) : null;
-                }
-            }
-        }
-
-        public ControlDetailsViewModel Details
-        {
-            get => _details;
-            private set => RaiseAndSetIfChanged(ref _details, value);
-        }
-
-        public TreeNode FindNode(IControl control)
-        {
-            foreach (var node in Nodes)
-            {
-                var result = FindNode(node, control);
-
-                if (result != null)
-                {
-                    return result;
-                }
-            }
-
-            return null;
-        }
-
-        public void SelectControl(IControl control)
-        {
-            var node = default(TreeNode);
-
-            while (node == null && control != null)
-            {
-                node = FindNode(control);
-
-                if (node == null)
-                {
-                    control = control.GetVisualParent<IControl>();
-                }
-            }
-
-            if (node != null)
-            {
-                SelectedNode = node;
-                ExpandNode(node.Parent);
-            }
-        }
-
-        private void ExpandNode(TreeNode node)
-        {
-            if (node != null)
-            {
-                node.IsExpanded = true;
-                ExpandNode(node.Parent);
-            }
-        }
-
-        private TreeNode FindNode(TreeNode node, IControl control)
-        {
-            if (node.Visual == control)
-            {
-                return node;
-            }
-
-            foreach (var child in node.Children)
-            {
-                var result = FindNode(child, control);
-
-                if (result != null)
-                {
-                    return result;
-                }
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/src/Avalonia.Diagnostics/ViewModels/VisualTreeNode.cs b/src/Avalonia.Diagnostics/ViewModels/VisualTreeNode.cs
deleted file mode 100644
index 47ef91507a..0000000000
--- a/src/Avalonia.Diagnostics/ViewModels/VisualTreeNode.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Collections;
-using Avalonia.Styling;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Diagnostics.ViewModels
-{
-    internal class VisualTreeNode : TreeNode
-    {
-        public VisualTreeNode(IVisual visual, TreeNode parent)
-            : base(visual, parent)
-        {
-            var host = visual as IVisualTreeHost;
-
-            if (host?.Root == null)
-            {
-                Children = visual.VisualChildren.CreateDerivedList(x => new VisualTreeNode(x, this));
-            }
-            else
-            {
-                Children = new AvaloniaList<VisualTreeNode>(new[] { new VisualTreeNode(host.Root, this) });
-            }
-
-            if ((Visual is IStyleable styleable))
-            {
-                IsInTemplate = styleable.TemplatedParent != null;
-            }
-        }
-
-        public bool IsInTemplate { get; }
-
-        public static VisualTreeNode[] Create(object control)
-        {
-            return control is IVisual visual ? new[] { new VisualTreeNode(visual, null) } : null;
-        }
-    }
-}
diff --git a/src/Avalonia.Diagnostics/Views/ControlDetailsView.cs b/src/Avalonia.Diagnostics/Views/ControlDetailsView.cs
deleted file mode 100644
index fb867ab55e..0000000000
--- a/src/Avalonia.Diagnostics/Views/ControlDetailsView.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Collections.Generic;
-using System.Reactive.Linq;
-using Avalonia.Controls;
-using Avalonia.Diagnostics.ViewModels;
-using Avalonia.Media;
-
-namespace Avalonia.Diagnostics.Views
-{
-    internal class ControlDetailsView : UserControl
-    {
-        private static readonly StyledProperty<ControlDetailsViewModel> ViewModelProperty =
-            AvaloniaProperty.Register<ControlDetailsView, ControlDetailsViewModel>(nameof(ViewModel));
-
-        private SimpleGrid _grid;
-
-        public ControlDetailsView()
-        {
-            InitializeComponent();
-            this.GetObservable(DataContextProperty)
-                .Subscribe(x => ViewModel = (ControlDetailsViewModel)x);
-        }
-
-        public ControlDetailsViewModel ViewModel
-        {
-            get => GetValue(ViewModelProperty);
-            private set
-            {
-                SetValue(ViewModelProperty, value);
-                _grid[GridRepeater.ItemsProperty] = value?.Properties;
-            }
-        }
-
-        private void InitializeComponent()
-        {
-            Func<object, IEnumerable<Control>> pt = PropertyTemplate;
-
-            Content = new ScrollViewer { Content = _grid = new SimpleGrid { [GridRepeater.TemplateProperty] = pt } };
-        }
-
-        private IEnumerable<Control> PropertyTemplate(object i)
-        {
-            var property = (PropertyDetails)i;
-
-            var margin = new Thickness(2);
-
-            yield return new TextBlock
-            {
-                Margin = margin,
-                Text = property.Name,
-                TextWrapping = TextWrapping.NoWrap,
-                [!ToolTip.TipProperty] = property.GetObservable<string>(nameof(property.Diagnostic)).ToBinding()
-            };
-
-            yield return new TextBlock
-            {
-                Margin = margin,
-                TextWrapping = TextWrapping.NoWrap,
-                [!TextBlock.TextProperty] = property.GetObservable<object>(nameof(property.Value))
-                    .Select(v => v?.ToString())
-                    .ToBinding()
-            };
-
-            yield return new TextBlock
-            {
-                Margin = margin,
-                TextWrapping = TextWrapping.NoWrap,
-                [!TextBlock.TextProperty] = property.GetObservable<string>((nameof(property.Priority))).ToBinding()
-            };
-        }
-    }
-}
diff --git a/src/Avalonia.Diagnostics/Views/GridRepeater.cs b/src/Avalonia.Diagnostics/Views/GridRepeater.cs
deleted file mode 100644
index b0ff26c7b6..0000000000
--- a/src/Avalonia.Diagnostics/Views/GridRepeater.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using Avalonia.Controls;
-
-namespace Avalonia.Diagnostics.Views
-{
-    internal static class GridRepeater
-    {
-        public static readonly AttachedProperty<IEnumerable> ItemsProperty =
-            AvaloniaProperty.RegisterAttached<SimpleGrid, IEnumerable>("Items", typeof(GridRepeater));
-
-        public static readonly AttachedProperty<Func<object, IEnumerable<Control>>> TemplateProperty =
-            AvaloniaProperty.RegisterAttached<SimpleGrid, Func<object, IEnumerable<Control>>>("Template",
-                typeof(GridRepeater));
-
-        static GridRepeater()
-        {
-            ItemsProperty.Changed.Subscribe(ItemsChanged);
-        }
-
-        private static void ItemsChanged(AvaloniaPropertyChangedEventArgs e)
-        {
-            var grid = (SimpleGrid)e.Sender;
-            var items = (IEnumerable)e.NewValue;
-            var template = grid.GetValue(TemplateProperty);
-
-            grid.Children.Clear();
-
-            if (items != null)
-            {
-                int count = 0;
-                int cols = 3;
-
-                foreach (var item in items)
-                {
-                    foreach (var control in template(item))
-                    {
-                        grid.Children.Add(control);
-                        SimpleGrid.SetColumn(control, count % cols);
-                        SimpleGrid.SetRow(control, count / cols);
-                        ++count;
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Diagnostics/Views/PropertyChangedExtensions.cs b/src/Avalonia.Diagnostics/Views/PropertyChangedExtensions.cs
deleted file mode 100644
index 24b2f29463..0000000000
--- a/src/Avalonia.Diagnostics/Views/PropertyChangedExtensions.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.ComponentModel;
-using System.Reactive.Linq;
-using System.Reflection;
-
-namespace Avalonia.Diagnostics.Views
-{
-    internal static class PropertyChangedExtensions
-    {
-        public static IObservable<T> GetObservable<T>(this INotifyPropertyChanged source, string propertyName)
-        {
-            Contract.Requires<ArgumentNullException>(source != null);
-            Contract.Requires<ArgumentNullException>(propertyName != null);
-
-            var property = source.GetType().GetTypeInfo().GetDeclaredProperty(propertyName);
-
-            if (property == null)
-            {
-                throw new ArgumentException($"Property '{propertyName}' not found on '{source}.");
-            }
-
-            return Observable.FromEventPattern<PropertyChangedEventHandler, PropertyChangedEventArgs>(
-                    e => source.PropertyChanged += e,
-                    e => source.PropertyChanged -= e)
-                .Where(e => e.EventArgs.PropertyName == propertyName)
-                .Select(_ => (T)property.GetValue(source))
-                .StartWith((T)property.GetValue(source));
-        }
-    }
-}
diff --git a/src/Avalonia.Diagnostics/Views/SimpleGrid.cs b/src/Avalonia.Diagnostics/Views/SimpleGrid.cs
deleted file mode 100644
index 4fc77666e1..0000000000
--- a/src/Avalonia.Diagnostics/Views/SimpleGrid.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.Collections.Generic;
-using Avalonia.Controls;
-
-namespace Avalonia.Diagnostics.Views
-{
-    /// <summary>
-    /// A simple grid control that lays out columns with a equal width and rows to their desired
-    /// size.
-    /// </summary>
-    /// <remarks>
-    /// This is used in the devtools because our <see cref="Grid"/> performance sucks.
-    /// </remarks>
-    public class SimpleGrid : Panel
-    {
-        private readonly List<double> _columnWidths = new List<double>();
-        private readonly List<double> _rowHeights = new List<double>();
-        private double _totalWidth;
-        private double _totalHeight;
-
-        /// <summary>
-        /// Defines the Column attached property.
-        /// </summary>
-        public static readonly AttachedProperty<int> ColumnProperty =
-            AvaloniaProperty.RegisterAttached<SimpleGrid, Control, int>("Column");
-
-        /// <summary>
-        /// Defines the Row attached property.
-        /// </summary>
-        public static readonly AttachedProperty<int> RowProperty =
-            AvaloniaProperty.RegisterAttached<SimpleGrid, Control, int>("Row");
-
-        /// <summary>
-        /// Gets the value of the Column attached property for a control.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <returns>The control's column.</returns>
-        public static int GetColumn(IControl control)
-        {
-            return control.GetValue(ColumnProperty);
-        }
-
-        /// <summary>
-        /// Gets the value of the Row attached property for a control.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <returns>The control's row.</returns>
-        public static int GetRow(IControl control)
-        {
-            return control.GetValue(RowProperty);
-        }
-
-        /// <summary>
-        /// Sets the value of the Column attached property for a control.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="value">The column value.</param>
-        public static void SetColumn(IControl control, int value)
-        {
-            control.SetValue(ColumnProperty, value);
-        }
-
-
-        /// <summary>
-        /// Sets the value of the Row attached property for a control.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="value">The row value.</param>
-        public static void SetRow(IControl control, int value)
-        {
-            control.SetValue(RowProperty, value);
-        }
-
-        protected override Size MeasureOverride(Size availableSize)
-        {
-            _columnWidths.Clear();
-            _rowHeights.Clear();
-            _totalWidth = 0;
-            _totalHeight = 0;
-
-            foreach (var child in Children)
-            {
-                var column = GetColumn(child);
-                var row = GetRow(child);
-
-                child.Measure(availableSize);
-
-                var desired = child.DesiredSize;
-                UpdateCell(_columnWidths, column, desired.Width, ref _totalWidth);
-                UpdateCell(_rowHeights, row, desired.Height, ref _totalHeight);
-            }
-
-            return new Size(_totalWidth, _totalHeight);
-        }
-
-        protected override Size ArrangeOverride(Size finalSize)
-        {
-            var columnWidth = finalSize.Width / _columnWidths.Count;
-
-            foreach (var child in Children)
-            {
-                var column = GetColumn(child);
-                var row = GetRow(child);
-                var rect = new Rect(column * columnWidth, GetRowTop(row), columnWidth, _rowHeights[row]);
-                child.Arrange(rect);
-            }
-
-            return new Size(finalSize.Width, _totalHeight);
-        }
-
-        private double UpdateCell(IList<double> cells, int cell, double value, ref double total)
-        {
-            while (cells.Count < cell + 1)
-            {
-                cells.Add(0);
-            }
-
-            var existing = cells[cell];
-
-            if (value > existing)
-            {
-                cells[cell] = value;
-                total += value - existing;
-                return value;
-            }
-            else
-            {
-                return existing;
-            }
-        }
-
-        private double GetRowTop(int row)
-        {
-            var result = 0.0;
-
-            for (var i = 0; i < row; ++i)
-            {
-                result += _rowHeights[i];
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/src/Avalonia.Diagnostics/Views/TreePageView.xaml.cs b/src/Avalonia.Diagnostics/Views/TreePageView.xaml.cs
deleted file mode 100644
index 1326f718de..0000000000
--- a/src/Avalonia.Diagnostics/Views/TreePageView.xaml.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Controls;
-using Avalonia.Controls.Generators;
-using Avalonia.Controls.Primitives;
-using Avalonia.Controls.Shapes;
-using Avalonia.Diagnostics.ViewModels;
-using Avalonia.Input;
-using Avalonia.Markup.Xaml;
-using Avalonia.Media;
-
-namespace Avalonia.Diagnostics.Views
-{
-    public class TreePageView : UserControl
-    {
-        private Control _adorner;
-        private TreeView _tree;
-
-        public TreePageView()
-        {
-            InitializeComponent();
-            _tree.ItemContainerGenerator.Index.Materialized += TreeViewItemMaterialized;
-        }
-
-        protected void AddAdorner(object sender, PointerEventArgs e)
-        {
-            var node = (TreeNode)((Control)sender).DataContext;
-            var layer = AdornerLayer.GetAdornerLayer(node.Visual);
-
-            if (layer != null)
-            {
-                if (_adorner != null)
-                {
-                    ((Panel)_adorner.Parent).Children.Remove(_adorner);
-                    _adorner = null;
-                }
-
-                _adorner = new Rectangle
-                {
-                    Fill = new SolidColorBrush(0x80a0c5e8),
-                    [AdornerLayer.AdornedElementProperty] = node.Visual
-                };
-
-                layer.Children.Add(_adorner);
-            }
-        }
-
-        protected void RemoveAdorner(object sender, PointerEventArgs e)
-        {
-            if (_adorner != null)
-            {
-                ((Panel)_adorner.Parent).Children.Remove(_adorner);
-                _adorner = null;
-            }
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-            _tree = this.FindControl<TreeView>("tree");
-        }
-
-        private void TreeViewItemMaterialized(object sender, ItemContainerEventArgs e)
-        {
-            var item = (TreeViewItem)e.Containers[0].ContainerControl;
-            item.TemplateApplied += TreeViewItemTemplateApplied;
-        }
-
-        private void TreeViewItemTemplateApplied(object sender, TemplateAppliedEventArgs e)
-        {
-            var item = (TreeViewItem)sender;
-            var headerPresenter = item.HeaderPresenter;
-            headerPresenter.ApplyTemplate();
-
-            var header = headerPresenter.Child;
-            header.PointerEnter += AddAdorner;
-            header.PointerLeave += RemoveAdorner;
-            item.TemplateApplied -= TreeViewItemTemplateApplied;
-        }
-    }
-}
diff --git a/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml b/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml
index e227fc2812..e51cc2f3ce 100644
--- a/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml
+++ b/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml
@@ -99,7 +99,7 @@
       </StackPanel>
      </StackPanel> 
     <StackPanel VerticalAlignment="Bottom" Margin="10">
-      <TextBlock Text="© 2019 The Avalonia Project" TextWrapping="Wrap" HorizontalAlignment="Center" />
+      <TextBlock Text="© 2020 The Avalonia Project" TextWrapping="Wrap" HorizontalAlignment="Center" />
     </StackPanel>
   </Grid>
 </Window>
\ No newline at end of file
diff --git a/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml.cs b/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml.cs
index ef467aa5a3..09fab0ed3f 100644
--- a/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml.cs
+++ b/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using Avalonia.Controls;
@@ -29,7 +26,7 @@ namespace Avalonia.Dialogs
                 using (Process process = Process.Start(new ProcessStartInfo
                 {
                     FileName = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? url : "open",
-                    Arguments = RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? $"-e {url}" : "",
+                    Arguments = RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? $"{url}" : "",
                     CreateNoWindow = true,
                     UseShellExecute = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
                 }));
diff --git a/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj b/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
index cb86e271a6..dd476e2559 100644
--- a/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
+++ b/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
@@ -13,7 +13,8 @@
   <Import Project="..\..\build\BuildTargets.targets" />
 
   <ItemGroup>
-    <ProjectReference Include="..\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
     <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
   </ItemGroup>
+
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>
diff --git a/src/Avalonia.Dialogs/ManagedFileChooser.xaml b/src/Avalonia.Dialogs/ManagedFileChooser.xaml
index af0c91e7bd..227cc1afc0 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooser.xaml
+++ b/src/Avalonia.Dialogs/ManagedFileChooser.xaml
@@ -58,7 +58,7 @@
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Spacing="10">
                 <StackPanel.Styles>
                     <Style Selector="Button">
-                        <Setter Property="Margin">4</Setter>
+                        <Setter Property="Margin" Value="4"/>
                     </Style>
                 </StackPanel.Styles>
                 <Button Command="{Binding Ok}">OK</Button>
@@ -66,7 +66,7 @@
             </StackPanel>
         </DockPanel>
 
-        <DropDown DockPanel.Dock="Bottom" 
+        <ComboBox DockPanel.Dock="Bottom" 
                   IsVisible="{Binding ShowFilters}" 
                   Items="{Binding Filters}"
                   SelectedItem="{Binding SelectedFilter}"
@@ -76,7 +76,7 @@
 
         <ListBox Margin="0 0 5 5" BorderBrush="Transparent" x:Name="QuickLinks" Items="{Binding QuickLinks}"
                  SelectedIndex="{Binding QuickLinksSelectedIndex}"
-                 DockPanel.Dock="Left" Background="{DynamicResource ThemeControlMidBrush}" Focusable="False">
+                 DockPanel.Dock="Left" Focusable="False">
             <ListBox.ItemTemplate>
                 <DataTemplate>
                     <StackPanel Spacing="4" Orientation="Horizontal" Background="Transparent">
diff --git a/src/Avalonia.Dialogs/ManagedFileChooser.xaml.cs b/src/Avalonia.Dialogs/ManagedFileChooser.xaml.cs
index b967b40c0d..7f29407ed5 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooser.xaml.cs
+++ b/src/Avalonia.Dialogs/ManagedFileChooser.xaml.cs
@@ -34,7 +34,7 @@ namespace Avalonia.Dialogs
                 return;
             }
 
-            var isQuickLink = _quickLinksRoot.IsLogicalParentOf(e.Source as Control);
+            var isQuickLink = _quickLinksRoot.IsLogicalAncestorOf(e.Source as Control);
             if (e.ClickCount == 2 || isQuickLink)
             {
                 if (model.ItemType == ManagedFileChooserItemType.File)
@@ -81,7 +81,7 @@ namespace Avalonia.Dialogs
 
             if (indexOfPreselected > 1)
             {
-                _filesView.ScrollIntoView(model.Items[indexOfPreselected - 1]);
+                _filesView.ScrollIntoView(indexOfPreselected - 1);
             }
         }
     }
diff --git a/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs b/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs
index 189e13802d..28d40f13b9 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs
+++ b/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs
@@ -14,6 +14,7 @@ namespace Avalonia.Dialogs
 {
     internal class ManagedFileChooserViewModel : InternalViewModelBase
     {
+        private readonly ManagedFileDialogOptions _options;
         public event Action CancelRequested;
         public event Action<string[]> CompleteRequested;
 
@@ -103,8 +104,9 @@ namespace Avalonia.Dialogs
             QuickLinks.AddRange(quickSources.GetAllItems().Select(i => new ManagedFileChooserItemViewModel(i)));
         }
 
-        public ManagedFileChooserViewModel(FileSystemDialog dialog)
+        public ManagedFileChooserViewModel(FileSystemDialog dialog, ManagedFileDialogOptions options)
         {
+            _options = options;
             _disposables = new CompositeDisposable();
 
             var quickSources = AvaloniaLocator.Current
@@ -134,7 +136,7 @@ namespace Avalonia.Dialogs
                         : dialog is OpenFolderDialog ? "Select directory"
                         : throw new ArgumentException(nameof(dialog)));
 
-            var directory = dialog.InitialDirectory;
+            var directory = dialog.Directory;
 
             if (directory == null || !Directory.Exists(directory))
             {
@@ -202,10 +204,12 @@ namespace Avalonia.Dialogs
                     }
                     else
                     {
-                        var invalidItems = SelectedItems.Where(i => i.ItemType == ManagedFileChooserItemType.Folder).ToList();
-                        foreach (var item in invalidItems)
+                        if (!_options.AllowDirectorySelection)
                         {
-                            SelectedItems.Remove(item);
+                            var invalidItems = SelectedItems.Where(i => i.ItemType == ManagedFileChooserItemType.Folder)
+                                .ToList();
+                            foreach (var item in invalidItems) 
+                                SelectedItems.Remove(item);
                         }
 
                         if (!_selectingDirectory)
diff --git a/src/Avalonia.Dialogs/ManagedFileDialogExtensions.cs b/src/Avalonia.Dialogs/ManagedFileDialogExtensions.cs
index 771d2b1b5e..f9e62d905b 100644
--- a/src/Avalonia.Dialogs/ManagedFileDialogExtensions.cs
+++ b/src/Avalonia.Dialogs/ManagedFileDialogExtensions.cs
@@ -1,25 +1,23 @@
-using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
-using Avalonia.Dialogs;
-using Avalonia.Platform;
 
 namespace Avalonia.Dialogs
 {
     public static class ManagedFileDialogExtensions
     {
-        class ManagedSystemDialogImpl<T> : ISystemDialogImpl where T : Window, new()
+        private class ManagedSystemDialogImpl<T> : ISystemDialogImpl where T : Window, new()
         {
-            async Task<string[]> Show(SystemDialog d, IWindowImpl parent)
+            async Task<string[]> Show(SystemDialog d, Window parent, ManagedFileDialogOptions options = null)
             {
-                var model = new ManagedFileChooserViewModel((FileSystemDialog)d);
+                var model = new ManagedFileChooserViewModel((FileSystemDialog)d,
+                    options ?? new ManagedFileDialogOptions());
 
                 var dialog = new T
                 {
                     Content = new ManagedFileChooser(),
+                    Title = d.Title,
                     DataContext = model
                 };
 
@@ -39,15 +37,20 @@ namespace Avalonia.Dialogs
                 return result;
             }
 
-            public async Task<string[]> ShowFileDialogAsync(FileDialog dialog, IWindowImpl parent)
+            public async Task<string[]> ShowFileDialogAsync(FileDialog dialog, Window parent)
             {
                 return await Show(dialog, parent);
             }
 
-            public async Task<string> ShowFolderDialogAsync(OpenFolderDialog dialog, IWindowImpl 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);
+            }
         }
 
         public static TAppBuilder UseManagedSystemDialogs<TAppBuilder>(this TAppBuilder builder)
@@ -65,5 +68,14 @@ namespace Avalonia.Dialogs
                 AvaloniaLocator.CurrentMutable.Bind<ISystemDialogImpl>().ToSingleton<ManagedSystemDialogImpl<TWindow>>());
             return builder;
         }
+
+        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()
+        {
+            return new ManagedSystemDialogImpl<TWindow>().ShowFileDialogAsync(dialog, parent, options);
+        }
     }
 }
diff --git a/src/Avalonia.Dialogs/ManagedFileDialogOptions.cs b/src/Avalonia.Dialogs/ManagedFileDialogOptions.cs
new file mode 100644
index 0000000000..56a3eb9122
--- /dev/null
+++ b/src/Avalonia.Dialogs/ManagedFileDialogOptions.cs
@@ -0,0 +1,7 @@
+namespace Avalonia.Dialogs
+{
+    public class ManagedFileDialogOptions
+    {
+        public bool AllowDirectorySelection { get; set; }
+    }
+}
diff --git a/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj b/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj
index d9fd3b78a2..81af76dc20 100644
--- a/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj
+++ b/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj
@@ -1,15 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>    
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Tmds.DBus" Version="0.7.0" />
+    <PackageReference Include="Tmds.DBus" Version="0.9.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Avalonia.FreeDesktop/DBusMenuExporter.cs b/src/Avalonia.FreeDesktop/DBusMenuExporter.cs
index 90239b5a49..e93ca64d3a 100644
--- a/src/Avalonia.FreeDesktop/DBusMenuExporter.cs
+++ b/src/Avalonia.FreeDesktop/DBusMenuExporter.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.IO;
 using System.Reactive.Disposables;
 using System.Threading.Tasks;
 using Avalonia.Controls;
@@ -184,7 +185,7 @@ namespace Avalonia.FreeDesktop
 
             private static string[] AllProperties = new[]
             {
-                "type", "label", "enabled", "visible", "shortcut", "toggle-type", "children-display"
+                "type", "label", "enabled", "visible", "shortcut", "toggle-type", "children-display", "toggle-state", "icon-data"
             };
             
             object GetProperty((NativeMenuItemBase item, NativeMenu menu) i, string name)
@@ -210,7 +211,7 @@ namespace Avalonia.FreeDesktop
                             return null;
                         if (item.Menu != null && item.Menu.Items.Count == 0)
                             return false;
-                        if (item.Enabled == false)
+                        if (item.IsEnabled == false)
                             return false;
                         return null;
                     }
@@ -234,6 +235,30 @@ namespace Avalonia.FreeDesktop
                         return new[] { lst.ToArray() };
                     }
 
+                    if (name == "toggle-type")
+                    {
+                        if (item.ToggleType == NativeMenuItemToggleType.CheckBox)
+                            return "checkmark";
+                        if (item.ToggleType == NativeMenuItemToggleType.Radio)
+                            return "radio";
+                    }
+
+                    if (name == "toggle-state")
+                    {
+                        if (item.ToggleType != NativeMenuItemToggleType.None)
+                            return item.IsChecked ? 1 : 0;
+                    }
+
+                    if (name == "icon-data")
+                    {
+                        if (item.Icon != null)
+                        {
+                            var ms = new MemoryStream();
+                            item.Icon.Save(ms);
+                            return ms.ToArray();
+                        }
+                    }
+
                     if (name == "children-display")
                         return menu != null ? "submenu" : null;
                 }
@@ -319,10 +344,10 @@ namespace Avalonia.FreeDesktop
                 {
                     var item = GetMenu(id).item;
 
-                    if (item is NativeMenuItem menuItem)
+                    if (item is NativeMenuItem menuItem && item is INativeMenuItemExporterEventsImplBridge bridge)
                     {
-                        if (menuItem?.Enabled == true)
-                            menuItem.RaiseClick();
+                        if (menuItem?.IsEnabled == true)
+                            bridge?.RaiseClicked();
                     }
                 }
             }
diff --git a/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoListener.cs b/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoListener.cs
index 8081528e55..f9737b461d 100644
--- a/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoListener.cs
+++ b/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoListener.cs
@@ -47,7 +47,8 @@ namespace Avalonia.FreeDesktop
 
             var fProcMounts = File.ReadAllLines(ProcMountsDir)
                                   .Select(x => x.Split(' '))
-                                  .Select(x => (x[0], x[1]));
+                                  .Select(x => (x[0], x[1]))
+                                  .Where(x => !x.Item2.StartsWith("/snap/", StringComparison.InvariantCultureIgnoreCase));
 
             var labelDirEnum = Directory.Exists(DevByLabelDir) ?
                                new DirectoryInfo(DevByLabelDir).GetFiles() : Enumerable.Empty<FileInfo>();
diff --git a/src/Avalonia.Headless.Vnc/Avalonia.Headless.Vnc.csproj b/src/Avalonia.Headless.Vnc/Avalonia.Headless.Vnc.csproj
new file mode 100644
index 0000000000..4aac862ae8
--- /dev/null
+++ b/src/Avalonia.Headless.Vnc/Avalonia.Headless.Vnc.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Avalonia.Headless\Avalonia.Headless.csproj" />
+      <PackageReference Include="Quamotion.RemoteViewing" Version="1.1.21" />
+    </ItemGroup>
+
+</Project>
diff --git a/src/Avalonia.Headless.Vnc/HeadlessVncFramebufferSource.cs b/src/Avalonia.Headless.Vnc/HeadlessVncFramebufferSource.cs
new file mode 100644
index 0000000000..32f9f99709
--- /dev/null
+++ b/src/Avalonia.Headless.Vnc/HeadlessVncFramebufferSource.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Runtime.InteropServices;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Threading;
+using RemoteViewing.Vnc;
+using RemoteViewing.Vnc.Server;
+
+namespace Avalonia.Headless.Vnc
+{
+    public class HeadlessVncFramebufferSource : IVncFramebufferSource
+    {
+        public IHeadlessWindow Window { get; set; }
+        private object _lock = new object();
+        public VncFramebuffer _framebuffer = new VncFramebuffer("Avalonia", 1, 1, VncPixelFormat.RGB32);
+
+        private VncButton _previousButtons;
+        public HeadlessVncFramebufferSource(VncServerSession session, Window window)
+        {
+            Window = (IHeadlessWindow)window.PlatformImpl;
+            session.PointerChanged += (_, args) =>
+            {
+                var pt = new Point(args.X, args.Y);
+                    
+                var buttons = (VncButton)args.PressedButtons;
+
+                int TranslateButton(VncButton vncButton) =>
+                    vncButton == VncButton.Left ? 0 : vncButton == VncButton.Right ? 1 : 2;
+
+                var modifiers = (RawInputModifiers)(((int)buttons & 7) << 4);
+                
+                Dispatcher.UIThread.Post(() =>
+                {
+                    Window?.MouseMove(pt);
+                    foreach (var btn in CheckedButtons)
+                        if (_previousButtons.HasFlag(btn) && !buttons.HasFlag(btn))
+                            Window?.MouseUp(pt, TranslateButton(btn), modifiers);
+                    
+                    foreach (var btn in CheckedButtons)
+                        if (!_previousButtons.HasFlag(btn) && buttons.HasFlag(btn))
+                            Window?.MouseDown(pt, TranslateButton(btn), modifiers);
+                    _previousButtons = buttons;
+                }, DispatcherPriority.Input);
+            };
+            
+        }
+
+        [Flags]
+        enum VncButton
+        {
+            Left = 1,
+            Middle = 2,
+            Right = 4,
+            ScrollUp = 8,
+            ScrollDown = 16
+        }
+        
+
+        private static VncButton[] CheckedButtons = new[] {VncButton.Left, VncButton.Middle, VncButton.Right}; 
+
+        public VncFramebuffer Capture()
+        {
+            lock (_lock)
+            {
+                using (var bmpRef = Window.GetLastRenderedFrame())
+                {
+                    if (bmpRef?.Item == null)
+                        return _framebuffer;
+                    var bmp = bmpRef.Item;
+                    if (bmp.PixelSize.Width != _framebuffer.Width || bmp.PixelSize.Height != _framebuffer.Height)
+                    {
+                        _framebuffer = new VncFramebuffer("Avalonia", bmp.PixelSize.Width, bmp.PixelSize.Height,
+                            VncPixelFormat.RGB32);
+                    }
+
+                    using (var fb = bmp.Lock())
+                    {
+                        var buf = _framebuffer.GetBuffer();
+                        if (_framebuffer.Stride == fb.RowBytes)
+                            Marshal.Copy(fb.Address, buf, 0, buf.Length);
+                        else
+                            for (var y = 0; y < fb.Size.Height; y++)
+                            {
+                                var sourceStart = fb.RowBytes * y;
+                                var dstStart = _framebuffer.Stride * y;
+                                var row = fb.Size.Width * 4;
+                                Marshal.Copy(new IntPtr(sourceStart + fb.Address.ToInt64()), buf, dstStart, row);
+                            }
+                    }
+                }
+            }
+
+            return _framebuffer;
+        }
+    }
+}
diff --git a/src/Avalonia.Headless.Vnc/HeadlessVncPlatformExtensions.cs b/src/Avalonia.Headless.Vnc/HeadlessVncPlatformExtensions.cs
new file mode 100644
index 0000000000..bd215296c8
--- /dev/null
+++ b/src/Avalonia.Headless.Vnc/HeadlessVncPlatformExtensions.cs
@@ -0,0 +1,48 @@
+using System.Net;
+using System.Net.Sockets;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Headless;
+using Avalonia.Headless.Vnc;
+using RemoteViewing.Vnc;
+using RemoteViewing.Vnc.Server;
+
+namespace Avalonia
+{
+    public static class HeadlessVncPlatformExtensions
+    {
+        public static int StartWithHeadlessVncPlatform<T>(
+            this T builder,
+            string host, int port,
+            string[] args, ShutdownMode shutdownMode = ShutdownMode.OnLastWindowClose)
+            where T : AppBuilderBase<T>, new()
+        {
+            var tcpServer = new TcpListener(host == null ? IPAddress.Loopback : IPAddress.Parse(host), port);
+            tcpServer.Start();    
+            return builder
+                .UseHeadless(false)
+                .AfterSetup(_ =>
+                {
+                    var lt = ((IClassicDesktopStyleApplicationLifetime)builder.Instance.ApplicationLifetime);
+                    lt.Startup += async delegate
+                    {
+                        while (true)
+                        {
+                            var client = await tcpServer.AcceptTcpClientAsync();
+                            var options = new VncServerSessionOptions
+                            {
+                                AuthenticationMethod = AuthenticationMethod.None
+                            };
+                            var session = new VncServerSession();
+                            
+                            session.SetFramebufferSource(new HeadlessVncFramebufferSource(
+                                session, lt.MainWindow));
+                            session.Connect(client.GetStream(), options);
+                        }
+                        
+                    };
+                })
+                .StartWithClassicDesktopLifetime(args, shutdownMode);
+        }
+    }
+}
diff --git a/src/Avalonia.Headless/Avalonia.Headless.csproj b/src/Avalonia.Headless/Avalonia.Headless.csproj
new file mode 100644
index 0000000000..ac591b68a8
--- /dev/null
+++ b/src/Avalonia.Headless/Avalonia.Headless.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />
+  </ItemGroup>  
+</Project>
diff --git a/src/Avalonia.Headless/AvaloniaHeadlessPlatform.cs b/src/Avalonia.Headless/AvaloniaHeadlessPlatform.cs
new file mode 100644
index 0000000000..1f750a0309
--- /dev/null
+++ b/src/Avalonia.Headless/AvaloniaHeadlessPlatform.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Diagnostics;
+using System.Reactive.Disposables;
+using Avalonia.Controls;
+using Avalonia.Controls.Platform;
+using Avalonia.Input;
+using Avalonia.Input.Platform;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.Threading;
+
+namespace Avalonia.Headless
+{
+    public static class AvaloniaHeadlessPlatform
+    {
+        class RenderTimer : DefaultRenderTimer
+        {
+            private readonly int _framesPerSecond;
+            private Action _forceTick; 
+            protected override IDisposable StartCore(Action<TimeSpan> tick)
+            {
+                bool cancelled = false;
+                var st = Stopwatch.StartNew();
+                _forceTick = () => tick(st.Elapsed);
+                DispatcherTimer.Run(() =>
+                {
+                    if (cancelled)
+                        return false;
+                    tick(st.Elapsed);
+                    return !cancelled;
+                }, TimeSpan.FromSeconds(1.0 / _framesPerSecond), DispatcherPriority.Render);
+                return Disposable.Create(() =>
+                {
+                    _forceTick = null;
+                    cancelled = true;
+                });
+            }
+
+            public RenderTimer(int framesPerSecond) : base(framesPerSecond)
+            {
+                _framesPerSecond = framesPerSecond;
+            }
+
+            public void ForceTick() => _forceTick?.Invoke();
+        }
+
+        class HeadlessWindowingPlatform : IWindowingPlatform
+        {
+            public IWindowImpl CreateWindow() => new HeadlessWindowImpl(false);
+
+            public IWindowImpl CreateEmbeddableWindow() => throw new PlatformNotSupportedException();
+
+            public IPopupImpl CreatePopup() => new HeadlessWindowImpl(true);
+        }
+        
+        internal static void Initialize()
+        {
+            AvaloniaLocator.CurrentMutable
+                .Bind<IPlatformThreadingInterface>().ToConstant(new HeadlessPlatformThreadingInterface())
+                .Bind<IClipboard>().ToSingleton<HeadlessClipboardStub>()
+                .Bind<IStandardCursorFactory>().ToSingleton<HeadlessCursorFactoryStub>()
+                .Bind<IPlatformSettings>().ToConstant(new HeadlessPlatformSettingsStub())
+                .Bind<ISystemDialogImpl>().ToSingleton<HeadlessSystemDialogsStub>()
+                .Bind<IPlatformIconLoader>().ToSingleton<HeadlessIconLoaderStub>()
+                .Bind<IKeyboardDevice>().ToConstant(new KeyboardDevice())
+                .Bind<IRenderLoop>().ToConstant(new RenderLoop())
+                .Bind<IRenderTimer>().ToConstant(new RenderTimer(60))
+                .Bind<IFontManagerImpl>().ToSingleton<HeadlessFontManagerStub>()
+                .Bind<ITextShaperImpl>().ToSingleton<HeadlessTextShaperStub>()
+                .Bind<IWindowingPlatform>().ToConstant(new HeadlessWindowingPlatform())
+                .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>();
+        }
+
+
+        public static void ForceRenderTimerTick(int count = 1)
+        {
+            var timer = AvaloniaLocator.Current.GetService<IRenderTimer>() as RenderTimer;
+            for (var c = 0; c < count; c++)
+                timer?.ForceTick();
+
+        }
+    }
+    
+    public static class AvaloniaHeadlessPlatformExtensions
+    {
+        public static T UseHeadless<T>(this T builder, bool headlessDrawing = true) 
+            where T : AppBuilderBase<T>, new()
+        {
+            if (headlessDrawing)
+                builder.UseRenderingSubsystem(HeadlessPlatformRenderInterface.Initialize, "Headless");
+            return builder.UseWindowingSubsystem(AvaloniaHeadlessPlatform.Initialize, "Headless");
+        }
+    }
+}
diff --git a/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs b/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
new file mode 100644
index 0000000000..6a78f4c6e7
--- /dev/null
+++ b/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
@@ -0,0 +1,445 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+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;
+
+namespace Avalonia.Headless
+{
+    internal class HeadlessPlatformRenderInterface : IPlatformRenderInterface
+    {
+        public static void Initialize()
+        {
+            AvaloniaLocator.CurrentMutable
+                .Bind<IPlatformRenderInterface>().ToConstant(new HeadlessPlatformRenderInterface());
+        }
+
+        public IEnumerable<string> InstalledFontNames { get; } = new[] { "Tahoma" };
+
+        public bool SupportsIndividualRoundRects => false;
+
+        public AlphaFormat DefaultAlphaFormat => AlphaFormat.Premul;
+
+        public PixelFormat DefaultPixelFormat => PixelFormat.Rgba8888;
+
+        public IFormattedTextImpl CreateFormattedText(string text, Typeface typeface, double fontSize, TextAlignment textAlignment, TextWrapping wrapping, Size constraint, IReadOnlyList<FormattedTextStyleSpan> spans)
+        {
+            return new HeadlessFormattedTextStub(text, constraint);
+        }
+
+        public IGeometryImpl CreateEllipseGeometry(Rect rect) => new HeadlessGeometryStub(rect);
+
+        public IGeometryImpl CreateLineGeometry(Point p1, Point p2)
+        {
+            var tl = new Point(Math.Min(p1.X, p2.X), Math.Min(p1.Y, p2.Y));
+            var br = new Point(Math.Max(p1.X, p2.X), Math.Max(p1.Y, p2.Y));
+            return new HeadlessGeometryStub(new Rect(tl, br));
+        }
+
+        public IGeometryImpl CreateRectangleGeometry(Rect rect)
+        {
+            return new HeadlessGeometryStub(rect);
+        }
+
+        public IStreamGeometryImpl CreateStreamGeometry() => new HeadlessStreamingGeometryStub();
+
+        public IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces) => new HeadlessRenderTarget();
+
+        public IRenderTargetBitmapImpl CreateRenderTargetBitmap(PixelSize size, Vector dpi)
+        {
+            return new HeadlessBitmapStub(size, dpi);
+        }
+
+        public IWriteableBitmapImpl CreateWriteableBitmap(PixelSize size, Vector dpi, PixelFormat format, AlphaFormat alphaFormat)
+        {
+            return new HeadlessBitmapStub(size, dpi);
+        }
+
+        public IBitmapImpl LoadBitmap(string fileName)
+        {
+            return new HeadlessBitmapStub(new Size(1, 1), new Vector(96, 96));
+        }
+
+        public IBitmapImpl LoadBitmap(Stream stream)
+        {
+            return new HeadlessBitmapStub(new Size(1, 1), new Vector(96, 96));
+        }
+
+        public IBitmapImpl LoadBitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride)
+        {
+            return new HeadlessBitmapStub(new Size(1, 1), new Vector(96, 96));
+        }        
+
+        public IBitmapImpl LoadBitmapToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            return new HeadlessBitmapStub(new Size(width, width), new Vector(96, 96));
+        }
+
+        public IBitmapImpl LoadBitmapToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            return new HeadlessBitmapStub(new Size(height, height), new Vector(96, 96));
+        }
+
+        public IBitmapImpl ResizeBitmap(IBitmapImpl bitmapImpl, PixelSize destinationSize, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            return new HeadlessBitmapStub(destinationSize, new Vector(96, 96));
+        }
+
+        public IGlyphRunImpl CreateGlyphRun(GlyphRun glyphRun, out double width)
+        {
+            width = 100;
+            return new HeadlessGlyphRunStub();
+        }
+
+        class HeadlessGeometryStub : IGeometryImpl
+        {
+            public HeadlessGeometryStub(Rect bounds)
+            {
+                Bounds = bounds;
+            }
+
+            public Rect Bounds { get; set; }
+            public virtual bool FillContains(Point point) => Bounds.Contains(point);
+
+            public Rect GetRenderBounds(IPen pen)
+            {
+                if(pen is null)
+                {
+                    return Bounds;
+                }
+
+                return Bounds.Inflate(pen.Thickness / 2);
+            }
+
+            public bool StrokeContains(IPen pen, Point point)
+            {
+                return false;
+            }
+
+            public IGeometryImpl Intersect(IGeometryImpl geometry)
+                => new HeadlessGeometryStub(geometry.Bounds.Intersect(Bounds));
+
+            public ITransformedGeometryImpl WithTransform(Matrix transform) =>
+                new HeadlessTransformedGeometryStub(this, transform);
+        }
+
+        class HeadlessTransformedGeometryStub : HeadlessGeometryStub, ITransformedGeometryImpl
+        {
+            public HeadlessTransformedGeometryStub(IGeometryImpl b, Matrix transform) : this(Fix(b, transform))
+            {
+
+            }
+
+            static (IGeometryImpl, Matrix, Rect) Fix(IGeometryImpl b, Matrix transform)
+            {
+                if (b is HeadlessTransformedGeometryStub transformed)
+                {
+                    b = transformed.SourceGeometry;
+                    transform = transformed.Transform * transform;
+                }
+
+                return (b, transform, b.Bounds.TransformToAABB(transform));
+            }
+
+            private HeadlessTransformedGeometryStub((IGeometryImpl b, Matrix transform, Rect bounds) fix) : base(fix.bounds)
+            {
+                SourceGeometry = fix.b;
+                Transform = fix.transform;
+            }
+
+
+            public IGeometryImpl SourceGeometry { get; }
+            public Matrix Transform { get; }
+        }
+
+        class HeadlessGlyphRunStub : IGlyphRunImpl
+        {
+            public void Dispose()
+            {
+            }
+        }
+
+        class HeadlessStreamingGeometryStub : HeadlessGeometryStub, IStreamGeometryImpl
+        {
+            public HeadlessStreamingGeometryStub() : base(Rect.Empty)
+            {
+            }
+
+            public IStreamGeometryImpl Clone()
+            {
+                return this;
+            }
+
+            public IStreamGeometryContextImpl Open()
+            {
+                return new HeadlessStreamingGeometryContextStub(this);
+            }
+
+            class HeadlessStreamingGeometryContextStub : IStreamGeometryContextImpl
+            {
+                private readonly HeadlessStreamingGeometryStub _parent;
+                private double _x1, _y1, _x2, _y2;
+                public HeadlessStreamingGeometryContextStub(HeadlessStreamingGeometryStub parent)
+                {
+                    _parent = parent;
+                }
+
+                void Track(Point pt)
+                {
+                    if (_x1 > pt.X)
+                        _x1 = pt.X;
+                    if (_x2 < pt.X)
+                        _x2 = pt.X;
+                    if (_y1 > pt.Y)
+                        _y1 = pt.Y;
+                    if (_y2 < pt.Y)
+                        _y2 = pt.Y;
+                }
+
+                public void Dispose()
+                {
+                    _parent.Bounds = new Rect(_x1, _y1, _x2 - _x1, _y2 - _y1);
+                }
+
+                public void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
+                    => Track(point);
+
+                public void BeginFigure(Point startPoint, bool isFilled = true) => Track(startPoint);
+
+                public void CubicBezierTo(Point point1, Point point2, Point point3)
+                {
+                    Track(point1);
+                    Track(point2);
+                    Track(point3);
+                }
+
+                public void QuadraticBezierTo(Point control, Point endPoint)
+                {
+                    Track(control);
+                    Track(endPoint);
+                }
+
+                public void LineTo(Point point) => Track(point);
+
+                public void EndFigure(bool isClosed)
+                {
+                    Dispose();
+                }
+
+                public void SetFillRule(FillRule fillRule)
+                {
+
+                }
+            }
+        }
+
+        class HeadlessBitmapStub : IBitmapImpl, IDrawingContextLayerImpl, IWriteableBitmapImpl
+        {
+            public Size Size { get; }
+
+            public HeadlessBitmapStub(Size size, Vector dpi)
+            {
+                Size = size;
+                Dpi = dpi;
+                var pixel = Size * (Dpi / 96);
+                PixelSize = new PixelSize(Math.Max(1, (int)pixel.Width), Math.Max(1, (int)pixel.Height));
+            }
+
+            public HeadlessBitmapStub(PixelSize size, Vector dpi)
+            {
+                PixelSize = size;
+                Dpi = dpi;
+                Size = PixelSize.ToSizeWithDpi(dpi);
+            }
+
+            public void Dispose()
+            {
+
+            }
+
+            public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
+            {
+                return new HeadlessDrawingContextStub();
+            }
+
+            public void Blit(IDrawingContextImpl context)
+            {
+                
+            }
+
+            public bool CanBlit => false;
+
+            public Vector Dpi { get; }
+            public PixelSize PixelSize { get; }
+            public int Version { get; set; }
+            public void Save(string fileName)
+            {
+
+            }
+
+            public void Save(Stream stream)
+            {
+
+            }
+
+            public ILockedFramebuffer Lock()
+            {
+                Version++;
+                var mem = Marshal.AllocHGlobal(PixelSize.Width * PixelSize.Height * 4);
+                return new LockedFramebuffer(mem, PixelSize, PixelSize.Width * 4, Dpi, PixelFormat.Rgba8888,
+                    () => Marshal.FreeHGlobal(mem));
+            }
+        }
+
+        class HeadlessDrawingContextStub : IDrawingContextImpl
+        {
+            public void Dispose()
+            {
+
+            }
+
+            public Matrix Transform { get; set; }
+            public void Clear(Color color)
+            {
+
+            }
+
+            public void DrawText(IBrush foreground, Point origin, IFormattedTextImpl text)
+            {
+
+            }
+
+            public IDrawingContextLayerImpl CreateLayer(Size size)
+            {
+                return new HeadlessBitmapStub(size, new Vector(96, 96));
+            }
+
+            public void PushClip(Rect clip)
+            {
+
+            }
+
+            public void PopClip()
+            {
+
+            }
+
+            public void PushOpacity(double opacity)
+            {
+
+            }
+
+            public void PopOpacity()
+            {
+
+            }
+
+            public void PushOpacityMask(IBrush mask, Rect bounds)
+            {
+
+            }
+
+            public void PopOpacityMask()
+            {
+
+            }
+
+            public void PushGeometryClip(IGeometryImpl clip)
+            {
+
+            }
+
+            public void PopGeometryClip()
+            {
+
+            }
+
+            public void Custom(ICustomDrawOperation custom)
+            {
+
+            }
+
+            public void DrawLine(IPen pen, Point p1, Point p2)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void DrawGeometry(IBrush brush, IPen pen, IGeometryImpl geometry)
+            {
+            }
+
+            public void DrawRectangle(IPen pen, Rect rect, float cornerRadius = 0)
+            {
+            }
+
+            public void DrawBitmap(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode = BitmapInterpolationMode.Default)
+            {
+                
+            }
+
+            public void DrawBitmap(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect)
+            {
+                
+            }
+
+            public void DrawRectangle(IBrush brush, IPen pen, RoundedRect rect, BoxShadows boxShadow = default)
+            {
+                
+            }
+
+            public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
+            {
+                
+            }
+
+            public void PushClip(RoundedRect clip)
+            {
+                
+            }
+        }
+
+        class HeadlessRenderTarget : IRenderTarget
+        {
+            public void Dispose()
+            {
+
+            }
+
+            public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
+            {
+                return new HeadlessDrawingContextStub();
+            }
+        }
+
+        class HeadlessFormattedTextStub : IFormattedTextImpl
+        {
+            public HeadlessFormattedTextStub(string text, Size constraint)
+            {
+                Text = text;
+                Constraint = constraint;
+                Bounds = new Rect(Constraint.Constrain(new Size(50, 50)));
+            }
+
+            public Size Constraint { get; }
+            public Rect Bounds { get; }
+            public string Text { get; }
+
+
+            public IEnumerable<FormattedTextLine> GetLines()
+            {
+                return new[] { new FormattedTextLine(Text.Length, 10) };
+            }
+
+            public TextHitTestResult HitTestPoint(Point point) => new TextHitTestResult();
+
+            public Rect HitTestTextPosition(int index) => new Rect();
+
+            public IEnumerable<Rect> HitTestTextRange(int index, int length) => new Rect[length];
+        }
+    }
+}
diff --git a/src/Avalonia.Headless/HeadlessPlatformStubs.cs b/src/Avalonia.Headless/HeadlessPlatformStubs.cs
new file mode 100644
index 0000000000..4c0e2982f4
--- /dev/null
+++ b/src/Avalonia.Headless/HeadlessPlatformStubs.cs
@@ -0,0 +1,201 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.Platform;
+using Avalonia.Input;
+using Avalonia.Input.Platform;
+using Avalonia.Media;
+using Avalonia.Media.Fonts;
+using Avalonia.Media.TextFormatting;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+
+namespace Avalonia.Headless
+{
+    class HeadlessClipboardStub : IClipboard
+    {
+        private string _text;
+        private IDataObject _data;
+
+        public Task<string> GetTextAsync()
+        {
+            return Task.Run(() => _text);
+        }
+
+        public Task SetTextAsync(string text)
+        {
+            return Task.Run(() => _text = text);
+        }
+
+        public Task ClearAsync()
+        {
+            return Task.Run(() => _text = null);
+        }
+
+        public Task SetDataObjectAsync(IDataObject data)
+        {
+            return Task.Run(() => _data = data);
+        }
+
+        public Task<string[]> GetFormatsAsync()
+        {
+            throw new NotImplementedException();
+        }
+
+        public async Task<object> GetDataAsync(string format)
+        {
+            return await Task.Run(() => _data);
+        }
+    }
+
+    class HeadlessCursorFactoryStub : IStandardCursorFactory
+    {
+
+        public IPlatformHandle GetCursor(StandardCursorType cursorType)
+        {
+            return new PlatformHandle(new IntPtr((int)cursorType), "STUB");
+        }
+    }
+
+    class HeadlessPlatformSettingsStub : IPlatformSettings
+    {
+        public Size DoubleClickSize { get; } = new Size(2, 2);
+        public TimeSpan DoubleClickTime { get; } = TimeSpan.FromMilliseconds(500);
+    }
+
+    class HeadlessSystemDialogsStub : ISystemDialogImpl
+    {
+        public Task<string[]> ShowFileDialogAsync(FileDialog dialog, Window parent)
+        {
+            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;
+
+        public int Descent => 5;
+
+        public int LineGap => 2;
+
+        public int UnderlinePosition => 5;
+
+        public int UnderlineThickness => 5;
+
+        public int StrikethroughPosition => 5;
+
+        public int StrikethroughThickness => 2;
+
+        public bool IsFixedPitch => true;
+
+        public void Dispose()
+        {
+        }
+
+        public ushort GetGlyph(uint codepoint)
+        {
+            return 1;
+        }
+
+        public int GetGlyphAdvance(ushort glyph)
+        {
+            return 1;
+        }
+
+        public int[] GetGlyphAdvances(ReadOnlySpan<ushort> glyphs)
+        {
+            return glyphs.ToArray().Select(x => (int)x).ToArray();
+        }
+
+        public ushort[] GetGlyphs(ReadOnlySpan<uint> codepoints)
+        {
+            return codepoints.ToArray().Select(x => (ushort)x).ToArray();
+        }
+    }
+
+    class HeadlessTextShaperStub : ITextShaperImpl
+    {
+        public GlyphRun ShapeText(ReadOnlySlice<char> text, Typeface typeface, double fontRenderingEmSize, CultureInfo culture)
+        {
+            return new GlyphRun(new GlyphTypeface(typeface), 10,
+                new ReadOnlySlice<ushort>(new ushort[] { 1, 2, 3 }),
+                new ReadOnlySlice<double>(new double[] { 1, 2, 3 }),
+                new ReadOnlySlice<Vector>(new Vector[] { new Vector(1, 1), new Vector(2, 2), new Vector(3, 3) }),
+                text,
+                new ReadOnlySlice<ushort>(new ushort[] { 1, 2, 3 }));
+        }
+    }
+
+    class HeadlessFontManagerStub : IFontManagerImpl
+    {
+        public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)
+        {
+            return new HeadlessGlyphTypefaceImpl();
+        }
+
+        public string GetDefaultFontFamilyName()
+        {
+            return "Arial";
+        }
+
+        public IEnumerable<string> GetInstalledFontFamilyNames(bool checkForUpdates = false)
+        {
+            return new List<string> { "Arial" };
+        }
+
+        public bool TryMatchCharacter(int codepoint, FontStyle fontStyle, FontWeight fontWeight, FontFamily fontFamily, CultureInfo culture, out Typeface typeface)
+        {
+            typeface = new Typeface("Arial", fontStyle, fontWeight);
+            return true;
+        }
+    }
+
+    class HeadlessIconLoaderStub : IPlatformIconLoader
+    {
+
+        class IconStub : IWindowIconImpl
+        {
+            public void Save(Stream outputStream)
+            {
+
+            }
+        }
+        public IWindowIconImpl LoadIcon(string fileName)
+        {
+            return new IconStub();
+        }
+
+        public IWindowIconImpl LoadIcon(Stream stream)
+        {
+            return new IconStub();
+        }
+
+        public IWindowIconImpl LoadIcon(IBitmapImpl bitmap)
+        {
+            return new IconStub();
+        }
+    }
+
+    class HeadlessScreensStub : IScreenImpl
+    {
+        public int ScreenCount { get; } = 1;
+
+        public IReadOnlyList<Screen> AllScreens { get; } = new[]
+        {
+            new Screen(1, new PixelRect(0, 0, 1920, 1280),
+                new PixelRect(0, 0, 1920, 1280), true),
+        };
+    }
+}
diff --git a/src/Avalonia.Headless/HeadlessPlatformThreadingInterface.cs b/src/Avalonia.Headless/HeadlessPlatformThreadingInterface.cs
new file mode 100644
index 0000000000..e42a7b1a71
--- /dev/null
+++ b/src/Avalonia.Headless/HeadlessPlatformThreadingInterface.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Reactive.Disposables;
+using System.Threading;
+using Avalonia.Platform;
+using Avalonia.Threading;
+
+namespace Avalonia.Headless
+{
+    class HeadlessPlatformThreadingInterface : IPlatformThreadingInterface
+    {
+        public HeadlessPlatformThreadingInterface()
+        {
+            _thread = Thread.CurrentThread;
+        }
+        
+        private AutoResetEvent _event = new AutoResetEvent(false);
+        private Thread _thread;
+        private object _lock = new object();
+        private DispatcherPriority? _signaledPriority;
+
+        public void RunLoop(CancellationToken cancellationToken)
+        {
+            while (!cancellationToken.IsCancellationRequested)
+            {
+                DispatcherPriority? signaled = null;
+                lock (_lock)
+                {
+                    signaled = _signaledPriority;
+                    _signaledPriority = null;
+                }
+                if(signaled.HasValue)
+                    Signaled?.Invoke(signaled);
+                WaitHandle.WaitAny(new[] {cancellationToken.WaitHandle, _event}, TimeSpan.FromMilliseconds(20));
+            }
+        }
+
+        public IDisposable StartTimer(DispatcherPriority priority, TimeSpan interval, Action tick)
+        {
+            var cancelled = false;
+            var enqueued = false;
+            var l = new object();
+            var timer = new Timer(_ =>
+            {
+                lock (l)
+                {
+                    if (cancelled || enqueued)
+                        return;
+                    enqueued = true;
+                    Dispatcher.UIThread.Post(() =>
+                    {
+                        lock (l)
+                        {
+                            enqueued = false;
+                            if (cancelled)
+                                return;
+                            tick();
+                        }
+                    }, priority);
+                }
+            }, null, interval, interval);
+            return Disposable.Create(() =>
+            {
+                lock (l)
+                {
+                    timer.Dispose();
+                    cancelled = true;
+                }
+            });
+        }
+
+        public void Signal(DispatcherPriority priority)
+        {
+            lock (_lock)
+            {
+                if (_signaledPriority == null || _signaledPriority.Value > priority)
+                {
+                    _signaledPriority = priority;
+                }
+                _event.Set();
+            }
+        }
+
+        public bool CurrentThreadIsLoopThread => _thread == Thread.CurrentThread;
+        public event Action<DispatcherPriority?> Signaled;
+    }
+}
diff --git a/src/Avalonia.Headless/HeadlessWindowImpl.cs b/src/Avalonia.Headless/HeadlessWindowImpl.cs
new file mode 100644
index 0000000000..3a1f3bdaf7
--- /dev/null
+++ b/src/Avalonia.Headless/HeadlessWindowImpl.cs
@@ -0,0 +1,344 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using Avalonia.Controls;
+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.Rendering;
+using Avalonia.Threading;
+using Avalonia.Utilities;
+
+namespace Avalonia.Headless
+{
+    class HeadlessWindowImpl : IWindowImpl, IPopupImpl, IFramebufferPlatformSurface, IHeadlessWindow
+    {
+        private IKeyboardDevice _keyboard;
+        private Stopwatch _st = Stopwatch.StartNew();
+        private Pointer _mousePointer;
+        private WriteableBitmap _lastRenderedFrame;
+        private object _sync = new object();
+        public bool IsPopup { get; }
+
+        public HeadlessWindowImpl(bool isPopup)
+        {
+            IsPopup = isPopup;
+            Surfaces = new object[] { this };
+            _keyboard = AvaloniaLocator.Current.GetService<IKeyboardDevice>();
+            _mousePointer = new Pointer(Pointer.GetNextFreeId(), PointerType.Mouse, true);
+            MouseDevice = new MouseDevice(_mousePointer);
+            ClientSize = new Size(1024, 768);
+        }
+
+        public void Dispose()
+        {
+            Closed?.Invoke();
+            _lastRenderedFrame?.Dispose();
+            _lastRenderedFrame = null;
+        }
+
+        public Size ClientSize { get; set; }
+        public double RenderScaling { get; } = 1;
+        public double DesktopScaling => RenderScaling;
+        public IEnumerable<object> Surfaces { get; }
+        public Action<RawInputEventArgs> Input { get; set; }
+        public Action<Rect> Paint { get; set; }
+        public Action<Size> Resized { get; set; }
+        public Action<double> ScalingChanged { get; set; }
+
+        public IRenderer CreateRenderer(IRenderRoot root)
+            => new DeferredRenderer(root, AvaloniaLocator.Current.GetService<IRenderLoop>());
+
+        public void Invalidate(Rect rect)
+        {
+        }
+
+        public void SetInputRoot(IInputRoot inputRoot)
+        {
+            InputRoot = inputRoot;
+        }
+
+        public IInputRoot InputRoot { get; set; }
+
+        public Point PointToClient(PixelPoint point) => point.ToPoint(RenderScaling);
+
+        public PixelPoint PointToScreen(Point point) => PixelPoint.FromPoint(point, RenderScaling);
+
+        public void SetCursor(IPlatformHandle cursor)
+        {
+
+        }
+
+        public Action Closed { get; set; }
+        public IMouseDevice MouseDevice { get; }
+
+        public void Show(bool activate)
+        {
+            if (activate)
+                Dispatcher.UIThread.Post(() => Activated?.Invoke(), DispatcherPriority.Input);
+        }
+
+        public void Hide()
+        {
+            Dispatcher.UIThread.Post(() => Deactivated?.Invoke(), DispatcherPriority.Input);
+        }
+
+        public void BeginMoveDrag()
+        {
+
+        }
+
+        public void BeginResizeDrag(WindowEdge edge)
+        {
+
+        }
+
+        public PixelPoint Position { get; set; }
+        public Action<PixelPoint> PositionChanged { get; set; }
+        public void Activate()
+        {
+            Dispatcher.UIThread.Post(() => Activated?.Invoke(), DispatcherPriority.Input);
+        }
+
+        public Action Deactivated { get; set; }
+        public Action Activated { get; set; }
+        public IPlatformHandle Handle { get; } = new PlatformHandle(IntPtr.Zero, "STUB");
+        public Size MaxClientSize { get; } = new Size(1920, 1280);
+        public void Resize(Size clientSize)
+        {
+            // Emulate X11 behavior here
+            if (IsPopup)
+                DoResize(clientSize);
+            else
+                Dispatcher.UIThread.Post(() =>
+                {
+                    DoResize(clientSize);
+                });
+        }
+
+        void DoResize(Size clientSize)
+        {
+            // Uncomment this check and experience a weird bug in layout engine
+            if (ClientSize != clientSize)
+            {
+                ClientSize = clientSize;
+                Resized?.Invoke(clientSize);
+            }
+        }
+
+        public void SetMinMaxSize(Size minSize, Size maxSize)
+        {
+
+        }
+
+        public void SetTopmost(bool value)
+        {
+
+        }
+
+        public IScreenImpl Screen { get; } = new HeadlessScreensStub();
+        public WindowState WindowState { get; set; }
+        public Action<WindowState> WindowStateChanged { get; set; }
+        public void SetTitle(string title)
+        {
+
+        }
+
+        public void ShowDialog(IWindowImpl parent)
+        {
+            Show(true);
+        }
+
+        public void SetSystemDecorations(bool enabled)
+        {
+
+        }
+
+        public void SetIcon(IWindowIconImpl icon)
+        {
+
+        }
+
+        public void ShowTaskbarIcon(bool value)
+        {
+
+        }
+
+        public void CanResize(bool value)
+        {
+
+        }
+
+        public Func<bool> Closing { get; set; }
+
+        class FramebufferProxy : ILockedFramebuffer
+        {
+            private readonly ILockedFramebuffer _fb;
+            private readonly Action _onDispose;
+            private bool _disposed;
+
+            public FramebufferProxy(ILockedFramebuffer fb, Action onDispose)
+            {
+                _fb = fb;
+                _onDispose = onDispose;
+            }
+            public void Dispose()
+            {
+                if (_disposed)
+                    return;
+                _disposed = true;
+                _fb.Dispose();
+                _onDispose();
+            }
+
+            public IntPtr Address => _fb.Address;
+            public PixelSize Size => _fb.Size;
+            public int RowBytes => _fb.RowBytes;
+            public Vector Dpi => _fb.Dpi;
+            public PixelFormat Format => _fb.Format;
+        }
+
+        public ILockedFramebuffer Lock()
+        {
+            var bmp = new WriteableBitmap(PixelSize.FromSize(ClientSize, RenderScaling), new Vector(96, 96) * RenderScaling);
+            var fb = bmp.Lock();
+            return new FramebufferProxy(fb, () =>
+            {
+                lock (_sync)
+                {
+                    _lastRenderedFrame?.Dispose();
+                    _lastRenderedFrame = bmp;
+                }
+            });
+        }
+
+        public IRef<IWriteableBitmapImpl> GetLastRenderedFrame()
+        {
+            lock (_sync)
+                return _lastRenderedFrame?.PlatformImpl?.CloneAs<IWriteableBitmapImpl>();
+        }
+
+        private ulong Timestamp => (ulong)_st.ElapsedMilliseconds;
+
+        // TODO: Hook recent Popup changes. 
+        IPopupPositioner IPopupImpl.PopupPositioner => null;
+
+        public Size MaxAutoSizeHint => new Size(1920, 1080);
+
+        public Action<WindowTransparencyLevel> TransparencyLevelChanged { get; set; }
+
+        public WindowTransparencyLevel TransparencyLevel => WindowTransparencyLevel.None;
+
+        public Action GotInputWhenDisabled { get; set; }
+
+        public bool IsClientAreaExtendedToDecorations => false;
+
+        public Action<bool> ExtendClientAreaToDecorationsChanged { get; set; }
+
+        public bool NeedsManagedDecorations => false;
+
+        public Thickness ExtendedMargins => new Thickness();
+
+        public Thickness OffScreenMargin => new Thickness();
+
+        public Action LostFocus { get; set; }
+
+        public AcrylicPlatformCompensationLevels AcrylicCompensationLevels => new AcrylicPlatformCompensationLevels(1, 1, 1);
+
+        void IHeadlessWindow.KeyPress(Key key, RawInputModifiers modifiers)
+        {
+            Input?.Invoke(new RawKeyEventArgs(_keyboard, Timestamp, InputRoot, RawKeyEventType.KeyDown, key, modifiers));
+        }
+
+        void IHeadlessWindow.KeyRelease(Key key, RawInputModifiers modifiers)
+        {
+            Input?.Invoke(new RawKeyEventArgs(_keyboard, Timestamp, InputRoot, RawKeyEventType.KeyUp, key, modifiers));
+        }
+
+        void IHeadlessWindow.MouseDown(Point point, int button, RawInputModifiers modifiers)
+        {
+            Input?.Invoke(new RawPointerEventArgs(MouseDevice, Timestamp, InputRoot,
+                button == 0 ? RawPointerEventType.LeftButtonDown :
+                button == 1 ? RawPointerEventType.MiddleButtonDown : RawPointerEventType.RightButtonDown,
+                point, modifiers));
+        }
+
+        void IHeadlessWindow.MouseMove(Point point, RawInputModifiers modifiers)
+        {
+            Input?.Invoke(new RawPointerEventArgs(MouseDevice, Timestamp, InputRoot,
+                RawPointerEventType.Move, point, modifiers));
+        }
+
+        void IHeadlessWindow.MouseUp(Point point, int button, RawInputModifiers modifiers)
+        {
+            Input?.Invoke(new RawPointerEventArgs(MouseDevice, Timestamp, InputRoot,
+                button == 0 ? RawPointerEventType.LeftButtonUp :
+                button == 1 ? RawPointerEventType.MiddleButtonUp : RawPointerEventType.RightButtonUp,
+                point, modifiers));
+        }
+
+        void IWindowImpl.Move(PixelPoint point)
+        {
+
+        }
+
+        public IPopupImpl CreatePopup()
+        {
+            // TODO: Hook recent Popup changes. 
+            return null;
+        }
+
+        public void SetWindowManagerAddShadowHint(bool enabled)
+        {
+            
+        }
+
+        public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel)
+        {
+            
+        }
+
+        public void SetParent(IWindowImpl parent)
+        {
+            
+        }
+
+        public void SetEnabled(bool enable)
+        {
+            
+        }
+
+        public void SetSystemDecorations(SystemDecorations enabled)
+        {
+            
+        }
+
+        public void BeginMoveDrag(PointerPressedEventArgs e)
+        {
+            
+        }
+
+        public void BeginResizeDrag(WindowEdge edge, PointerPressedEventArgs e)
+        {
+            
+        }
+
+        public void SetExtendClientAreaToDecorationsHint(bool extendIntoClientAreaHint)
+        {
+            
+        }
+
+        public void SetExtendClientAreaChromeHints(ExtendClientAreaChromeHints hints)
+        {
+            
+        }
+
+        public void SetExtendClientAreaTitleBarHeightHint(double titleBarHeight)
+        {
+            
+        }
+    }
+}
diff --git a/src/Avalonia.Headless/IHeadlessWindow.cs b/src/Avalonia.Headless/IHeadlessWindow.cs
new file mode 100644
index 0000000000..282662f98b
--- /dev/null
+++ b/src/Avalonia.Headless/IHeadlessWindow.cs
@@ -0,0 +1,17 @@
+using Avalonia.Input;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+
+namespace Avalonia.Headless
+{
+    public interface IHeadlessWindow
+    {
+        IRef<IWriteableBitmapImpl> GetLastRenderedFrame();
+        void KeyPress(Key key, RawInputModifiers modifiers);
+        void KeyRelease(Key key, RawInputModifiers modifiers);
+        void MouseDown(Point point, int button, RawInputModifiers modifiers = RawInputModifiers.None);
+        void MouseMove(Point point, RawInputModifiers modifiers = RawInputModifiers.None);
+        void MouseUp(Point point, int button, RawInputModifiers modifiers = RawInputModifiers.None);
+    }
+}
diff --git a/src/Avalonia.Input/AccessKeyHandler.cs b/src/Avalonia.Input/AccessKeyHandler.cs
index aa009770f6..660584e2ed 100644
--- a/src/Avalonia.Input/AccessKeyHandler.cs
+++ b/src/Avalonia.Input/AccessKeyHandler.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -31,7 +28,7 @@ namespace Avalonia.Input
         /// <summary>
         /// The window to which the handler belongs.
         /// </summary>
-        private IInputRoot _owner;
+        private IInputRoot? _owner;
 
         /// <summary>
         /// Whether access keys are currently being shown;
@@ -51,17 +48,17 @@ namespace Avalonia.Input
         /// <summary>
         /// Element to restore following AltKey taking focus.
         /// </summary>
-        private IInputElement _restoreFocusElement;
+        private IInputElement? _restoreFocusElement;
 
         /// <summary>
         /// The window's main menu.
         /// </summary>
-        private IMainMenu _mainMenu;
+        private IMainMenu? _mainMenu;
 
         /// <summary>
         /// Gets or sets the window's main menu.
         /// </summary>
-        public IMainMenu MainMenu
+        public IMainMenu? MainMenu
         {
             get => _mainMenu;
             set
@@ -89,14 +86,12 @@ namespace Avalonia.Input
         /// </remarks>
         public void SetOwner(IInputRoot owner)
         {
-            Contract.Requires<ArgumentNullException>(owner != null);
-
             if (_owner != null)
             {
                 throw new InvalidOperationException("AccessKeyHandler owner has already been set.");
             }
 
-            _owner = owner;
+            _owner = owner ?? throw new ArgumentNullException(nameof(owner));
 
             _owner.AddHandler(InputElement.KeyDownEvent, OnPreviewKeyDown, RoutingStrategies.Tunnel);
             _owner.AddHandler(InputElement.KeyDownEvent, OnKeyDown, RoutingStrategies.Bubble);
@@ -140,7 +135,7 @@ namespace Avalonia.Input
         /// <param name="e">The event args.</param>
         protected virtual void OnPreviewKeyDown(object sender, KeyEventArgs e)
         {
-            if (e.Key == Key.LeftAlt)
+            if (e.Key == Key.LeftAlt || e.Key == Key.RightAlt)
             {
                 _altIsDown = true;
 
@@ -152,7 +147,7 @@ namespace Avalonia.Input
 
                     // When Alt is pressed without a main menu, or with a closed main menu, show
                     // access key markers in the window (i.e. "_File").
-                    _owner.ShowAccessKeys = _showingAccessKeys = true;
+                    _owner!.ShowAccessKeys = _showingAccessKeys = true;
                 }
                 else
                 {
@@ -218,6 +213,7 @@ namespace Avalonia.Input
             switch (e.Key)
             {
                 case Key.LeftAlt:
+                case Key.RightAlt:
                     _altIsDown = false;
 
                     if (_ignoreAltUp)
@@ -243,7 +239,7 @@ namespace Avalonia.Input
         {
             if (_showingAccessKeys)
             {
-                _owner.ShowAccessKeys = false;
+                _owner!.ShowAccessKeys = false;
             }
         }
 
@@ -252,13 +248,13 @@ namespace Avalonia.Input
         /// </summary>
         private void CloseMenu()
         {
-            MainMenu.Close();
-            _owner.ShowAccessKeys = _showingAccessKeys = false;
+            MainMenu!.Close();
+            _owner!.ShowAccessKeys = _showingAccessKeys = false;
         }
 
         private void MainMenuClosed(object sender, EventArgs e)
         {
-            _owner.ShowAccessKeys = false;
+            _owner!.ShowAccessKeys = false;
         }
     }
 }
diff --git a/src/Avalonia.Input/Avalonia.Input.csproj b/src/Avalonia.Input/Avalonia.Input.csproj
index ea560ce2ea..c39c81a965 100644
--- a/src/Avalonia.Input/Avalonia.Input.csproj
+++ b/src/Avalonia.Input/Avalonia.Input.csproj
@@ -1,6 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <Nullable>Enable</Nullable>
+    <WarningsAsErrors>CS8600;CS8602;CS8603</WarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
@@ -10,4 +12,5 @@
     <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
   </ItemGroup>  
   <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>
diff --git a/src/Avalonia.Input/Cursors.cs b/src/Avalonia.Input/Cursors.cs
index f72ccf1850..920b598eac 100644
--- a/src/Avalonia.Input/Cursors.cs
+++ b/src/Avalonia.Input/Cursors.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Platform;
 
diff --git a/src/Avalonia.Input/DataObject.cs b/src/Avalonia.Input/DataObject.cs
index 60d7d67606..688f5f9cc8 100644
--- a/src/Avalonia.Input/DataObject.cs
+++ b/src/Avalonia.Input/DataObject.cs
@@ -11,7 +11,7 @@ namespace Avalonia.Input
             return _items.ContainsKey(dataFormat);
         }
 
-        public object Get(string dataFormat)
+        public object? Get(string dataFormat)
         {
             if (_items.ContainsKey(dataFormat))
                 return _items[dataFormat];
@@ -23,12 +23,12 @@ namespace Avalonia.Input
             return _items.Keys;
         }
 
-        public IEnumerable<string> GetFileNames()
+        public IEnumerable<string>? GetFileNames()
         {
             return Get(DataFormats.FileNames) as IEnumerable<string>;
         }
 
-        public string GetText()
+        public string? GetText()
         {
             return Get(DataFormats.Text) as string;
         }
diff --git a/src/Avalonia.Input/DragDrop.cs b/src/Avalonia.Input/DragDrop.cs
index d39659cee3..723d577964 100644
--- a/src/Avalonia.Input/DragDrop.cs
+++ b/src/Avalonia.Input/DragDrop.cs
@@ -23,7 +23,7 @@ namespace Avalonia.Input
         /// </summary>
         public static readonly RoutedEvent<DragEventArgs> DropEvent = RoutedEvent.Register<DragEventArgs>("Drop", RoutingStrategies.Bubble, typeof(DragDrop));
 
-        public static readonly AvaloniaProperty<bool> AllowDropProperty = AvaloniaProperty.RegisterAttached<Interactive, bool>("AllowDrop", typeof(DragDrop), inherits: true);
+        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. 
diff --git a/src/Avalonia.Input/DragDropDevice.cs b/src/Avalonia.Input/DragDropDevice.cs
index 25d3b6887f..30a08eda17 100644
--- a/src/Avalonia.Input/DragDropDevice.cs
+++ b/src/Avalonia.Input/DragDropDevice.cs
@@ -9,9 +9,9 @@ namespace Avalonia.Input
     {
         public static readonly DragDropDevice Instance = new DragDropDevice();
         
-        private Interactive _lastTarget = null;
+        private Interactive? _lastTarget = null;
         
-        private Interactive GetTarget(IInputRoot root, Point local)
+        private Interactive? GetTarget(IInputRoot root, Point local)
         {
             var target = root.InputHitTest(local)?.GetSelfAndVisualAncestors()?.OfType<Interactive>()?.FirstOrDefault();
             if (target != null && DragDrop.GetAllowDrop(target))
@@ -19,7 +19,7 @@ namespace Avalonia.Input
             return null;
         }
         
-        private DragDropEffects RaiseDragEvent(Interactive target, IInputRoot inputRoot, Point point, RoutedEvent<DragEventArgs> routedEvent, DragDropEffects operation, IDataObject data, InputModifiers modifiers)
+        private DragDropEffects RaiseDragEvent(Interactive? target, IInputRoot inputRoot, Point point, RoutedEvent<DragEventArgs> routedEvent, DragDropEffects operation, IDataObject data, KeyModifiers modifiers)
         {
             if (target == null)
                 return DragDropEffects.None;
@@ -38,13 +38,13 @@ namespace Avalonia.Input
             return args.DragEffects;
         }
         
-        private DragDropEffects DragEnter(IInputRoot inputRoot, Point point, IDataObject data, DragDropEffects effects, InputModifiers modifiers)
+        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, InputModifiers modifiers)
+        private DragDropEffects DragOver(IInputRoot inputRoot, Point point, IDataObject data, DragDropEffects effects, KeyModifiers modifiers)
         {
             var target = GetTarget(inputRoot, point);
 
@@ -77,7 +77,7 @@ namespace Avalonia.Input
             }
         }
 
-        private DragDropEffects Drop(IInputRoot inputRoot, Point point, IDataObject data, DragDropEffects effects, InputModifiers modifiers)
+        private DragDropEffects Drop(IInputRoot inputRoot, Point point, IDataObject data, DragDropEffects effects, KeyModifiers modifiers)
         {
             try
             {
@@ -100,16 +100,16 @@ namespace Avalonia.Input
             switch (e.Type)
             {
                 case RawDragEventType.DragEnter:
-                    e.Effects = DragEnter(e.Root, e.Location, e.Data, e.Effects, e.Modifiers);
+                    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.Modifiers);
+                    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.Modifiers);
+                    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
index dc0b76b225..22ca8358ff 100644
--- a/src/Avalonia.Input/DragEventArgs.cs
+++ b/src/Avalonia.Input/DragEventArgs.cs
@@ -13,8 +13,11 @@ namespace Avalonia.Input
 
         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);
@@ -32,13 +35,27 @@ namespace Avalonia.Input
             return point;
         }
 
+        [Obsolete("Use constructor taking KeyModifiers")]
         public DragEventArgs(RoutedEvent<DragEventArgs> routedEvent, IDataObject data, Interactive target, Point targetLocation, InputModifiers modifiers)
             : base(routedEvent)
         {
-            this.Data = data;
-            this._target = target;
-            this._targetLocation = targetLocation;
-            this.Modifiers = modifiers;
+            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
index 104ac9cb61..a1f1478f51 100644
--- a/src/Avalonia.Input/FocusManager.cs
+++ b/src/Avalonia.Input/FocusManager.cs
@@ -1,9 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using Avalonia.Interactivity;
 using Avalonia.VisualTree;
 
@@ -17,8 +15,8 @@ namespace Avalonia.Input
         /// <summary>
         /// The focus scopes in which the focus is currently defined.
         /// </summary>
-        private readonly Dictionary<IFocusScope, IInputElement> _focusScopes =
-            new Dictionary<IFocusScope, IInputElement>();
+        private readonly ConditionalWeakTable<IFocusScope, IInputElement?> _focusScopes =
+            new ConditionalWeakTable<IFocusScope, IInputElement?>();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="FocusManager"/> class.
@@ -39,12 +37,12 @@ namespace Avalonia.Input
         /// <summary>
         /// Gets the currently focused <see cref="IInputElement"/>.
         /// </summary>
-        public IInputElement Current => KeyboardDevice.Instance?.FocusedElement;
+        public IInputElement? Current => KeyboardDevice.Instance?.FocusedElement;
 
         /// <summary>
         /// Gets the current focus scope.
         /// </summary>
-        public IFocusScope Scope
+        public IFocusScope? Scope
         {
             get;
             private set;
@@ -55,11 +53,11 @@ namespace Avalonia.Input
         /// </summary>
         /// <param name="control">The control to focus.</param>
         /// <param name="method">The method by which focus was changed.</param>
-        /// <param name="modifiers">Any input modifiers active at the time of focus.</param>
+        /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
         public void Focus(
-            IInputElement control, 
+            IInputElement? control, 
             NavigationMethod method = NavigationMethod.Unspecified,
-            InputModifiers modifiers = InputModifiers.None)
+            KeyModifiers keyModifiers = KeyModifiers.None)
         {
             if (control != null)
             {
@@ -69,7 +67,7 @@ namespace Avalonia.Input
                 if (scope != null)
                 {
                     Scope = scope;
-                    SetFocusedElement(scope, control, method, modifiers);
+                    SetFocusedElement(scope, control, method, keyModifiers);
                 }
             }
             else if (Current != null)
@@ -77,17 +75,18 @@ namespace Avalonia.Input
                 // If control is null, set focus to the topmost focus scope.
                 foreach (var scope in GetFocusScopeAncestors(Current).Reverse().ToList())
                 {
-                    IInputElement element;
-
-                    if (_focusScopes.TryGetValue(scope, out element) && element != null)
+                    if (_focusScopes.TryGetValue(scope, out var element) && element != null)
                     {
                         Focus(element, method);
                         return;
                     }
                 }
 
-                // Couldn't find a focus scope, clear focus.
-                SetFocusedElement(Scope, null);
+                if (Scope is object)
+                {
+                    // Couldn't find a focus scope, clear focus.
+                    SetFocusedElement(Scope, null);
+                }
             }
         }
 
@@ -97,24 +96,35 @@ namespace Avalonia.Input
         /// <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="modifiers">Any input modifiers active at the time of focus.</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,
+            IInputElement? element,
             NavigationMethod method = NavigationMethod.Unspecified,
-            InputModifiers modifiers = InputModifiers.None)
+            KeyModifiers keyModifiers = KeyModifiers.None)
         {
-            Contract.Requires<ArgumentNullException>(scope != null);
+            scope = scope ?? throw new ArgumentNullException(nameof(scope));
 
-            _focusScopes[scope] = element;
+            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, modifiers);
+                KeyboardDevice.Instance?.SetFocusedElement(element, method, keyModifiers);
             }
         }
 
@@ -124,11 +134,9 @@ namespace Avalonia.Input
         /// <param name="scope">The new focus scope.</param>
         public void SetFocusScope(IFocusScope scope)
         {
-            Contract.Requires<ArgumentNullException>(scope != null);
-
-            IInputElement e;
+            scope = scope ?? throw new ArgumentNullException(nameof(scope));
 
-            if (!_focusScopes.TryGetValue(scope, out e))
+            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
@@ -155,17 +163,19 @@ namespace Avalonia.Input
         /// <returns>The focus scopes.</returns>
         private static IEnumerable<IFocusScope> GetFocusScopeAncestors(IInputElement control)
         {
-            while (control != null)
+            IInputElement? c = control;
+
+            while (c != null)
             {
-                var scope = control as IFocusScope;
+                var scope = c as IFocusScope;
 
-                if (scope != null)
+                if (scope != null && c.VisualRoot?.IsVisible == true)
                 {
                     yield return scope;
                 }
 
-                control = control.GetVisualParent<IInputElement>() ??
-                    ((control as IHostedVisualTreeRoot)?.Host as IInputElement);
+                c = c.GetVisualParent<IInputElement>() ??
+                    ((c as IHostedVisualTreeRoot)?.Host as IInputElement);
             }
         }
 
@@ -177,21 +187,22 @@ namespace Avalonia.Input
         private static void OnPreviewPointerPressed(object sender, RoutedEventArgs e)
         {
             var ev = (PointerPressedEventArgs)e;
+            var visual = (IVisual)sender;
 
-            if (sender == e.Source && ev.MouseButton == MouseButton.Left)
+            if (sender == e.Source && ev.GetCurrentPoint(visual).Properties.IsLeftButtonPressed)
             {
-                var element = (ev.Pointer?.Captured as IInputElement) ?? (e.Source as IInputElement);
+                IVisual? element = ev.Pointer?.Captured ?? e.Source as IInputElement;
 
-                if (element == null || !CanFocus(element))
+                while (element != null)
                 {
-                    element = element.GetSelfAndVisualAncestors()
-                        .OfType<IInputElement>()
-                        .FirstOrDefault(CanFocus);
-                }
+                    if (element is IInputElement inputElement && CanFocus(inputElement))
+                    {
+                        Instance?.Focus(inputElement, NavigationMethod.Pointer, ev.KeyModifiers);
 
-                if (element != null)
-                {
-                    Instance?.Focus(element, NavigationMethod.Pointer, ev.InputModifiers);
+                        break;
+                    }
+                    
+                    element = element.VisualParent;
                 }
             }
         }
diff --git a/src/Avalonia.Input/GestureRecognizers/GestureRecognizerCollection.cs b/src/Avalonia.Input/GestureRecognizers/GestureRecognizerCollection.cs
index 91b224e65a..54ef0b1a68 100644
--- a/src/Avalonia.Input/GestureRecognizers/GestureRecognizerCollection.cs
+++ b/src/Avalonia.Input/GestureRecognizers/GestureRecognizerCollection.cs
@@ -1,8 +1,6 @@
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using Avalonia.Controls;
-using Avalonia.Data;
 using Avalonia.LogicalTree;
 using Avalonia.Styling;
 
@@ -11,8 +9,8 @@ namespace Avalonia.Input.GestureRecognizers
     public class GestureRecognizerCollection : IReadOnlyCollection<IGestureRecognizer>, IGestureRecognizerActionsDispatcher
     {
         private readonly IInputElement _inputElement;
-        private List<IGestureRecognizer> _recognizers;
-        private Dictionary<IPointer, IGestureRecognizer> _pointerGrabs;
+        private List<IGestureRecognizer>? _recognizers;
+        private Dictionary<IPointer, IGestureRecognizer>? _pointerGrabs;
         
         
         public GestureRecognizerCollection(IInputElement inputElement)
@@ -72,7 +70,7 @@ namespace Avalonia.Input.GestureRecognizers
         {
             if (_recognizers == null)
                 return false;
-            if (_pointerGrabs.TryGetValue(e.Pointer, out var capture))
+            if (_pointerGrabs!.TryGetValue(e.Pointer, out var capture))
             {
                 capture.PointerReleased(e);
             }
@@ -90,7 +88,7 @@ namespace Avalonia.Input.GestureRecognizers
         {
             if (_recognizers == null)
                 return false;
-            if (_pointerGrabs.TryGetValue(e.Pointer, out var capture))
+            if (_pointerGrabs!.TryGetValue(e.Pointer, out var capture))
             {
                 capture.PointerMoved(e);
             }
@@ -108,19 +106,22 @@ namespace Avalonia.Input.GestureRecognizers
         {
             if (_recognizers == null)
                 return;
-            _pointerGrabs.Remove(e.Pointer);
+            _pointerGrabs!.Remove(e.Pointer);
             foreach (var r in _recognizers)
             {
-                if(e.Handled)
-                    break;
-                r.PointerCaptureLost(e);
+                r.PointerCaptureLost(e.Pointer);
             }
         }
 
         void IGestureRecognizerActionsDispatcher.Capture(IPointer pointer, IGestureRecognizer recognizer)
         {
             pointer.Capture(_inputElement);
-            _pointerGrabs[pointer] = recognizer;
+            _pointerGrabs![pointer] = recognizer;
+            foreach (var r in _recognizers!)
+            {
+                if (r != recognizer)
+                    r.PointerCaptureLost(pointer);
+            }
         }
 
     }
diff --git a/src/Avalonia.Input/GestureRecognizers/IGestureRecognizer.cs b/src/Avalonia.Input/GestureRecognizers/IGestureRecognizer.cs
index b8ba9e529c..c1d9ae5304 100644
--- a/src/Avalonia.Input/GestureRecognizers/IGestureRecognizer.cs
+++ b/src/Avalonia.Input/GestureRecognizers/IGestureRecognizer.cs
@@ -6,7 +6,7 @@ namespace Avalonia.Input.GestureRecognizers
         void PointerPressed(PointerPressedEventArgs e);
         void PointerReleased(PointerReleasedEventArgs e);
         void PointerMoved(PointerEventArgs e);
-        void PointerCaptureLost(PointerCaptureLostEventArgs e);
+        void PointerCaptureLost(IPointer pointer);
     }
     
     public interface IGestureRecognizerActionsDispatcher
diff --git a/src/Avalonia.Input/GestureRecognizers/ScrollGestureRecognizer.cs b/src/Avalonia.Input/GestureRecognizers/ScrollGestureRecognizer.cs
index 4f3c7c0bba..3858cc04f2 100644
--- a/src/Avalonia.Input/GestureRecognizers/ScrollGestureRecognizer.cs
+++ b/src/Avalonia.Input/GestureRecognizers/ScrollGestureRecognizer.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Diagnostics;
-using Avalonia.Interactivity;
 using Avalonia.Threading;
 
 namespace Avalonia.Input.GestureRecognizers
@@ -11,9 +10,9 @@ namespace Avalonia.Input.GestureRecognizers
     {
         private bool _scrolling;
         private Point _trackedRootPoint;
-        private IPointer _tracking;
-        private IInputElement _target;
-        private IGestureRecognizerActionsDispatcher _actions;
+        private IPointer? _tracking;
+        private IInputElement? _target;
+        private IGestureRecognizerActionsDispatcher? _actions;
         private bool _canHorizontallyScroll;
         private bool _canVerticallyScroll;
         private int _gestureId;
@@ -95,7 +94,7 @@ namespace Avalonia.Input.GestureRecognizers
                         _scrolling = true;
                     if (_scrolling)
                     {
-                        _actions.Capture(e.Pointer, this);
+                        _actions!.Capture(e.Pointer, this);
                     }
                 }
 
@@ -110,15 +109,15 @@ namespace Avalonia.Input.GestureRecognizers
                     _trackedRootPoint = rootPoint;
                     if (elapsed.TotalSeconds > 0)
                         _inertia = vector / elapsed.TotalSeconds;
-                    _target.RaiseEvent(new ScrollGestureEventArgs(_gestureId, vector));
+                    _target!.RaiseEvent(new ScrollGestureEventArgs(_gestureId, vector));
                     e.Handled = true;
                 }
             }
         }
 
-        public void PointerCaptureLost(PointerCaptureLostEventArgs e)
+        public void PointerCaptureLost(IPointer pointer)
         {
-            if (e.Pointer == _tracking) EndGesture();
+            if (pointer == _tracking) EndGesture();
         }
 
         void EndGesture()
@@ -128,7 +127,7 @@ namespace Avalonia.Input.GestureRecognizers
             {
                 _inertia = default;
                 _scrolling = false;
-                _target.RaiseEvent(new ScrollGestureEndedEventArgs(_gestureId));
+                _target!.RaiseEvent(new ScrollGestureEndedEventArgs(_gestureId));
                 _gestureId = 0;
                 _lastMoveTimestamp = null;
             }
@@ -148,6 +147,7 @@ namespace Avalonia.Input.GestureRecognizers
                     EndGesture();
                 else
                 {
+                    _tracking = null;
                     var savedGestureId = _gestureId;
                     var st = Stopwatch.StartNew();
                     var lastTime = TimeSpan.Zero;
@@ -164,7 +164,7 @@ namespace Avalonia.Input.GestureRecognizers
 
                         var speed = _inertia * Math.Pow(0.15, st.Elapsed.TotalSeconds);
                         var distance = speed * elapsedSinceLastTick.TotalSeconds;
-                        _target.RaiseEvent(new ScrollGestureEventArgs(_gestureId, distance));
+                        _target!.RaiseEvent(new ScrollGestureEventArgs(_gestureId, distance));
 
 
 
diff --git a/src/Avalonia.Input/Gestures.cs b/src/Avalonia.Input/Gestures.cs
index a5bd4feb64..1be2595ebe 100644
--- a/src/Avalonia.Input/Gestures.cs
+++ b/src/Avalonia.Input/Gestures.cs
@@ -1,8 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Interactivity;
+using Avalonia.VisualTree;
 
 namespace Avalonia.Input
 {
@@ -31,7 +29,9 @@ namespace Avalonia.Input
             RoutedEvent.Register<ScrollGestureEventArgs>(
                 "ScrollGestureEnded", RoutingStrategies.Bubble, typeof(Gestures));
 
+#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
         private static WeakReference<IInteractive> s_lastPress = new WeakReference<IInteractive>(null);
+#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
 
         static Gestures()
         {
@@ -71,15 +71,21 @@ namespace Avalonia.Input
 
         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_lastPress = new WeakReference<IInteractive>(e.Source);
+                    s_lastPress = new WeakReference<IInteractive>(ev.Source);
                 }
-                else if (s_lastPress != null && e.ClickCount == 2 && e.MouseButton != MouseButton.Right)
+                else if (s_lastPress != null && e.ClickCount == 2 && e.GetCurrentPoint(visual).Properties.IsLeftButtonPressed)
                 {
                     if (s_lastPress.TryGetTarget(out var target) && target == e.Source)
                     {
@@ -97,8 +103,11 @@ namespace Avalonia.Input
 
                 if (s_lastPress.TryGetTarget(out var target) && target == e.Source)
                 {
-                    var et = e.InitialPressMouseButton != MouseButton.Right ? TappedEvent : RightTappedEvent;
-                    e.Source.RaiseEvent(new RoutedEventArgs(et));
+                    if (e.InitialPressMouseButton == MouseButton.Left || e.InitialPressMouseButton == MouseButton.Right)
+                    {
+                        var et = e.InitialPressMouseButton != MouseButton.Right ? TappedEvent : RightTappedEvent;
+                        e.Source.RaiseEvent(new RoutedEventArgs(et));
+                    }
                 }
             }
         }
diff --git a/src/Avalonia.Input/GotFocusEventArgs.cs b/src/Avalonia.Input/GotFocusEventArgs.cs
index 01e978a55c..9d958823fe 100644
--- a/src/Avalonia.Input/GotFocusEventArgs.cs
+++ b/src/Avalonia.Input/GotFocusEventArgs.cs
@@ -1,6 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using System;
 using Avalonia.Interactivity;
 
 namespace Avalonia.Input
@@ -18,6 +16,16 @@ namespace Avalonia.Input
         /// <summary>
         /// Gets or sets any input modifiers active at the time of focus.
         /// </summary>
-        public InputModifiers InputModifiers { get; set; }
+        [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
index 4ad4ed4c8a..e484d003c7 100644
--- a/src/Avalonia.Input/IAccessKeyHandler.cs
+++ b/src/Avalonia.Input/IAccessKeyHandler.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Input
 {
     /// <summary>
@@ -11,7 +8,7 @@ namespace Avalonia.Input
         /// <summary>
         /// Gets or sets the window's main menu.
         /// </summary>
-        IMainMenu MainMenu { get; set; }
+        IMainMenu? MainMenu { get; set; }
 
         /// <summary>
         /// Sets the owner of the access key handler.
diff --git a/src/Avalonia.Input/ICloseable.cs b/src/Avalonia.Input/ICloseable.cs
index b25e29360a..3d6b95ddf4 100644
--- a/src/Avalonia.Input/ICloseable.cs
+++ b/src/Avalonia.Input/ICloseable.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Input
diff --git a/src/Avalonia.Input/ICommandSource.cs b/src/Avalonia.Input/ICommandSource.cs
new file mode 100644
index 0000000000..ba2e8eed4e
--- /dev/null
+++ b/src/Avalonia.Input/ICommandSource.cs
@@ -0,0 +1,36 @@
+using System.Windows.Input;
+
+namespace Avalonia.Input
+{
+    ///<summary>
+    /// An interface for classes that know how to invoke a Command.
+    ///</summary>
+    public interface ICommandSource
+    {
+        /// <summary>
+        /// The command that will be executed when the class is "invoked."
+        /// Classes that implement this interface should enable or disable based on the command's CanExecute return value.
+        /// The property may be implemented as read-write if desired.
+        /// </summary>
+        ICommand Command { get; }
+
+        /// <summary>
+        /// The parameter that will be passed to the command when executing the command.
+        /// The property may be implemented as read-write if desired.
+        /// </summary>
+        object CommandParameter { get; }
+
+
+        /// <summary>
+        /// Bor the bheavior CanExecuteChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void CanExecuteChanged(object sender, System.EventArgs e);
+
+        /// <summary>
+        /// Gets a value indicating whether this control and all its parents are enabled.
+        /// </summary>
+        bool IsEffectivelyEnabled { get; }
+    }
+}
diff --git a/src/Avalonia.Input/ICustomKeyboardNavigation.cs b/src/Avalonia.Input/ICustomKeyboardNavigation.cs
index ff4c2094b3..3d2927c632 100644
--- a/src/Avalonia.Input/ICustomKeyboardNavigation.cs
+++ b/src/Avalonia.Input/ICustomKeyboardNavigation.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-
+
 namespace Avalonia.Input
 {
     /// <summary>
diff --git a/src/Avalonia.Input/IDataObject.cs b/src/Avalonia.Input/IDataObject.cs
index 1aa8fd63d5..1db008aa3a 100644
--- a/src/Avalonia.Input/IDataObject.cs
+++ b/src/Avalonia.Input/IDataObject.cs
@@ -23,17 +23,17 @@ namespace Avalonia.Input
         /// Returns the dragged text if the DataObject contains any text.
         /// <seealso cref="DataFormats.Text"/>
         /// </summary>
-        string GetText();
+        string? GetText();
 
         /// <summary>
         /// Returns a list of filenames if the DataObject contains filenames.
         /// <seealso cref="DataFormats.FileNames"/>
         /// </summary>
-        IEnumerable<string> GetFileNames();
+        IEnumerable<string>? GetFileNames();
         
         /// <summary>
         /// Tries to get the data of the given DataFormat.
         /// </summary>
-        object Get(string dataFormat);
+        object? Get(string dataFormat);
     }
 }
diff --git a/src/Avalonia.Input/IFocusManager.cs b/src/Avalonia.Input/IFocusManager.cs
index 29a22b86b2..e1b5087c3d 100644
--- a/src/Avalonia.Input/IFocusManager.cs
+++ b/src/Avalonia.Input/IFocusManager.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Input
 {
     /// <summary>
@@ -11,23 +8,23 @@ namespace Avalonia.Input
         /// <summary>
         /// Gets the currently focused <see cref="IInputElement"/>.
         /// </summary>
-        IInputElement Current { get; }
+        IInputElement? Current { get; }
 
         /// <summary>
         /// Gets the current focus scope.
         /// </summary>
-        IFocusScope Scope { get; }
+        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="modifiers">Any input modifiers active at the time of focus.</param>
+        /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
         void Focus(
-            IInputElement control, 
+            IInputElement? control,
             NavigationMethod method = NavigationMethod.Unspecified,
-            InputModifiers modifiers = InputModifiers.None);
+            KeyModifiers keyModifiers = KeyModifiers.None);
 
         /// <summary>
         /// Notifies the focus manager of a change in focus scope.
diff --git a/src/Avalonia.Input/IFocusScope.cs b/src/Avalonia.Input/IFocusScope.cs
index 97b97e0157..56f558040e 100644
--- a/src/Avalonia.Input/IFocusScope.cs
+++ b/src/Avalonia.Input/IFocusScope.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Input
 {
     public interface IFocusScope
diff --git a/src/Avalonia.Input/IInputDevice.cs b/src/Avalonia.Input/IInputDevice.cs
index 72fa2ab9bf..ab0fae65df 100644
--- a/src/Avalonia.Input/IInputDevice.cs
+++ b/src/Avalonia.Input/IInputDevice.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Input.Raw;
 
 namespace Avalonia.Input
diff --git a/src/Avalonia.Input/IInputElement.cs b/src/Avalonia.Input/IInputElement.cs
index 9247fb48a9..7aa9c32bca 100644
--- a/src/Avalonia.Input/IInputElement.cs
+++ b/src/Avalonia.Input/IInputElement.cs
@@ -1,5 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
 using System;
 using System.Collections.Generic;
 using Avalonia.Interactivity;
@@ -63,7 +61,7 @@ namespace Avalonia.Input
         event EventHandler<PointerReleasedEventArgs> PointerReleased;
 
         /// <summary>
-        /// Occurs when the mouse wheen is scrolled over the control.
+        /// Occurs when the mouse wheel is scrolled over the control.
         /// </summary>
         event EventHandler<PointerWheelEventArgs> PointerWheelChanged;
 
@@ -80,7 +78,7 @@ namespace Avalonia.Input
         /// <summary>
         /// Gets or sets the associated mouse cursor.
         /// </summary>
-        Cursor Cursor { get; }
+        Cursor? Cursor { get; }
 
         /// <summary>
         /// Gets a value indicating whether this control and all its parents are enabled.
@@ -91,6 +89,11 @@ namespace Avalonia.Input
         /// <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.
diff --git a/src/Avalonia.Input/IInputManager.cs b/src/Avalonia.Input/IInputManager.cs
index cdd72a7f3e..80b71d3e47 100644
--- a/src/Avalonia.Input/IInputManager.cs
+++ b/src/Avalonia.Input/IInputManager.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Input.Raw;
 
diff --git a/src/Avalonia.Input/IInputRoot.cs b/src/Avalonia.Input/IInputRoot.cs
index 6b3e1e6bc5..3e2b8cc477 100644
--- a/src/Avalonia.Input/IInputRoot.cs
+++ b/src/Avalonia.Input/IInputRoot.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using JetBrains.Annotations;
 
 namespace Avalonia.Input
@@ -23,7 +20,7 @@ namespace Avalonia.Input
         /// <summary>
         /// Gets or sets the input element that the pointer is currently over.
         /// </summary>
-        IInputElement PointerOverElement { get; set; }
+        IInputElement? PointerOverElement { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether access keys are shown in the window.
@@ -34,6 +31,6 @@ namespace Avalonia.Input
         /// Gets associated mouse device
         /// </summary>
         [CanBeNull]
-        IMouseDevice MouseDevice { get; }
+        IMouseDevice? MouseDevice { get; }
     }
 }
diff --git a/src/Avalonia.Input/IKeyboardDevice.cs b/src/Avalonia.Input/IKeyboardDevice.cs
index 1a82f7d671..9506dc36fb 100644
--- a/src/Avalonia.Input/IKeyboardDevice.cs
+++ b/src/Avalonia.Input/IKeyboardDevice.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.ComponentModel;
 
@@ -48,6 +45,8 @@ namespace Avalonia.Input
         LeftMouseButton = 16,
         RightMouseButton = 32,
         MiddleMouseButton = 64,
+        XButton1MouseButton = 128,
+        XButton2MouseButton = 256,
         KeyboardMask = Alt | Control | Shift | Meta
     }
 
@@ -59,11 +58,11 @@ namespace Avalonia.Input
 
     public interface IKeyboardDevice : IInputDevice, INotifyPropertyChanged
     {
-        IInputElement FocusedElement { get; }
+        IInputElement? FocusedElement { get; }
 
         void SetFocusedElement(
-            IInputElement element, 
+            IInputElement? element, 
             NavigationMethod method,
-            InputModifiers modifiers);
+            KeyModifiers modifiers);
     }
 }
diff --git a/src/Avalonia.Input/IKeyboardNavigationHandler.cs b/src/Avalonia.Input/IKeyboardNavigationHandler.cs
index db3a3cf114..88d00b3b50 100644
--- a/src/Avalonia.Input/IKeyboardNavigationHandler.cs
+++ b/src/Avalonia.Input/IKeyboardNavigationHandler.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Input
 {
     /// <summary>
@@ -22,10 +19,10 @@ namespace Avalonia.Input
         /// </summary>
         /// <param name="element">The current element.</param>
         /// <param name="direction">The direction to move.</param>
-        /// <param name="modifiers">Any input modifiers active at the time of focus.</param>
+        /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
         void Move(
             IInputElement element, 
             NavigationDirection direction,
-            InputModifiers modifiers = InputModifiers.None);
+            KeyModifiers keyModifiers = KeyModifiers.None);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Input/IMainMenu.cs b/src/Avalonia.Input/IMainMenu.cs
index a3373191a8..781b176f5c 100644
--- a/src/Avalonia.Input/IMainMenu.cs
+++ b/src/Avalonia.Input/IMainMenu.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Interactivity;
 using Avalonia.VisualTree;
diff --git a/src/Avalonia.Input/IMouseDevice.cs b/src/Avalonia.Input/IMouseDevice.cs
index a641544f7a..272d1eb8d7 100644
--- a/src/Avalonia.Input/IMouseDevice.cs
+++ b/src/Avalonia.Input/IMouseDevice.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Input
diff --git a/src/Avalonia.Input/INavigableContainer.cs b/src/Avalonia.Input/INavigableContainer.cs
index df434bca70..c52f3ac404 100644
--- a/src/Avalonia.Input/INavigableContainer.cs
+++ b/src/Avalonia.Input/INavigableContainer.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Input
 {
     /// <summary>
diff --git a/src/Avalonia.Input/IPointer.cs b/src/Avalonia.Input/IPointer.cs
index a3f051ce7f..7af48cef82 100644
--- a/src/Avalonia.Input/IPointer.cs
+++ b/src/Avalonia.Input/IPointer.cs
@@ -3,8 +3,8 @@ namespace Avalonia.Input
     public interface IPointer
     {
         int Id { get; }
-        void Capture(IInputElement control);
-        IInputElement Captured { get; }
+        void Capture(IInputElement? control);
+        IInputElement? Captured { get; }
         PointerType Type { get; }
         bool IsPrimary { get; }
         
diff --git a/src/Avalonia.Input/IPointerDevice.cs b/src/Avalonia.Input/IPointerDevice.cs
index de775d90f2..1f82cb1ed7 100644
--- a/src/Avalonia.Input/IPointerDevice.cs
+++ b/src/Avalonia.Input/IPointerDevice.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.VisualTree;
 
@@ -9,10 +6,10 @@ namespace Avalonia.Input
     public interface IPointerDevice : IInputDevice
     {
         [Obsolete("Use IPointer")]
-        IInputElement Captured { get; }
+        IInputElement? Captured { get; }
         
         [Obsolete("Use IPointer")]
-        void Capture(IInputElement control);
+        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
index 535b930f8b..66fb9cfb1c 100644
--- a/src/Avalonia.Input/InputElement.cs
+++ b/src/Avalonia.Input/InputElement.cs
@@ -1,9 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 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.Interactivity;
 using Avalonia.VisualTree;
@@ -13,6 +13,7 @@ namespace Avalonia.Input
     /// <summary>
     /// Implements input-related functionality for a control.
     /// </summary>
+    [PseudoClasses(":disabled", ":focus", ":focus-visible", ":pointerover")]
     public class InputElement : Interactive, IInputElement
     {
         /// <summary>
@@ -38,9 +39,17 @@ namespace Avalonia.Input
         /// <summary>
         /// Gets or sets associated mouse cursor.
         /// </summary>
-        public static readonly StyledProperty<Cursor> CursorProperty =
-            AvaloniaProperty.Register<InputElement, Cursor>(nameof(Cursor), null, true);
+        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>
@@ -159,8 +168,10 @@ namespace Avalonia.Input
 
         private bool _isEffectivelyEnabled = true;
         private bool _isFocused;
+        private bool _isKeyboardFocusWithin;
+        private bool _isFocusVisible;
         private bool _isPointerOver;
-        private GestureRecognizerCollection _gestureRecognizers;
+        private GestureRecognizerCollection? _gestureRecognizers;
 
         /// <summary>
         /// Initializes static members of the <see cref="InputElement"/> class.
@@ -181,10 +192,11 @@ namespace Avalonia.Input
             PointerReleasedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerReleased(e));
             PointerCaptureLostEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerCaptureLost(e));
             PointerWheelChangedEvent.AddClassHandler<InputElement>((x, e) => x.OnPointerWheelChanged(e));
+        }
 
-            PseudoClass<InputElement, bool>(IsEffectivelyEnabledProperty, x => !x, ":disabled");
-            PseudoClass<InputElement>(IsFocusedProperty, ":focus");
-            PseudoClass<InputElement>(IsPointerOverProperty, ":pointerover");
+        public InputElement()
+        {
+            UpdatePseudoClasses(IsFocused, IsPointerOver);
         }
 
         /// <summary>
@@ -335,14 +347,23 @@ namespace Avalonia.Input
         /// <summary>
         /// Gets or sets associated mouse cursor.
         /// </summary>
-        public Cursor Cursor
+        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 or sets a value indicating whether the control is focused.
+        /// Gets a value indicating whether the control is focused.
         /// </summary>
         public bool IsFocused
         {
@@ -360,7 +381,7 @@ namespace Avalonia.Input
         }
 
         /// <summary>
-        /// Gets or sets a value indicating whether the pointer is currently over the control.
+        /// Gets a value indicating whether the pointer is currently over the control.
         /// </summary>
         public bool IsPointerOver
         {
@@ -372,7 +393,11 @@ namespace Avalonia.Input
         public bool IsEffectivelyEnabled
         {
             get => _isEffectivelyEnabled;
-            private set => SetAndRaise(IsEffectivelyEnabledProperty, ref _isEffectivelyEnabled, value);
+            private set
+            {
+                SetAndRaise(IsEffectivelyEnabledProperty, ref _isEffectivelyEnabled, value);
+                PseudoClasses.Set(":disabled", !value);
+            }
         }
 
         public List<KeyBinding> KeyBindings { get; } = new List<KeyBinding>();
@@ -423,7 +448,9 @@ namespace Avalonia.Input
         /// <param name="e">The event args.</param>
         protected virtual void OnGotFocus(GotFocusEventArgs e)
         {
-            IsFocused = e.Source == this;
+            var isFocused = e.Source == this;
+            _isFocusVisible = isFocused && (e.NavigationMethod == NavigationMethod.Directional || e.NavigationMethod == NavigationMethod.Tab);
+            IsFocused = isFocused;
         }
 
         /// <summary>
@@ -432,6 +459,7 @@ namespace Avalonia.Input
         /// <param name="e">The event args.</param>
         protected virtual void OnLostFocus(RoutedEventArgs e)
         {
+            _isFocusVisible = false;
             IsFocused = false;
         }
 
@@ -522,6 +550,24 @@ namespace Avalonia.Input
         {
         }
 
+        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", _isKeyboardFocusWithin);
+            }
+        }
+
         /// <summary>
         /// Updates the <see cref="IsEffectivelyEnabled"/> property value according to the parent
         /// control's enabled state and <see cref="IsEnabledCore"/>.
@@ -578,5 +624,19 @@ namespace Avalonia.Input
                 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.Input/InputExtensions.cs
index f83c41e266..cbe36583e6 100644
--- a/src/Avalonia.Input/InputExtensions.cs
+++ b/src/Avalonia.Input/InputExtensions.cs
@@ -1,11 +1,10 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using Avalonia.VisualTree;
 
+#nullable enable
+
 namespace Avalonia.Input
 {
     /// <summary>
@@ -25,7 +24,7 @@ namespace Avalonia.Input
         /// </returns>
         public static IEnumerable<IInputElement> GetInputElementsAt(this IInputElement element, Point p)
         {
-            Contract.Requires<ArgumentNullException>(element != null);
+            element = element ?? throw new ArgumentNullException(nameof(element));
 
             return element.GetVisualsAt(p, s_hitTestDelegate).Cast<IInputElement>();
         }
@@ -36,9 +35,32 @@ namespace Avalonia.Input
         /// <param name="element">The element to test.</param>
         /// <param name="p">The point on <paramref name="element"/>.</param>
         /// <returns>The topmost <see cref="IInputElement"/> at the specified position.</returns>
-        public static IInputElement InputHitTest(this IInputElement element, Point p)
+        public static IInputElement? InputHitTest(this IInputElement element, Point p)
         {
-            return element.GetInputElementsAt(p).FirstOrDefault();
+            element = element ?? throw new ArgumentNullException(nameof(element));
+
+            return element.GetVisualAt(p, s_hitTestDelegate) as IInputElement;
+        }
+
+        /// <summary>
+        /// Returns the topmost active input element at a point on an <see cref="IInputElement"/>.
+        /// </summary>
+        /// <param name="element">The element to test.</param>
+        /// <param name="p">The point on <paramref name="element"/>.</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 topmost <see cref="IInputElement"/> at the specified position.</returns>
+        public static IInputElement? InputHitTest(
+            this IInputElement element,
+            Point p,
+            Func<IVisual, bool> filter)
+        {
+            element = element ?? throw new ArgumentNullException(nameof(element));
+            filter = filter ?? throw new ArgumentNullException(nameof(filter));
+
+            return element.GetVisualAt(p, x => s_hitTestDelegate(x) && filter(x)) as IInputElement;
         }
 
         private static bool IsHitTestVisible(IVisual visual)
diff --git a/src/Avalonia.Input/InputManager.cs b/src/Avalonia.Input/InputManager.cs
index 4fbdfd56c0..129b9cf474 100644
--- a/src/Avalonia.Input/InputManager.cs
+++ b/src/Avalonia.Input/InputManager.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Subjects;
 using Avalonia.Input.Raw;
diff --git a/src/Avalonia.Input/Key.cs b/src/Avalonia.Input/Key.cs
index d51b990fd4..33e1e5df45 100644
--- a/src/Avalonia.Input/Key.cs
+++ b/src/Avalonia.Input/Key.cs
@@ -1,5 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
 #if AVALONIA_REMOTE_PROTOCOL
 namespace Avalonia.Remote.Protocol.Input
 #else
diff --git a/src/Avalonia.Input/KeyEventArgs.cs b/src/Avalonia.Input/KeyEventArgs.cs
index 8aef81503f..67cd5a520a 100644
--- a/src/Avalonia.Input/KeyEventArgs.cs
+++ b/src/Avalonia.Input/KeyEventArgs.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Interactivity;
 
@@ -8,7 +5,7 @@ namespace Avalonia.Input
 {
     public class KeyEventArgs : RoutedEventArgs
     {
-        public IKeyboardDevice Device { get; set; }
+        public IKeyboardDevice? Device { get; set; }
 
         public Key Key { get; set; }
 
diff --git a/src/Avalonia.Input/KeyGesture.cs b/src/Avalonia.Input/KeyGesture.cs
index 490c31bef9..e155666631 100644
--- a/src/Avalonia.Input/KeyGesture.cs
+++ b/src/Avalonia.Input/KeyGesture.cs
@@ -1,9 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.Text;
 
 namespace Avalonia.Input
 {
@@ -30,7 +27,7 @@ namespace Avalonia.Input
             KeyModifiers = modifiers;
         }
 
-        public bool Equals(KeyGesture other)
+        public bool Equals(KeyGesture? other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
@@ -38,12 +35,12 @@ namespace Avalonia.Input
             return Key == other.Key && KeyModifiers == other.KeyModifiers;
         }
 
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             if (ReferenceEquals(null, obj)) return false;
             if (ReferenceEquals(this, obj)) return true;
 
-            return obj is KeyGesture && Equals((KeyGesture)obj);
+            return obj is KeyGesture gesture && Equals(gesture);
         }
 
         public override int GetHashCode()
@@ -54,12 +51,12 @@ namespace Avalonia.Input
             }
         }
 
-        public static bool operator ==(KeyGesture left, KeyGesture right)
+        public static bool operator ==(KeyGesture? left, KeyGesture? right)
         {
             return Equals(left, right);
         }
 
-        public static bool operator !=(KeyGesture left, KeyGesture right)
+        public static bool operator !=(KeyGesture? left, KeyGesture? right)
         {
             return !Equals(left, right);
         }
@@ -108,22 +105,49 @@ namespace Avalonia.Input
 
         public override string ToString()
         {
-            var parts = new List<string>();
+            var s = new StringBuilder();
 
-            foreach (var flag in Enum.GetValues(typeof(KeyModifiers)).Cast<KeyModifiers>())
+            static void Plus(StringBuilder s)
             {
-                if (KeyModifiers.HasFlag(flag) && flag != KeyModifiers.None)
+                if (s.Length > 0)
                 {
-                    parts.Add(flag.ToString());
+                    s.Append("+");
                 }
             }
 
-            parts.Add(Key.ToString());
+            if (KeyModifiers.HasFlagCustom(KeyModifiers.Control))
+            {
+                s.Append("Ctrl");
+            }
+
+            if (KeyModifiers.HasFlagCustom(KeyModifiers.Shift))
+            {
+                Plus(s);
+                s.Append("Shift");
+            }
+
+            if (KeyModifiers.HasFlagCustom(KeyModifiers.Alt))
+            {
+                Plus(s);
+                s.Append("Alt");
+            }
+
+            if (KeyModifiers.HasFlagCustom(KeyModifiers.Meta))
+            {
+                Plus(s);
+                s.Append("Cmd");
+            }
+
+            Plus(s);
+            s.Append(Key);
 
-            return string.Join(" + ", parts);
+            return s.ToString();
         }
 
-        public bool Matches(KeyEventArgs keyEvent) => ResolveNumPadOperationKey(keyEvent.Key) == Key && keyEvent.KeyModifiers == KeyModifiers;
+        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)
@@ -141,7 +165,9 @@ namespace Avalonia.Input
                 return KeyModifiers.Control;
             }
 
-            if (modifier.Equals("cmd".AsSpan(), StringComparison.OrdinalIgnoreCase))
+            if (modifier.Equals("cmd".AsSpan(), StringComparison.OrdinalIgnoreCase) ||
+                modifier.Equals("win".AsSpan(), StringComparison.OrdinalIgnoreCase) ||
+                modifier.Equals("⌘".AsSpan(), StringComparison.OrdinalIgnoreCase))
             {
                 return KeyModifiers.Meta;
             }
diff --git a/src/Avalonia.Input/KeyboardDevice.cs b/src/Avalonia.Input/KeyboardDevice.cs
index 9db8525591..6f4cb7a35c 100644
--- a/src/Avalonia.Input/KeyboardDevice.cs
+++ b/src/Avalonia.Input/KeyboardDevice.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using Avalonia.Input.Raw;
@@ -11,9 +8,10 @@ namespace Avalonia.Input
 {
     public class KeyboardDevice : IKeyboardDevice, INotifyPropertyChanged
     {
-        private IInputElement _focusedElement;
+        private IInputElement? _focusedElement;
+        private IInputRoot? _focusedRoot;
 
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         public static IKeyboardDevice Instance => AvaloniaLocator.Current.GetService<IKeyboardDevice>();
 
@@ -21,7 +19,7 @@ namespace Avalonia.Input
 
         public IFocusManager FocusManager => AvaloniaLocator.Current.GetService<IFocusManager>();
 
-        public IInputElement FocusedElement
+        public IInputElement? FocusedElement
         {
             get
             {
@@ -31,18 +29,134 @@ namespace Avalonia.Input
             private set
             {
                 _focusedElement = value;
+
+                if (_focusedElement != null && _focusedElement.IsAttachedToVisualTree)
+                {
+                    _focusedRoot = _focusedElement.VisualRoot as IInputRoot;
+                }
+                else
+                {
+                    _focusedRoot = null;
+                }
+                
                 RaisePropertyChanged();
             }
         }
 
+        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, 
+            IInputElement? element, 
             NavigationMethod method,
-            InputModifiers modifiers)
+            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
@@ -56,7 +170,7 @@ namespace Avalonia.Input
                 {
                     RoutedEvent = InputElement.GotFocusEvent,
                     NavigationMethod = method,
-                    InputModifiers = modifiers,
+                    KeyModifiers = keyModifiers,
                 });
             }
         }
diff --git a/src/Avalonia.Input/KeyboardNavigation.cs b/src/Avalonia.Input/KeyboardNavigation.cs
index 0277876e24..6ef3c4fd60 100644
--- a/src/Avalonia.Input/KeyboardNavigation.cs
+++ b/src/Avalonia.Input/KeyboardNavigation.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Input
 {
     /// <summary>
@@ -28,11 +25,23 @@ namespace Avalonia.Input
         /// 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>(
+        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="TabNavigationProperty"/> for a container.
         /// </summary>
@@ -58,7 +67,7 @@ namespace Avalonia.Input
         /// </summary>
         /// <param name="element">The container.</param>
         /// <returns>The active element for the container.</returns>
-        public static IInputElement GetTabOnceActiveElement(InputElement element)
+        public static IInputElement? GetTabOnceActiveElement(InputElement element)
         {
             return element.GetValue(TabOnceActiveElementProperty);
         }
@@ -68,9 +77,29 @@ namespace Avalonia.Input
         /// </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)
+        public static void SetTabOnceActiveElement(InputElement element, IInputElement? value)
         {
             element.SetValue(TabOnceActiveElementProperty, value);
         }
+
+        /// <summary>
+        /// Sets the <see cref="IsTabStopProperty"/> for a container.
+        /// </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 a container.
+        /// </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.Input/KeyboardNavigationHandler.cs
index 32faf98603..dbefe63789 100644
--- a/src/Avalonia.Input/KeyboardNavigationHandler.cs
+++ b/src/Avalonia.Input/KeyboardNavigationHandler.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Linq;
 using Avalonia.Input.Navigation;
@@ -16,7 +13,7 @@ namespace Avalonia.Input
         /// <summary>
         /// The window to which the handler belongs.
         /// </summary>
-        private IInputRoot _owner;
+        private IInputRoot? _owner;
 
         /// <summary>
         /// Sets the owner of the keyboard navigation handler.
@@ -27,15 +24,12 @@ namespace Avalonia.Input
         /// </remarks>
         public void SetOwner(IInputRoot owner)
         {
-            Contract.Requires<ArgumentNullException>(owner != null);
-
             if (_owner != null)
             {
                 throw new InvalidOperationException("AccessKeyHandler owner has already been set.");
             }
 
-            _owner = owner;
-
+            _owner = owner ?? throw new ArgumentNullException(nameof(owner));
             _owner.AddHandler(InputElement.KeyDownEvent, OnKeyDown);
         }
 
@@ -48,11 +42,11 @@ namespace Avalonia.Input
         /// The next element in the specified direction, or null if <paramref name="element"/>
         /// was the last in the requested direction.
         /// </returns>
-        public static IInputElement GetNext(
+        public static IInputElement? GetNext(
             IInputElement element,
             NavigationDirection direction)
         {
-            Contract.Requires<ArgumentNullException>(element != null);
+            element = element ?? throw new ArgumentNullException(nameof(element));
 
             var customHandler = element.GetSelfAndVisualAncestors()
                 .OfType<ICustomKeyboardNavigation>()
@@ -94,13 +88,13 @@ namespace Avalonia.Input
         /// </summary>
         /// <param name="element">The current element.</param>
         /// <param name="direction">The direction to move.</param>
-        /// <param name="modifiers">Any input modifiers active at the time of focus.</param>
+        /// <param name="keyModifiers">Any key modifiers active at the time of focus.</param>
         public void Move(
             IInputElement element, 
             NavigationDirection direction,
-            InputModifiers modifiers = InputModifiers.None)
+            KeyModifiers keyModifiers = KeyModifiers.None)
         {
-            Contract.Requires<ArgumentNullException>(element != null);
+            element = element ?? throw new ArgumentNullException(nameof(element));
 
             var next = GetNext(element, direction);
 
@@ -109,7 +103,7 @@ namespace Avalonia.Input
                 var method = direction == NavigationDirection.Next ||
                              direction == NavigationDirection.Previous ?
                              NavigationMethod.Tab : NavigationMethod.Directional;
-                FocusManager.Instance.Focus(next, method, modifiers);
+                FocusManager.Instance.Focus(next, method, keyModifiers);
             }
         }
 
@@ -124,9 +118,9 @@ namespace Avalonia.Input
 
             if (current != null && e.Key == Key.Tab)
             {
-                var direction = (e.Modifiers & InputModifiers.Shift) == 0 ?
+                var direction = (e.KeyModifiers & KeyModifiers.Shift) == 0 ?
                     NavigationDirection.Next : NavigationDirection.Previous;
-                Move(current, direction, e.Modifiers);
+                Move(current, direction, e.KeyModifiers);
                 e.Handled = true;
             }
         }
diff --git a/src/Avalonia.Input/KeyboardNavigationMode.cs b/src/Avalonia.Input/KeyboardNavigationMode.cs
index c6ad7ecbaf..41e778bf49 100644
--- a/src/Avalonia.Input/KeyboardNavigationMode.cs
+++ b/src/Avalonia.Input/KeyboardNavigationMode.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Input
 {
     /// <summary>
diff --git a/src/Avalonia.Input/MouseDevice.cs b/src/Avalonia.Input/MouseDevice.cs
index 4dcf0eee53..5c63546f5d 100644
--- a/src/Avalonia.Input/MouseDevice.cs
+++ b/src/Avalonia.Input/MouseDevice.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Linq;
 using System.Reactive.Linq;
@@ -22,8 +19,9 @@ namespace Avalonia.Input
 
         private readonly Pointer _pointer;
         private bool _disposed;
+        private PixelPoint? _position; 
 
-        public MouseDevice(Pointer pointer = null)
+        public MouseDevice(Pointer? pointer = null)
         {
             _pointer = pointer ?? new Pointer(Pointer.GetNextFreeId(), PointerType.Mouse, true);
         }
@@ -37,15 +35,16 @@ namespace Avalonia.Input
         /// <see cref="Capture"/> method.
         /// </remarks>
         [Obsolete("Use IPointer instead")]
-        public IInputElement Captured => _pointer.Captured;
+        public IInputElement? Captured => _pointer.Captured;
 
         /// <summary>
         /// Gets the mouse position, in screen coordinates.
         /// </summary>
+        [Obsolete("Use events instead")]
         public PixelPoint Position
         {
-            get;
-            protected set;
+            get => _position ?? new PixelPoint(-1, -1);
+            protected set => _position = value;
         }
 
         /// <summary>
@@ -57,7 +56,7 @@ namespace Avalonia.Input
         /// 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)
+        public void Capture(IInputElement? control)
         {
             _pointer.Capture(control);
         }
@@ -69,7 +68,7 @@ namespace Avalonia.Input
         /// <returns>The mouse position in the control's coordinates.</returns>
         public Point GetPosition(IVisual relativeTo)
         {
-            Contract.Requires<ArgumentNullException>(relativeTo != null);
+            relativeTo = relativeTo ?? throw new ArgumentNullException(nameof(relativeTo));
 
             if (relativeTo.VisualRoot == null)
             {
@@ -78,7 +77,7 @@ namespace Avalonia.Input
 
             var rootPoint = relativeTo.VisualRoot.PointToClient(Position);
             var transform = relativeTo.VisualRoot.TransformToVisual(relativeTo);
-            return rootPoint * transform.Value;
+            return rootPoint * transform!.Value;
         }
 
         public void ProcessRawEvent(RawInputEventArgs e)
@@ -94,7 +93,16 @@ namespace Avalonia.Input
 
         public void SceneInvalidated(IInputRoot root, Rect rect)
         {
-            var clientPoint = root.PointToClient(Position);
+            // 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))
             {
@@ -120,18 +128,22 @@ namespace Avalonia.Input
                 rv++;
             if (props.IsRightButtonPressed)
                 rv++;
+            if (props.IsXButton1Pressed)
+                rv++;
+            if (props.IsXButton2Pressed)
+                rv++;
             return rv;
         }
         
         private void ProcessRawEvent(RawPointerEventArgs e)
         {
-            Contract.Requires<ArgumentNullException>(e != null);
+            e = e ?? throw new ArgumentNullException(nameof(e));
 
             var mouse = (MouseDevice)e.Device;
             if(mouse._disposed)
                 return;
 
-            Position = e.Root.PointToScreen(e.Position);
+            _position = e.Root.PointToScreen(e.Position);
             var props = CreateProperties(e);
             var keyModifiers = KeyModifiersUtils.ConvertToKey(e.InputModifiers);
             switch (e.Type)
@@ -142,6 +154,8 @@ namespace Avalonia.Input
                 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);
                     else
@@ -151,6 +165,8 @@ namespace Avalonia.Input
                 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);
                     else
@@ -168,9 +184,10 @@ namespace Avalonia.Input
         private void LeaveWindow(IMouseDevice device, ulong timestamp, IInputRoot root, PointerPointProperties properties,
             KeyModifiers inputModifiers)
         {
-            Contract.Requires<ArgumentNullException>(device != null);
-            Contract.Requires<ArgumentNullException>(root != null);
+            device = device ?? throw new ArgumentNullException(nameof(device));
+            root = root ?? throw new ArgumentNullException(nameof(root));
 
+            _position = null;
             ClearPointerOver(this, timestamp, root, properties, inputModifiers);
         }
 
@@ -186,12 +203,20 @@ namespace Avalonia.Input
                 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);
         }
@@ -201,8 +226,8 @@ namespace Avalonia.Input
             PointerPointProperties properties,
             KeyModifiers inputModifiers)
         {
-            Contract.Requires<ArgumentNullException>(device != null);
-            Contract.Requires<ArgumentNullException>(root != null);
+            device = device ?? throw new ArgumentNullException(nameof(device));
+            root = root ?? throw new ArgumentNullException(nameof(root));
 
             var hit = HitTest(root, p);
 
@@ -237,10 +262,10 @@ namespace Avalonia.Input
         private bool MouseMove(IMouseDevice device, ulong timestamp, IInputRoot root, Point p, PointerPointProperties properties,
             KeyModifiers inputModifiers)
         {
-            Contract.Requires<ArgumentNullException>(device != null);
-            Contract.Requires<ArgumentNullException>(root != null);
+            device = device ?? throw new ArgumentNullException(nameof(device));
+            root = root ?? throw new ArgumentNullException(nameof(root));
 
-            IInputElement source;
+            IInputElement? source;
 
             if (_pointer.Captured == null)
             {
@@ -252,18 +277,23 @@ namespace Avalonia.Input
                 source = _pointer.Captured;
             }
 
-            var e = new PointerEventArgs(InputElement.PointerMovedEvent, source, _pointer, root,
-                p, timestamp, properties, inputModifiers);
+            if (source is object)
+            {
+                var e = new PointerEventArgs(InputElement.PointerMovedEvent, source, _pointer, root,
+                    p, timestamp, properties, inputModifiers);
+
+                source.RaiseEvent(e);
+                return e.Handled;
+            }
 
-            source?.RaiseEvent(e);
-            return e.Handled;
+            return false;
         }
 
         private bool MouseUp(IMouseDevice device, ulong timestamp, IInputRoot root, Point p, PointerPointProperties props,
             KeyModifiers inputModifiers)
         {
-            Contract.Requires<ArgumentNullException>(device != null);
-            Contract.Requires<ArgumentNullException>(root != null);
+            device = device ?? throw new ArgumentNullException(nameof(device));
+            root = root ?? throw new ArgumentNullException(nameof(root));
 
             var hit = HitTest(root, p);
 
@@ -285,8 +315,8 @@ namespace Avalonia.Input
             PointerPointProperties props,
             Vector delta, KeyModifiers inputModifiers)
         {
-            Contract.Requires<ArgumentNullException>(device != null);
-            Contract.Requires<ArgumentNullException>(root != null);
+            device = device ?? throw new ArgumentNullException(nameof(device));
+            root = root ?? throw new ArgumentNullException(nameof(root));
 
             var hit = HitTest(root, p);
 
@@ -304,21 +334,21 @@ namespace Avalonia.Input
 
         private IInteractive GetSource(IVisual hit)
         {
-            Contract.Requires<ArgumentNullException>(hit != null);
+            hit = hit ?? throw new ArgumentNullException(nameof(hit));
 
             return _pointer.Captured ??
                 (hit as IInteractive) ??
                 hit.GetSelfAndVisualAncestors().OfType<IInteractive>().FirstOrDefault();
         }
 
-        private IInputElement HitTest(IInputElement root, Point p)
+        private IInputElement? HitTest(IInputElement root, Point p)
         {
-            Contract.Requires<ArgumentNullException>(root != null);
+            root = root ?? throw new ArgumentNullException(nameof(root));
 
             return _pointer.Captured ?? root.InputHitTest(p);
         }
 
-        PointerEventArgs CreateSimpleEvent(RoutedEvent ev, ulong timestamp, IInteractive source,
+        PointerEventArgs CreateSimpleEvent(RoutedEvent ev, ulong timestamp, IInteractive? source,
             PointerPointProperties properties,
             KeyModifiers inputModifiers)
         {
@@ -330,8 +360,8 @@ namespace Avalonia.Input
             PointerPointProperties properties,
             KeyModifiers inputModifiers)
         {
-            Contract.Requires<ArgumentNullException>(device != null);
-            Contract.Requires<ArgumentNullException>(root != null);
+            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);
@@ -371,12 +401,12 @@ namespace Avalonia.Input
             }
         }
 
-        private IInputElement SetPointerOver(IPointerDevice device, ulong timestamp, IInputRoot root, Point p, 
+        private IInputElement? SetPointerOver(IPointerDevice device, ulong timestamp, IInputRoot root, Point p, 
             PointerPointProperties properties,
             KeyModifiers inputModifiers)
         {
-            Contract.Requires<ArgumentNullException>(device != null);
-            Contract.Requires<ArgumentNullException>(root != null);
+            device = device ?? throw new ArgumentNullException(nameof(device));
+            root = root ?? throw new ArgumentNullException(nameof(root));
 
             var element = root.InputHitTest(p);
 
@@ -399,11 +429,11 @@ namespace Avalonia.Input
             PointerPointProperties properties,
             KeyModifiers inputModifiers)
         {
-            Contract.Requires<ArgumentNullException>(device != null);
-            Contract.Requires<ArgumentNullException>(root != null);
-            Contract.Requires<ArgumentNullException>(element != null);
+            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? branch = null;
 
             var el = element;
 
diff --git a/src/Avalonia.Input/Navigation/FocusExtensions.cs b/src/Avalonia.Input/Navigation/FocusExtensions.cs
index 794dc63f84..83bcd9187a 100644
--- a/src/Avalonia.Input/Navigation/FocusExtensions.cs
+++ b/src/Avalonia.Input/Navigation/FocusExtensions.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Input.Navigation
 {
     /// <summary>
diff --git a/src/Avalonia.Input/Navigation/TabNavigation.cs b/src/Avalonia.Input/Navigation/TabNavigation.cs
index 18db2a9173..6f6d68940b 100644
--- a/src/Avalonia.Input/Navigation/TabNavigation.cs
+++ b/src/Avalonia.Input/Navigation/TabNavigation.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -25,15 +22,17 @@ namespace Avalonia.Input.Navigation
         /// The next element in the specified direction, or null if <paramref name="element"/>
         /// was the last in the requested direction.
         /// </returns>
-        public static IInputElement GetNextInTabOrder(
+        public static IInputElement? GetNextInTabOrder(
             IInputElement element,
             NavigationDirection direction,
             bool outsideElement = false)
         {
-            Contract.Requires<ArgumentNullException>(element != null);
-            Contract.Requires<ArgumentException>(
-                direction == NavigationDirection.Next ||
-                direction == NavigationDirection.Previous);
+            element = element ?? throw new ArgumentNullException(nameof(element));
+
+            if (direction != NavigationDirection.Next && direction != NavigationDirection.Previous)
+            {
+                throw new ArgumentException("Invalid direction: must be Next or Previous.");
+            }
 
             var container = element.GetVisualParent<IInputElement>();
 
@@ -80,7 +79,8 @@ namespace Avalonia.Input.Navigation
         /// <param name="element">The element.</param>
         /// <param name="direction">The tab direction. Must be Next or Previous.</param>
         /// <returns>The element's focusable descendants.</returns>
-        private static IEnumerable<IInputElement> GetFocusableDescendants(IInputElement element, NavigationDirection direction)
+        private static IEnumerable<IInputElement> GetFocusableDescendants(IInputElement element,
+            NavigationDirection direction)
         {
             var mode = KeyboardNavigation.GetTabNavigation((InputElement)element);
 
@@ -112,11 +112,11 @@ namespace Avalonia.Input.Navigation
 
                 if (customNext.handled)
                 {
-                    yield return customNext.next;
+                    yield return customNext.next!;
                 }
                 else
                 {
-                    if (child.CanFocus())
+                    if (child.CanFocus() && KeyboardNavigation.GetIsTabStop((InputElement)child))
                     {
                         yield return child;
                     }
@@ -125,7 +125,10 @@ namespace Avalonia.Input.Navigation
                     {
                         foreach (var descendant in GetFocusableDescendants(child, direction))
                         {
-                            yield return descendant;
+                            if (KeyboardNavigation.GetIsTabStop((InputElement)descendant))
+                            {
+                                yield return descendant;
+                            }
                         }
                     }
                 }
@@ -142,12 +145,14 @@ namespace Avalonia.Input.Navigation
         /// If true will not descend into <paramref name="element"/> to find next control.
         /// </param>
         /// <returns>The next element, or null if the element is the last.</returns>
-        private static IInputElement GetNextInContainer(
+        private static IInputElement? GetNextInContainer(
             IInputElement element,
             IInputElement container,
             NavigationDirection direction,
             bool outsideElement)
         {
+            IInputElement? e = element;
+
             if (direction == NavigationDirection.Next && !outsideElement)
             {
                 var descendant = GetFocusableDescendants(element, direction).FirstOrDefault();
@@ -166,11 +171,13 @@ namespace Avalonia.Input.Navigation
                 // INavigableContainer.
                 if (navigable != null)
                 {
-                    while (element != null)
+                    while (e != null)
                     {
-                        element = navigable.GetControl(direction, element, false);
+                        e = navigable.GetControl(direction, e, false);
 
-                        if (element != null && element.CanFocus())
+                        if (e != null && 
+                            e.CanFocus() &&
+                            KeyboardNavigation.GetIsTabStop((InputElement)e))
                         {
                             break;
                         }
@@ -180,12 +187,12 @@ namespace Avalonia.Input.Navigation
                 {
                     // TODO: Do a spatial search here if the container doesn't implement
                     // INavigableContainer.
-                    element = null;
+                    e = null;
                 }
 
-                if (element != null && direction == NavigationDirection.Previous)
+                if (e != null && direction == NavigationDirection.Previous)
                 {
-                    var descendant = GetFocusableDescendants(element, direction).LastOrDefault();
+                    var descendant = GetFocusableDescendants(e, direction).LastOrDefault();
 
                     if (descendant != null)
                     {
@@ -193,7 +200,7 @@ namespace Avalonia.Input.Navigation
                     }
                 }
 
-                return element;
+                return e;
             }
 
             return null;
@@ -206,17 +213,19 @@ namespace Avalonia.Input.Navigation
         /// <param name="container">The container.</param>
         /// <param name="direction">The direction of the search.</param>
         /// <returns>The first element, or null if there are no more elements.</returns>
-        private static IInputElement GetFirstInNextContainer(
+        private static IInputElement? GetFirstInNextContainer(
             IInputElement element,
             IInputElement container,
             NavigationDirection direction)
         {
             var parent = container.GetVisualParent<IInputElement>();
-            IInputElement next = null;
+            IInputElement? next = null;
 
             if (parent != null)
             {
-                if (direction == NavigationDirection.Previous && parent.CanFocus())
+                if (direction == NavigationDirection.Previous &&
+                    parent.CanFocus() && 
+                    KeyboardNavigation.GetIsTabStop((InputElement) parent))
                 {
                     return parent;
                 }
@@ -236,26 +245,22 @@ namespace Avalonia.Input.Navigation
                         return customNext.next;
                     }
 
-                    if (sibling.CanFocus())
+                    if (sibling.CanFocus() && KeyboardNavigation.GetIsTabStop((InputElement) sibling))
                     {
                         return sibling;
                     }
-                    else
+
+                    next = direction == NavigationDirection.Next ?
+                        GetFocusableDescendants(sibling, direction).FirstOrDefault() :
+                        GetFocusableDescendants(sibling, direction).LastOrDefault();
+
+                    if (next != null)
                     {
-                        next = direction == NavigationDirection.Next ?
-                            GetFocusableDescendants(sibling, direction).FirstOrDefault() :
-                            GetFocusableDescendants(sibling, direction).LastOrDefault();
-                        if(next != null)
-                        {
-                            return next;
-                        }
+                        return next;
                     }
                 }
 
-                if (next == null)
-                {
-                    next = GetFirstInNextContainer(element, parent, direction);
-                }
+                next = GetFirstInNextContainer(element, parent, direction);
             }
             else
             {
@@ -267,7 +272,8 @@ namespace Avalonia.Input.Navigation
             return next;
         }
 
-        private static (bool handled, IInputElement next) GetCustomNext(IInputElement element, NavigationDirection direction)
+        private static (bool handled, IInputElement? next) GetCustomNext(IInputElement element,
+            NavigationDirection direction)
         {
             if (element is ICustomKeyboardNavigation custom)
             {
diff --git a/src/Avalonia.Input/NavigationDirection.cs b/src/Avalonia.Input/NavigationDirection.cs
index 406890b767..9bd6a8bb42 100644
--- a/src/Avalonia.Input/NavigationDirection.cs
+++ b/src/Avalonia.Input/NavigationDirection.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Input
 {
     /// <summary>
@@ -86,7 +83,7 @@ namespace Avalonia.Input
         /// </returns>
         public static bool IsDirectional(this NavigationDirection direction)
         {
-            return direction > NavigationDirection.Previous ||
+            return direction > NavigationDirection.Previous &&
                 direction <= NavigationDirection.PageDown;
         }
 
@@ -100,12 +97,12 @@ namespace Avalonia.Input
         /// </returns>
         public static NavigationDirection? ToNavigationDirection(
             this Key key,
-            InputModifiers modifiers = InputModifiers.None)
+            KeyModifiers modifiers = KeyModifiers.None)
         {
             switch (key)
             {
                 case Key.Tab:
-                    return (modifiers & InputModifiers.Shift) != 0 ?
+                    return (modifiers & KeyModifiers.Shift) == 0 ?
                         NavigationDirection.Next : NavigationDirection.Previous;
                 case Key.Up:
                     return NavigationDirection.Up;
diff --git a/src/Avalonia.Input/NavigationMethod.cs b/src/Avalonia.Input/NavigationMethod.cs
index a8185da52a..ff46be6c4f 100644
--- a/src/Avalonia.Input/NavigationMethod.cs
+++ b/src/Avalonia.Input/NavigationMethod.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Input
 {
     /// <summary>
diff --git a/src/Avalonia.Input/Platform/IClipboard.cs b/src/Avalonia.Input/Platform/IClipboard.cs
index 4afb69f509..eb880904eb 100644
--- a/src/Avalonia.Input/Platform/IClipboard.cs
+++ b/src/Avalonia.Input/Platform/IClipboard.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Threading.Tasks;
 
 namespace Avalonia.Input.Platform
@@ -12,5 +9,11 @@ namespace Avalonia.Input.Platform
         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/IStandardCursorFactory.cs b/src/Avalonia.Input/Platform/IStandardCursorFactory.cs
index 393ba6b40a..51845cf03e 100644
--- a/src/Avalonia.Input/Platform/IStandardCursorFactory.cs
+++ b/src/Avalonia.Input/Platform/IStandardCursorFactory.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Input;
 
 namespace Avalonia.Platform
diff --git a/src/Avalonia.Input/Platform/PlatformHotkeyConfiguration.cs b/src/Avalonia.Input/Platform/PlatformHotkeyConfiguration.cs
index a758a328be..053f894755 100644
--- a/src/Avalonia.Input/Platform/PlatformHotkeyConfiguration.cs
+++ b/src/Avalonia.Input/Platform/PlatformHotkeyConfiguration.cs
@@ -4,14 +4,14 @@ namespace Avalonia.Input.Platform
 {
     public class PlatformHotkeyConfiguration
     {
-        public PlatformHotkeyConfiguration() : this(InputModifiers.Control)
+        public PlatformHotkeyConfiguration() : this(KeyModifiers.Control)
         {
             
         }
         
-        public PlatformHotkeyConfiguration(InputModifiers commandModifiers,
-            InputModifiers selectionModifiers = InputModifiers.Shift,
-            InputModifiers wholeWordTextActionModifiers = InputModifiers.Control)
+        public PlatformHotkeyConfiguration(KeyModifiers commandModifiers,
+            KeyModifiers selectionModifiers = KeyModifiers.Shift,
+            KeyModifiers wholeWordTextActionModifiers = KeyModifiers.Control)
         {
             CommandModifiers = commandModifiers;
             SelectionModifiers = selectionModifiers;
@@ -75,9 +75,9 @@ namespace Avalonia.Input.Platform
             };
         }
         
-        public InputModifiers CommandModifiers { get; set; }
-        public InputModifiers WholeWordTextActionModifiers { get; set; }
-        public InputModifiers SelectionModifiers { get; set; }
+        public KeyModifiers CommandModifiers { get; set; }
+        public KeyModifiers WholeWordTextActionModifiers { get; set; }
+        public KeyModifiers SelectionModifiers { get; set; }
         public List<KeyGesture> Copy { get; set; }
         public List<KeyGesture> Cut { get; set; }
         public List<KeyGesture> Paste { get; set; }
diff --git a/src/Avalonia.Input/Pointer.cs b/src/Avalonia.Input/Pointer.cs
index 819d231b31..a477711584 100644
--- a/src/Avalonia.Input/Pointer.cs
+++ b/src/Avalonia.Input/Pointer.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Avalonia.Interactivity;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Input
@@ -20,7 +19,7 @@ namespace Avalonia.Input
 
         public int Id { get; }
 
-        IInputElement FindCommonParent(IInputElement control1, IInputElement control2)
+        IInputElement? FindCommonParent(IInputElement? control1, IInputElement? control2)
         {
             if (control1 == null || control2 == null)
                 return null;
@@ -28,12 +27,12 @@ namespace Avalonia.Input
             return control2.GetSelfAndVisualAncestors().OfType<IInputElement>().FirstOrDefault(seen.Contains);
         }
 
-        protected virtual void PlatformCapture(IInputElement element)
+        protected virtual void PlatformCapture(IInputElement? element)
         {
             
         }
         
-        public void Capture(IInputElement control)
+        public void Capture(IInputElement? control)
         {
             if (Captured != null)
                 Captured.DetachedFromVisualTree -= OnCaptureDetached;
@@ -55,16 +54,18 @@ namespace Avalonia.Input
                 Captured.DetachedFromVisualTree += OnCaptureDetached;
         }
 
-        IInputElement GetNextCapture(IVisual parent) =>
-            parent as IInputElement ?? parent.GetVisualAncestors().OfType<IInputElement>().FirstOrDefault();
-        
+        IInputElement GetNextCapture(IVisual parent)
+        {
+            return parent as IInputElement ?? parent.FindAncestorOfType<IInputElement>();
+        }
+
         private void OnCaptureDetached(object sender, VisualTreeAttachmentEventArgs e)
         {
             Capture(GetNextCapture(e.Parent));
         }
 
 
-        public IInputElement Captured { get; private set; }
+        public IInputElement? Captured { get; private set; }
             
         public PointerType Type { get; }
         public bool IsPrimary { get; }
diff --git a/src/Avalonia.Input/PointerEventArgs.cs b/src/Avalonia.Input/PointerEventArgs.cs
index e12a20f7a2..451f80b1df 100644
--- a/src/Avalonia.Input/PointerEventArgs.cs
+++ b/src/Avalonia.Input/PointerEventArgs.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Input.Raw;
 using Avalonia.Interactivity;
@@ -10,14 +7,14 @@ namespace Avalonia.Input
 {
     public class PointerEventArgs : RoutedEventArgs
     {
-        private readonly IVisual _rootVisual;
+        private readonly IVisual? _rootVisual;
         private readonly Point _rootVisualPosition;
         private readonly PointerPointProperties _properties;
 
         public PointerEventArgs(RoutedEvent routedEvent,
-            IInteractive source,
+            IInteractive? source,
             IPointer pointer,
-            IVisual rootVisual, Point rootVisualPosition,
+            IVisual? rootVisual, Point rootVisualPosition,
             ulong timestamp,
             PointerPointProperties properties,
             KeyModifiers modifiers)
@@ -43,8 +40,8 @@ namespace Avalonia.Input
             
             public void ProcessRawEvent(RawInputEventArgs ev) => throw new NotSupportedException();
 
-            public IInputElement Captured => _ev.Pointer.Captured;
-            public void Capture(IInputElement control)
+            public IInputElement? Captured => _ev.Pointer.Captured;
+            public void Capture(IInputElement? control)
             {
                 _ev.Pointer.Capture(control);
             }
@@ -55,7 +52,7 @@ namespace Avalonia.Input
         public IPointer Pointer { get; }
         public ulong Timestamp { get; }
 
-        private IPointerDevice _device;
+        private IPointerDevice? _device;
 
         [Obsolete("Use Pointer to get pointer-specific information")]
         public IPointerDevice Device => _device ?? (_device = new EmulatedDevice(this));
@@ -79,7 +76,7 @@ namespace Avalonia.Input
         
         public KeyModifiers KeyModifiers { get; }
 
-        public Point GetPosition(IVisual relativeTo)
+        public Point GetPosition(IVisual? relativeTo)
         {
             if (_rootVisual == null)
                 return default;
@@ -89,14 +86,14 @@ namespace Avalonia.Input
         }
 
         [Obsolete("Use GetCurrentPoint")]
-        public PointerPoint GetPointerPoint(IVisual relativeTo) => GetCurrentPoint(relativeTo);
+        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)
+        public PointerPoint GetCurrentPoint(IVisual? relativeTo)
             => new PointerPoint(Pointer, GetPosition(relativeTo), _properties);
 
         /// <summary>
@@ -131,10 +128,10 @@ namespace Avalonia.Input
             _obsoleteClickCount = obsoleteClickCount;
         }
 
-        [Obsolete("Use DoubleTapped or DoubleRightTapped event instead")]
+        [Obsolete("Use DoubleTapped event or Gestures.DoubleRightTapped attached event")]
         public int ClickCount => _obsoleteClickCount;
 
-        [Obsolete("Use PointerUpdateKind")]
+        [Obsolete("Use PointerPressedEventArgs.GetCurrentPoint(this).Properties")]
         public MouseButton MouseButton => Properties.PointerUpdateKind.GetMouseButton();
     }
 
@@ -156,7 +153,7 @@ namespace Avalonia.Input
         /// </summary>
         public MouseButton InitialPressMouseButton { get; }
 
-        [Obsolete("Either use GetCurrentPoint(this).Properties.PointerUpdateKind or InitialPressMouseButton, see https://github.com/AvaloniaUI/Avalonia/wiki/Pointer-events-in-0.9 for more details", true)]
+        [Obsolete("Use InitialPressMouseButton")]
         public MouseButton MouseButton => InitialPressMouseButton;
     }
 
diff --git a/src/Avalonia.Input/PointerPoint.cs b/src/Avalonia.Input/PointerPoint.cs
index 1068a0d4d4..a316e0d964 100644
--- a/src/Avalonia.Input/PointerPoint.cs
+++ b/src/Avalonia.Input/PointerPoint.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Input
 {
     public sealed class PointerPoint
@@ -21,18 +18,24 @@ namespace Avalonia.Input
         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.HasFlagCustom(RawInputModifiers.LeftMouseButton);
             IsMiddleButtonPressed = modifiers.HasFlagCustom(RawInputModifiers.MiddleMouseButton);
             IsRightButtonPressed = modifiers.HasFlagCustom(RawInputModifiers.RightMouseButton);
+            IsXButton1Pressed = modifiers.HasFlagCustom(RawInputModifiers.XButton1MouseButton);
+            IsXButton2Pressed = modifiers.HasFlagCustom(RawInputModifiers.XButton2MouseButton);
 
             // The underlying input source might be reporting the previous state,
             // so make sure that we reflect the current state
@@ -49,6 +52,14 @@ namespace Avalonia.Input
                 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();
@@ -59,9 +70,13 @@ namespace Avalonia.Input
         LeftButtonPressed,
         MiddleButtonPressed,
         RightButtonPressed,
+        XButton1Pressed,
+        XButton2Pressed,
         LeftButtonReleased,
         MiddleButtonReleased,
         RightButtonReleased,
+        XButton1Released,
+        XButton2Released,
         Other
     }
 
diff --git a/src/Avalonia.Input/PointerWheelEventArgs.cs b/src/Avalonia.Input/PointerWheelEventArgs.cs
index 3d7f93ddde..e5701dcf23 100644
--- a/src/Avalonia.Input/PointerWheelEventArgs.cs
+++ b/src/Avalonia.Input/PointerWheelEventArgs.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Interactivity;
 using Avalonia.VisualTree;
 
diff --git a/src/Avalonia.Input/Properties/AssemblyInfo.cs b/src/Avalonia.Input/Properties/AssemblyInfo.cs
index 3a8d358931..433f821ca3 100644
--- a/src/Avalonia.Input/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Input/Properties/AssemblyInfo.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reflection;
 using Avalonia.Metadata;
 
diff --git a/src/Avalonia.Input/Raw/RawDragEvent.cs b/src/Avalonia.Input/Raw/RawDragEvent.cs
index 5722e17593..6e9ce20ff1 100644
--- a/src/Avalonia.Input/Raw/RawDragEvent.cs
+++ b/src/Avalonia.Input/Raw/RawDragEvent.cs
@@ -1,4 +1,6 @@
-namespace Avalonia.Input.Raw
+using System;
+
+namespace Avalonia.Input.Raw
 {
     public class RawDragEvent : RawInputEventArgs
     {
@@ -6,7 +8,9 @@
         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)
@@ -16,7 +20,10 @@
             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/RawDragEventType.cs b/src/Avalonia.Input/Raw/RawDragEventType.cs
index 9635f77467..77f17a5a41 100644
--- a/src/Avalonia.Input/Raw/RawDragEventType.cs
+++ b/src/Avalonia.Input/Raw/RawDragEventType.cs
@@ -7,4 +7,4 @@
         DragLeave,
         Drop
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Input/Raw/RawInputEventArgs.cs b/src/Avalonia.Input/Raw/RawInputEventArgs.cs
index 6a488c4cc7..dcc5f27a79 100644
--- a/src/Avalonia.Input/Raw/RawInputEventArgs.cs
+++ b/src/Avalonia.Input/Raw/RawInputEventArgs.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Input.Raw
@@ -24,7 +21,7 @@ namespace Avalonia.Input.Raw
         /// <param name="root">The root from which the event originates.</param>
         public RawInputEventArgs(IInputDevice device, ulong timestamp, IInputRoot root)
         {
-            Contract.Requires<ArgumentNullException>(device != null);
+            device = device ?? throw new ArgumentNullException(nameof(device));
 
             Device = device;
             Timestamp = timestamp;
diff --git a/src/Avalonia.Input/Raw/RawKeyEventArgs.cs b/src/Avalonia.Input/Raw/RawKeyEventArgs.cs
index c720cf11f8..6ed073d006 100644
--- a/src/Avalonia.Input/Raw/RawKeyEventArgs.cs
+++ b/src/Avalonia.Input/Raw/RawKeyEventArgs.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Input.Raw
 {
     public enum RawKeyEventType
diff --git a/src/Avalonia.Input/Raw/RawMouseWheelEventArgs.cs b/src/Avalonia.Input/Raw/RawMouseWheelEventArgs.cs
index 516234de7e..a752275980 100644
--- a/src/Avalonia.Input/Raw/RawMouseWheelEventArgs.cs
+++ b/src/Avalonia.Input/Raw/RawMouseWheelEventArgs.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 
 namespace Avalonia.Input.Raw
 {
diff --git a/src/Avalonia.Input/Raw/RawPointerEventArgs.cs b/src/Avalonia.Input/Raw/RawPointerEventArgs.cs
index 56854c7d29..62a1dd5d84 100644
--- a/src/Avalonia.Input/Raw/RawPointerEventArgs.cs
+++ b/src/Avalonia.Input/Raw/RawPointerEventArgs.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Input.Raw
@@ -14,6 +11,10 @@ namespace Avalonia.Input.Raw
         RightButtonUp,
         MiddleButtonDown,
         MiddleButtonUp,
+        XButton1Down,
+        XButton1Up,
+        XButton2Down,
+        XButton2Up,
         Move,
         Wheel,
         NonClientLeftButtonDown,
@@ -62,7 +63,7 @@ namespace Avalonia.Input.Raw
         /// <summary>
         /// Gets the type of the event.
         /// </summary>
-        public RawPointerEventType Type { get; private set; }
+        public RawPointerEventType Type { get; set; }
 
         /// <summary>
         /// Gets the input modifiers.
diff --git a/src/Avalonia.Input/Raw/RawSizeEventArgs.cs b/src/Avalonia.Input/Raw/RawSizeEventArgs.cs
index 0a3074a859..b6a364eab9 100644
--- a/src/Avalonia.Input/Raw/RawSizeEventArgs.cs
+++ b/src/Avalonia.Input/Raw/RawSizeEventArgs.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Input.Raw
diff --git a/src/Avalonia.Input/Raw/RawTextInputEventArgs.cs b/src/Avalonia.Input/Raw/RawTextInputEventArgs.cs
index 010342da15..48c882197f 100644
--- a/src/Avalonia.Input/Raw/RawTextInputEventArgs.cs
+++ b/src/Avalonia.Input/Raw/RawTextInputEventArgs.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Input.Raw
 {
     public class RawTextInputEventArgs : RawInputEventArgs
diff --git a/src/Avalonia.Input/TextInputEventArgs.cs b/src/Avalonia.Input/TextInputEventArgs.cs
index b7203b54d5..cda0103749 100644
--- a/src/Avalonia.Input/TextInputEventArgs.cs
+++ b/src/Avalonia.Input/TextInputEventArgs.cs
@@ -1,14 +1,11 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Interactivity;
 
 namespace Avalonia.Input
 {
     public class TextInputEventArgs : RoutedEventArgs
     {
-        public IKeyboardDevice Device { get; set; }
+        public IKeyboardDevice? Device { get; set; }
 
-        public string Text { get; set; }
+        public string? Text { get; set; }
     }
 }
diff --git a/src/Avalonia.Input/VectorEventArgs.cs b/src/Avalonia.Input/VectorEventArgs.cs
index 11aa84e16b..000fd52f69 100644
--- a/src/Avalonia.Input/VectorEventArgs.cs
+++ b/src/Avalonia.Input/VectorEventArgs.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Interactivity;
 
diff --git a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj
index 66f1e8cc26..2da23410d6 100644
--- a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj
+++ b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj
@@ -1,6 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <Nullable>Enable</Nullable>
+    <WarningsAsErrors>CS8600;CS8602;CS8603</WarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
@@ -9,6 +11,5 @@
     <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
-</Project>
-
-
+  <Import Project="..\..\build\ApiDiff.props" />
+</Project>
\ No newline at end of file
diff --git a/src/Avalonia.Interactivity/EventRoute.cs b/src/Avalonia.Interactivity/EventRoute.cs
new file mode 100644
index 0000000000..85ba33d7ba
--- /dev/null
+++ b/src/Avalonia.Interactivity/EventRoute.cs
@@ -0,0 +1,200 @@
+using System;
+using Avalonia.Collections.Pooled;
+
+namespace Avalonia.Interactivity
+{
+    /// <summary>
+    /// Holds the route for a routed event and supports raising an event on that route.
+    /// </summary>
+    public class EventRoute : IDisposable
+    {
+        private readonly RoutedEvent _event;
+        private PooledList<RouteItem>? _route;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RoutedEvent"/> class.
+        /// </summary>
+        /// <param name="e">The routed event to be raised.</param>
+        public EventRoute(RoutedEvent e)
+        {
+            e = e ?? throw new ArgumentNullException(nameof(e));
+
+            _event = e;
+            _route = null;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the route has any handlers.
+        /// </summary>
+        public bool HasHandlers => _route?.Count > 0;
+
+        /// <summary>
+        /// Adds a handler to the route.
+        /// </summary>
+        /// <param name="target">The target on which the event should be raised.</param>
+        /// <param name="handler">The handler for the event.</param>
+        /// <param name="routes">The routing strategies to listen to.</param>
+        /// <param name="handledEventsToo">
+        /// If true the handler will be raised even when the routed event is marked as handled.
+        /// </param>
+        /// <param name="adapter">
+        /// An optional adapter which if supplied, will be called with <paramref name="handler"/>
+        /// and the parameters for the event. This adapter can be used to avoid calling
+        /// `DynamicInvoke` on the handler.
+        /// </param>
+        public void Add(
+            IInteractive target,
+            Delegate handler,
+            RoutingStrategies routes,
+            bool handledEventsToo = false,
+            Action<Delegate, object, RoutedEventArgs>? adapter = null)
+        {
+            target = target ?? throw new ArgumentNullException(nameof(target));
+            handler = handler ?? throw new ArgumentNullException(nameof(handler));
+
+            _route ??= new PooledList<RouteItem>(16);
+            _route.Add(new RouteItem(target, handler, adapter, routes, handledEventsToo));
+        }
+
+        /// <summary>
+        /// Adds a class handler to the route.
+        /// </summary>
+        /// <param name="target">The target on which the event should be raised.</param>
+        public void AddClassHandler(IInteractive target)
+        {
+            target = target ?? throw new ArgumentNullException(nameof(target));
+
+            _route ??= new PooledList<RouteItem>(16);
+            _route.Add(new RouteItem(target, null, null, 0, false));
+        }
+
+        /// <summary>
+        /// Raises an event along the route.
+        /// </summary>
+        /// <param name="source">The event source.</param>
+        /// <param name="e">The event args.</param>
+        public void RaiseEvent(IInteractive source, RoutedEventArgs e)
+        {
+            source = source ?? throw new ArgumentNullException(nameof(source));
+            e = e ?? throw new ArgumentNullException(nameof(e));
+
+            e.Source = source;
+
+            if (_event.RoutingStrategies == RoutingStrategies.Direct)
+            {
+                e.Route = RoutingStrategies.Direct;
+                RaiseEventImpl(e);
+                _event.InvokeRouteFinished(e);
+            }
+            else
+            {
+                if (_event.RoutingStrategies.HasFlagCustom(RoutingStrategies.Tunnel))
+                {
+                    e.Route = RoutingStrategies.Tunnel;
+                    RaiseEventImpl(e);
+                    _event.InvokeRouteFinished(e);
+                }
+
+                if (_event.RoutingStrategies.HasFlagCustom(RoutingStrategies.Bubble))
+                {
+                    e.Route = RoutingStrategies.Bubble;
+                    RaiseEventImpl(e);
+                    _event.InvokeRouteFinished(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Disposes of the event route.
+        /// </summary>
+        public void Dispose()
+        {
+            _route?.Dispose();
+            _route = null;
+        }
+
+        private void RaiseEventImpl(RoutedEventArgs e)
+        {
+            if (_route is null)
+            {
+                return;
+            }
+
+            if (e.Source is null)
+            {
+                throw new ArgumentException("Event source may not be null", nameof(e));
+            }
+
+            IInteractive? lastTarget = null;
+            var start = 0;
+            var end = _route.Count;
+            var step = 1;
+
+            if (e.Route == RoutingStrategies.Tunnel)
+            {
+                start = end - 1;
+                step = end = -1;
+            }
+
+            for (var i = start; i != end; i += step)
+            {
+                var entry = _route[i];
+
+                // If we've got to a new control then call any RoutedEvent.Raised listeners.
+                if (entry.Target != lastTarget)
+                {
+                    if (!e.Handled)
+                    {
+                        _event.InvokeRaised(entry.Target, e);
+                    }
+
+                    // If this is a direct event and we've already raised events then we're finished.
+                    if (e.Route == RoutingStrategies.Direct && lastTarget is object)
+                    {
+                        return;
+                    }
+
+                    lastTarget = entry.Target;
+                }
+
+                // Raise the event handler.
+                if (entry.Handler is object &&
+                    entry.Routes.HasFlagCustom(e.Route) &&
+                    (!e.Handled || entry.HandledEventsToo))
+                {
+                    if (entry.Adapter is object)
+                    {
+                        entry.Adapter(entry.Handler, entry.Target, e);
+                    }
+                    else
+                    {
+                        entry.Handler.DynamicInvoke(entry.Target, e);
+                    }
+                }
+            }
+        }
+
+        private readonly struct RouteItem
+        {
+            public RouteItem(
+                IInteractive target,
+                Delegate? handler,
+                Action<Delegate, object, RoutedEventArgs>? adapter,
+                RoutingStrategies routes,
+                bool handledEventsToo)
+            {
+                Target = target;
+                Handler = handler;
+                Adapter = adapter;
+                Routes = routes;
+                HandledEventsToo = handledEventsToo;
+            }
+
+            public IInteractive Target { get; }
+            public Delegate? Handler { get; }
+            public Action<Delegate, object, RoutedEventArgs>? Adapter { get; }
+            public RoutingStrategies Routes { get; }
+            public bool HandledEventsToo { get; }
+        }
+    }
+}
diff --git a/src/Avalonia.Interactivity/EventSubscription.cs b/src/Avalonia.Interactivity/EventSubscription.cs
deleted file mode 100644
index e8fb1bfaf1..0000000000
--- a/src/Avalonia.Interactivity/EventSubscription.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-
-namespace Avalonia.Interactivity
-{
-    internal delegate void HandlerInvokeSignature(Delegate baseHandler, object sender, RoutedEventArgs args);
-
-    internal class EventSubscription
-    {
-        public HandlerInvokeSignature InvokeAdapter { get; set; }
-
-        public Delegate Handler { get; set; }
-
-        public RoutingStrategies Routes { get; set; }
-
-        public bool AlsoIfHandled { get; set; }
-    }
-}
diff --git a/src/Avalonia.Interactivity/IInteractive.cs b/src/Avalonia.Interactivity/IInteractive.cs
index 47046b58e2..5c01f870ab 100644
--- a/src/Avalonia.Interactivity/IInteractive.cs
+++ b/src/Avalonia.Interactivity/IInteractive.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Interactivity
@@ -13,7 +10,7 @@ namespace Avalonia.Interactivity
         /// <summary>
         /// Gets the interactive parent of the object for bubbling and tunneling events.
         /// </summary>
-        IInteractive InteractiveParent { get; }
+        IInteractive? InteractiveParent { get; }
 
         /// <summary>
         /// Adds a handler for the specified routed event.
@@ -23,7 +20,7 @@ namespace Avalonia.Interactivity
         /// <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>
-        IDisposable AddHandler(
+        void AddHandler(
             RoutedEvent routedEvent,
             Delegate handler,
             RoutingStrategies routes = RoutingStrategies.Direct | RoutingStrategies.Bubble,
@@ -38,7 +35,7 @@ namespace Avalonia.Interactivity
         /// <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>
-        IDisposable AddHandler<TEventArgs>(
+        void AddHandler<TEventArgs>(
             RoutedEvent<TEventArgs> routedEvent,
             EventHandler<TEventArgs> handler,
             RoutingStrategies routes = RoutingStrategies.Direct | RoutingStrategies.Bubble,
@@ -60,6 +57,13 @@ namespace Avalonia.Interactivity
         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>
diff --git a/src/Avalonia.Interactivity/Interactive.cs b/src/Avalonia.Interactivity/Interactive.cs
index 27ece25183..bb7f0a8401 100644
--- a/src/Avalonia.Interactivity/Interactive.cs
+++ b/src/Avalonia.Interactivity/Interactive.cs
@@ -1,10 +1,5 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
 using Avalonia.Layout;
 using Avalonia.VisualTree;
 
@@ -15,16 +10,12 @@ namespace Avalonia.Interactivity
     /// </summary>
     public class Interactive : Layoutable, IInteractive
     {
-        private Dictionary<RoutedEvent, List<EventSubscription>> _eventHandlers;
-
-        private static readonly Dictionary<Type, HandlerInvokeSignature> s_invokeHandlerCache = new Dictionary<Type, HandlerInvokeSignature>();
+        private Dictionary<RoutedEvent, List<EventSubscription>>? _eventHandlers;
 
         /// <summary>
         /// Gets the interactive parent of the object for bubbling and tunneling events.
         /// </summary>
-        IInteractive IInteractive.InteractiveParent => ((IVisual)this).VisualParent as IInteractive;
-
-        private Dictionary<RoutedEvent, List<EventSubscription>> EventHandlers => _eventHandlers ?? (_eventHandlers = new Dictionary<RoutedEvent, List<EventSubscription>>());
+        IInteractive? IInteractive.InteractiveParent => ((IVisual)this).VisualParent as IInteractive;
 
         /// <summary>
         /// Adds a handler for the specified routed event.
@@ -33,24 +24,18 @@ namespace Avalonia.Interactivity
         /// <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>
-        public IDisposable AddHandler(
+        public void AddHandler(
             RoutedEvent routedEvent,
             Delegate handler,
             RoutingStrategies routes = RoutingStrategies.Direct | RoutingStrategies.Bubble,
             bool handledEventsToo = false)
         {
-            Contract.Requires<ArgumentNullException>(routedEvent != null);
-            Contract.Requires<ArgumentNullException>(handler != null);
+            routedEvent = routedEvent ?? throw new ArgumentNullException(nameof(routedEvent));
+            handler = handler ?? throw new ArgumentNullException(nameof(handler));
 
-            var subscription = new EventSubscription
-            {
-                Handler = handler,
-                Routes = routes,
-                AlsoIfHandled = handledEventsToo,
-            };
+            var subscription = new EventSubscription(handler, routes, handledEventsToo);
 
-            return AddEventSubscription(routedEvent, subscription);
+            AddEventSubscription(routedEvent, subscription);
         }
 
         /// <summary>
@@ -61,44 +46,26 @@ namespace Avalonia.Interactivity
         /// <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>
-        public IDisposable AddHandler<TEventArgs>(
+        public void AddHandler<TEventArgs>(
             RoutedEvent<TEventArgs> routedEvent,
             EventHandler<TEventArgs> handler,
             RoutingStrategies routes = RoutingStrategies.Direct | RoutingStrategies.Bubble,
             bool handledEventsToo = false) where TEventArgs : RoutedEventArgs
         {
-            Contract.Requires<ArgumentNullException>(routedEvent != null);
-            Contract.Requires<ArgumentNullException>(handler != null);
-
-            // EventHandler delegate is not covariant, this forces us to create small wrapper
-            // that will cast our type erased instance and invoke it.
-            Type eventArgsType = routedEvent.EventArgsType;
+            routedEvent = routedEvent ?? throw new ArgumentNullException(nameof(routedEvent));
+            handler = handler ?? throw new ArgumentNullException(nameof(handler));
 
-            if (!s_invokeHandlerCache.TryGetValue(eventArgsType, out var invokeAdapter))
+            static void InvokeAdapter(Delegate baseHandler, object sender, RoutedEventArgs args)
             {
-                void InvokeAdapter(Delegate baseHandler, object sender, RoutedEventArgs args)
-                {
-                    var typedHandler = (EventHandler<TEventArgs>)baseHandler;
-                    var typedArgs = (TEventArgs)args;
+                var typedHandler = (EventHandler<TEventArgs>)baseHandler;
+                var typedArgs = (TEventArgs)args;
 
-                    typedHandler(sender, typedArgs);
-                }
-
-                invokeAdapter = InvokeAdapter;
-
-                s_invokeHandlerCache.Add(eventArgsType, invokeAdapter);
+                typedHandler(sender, typedArgs);
             }
 
-            var subscription = new EventSubscription
-            {
-                InvokeAdapter = invokeAdapter,
-                Handler = handler,
-                Routes = routes,
-                AlsoIfHandled = handledEventsToo,
-            };
+            var subscription = new EventSubscription(handler, routes, handledEventsToo, (baseHandler, sender, args) => InvokeAdapter(baseHandler, sender, args));
 
-            return AddEventSubscription(routedEvent, subscription);
+            AddEventSubscription(routedEvent, subscription);
         }
 
         /// <summary>
@@ -108,14 +75,19 @@ namespace Avalonia.Interactivity
         /// <param name="handler">The handler.</param>
         public void RemoveHandler(RoutedEvent routedEvent, Delegate handler)
         {
-            Contract.Requires<ArgumentNullException>(routedEvent != null);
-            Contract.Requires<ArgumentNullException>(handler != null);
-
-            List<EventSubscription> subscriptions = null;
+            routedEvent = routedEvent ?? throw new ArgumentNullException(nameof(routedEvent));
+            handler = handler ?? throw new ArgumentNullException(nameof(handler));
 
-            if (_eventHandlers?.TryGetValue(routedEvent, out subscriptions) == true)
+            if (_eventHandlers is object &&
+                _eventHandlers.TryGetValue(routedEvent, out var subscriptions))
             {
-                subscriptions.RemoveAll(x => x.Handler == handler);
+                for (var i = subscriptions.Count - 1; i >= 0; i--)
+                {
+                    if (subscriptions[i].Handler == handler)
+                    {
+                        subscriptions.RemoveAt(i);
+                    }
+                }
             }
         }
 
@@ -137,191 +109,115 @@ namespace Avalonia.Interactivity
         /// <param name="e">The event args.</param>
         public void RaiseEvent(RoutedEventArgs e)
         {
-            Contract.Requires<ArgumentNullException>(e != null);
-
-            e.Source = e.Source ?? this;
-
-            if (e.RoutedEvent.RoutingStrategies == RoutingStrategies.Direct)
-            {
-                e.Route = RoutingStrategies.Direct;
-                RaiseEventImpl(e);
-                e.RoutedEvent.InvokeRouteFinished(e);
-            }
-
-            if ((e.RoutedEvent.RoutingStrategies & RoutingStrategies.Tunnel) != 0)
-            {
-                TunnelEvent(e);
-                e.RoutedEvent.InvokeRouteFinished(e);
-            }
+            e = e ?? throw new ArgumentNullException(nameof(e));
 
-            if ((e.RoutedEvent.RoutingStrategies & RoutingStrategies.Bubble) != 0)
+            if (e.RoutedEvent == null)
             {
-                BubbleEvent(e);
-                e.RoutedEvent.InvokeRouteFinished(e);
+                throw new ArgumentException("Cannot raise an event whose RoutedEvent is null.");
             }
-        }
 
-        /// <summary>
-        /// Bubbles an event.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private void BubbleEvent(RoutedEventArgs e)
-        {
-            Contract.Requires<ArgumentNullException>(e != null);
-
-            e.Route = RoutingStrategies.Bubble;
-
-            var traverser = HierarchyTraverser<RaiseEventTraverse, NopTraverse>.Create(e);
-
-            traverser.Traverse(this);
+            using var route = BuildEventRoute(e.RoutedEvent);
+            route.RaiseEvent(this, e);
         }
 
-        /// <summary>
-        /// Tunnels an event.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        private void TunnelEvent(RoutedEventArgs e)
+        void IInteractive.AddToEventRoute(RoutedEvent routedEvent, EventRoute route)
         {
-            Contract.Requires<ArgumentNullException>(e != null);
-
-            e.Route = RoutingStrategies.Tunnel;
-
-            var traverser = HierarchyTraverser<NopTraverse, RaiseEventTraverse>.Create(e);
+            routedEvent = routedEvent ?? throw new ArgumentNullException(nameof(routedEvent));
+            route = route ?? throw new ArgumentNullException(nameof(route));
 
-            traverser.Traverse(this);
+            if (_eventHandlers != null &&
+                _eventHandlers.TryGetValue(routedEvent, out var subscriptions))
+            {
+                foreach (var sub in subscriptions)
+                {
+                    route.Add(this, sub.Handler, sub.Routes, sub.HandledEventsToo, sub.InvokeAdapter);
+                }
+            }
         }
 
         /// <summary>
-        /// Carries out the actual invocation of an event on this object.
+        /// Builds an event route for a routed event.
         /// </summary>
-        /// <param name="e">The event args.</param>
-        private void RaiseEventImpl(RoutedEventArgs e)
+        /// <param name="e">The routed event.</param>
+        /// <returns>An <see cref="EventRoute"/> describing the route.</returns>
+        /// <remarks>
+        /// Usually, calling <see cref="RaiseEvent(RoutedEventArgs)"/> is sufficent to raise a routed
+        /// event, however there are situations in which the construction of the event args is expensive
+        /// and should be avoided if there are no handlers for an event. In these cases you can call
+        /// this method to build the event route and check the <see cref="EventRoute.HasHandlers"/>
+        /// property to see if there are any handlers registered on the route. If there are, call
+        /// <see cref="EventRoute.RaiseEvent(IInteractive, RoutedEventArgs)"/> to raise the event.
+        /// </remarks>
+        protected EventRoute BuildEventRoute(RoutedEvent e)
         {
-            Contract.Requires<ArgumentNullException>(e != null);
+            e = e ?? throw new ArgumentNullException(nameof(e));
 
-            e.RoutedEvent.InvokeRaised(this, e);
+            var result = new EventRoute(e);
+            var hasClassHandlers = e.HasRaisedSubscriptions;
 
-            List<EventSubscription> subscriptions = null;
-
-            if (_eventHandlers?.TryGetValue(e.RoutedEvent, out subscriptions) == true)
+            if (e.RoutingStrategies.HasFlagCustom(RoutingStrategies.Bubble) ||
+                e.RoutingStrategies.HasFlagCustom(RoutingStrategies.Tunnel))
             {
-                foreach (var sub in subscriptions.ToList())
-                {
-                    bool correctRoute = (e.Route & sub.Routes) != 0;
-                    bool notFinished = !e.Handled || sub.AlsoIfHandled;
+                IInteractive? element = this;
 
-                    if (correctRoute && notFinished)
+                while (element != null)
+                {
+                    if (hasClassHandlers)
                     {
-                        if (sub.InvokeAdapter != null)
-                        {
-                            sub.InvokeAdapter(sub.Handler, this, e);
-                        }
-                        else
-                        {
-                            sub.Handler.DynamicInvoke(this, e);
-                        }
+                        result.AddClassHandler(element);
                     }
+
+                    element.AddToEventRoute(e, result);
+                    element = element.InteractiveParent;
                 }
             }
-        }
-
-        private List<EventSubscription> GetEventSubscriptions(RoutedEvent routedEvent)
-        {
-            if (!EventHandlers.TryGetValue(routedEvent, out var subscriptions))
+            else
             {
-                subscriptions = new List<EventSubscription>();
-                EventHandlers.Add(routedEvent, subscriptions);
-            }
-
-            return subscriptions;
-        }
-
-        private IDisposable AddEventSubscription(RoutedEvent routedEvent, EventSubscription subscription)
-        {
-            List<EventSubscription> subscriptions = GetEventSubscriptions(routedEvent);
-
-            subscriptions.Add(subscription);
-
-            return new UnsubscribeDisposable(subscriptions, subscription);
-        }
-
-        private sealed class UnsubscribeDisposable : IDisposable
-        {
-            private readonly List<EventSubscription> _subscriptions;
-            private readonly EventSubscription _subscription;
+                if (hasClassHandlers)
+                {
+                    result.AddClassHandler(this);
+                }
 
-            public UnsubscribeDisposable(List<EventSubscription> subscriptions, EventSubscription subscription)
-            {
-                _subscriptions = subscriptions;
-                _subscription = subscription;
+                ((IInteractive)this).AddToEventRoute(e, result);
             }
 
-            public void Dispose()
-            {
-                _subscriptions.Remove(_subscription);
-            }
+            return result;
         }
 
-        private interface ITraverse
+        private void AddEventSubscription(RoutedEvent routedEvent, EventSubscription subscription)
         {
-            void Execute(IInteractive target, RoutedEventArgs e);
-        }
+            _eventHandlers ??= new Dictionary<RoutedEvent, List<EventSubscription>>();
 
-        private struct NopTraverse : ITraverse
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public void Execute(IInteractive target, RoutedEventArgs e)
+            if (!_eventHandlers.TryGetValue(routedEvent, out var subscriptions))
             {
+                subscriptions = new List<EventSubscription>();
+                _eventHandlers.Add(routedEvent, subscriptions);
             }
-        }
 
-        private struct RaiseEventTraverse : ITraverse
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public void Execute(IInteractive target, RoutedEventArgs e)
-            {
-                ((Interactive)target).RaiseEventImpl(e);
-            }
+            subscriptions.Add(subscription);
         }
 
-        /// <summary>
-        /// Traverses interactive hierarchy allowing for raising events.
-        /// </summary>
-        /// <typeparam name="TPreTraverse">Called before parent is traversed.</typeparam>
-        /// <typeparam name="TPostTraverse">Called after parent has been traversed.</typeparam>
-        private struct HierarchyTraverser<TPreTraverse, TPostTraverse>
-            where TPreTraverse : struct, ITraverse
-            where TPostTraverse : struct, ITraverse
+        private readonly struct EventSubscription
         {
-            private TPreTraverse _preTraverse;
-            private TPostTraverse _postTraverse;
-            private readonly RoutedEventArgs _args;
-
-            private HierarchyTraverser(TPreTraverse preTraverse, TPostTraverse postTraverse, RoutedEventArgs args)
-            {
-                _preTraverse = preTraverse;
-                _postTraverse = postTraverse;
-                _args = args;
-            }
-
-            public static HierarchyTraverser<TPreTraverse, TPostTraverse> Create(RoutedEventArgs args)
-            {
-                return new HierarchyTraverser<TPreTraverse, TPostTraverse>(new TPreTraverse(), new TPostTraverse(), args);
+            public EventSubscription(
+                Delegate handler,
+                RoutingStrategies routes,
+                bool handledEventsToo,
+                Action<Delegate, object, RoutedEventArgs>? invokeAdapter = null)
+            {
+                Handler = handler;
+                Routes = routes;
+                HandledEventsToo = handledEventsToo;
+                InvokeAdapter = invokeAdapter;
             }
 
-            public void Traverse(IInteractive target)
-            {
-                _preTraverse.Execute(target, _args);
+            public Action<Delegate, object, RoutedEventArgs>? InvokeAdapter { get; }
 
-                IInteractive parent = target.InteractiveParent;
+            public Delegate Handler { get; }
 
-                if (parent != null)
-                {
-                    Traverse(parent);
-                }
+            public RoutingStrategies Routes { get; }
 
-                _postTraverse.Execute(target, _args);
-            }
+            public bool HandledEventsToo { get; }
         }
     }
 }
diff --git a/src/Avalonia.Interactivity/InteractiveExtensions.cs b/src/Avalonia.Interactivity/InteractiveExtensions.cs
index 07e4029240..ee6b623b5f 100644
--- a/src/Avalonia.Interactivity/InteractiveExtensions.cs
+++ b/src/Avalonia.Interactivity/InteractiveExtensions.cs
@@ -1,9 +1,5 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Reactive.Disposables;
 using System.Reactive.Linq;
 
 namespace Avalonia.Interactivity
@@ -13,6 +9,28 @@ namespace Avalonia.Interactivity
     /// </summary>
     public static class InteractiveExtensions
     {
+        /// <summary>
+        /// Adds a handler for the specified routed event and returns a disposable that can terminate the event subscription.
+        /// </summary>
+        /// <typeparam name="TEventArgs">The type of the event's args.</typeparam>
+        /// <param name="o">Target for adding given event handler.</param>
+        /// <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>
+        public static IDisposable AddDisposableHandler<TEventArgs>(this IInteractive o, RoutedEvent<TEventArgs> routedEvent,
+            EventHandler<TEventArgs> handler,
+            RoutingStrategies routes = RoutingStrategies.Direct | RoutingStrategies.Bubble,
+            bool handledEventsToo = false) where TEventArgs : RoutedEventArgs
+        {
+            o.AddHandler(routedEvent, handler, routes, handledEventsToo);
+
+            return Disposable.Create(
+                (instance: o, handler, routedEvent),
+                state => state.instance.RemoveHandler(state.routedEvent, state.handler));
+        }
+
         /// <summary>
         /// Gets an observable for a <see cref="RoutedEvent{TEventArgs}"/>.
         /// </summary>
@@ -30,7 +48,10 @@ namespace Avalonia.Interactivity
             bool handledEventsToo = false)
                 where TEventArgs : RoutedEventArgs
         {
-            return Observable.Create<TEventArgs>(x => o.AddHandler(
+            o = o ?? throw new ArgumentNullException(nameof(o));
+            routedEvent = routedEvent ?? throw new ArgumentNullException(nameof(routedEvent));
+
+            return Observable.Create<TEventArgs>(x => o.AddDisposableHandler(
                 routedEvent, 
                 (_, e) => x.OnNext(e), 
                 routes,
diff --git a/src/Avalonia.Interactivity/RoutedEvent.cs b/src/Avalonia.Interactivity/RoutedEvent.cs
index bc5dec9a90..3f38a61048 100644
--- a/src/Avalonia.Interactivity/RoutedEvent.cs
+++ b/src/Avalonia.Interactivity/RoutedEvent.cs
@@ -1,9 +1,5 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Subjects;
-using System.Reflection;
 
 namespace Avalonia.Interactivity
 {
@@ -26,10 +22,14 @@ namespace Avalonia.Interactivity
             Type eventArgsType,
             Type ownerType)
         {
-            Contract.Requires<ArgumentNullException>(name != null);
-            Contract.Requires<ArgumentNullException>(eventArgsType != null);
-            Contract.Requires<ArgumentNullException>(ownerType != null);
-            Contract.Requires<InvalidCastException>(typeof(RoutedEventArgs).GetTypeInfo().IsAssignableFrom(eventArgsType.GetTypeInfo()));
+            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;
@@ -45,6 +45,8 @@ namespace Avalonia.Interactivity
 
         public RoutingStrategies RoutingStrategies { get; }
 
+        public bool HasRaisedSubscriptions => _raised.HasObservers;
+
         public IObservable<(object, RoutedEventArgs)> Raised => _raised;
         public IObservable<RoutedEventArgs> RouteFinished => _routeFinished;
 
@@ -53,7 +55,7 @@ namespace Avalonia.Interactivity
             RoutingStrategies routingStrategy)
                 where TEventArgs : RoutedEventArgs
         {
-            Contract.Requires<ArgumentNullException>(name != null);
+            name = name ?? throw new ArgumentNullException(nameof(name));
 
             var routedEvent = new RoutedEvent<TEventArgs>(name, routingStrategy, typeof(TOwner));
             RoutedEventRegistry.Instance.Register(typeof(TOwner), routedEvent);
@@ -66,7 +68,7 @@ namespace Avalonia.Interactivity
             Type ownerType)
                 where TEventArgs : RoutedEventArgs
         {
-            Contract.Requires<ArgumentNullException>(name != null);
+            name = name ?? throw new ArgumentNullException(nameof(name));
 
             var routedEvent = new RoutedEvent<TEventArgs>(name, routingStrategy, ownerType);
             RoutedEventRegistry.Instance.Register(ownerType, routedEvent);
@@ -109,8 +111,6 @@ namespace Avalonia.Interactivity
         public RoutedEvent(string name, RoutingStrategies routingStrategies, Type ownerType)
             : base(name, routingStrategies, typeof(TEventArgs), ownerType)
         {
-            Contract.Requires<ArgumentNullException>(name != null);
-            Contract.Requires<ArgumentNullException>(ownerType != null);
         }
 
         [Obsolete("Use overload taking Action<TTarget, TEventArgs>.")]
diff --git a/src/Avalonia.Interactivity/RoutedEventArgs.cs b/src/Avalonia.Interactivity/RoutedEventArgs.cs
index 05bbf7b6a3..ccbb41b7dc 100644
--- a/src/Avalonia.Interactivity/RoutedEventArgs.cs
+++ b/src/Avalonia.Interactivity/RoutedEventArgs.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Interactivity
@@ -11,12 +8,12 @@ namespace Avalonia.Interactivity
         {
         }
 
-        public RoutedEventArgs(RoutedEvent routedEvent)
+        public RoutedEventArgs(RoutedEvent? routedEvent)
         {
             RoutedEvent = routedEvent;
         }
 
-        public RoutedEventArgs(RoutedEvent routedEvent, IInteractive source)
+        public RoutedEventArgs(RoutedEvent? routedEvent, IInteractive? source)
         {
             RoutedEvent = routedEvent;
             Source = source;
@@ -24,10 +21,10 @@ namespace Avalonia.Interactivity
 
         public bool Handled { get; set; }
 
-        public RoutedEvent RoutedEvent { get; set; }
+        public RoutedEvent? RoutedEvent { get; set; }
 
         public RoutingStrategies Route { get; set; }
 
-        public IInteractive Source { get; set; }
+        public IInteractive? Source { get; set; }
     }
 }
diff --git a/src/Avalonia.Interactivity/RoutedEventRegistry.cs b/src/Avalonia.Interactivity/RoutedEventRegistry.cs
index 34c970a806..409e993b56 100644
--- a/src/Avalonia.Interactivity/RoutedEventRegistry.cs
+++ b/src/Avalonia.Interactivity/RoutedEventRegistry.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 
@@ -32,8 +29,8 @@ namespace Avalonia.Interactivity
         /// </remarks>
         public void Register(Type type, RoutedEvent @event)
         {
-            Contract.Requires<ArgumentNullException>(type != null);
-            Contract.Requires<ArgumentNullException>(@event != null);
+            type = type ?? throw new ArgumentNullException(nameof(type));
+            @event = @event ?? throw new ArgumentNullException(nameof(@event));
 
             if (!_registeredRoutedEvents.TryGetValue(type, out var list))
             {
@@ -66,7 +63,7 @@ namespace Avalonia.Interactivity
         /// <returns>All routed events registered with the provided type.</returns>
         public IReadOnlyList<RoutedEvent> GetRegistered(Type type)
         {
-            Contract.Requires<ArgumentNullException>(type != null);
+            type = type ?? throw new ArgumentNullException(nameof(type));
 
             if (_registeredRoutedEvents.TryGetValue(type, out var events))
             {
diff --git a/src/Avalonia.Layout/AttachedLayout.cs b/src/Avalonia.Layout/AttachedLayout.cs
index 5622731a7c..047c01343f 100644
--- a/src/Avalonia.Layout/AttachedLayout.cs
+++ b/src/Avalonia.Layout/AttachedLayout.cs
@@ -12,7 +12,7 @@ namespace Avalonia.Layout
     /// </summary>
     public abstract class AttachedLayout : AvaloniaObject
     {
-        internal string LayoutId { get; set; }
+        public string LayoutId { get; set; }
 
         /// <summary>
         /// Occurs when the measurement state (layout) has been invalidated.
@@ -46,7 +46,23 @@ namespace Avalonia.Layout
         /// <see cref="VirtualizingLayout.InitializeForContextCore"/> to provide the behavior for
         /// this method in a derived class.
         /// </remarks>
-        public abstract void InitializeForContext(LayoutContext context);
+        public void InitializeForContext(LayoutContext context)
+        {
+            if (this is VirtualizingLayout virtualizingLayout)
+            {
+                var virtualizingContext = GetVirtualizingLayoutContext(context);
+                virtualizingLayout.InitializeForContextCore(virtualizingContext);
+            }
+            else if (this is NonVirtualizingLayout nonVirtualizingLayout)
+            {
+                var nonVirtualizingContext = GetNonVirtualizingLayoutContext(context);
+                nonVirtualizingLayout.InitializeForContextCore(nonVirtualizingContext);
+            }
+            else
+            {
+                throw new NotSupportedException();
+            }
+        }
 
         /// <summary>
         /// Removes any state the layout previously stored on the ILayoutable container.
@@ -55,7 +71,23 @@ namespace Avalonia.Layout
         /// The context object that facilitates communication between the layout and its host
         /// container.
         /// </param>
-        public abstract void UninitializeForContext(LayoutContext context);
+        public void UninitializeForContext(LayoutContext context)
+        {
+            if (this is VirtualizingLayout virtualizingLayout)
+            {
+                var virtualizingContext = GetVirtualizingLayoutContext(context);
+                virtualizingLayout.UninitializeForContextCore(virtualizingContext);
+            }
+            else if (this is NonVirtualizingLayout nonVirtualizingLayout)
+            {
+                var nonVirtualizingContext = GetNonVirtualizingLayoutContext(context);
+                nonVirtualizingLayout.UninitializeForContextCore(nonVirtualizingContext);
+            }
+            else
+            {
+                throw new NotSupportedException();
+            }
+        }
 
         /// <summary>
         /// Suggests a DesiredSize for a container element. A container element that supports
@@ -73,7 +105,23 @@ namespace Avalonia.Layout
         /// if scrolling or other resize behavior is possible in that particular container.
         /// </param>
         /// <returns></returns>
-        public abstract Size Measure(LayoutContext context, Size availableSize);
+        public Size Measure(LayoutContext context, Size availableSize)
+        {
+            if (this is VirtualizingLayout virtualizingLayout)
+            {
+                var virtualizingContext = GetVirtualizingLayoutContext(context);
+                return virtualizingLayout.MeasureOverride(virtualizingContext, availableSize);
+            }
+            else if (this is NonVirtualizingLayout nonVirtualizingLayout)
+            {
+                var nonVirtualizingContext = GetNonVirtualizingLayoutContext(context);
+                return nonVirtualizingLayout.MeasureOverride(nonVirtualizingContext, availableSize);
+            }
+            else
+            {
+                throw new NotSupportedException();
+            }
+        }
 
         /// <summary>
         /// Positions child elements and determines a size for a container UIElement. Container
@@ -88,7 +136,23 @@ namespace Avalonia.Layout
         /// The final size that the container computes for the child in layout.
         /// </param>
         /// <returns>The actual size that is used after the element is arranged in layout.</returns>
-        public abstract Size Arrange(LayoutContext context, Size finalSize);
+        public Size Arrange(LayoutContext context, Size finalSize)
+        {
+            if (this is VirtualizingLayout virtualizingLayout)
+            {
+                var virtualizingContext = GetVirtualizingLayoutContext(context);
+                return virtualizingLayout.ArrangeOverride(virtualizingContext, finalSize);
+            }
+            else if (this is NonVirtualizingLayout nonVirtualizingLayout)
+            {
+                var nonVirtualizingContext = GetNonVirtualizingLayoutContext(context);
+                return nonVirtualizingLayout.ArrangeOverride(nonVirtualizingContext, finalSize);
+            }
+            else
+            {
+                throw new NotSupportedException();
+            }
+        }
 
         /// <summary>
         /// Invalidates the measurement state (layout) for all ILayoutable containers that reference
@@ -102,5 +166,37 @@ namespace Avalonia.Layout
         /// occurs asynchronously.
         /// </summary>
         protected void InvalidateArrange() => ArrangeInvalidated?.Invoke(this, EventArgs.Empty);
+
+        private VirtualizingLayoutContext GetVirtualizingLayoutContext(LayoutContext context)
+        {
+            if (context is VirtualizingLayoutContext virtualizingContext)
+            {
+                return virtualizingContext;
+            }
+            else if (context is NonVirtualizingLayoutContext nonVirtualizingContext)
+            {
+                return nonVirtualizingContext.GetVirtualizingContextAdapter();
+            }
+            else
+            {
+                throw new NotSupportedException();
+            }
+        }
+
+        private NonVirtualizingLayoutContext GetNonVirtualizingLayoutContext(LayoutContext context)
+        {
+            if (context is NonVirtualizingLayoutContext nonVirtualizingContext)
+            {
+                return nonVirtualizingContext;
+            }
+            else if (context is VirtualizingLayoutContext virtualizingContext)
+            {
+                return virtualizingContext.GetNonVirtualizingContextAdapter();
+            }
+            else
+            {
+                throw new NotSupportedException();
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Layout/Avalonia.Layout.csproj b/src/Avalonia.Layout/Avalonia.Layout.csproj
index 410a0791b1..076ec56cd6 100644
--- a/src/Avalonia.Layout/Avalonia.Layout.csproj
+++ b/src/Avalonia.Layout/Avalonia.Layout.csproj
@@ -8,4 +8,5 @@
     <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
   </ItemGroup>  
   <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>
diff --git a/src/Avalonia.Layout/EffectiveViewportChangedEventArgs.cs b/src/Avalonia.Layout/EffectiveViewportChangedEventArgs.cs
new file mode 100644
index 0000000000..1cdc775b13
--- /dev/null
+++ b/src/Avalonia.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
+    {
+        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/ElementManager.cs b/src/Avalonia.Layout/ElementManager.cs
index 1748a3be03..70805ba31c 100644
--- a/src/Avalonia.Layout/ElementManager.cs
+++ b/src/Avalonia.Layout/ElementManager.cs
@@ -7,6 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using Avalonia.Layout.Utils;
+using Avalonia.Logging;
 
 namespace Avalonia.Layout
 {
@@ -78,6 +79,7 @@ namespace Avalonia.Layout
                 {
                     // Sentinel. Create the element now since we need it.
                     int dataIndex = GetDataIndexFromRealizedRangeIndex(realizedIndex);
+                    Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "Creating element for sentinal with data index {Index}", dataIndex);
                     element = _context.GetOrCreateElementAt(
                         dataIndex,
                         ElementRealizationOptions.ForceCreate | ElementRealizationOptions.SuppressAutoRecycle);
@@ -232,6 +234,8 @@ namespace Avalonia.Layout
                 {
                     Insert(0, dataIndex, element);
                 }
+
+                Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Created element for index {index}", layoutId, dataIndex);
             }
         }
 
diff --git a/src/Avalonia.Layout/FlowLayoutAlgorithm.cs b/src/Avalonia.Layout/FlowLayoutAlgorithm.cs
index 615ce725bd..eace54d2e0 100644
--- a/src/Avalonia.Layout/FlowLayoutAlgorithm.cs
+++ b/src/Avalonia.Layout/FlowLayoutAlgorithm.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Specialized;
+using Avalonia.Logging;
 
 namespace Avalonia.Layout
 {
@@ -72,7 +73,9 @@ namespace Avalonia.Layout
             bool isWrapping,
             double minItemSpacing,
             double lineSpacing,
+            int maxItemsPerLine,
             ScrollOrientation orientation,
+            bool disableVirtualization,
             string layoutId)
         {
             _orientation.ScrollOrientation = orientation;
@@ -80,6 +83,9 @@ namespace Avalonia.Layout
             // 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))
@@ -94,14 +100,15 @@ namespace Avalonia.Layout
             _elementManager.OnBeginMeasure(orientation);
 
             int anchorIndex = GetAnchorIndex(availableSize, isWrapping, minItemSpacing, layoutId);
-            Generate(GenerateDirection.Forward, anchorIndex, availableSize, minItemSpacing, lineSpacing, layoutId);
-            Generate(GenerateDirection.Backward, anchorIndex, availableSize, minItemSpacing, lineSpacing, 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, layoutId);
+                Generate(GenerateDirection.Forward, 0 /*anchorIndex*/, availableSize, minItemSpacing, lineSpacing, maxItemsPerLine, disableVirtualization, layoutId);
             }
 
             RaiseLineArranged();
@@ -115,10 +122,12 @@ namespace Avalonia.Layout
         public Size Arrange(
             Size finalSize,
             VirtualizingLayoutContext context,
+            bool isWrapping,
             LineAlignment lineAlignment,
             string layoutId)
         {
-            ArrangeVirtualizingLayout(finalSize, lineAlignment, 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),
@@ -181,6 +190,7 @@ namespace Avalonia.Layout
 
                 if (isAnchorSuggestionValid)
                 {
+                    Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId}: Using suggested anchor {Anchor}", layoutId, suggestedAnchorIndex);
                     anchorIndex = _algorithmCallbacks.Algorithm_GetAnchorForTargetElement(
                         suggestedAnchorIndex,
                         availableSize,
@@ -201,7 +211,7 @@ namespace Avalonia.Layout
                             anchorPosition = new Point(anchorBounds.X, anchorBounds.Y);
                         }
                     }
-                    else
+                    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. 
@@ -220,6 +230,9 @@ namespace Avalonia.Layout
                 }
                 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);
@@ -228,6 +241,7 @@ namespace Avalonia.Layout
                 }
                 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);
@@ -235,12 +249,14 @@ namespace Avalonia.Layout
                 }
             }
 
+            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);
@@ -251,9 +267,17 @@ namespace Avalonia.Layout
                 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();
             }
 
@@ -270,22 +294,30 @@ namespace Avalonia.Layout
             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);
-                int countInLine = 1;
+                var countInLine = 1;
                 int count = 0;
                 bool lineNeedsReposition = false;
 
                 while (_elementManager.IsIndexValidInData(currentIndex) &&
-                    ShouldContinueFillingUpSpace(previousIndex, direction))
+                    (disableVirtualization || ShouldContinueFillingUpSpace(previousIndex, direction)))
                 {
                     // Ensure layout element.
                     _elementManager.EnsureElementRealized(direction == GenerateDirection.Forward, currentIndex, layoutId);
@@ -301,7 +333,7 @@ namespace Avalonia.Layout
                     if (direction == GenerateDirection.Forward)
                     {
                         double remainingSpace = _orientation.Minor(availableSize) - (_orientation.MinorStart(previousElementBounds) + _orientation.MinorSize(previousElementBounds) + minItemSpacing + _orientation.Minor(desiredSize));
-                        if (_algorithmCallbacks.Algorithm_ShouldBreakLine(currentIndex, remainingSpace))
+                        if (countInLine >= maxItemsPerLine || _algorithmCallbacks.Algorithm_ShouldBreakLine(currentIndex, remainingSpace))
                         {
                             // No more space in this row. wrap to next row.
                             _orientation.SetMinorStart(ref currentBounds, 0);
@@ -339,7 +371,7 @@ namespace Avalonia.Layout
                     {
                         // Backward 
                         double remainingSpace = _orientation.MinorStart(previousElementBounds) - (_orientation.Minor(desiredSize) + minItemSpacing);
-                        if (_algorithmCallbacks.Algorithm_ShouldBreakLine(currentIndex, remainingSpace))
+                        if (countInLine >= maxItemsPerLine || _algorithmCallbacks.Algorithm_ShouldBreakLine(currentIndex, remainingSpace))
                         {
                             // Does not fit, wrap to the previous row
                             var availableSizeMinor = _orientation.Minor(availableSize);
@@ -360,6 +392,10 @@ namespace Avalonia.Layout
                                         _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);
                                     }
                                 }
                             }
@@ -382,6 +418,11 @@ namespace Avalonia.Layout
                     }
 
                     _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;
                 }
@@ -389,20 +430,17 @@ namespace Avalonia.Layout
                 // 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 indicies inside the realization window.
-                if (count > 0)
+                if (direction == GenerateDirection.Forward)
                 {
-                    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);
-                    }
+                    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);
@@ -503,6 +541,7 @@ namespace Avalonia.Layout
                 lastDataIndex,
                 lastBounds);
 
+            Logger.TryGet(LogEventLevel.Verbose, "Repeater")?.Log(this, "{LayoutId} Extent: ({Bounds})", layoutId, extent);
             return extent;
         }
 
@@ -544,6 +583,7 @@ namespace Avalonia.Layout
         private void ArrangeVirtualizingLayout(
             Size finalSize,
             LineAlignment lineAlignment,
+            bool isWrapping,
             string layoutId)
         {
             // Walk through the realized elements one line at a time and 
@@ -563,7 +603,7 @@ namespace Avalonia.Layout
                     if (_orientation.MajorStart(currentBounds) != currentLineOffset)
                     {
                         spaceAtLineEnd = _orientation.Minor(finalSize) - _orientation.MinorStart(previousElementBounds) - _orientation.MinorSize(previousElementBounds);
-                        PerformLineAlignment(i - countInLine, countInLine, spaceAtLineStart, spaceAtLineEnd, currentLineSize, lineAlignment, layoutId);
+                        PerformLineAlignment(i - countInLine, countInLine, spaceAtLineStart, spaceAtLineEnd, currentLineSize, lineAlignment, isWrapping, finalSize, layoutId);
                         spaceAtLineStart = _orientation.MinorStart(currentBounds);
                         countInLine = 0;
                         currentLineOffset = _orientation.MajorStart(currentBounds);
@@ -580,7 +620,7 @@ namespace Avalonia.Layout
                 if (countInLine > 0)
                 {
                     var spaceAtEnd = _orientation.Minor(finalSize) - _orientation.MinorStart(previousElementBounds) - _orientation.MinorSize(previousElementBounds);
-                    PerformLineAlignment(realizedElementCount - countInLine, countInLine, spaceAtLineStart, spaceAtEnd, currentLineSize, lineAlignment, layoutId);
+                    PerformLineAlignment(realizedElementCount - countInLine, countInLine, spaceAtLineStart, spaceAtEnd, currentLineSize, lineAlignment, isWrapping, finalSize, layoutId);
                 }
             }
         }
@@ -594,6 +634,8 @@ namespace Avalonia.Layout
             double spaceAtLineEnd,
             double lineSize,
             LineAlignment lineAlignment,
+            bool isWrapping,
+            Size finalSize,
             string layoutId)
         {
             for (int rangeIndex = lineStartIndex; rangeIndex < lineStartIndex + countInLine; ++rangeIndex)
@@ -659,7 +701,20 @@ namespace Avalonia.Layout
                 }
 
                 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);
             }
         }
diff --git a/src/Avalonia.Layout/ILayoutManager.cs b/src/Avalonia.Layout/ILayoutManager.cs
index a255fb155c..614670a53b 100644
--- a/src/Avalonia.Layout/ILayoutManager.cs
+++ b/src/Avalonia.Layout/ILayoutManager.cs
@@ -1,14 +1,19 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
+using System;
 
+#nullable enable
 
 namespace Avalonia.Layout
 {
     /// <summary>
     /// Manages measuring and arranging of controls.
     /// </summary>
-    public interface ILayoutManager
+    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>
@@ -30,6 +35,15 @@ namespace Avalonia.Layout
         /// </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>
@@ -38,6 +52,19 @@ namespace Avalonia.Layout
         /// 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
index 700b6a8600..e2f16b338a 100644
--- a/src/Avalonia.Layout/ILayoutRoot.cs
+++ b/src/Avalonia.Layout/ILayoutRoot.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Layout
 {
     /// <summary>
@@ -13,11 +10,6 @@ namespace Avalonia.Layout
         /// </summary>
         Size ClientSize { get; }
 
-        /// <summary>
-        /// The maximum client size available.
-        /// </summary>
-        Size MaxClientSize { get; }
-
         /// <summary>
         /// The scaling factor to use in layout.
         /// </summary>
diff --git a/src/Avalonia.Layout/ILayoutable.cs b/src/Avalonia.Layout/ILayoutable.cs
index d670889565..54d3ba6a11 100644
--- a/src/Avalonia.Layout/ILayoutable.cs
+++ b/src/Avalonia.Layout/ILayoutable.cs
@@ -1,8 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.VisualTree;
 
+#nullable enable
+
 namespace Avalonia.Layout
 {
     /// <summary>
@@ -112,5 +111,12 @@ namespace Avalonia.Layout
         /// </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.Layout/LayoutContext.cs
index 45a8048ea2..dadce58c0c 100644
--- a/src/Avalonia.Layout/LayoutContext.cs
+++ b/src/Avalonia.Layout/LayoutContext.cs
@@ -14,7 +14,11 @@ namespace Avalonia.Layout
         /// <summary>
         /// Gets or sets an object that represents the state of a layout.
         /// </summary>
-        public object LayoutState { get; set; }
+        public object LayoutState 
+        {
+            get => LayoutStateCore;
+            set => LayoutStateCore = value;
+        }
 
         /// <summary>
         /// Implements the behavior of <see cref="LayoutState"/> in a derived or custom LayoutContext.
diff --git a/src/Avalonia.Layout/LayoutContextAdapter.cs b/src/Avalonia.Layout/LayoutContextAdapter.cs
new file mode 100644
index 0000000000..695866df94
--- /dev/null
+++ b/src/Avalonia.Layout/LayoutContextAdapter.cs
@@ -0,0 +1,45 @@
+// 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;
+
+namespace Avalonia.Layout
+{
+    internal class LayoutContextAdapter : VirtualizingLayoutContext
+    {
+        private readonly NonVirtualizingLayoutContext _nonVirtualizingContext;
+
+        public LayoutContextAdapter(NonVirtualizingLayoutContext nonVirtualizingContext)
+        {
+            _nonVirtualizingContext = nonVirtualizingContext;
+        }
+
+        protected override object LayoutStateCore 
+        { 
+            get => _nonVirtualizingContext.LayoutState;
+            set => _nonVirtualizingContext.LayoutState = value; 
+        }
+
+        protected override Point LayoutOriginCore 
+        {
+            get => default;
+            set 
+            { 
+                if (value != default)
+                {
+                    throw new InvalidOperationException("LayoutOrigin must be at (0,0) when RealizationRect is infinite sized.");
+                }
+            }
+        }
+
+        protected override Rect RealizationRectCore() => new Rect(Size.Infinity);
+
+        protected override int ItemCountCore() => _nonVirtualizingContext.Children.Count;
+        protected override object GetItemAtCore(int index) => _nonVirtualizingContext.Children[index];
+        protected override ILayoutable GetOrCreateElementAtCore(int index, ElementRealizationOptions options) =>
+            _nonVirtualizingContext.Children[index];
+        protected override void RecycleElementCore(ILayoutable element) { }
+    }
+}
diff --git a/src/Avalonia.Layout/LayoutHelper.cs b/src/Avalonia.Layout/LayoutHelper.cs
index cfb4b14b1c..3708748ad1 100644
--- a/src/Avalonia.Layout/LayoutHelper.cs
+++ b/src/Avalonia.Layout/LayoutHelper.cs
@@ -1,7 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using Avalonia.Utilities;
+using Avalonia.VisualTree;
 
 namespace Avalonia.Layout
 {
@@ -21,16 +20,11 @@ namespace Avalonia.Layout
         /// <returns>The control's size.</returns>
         public static Size ApplyLayoutConstraints(ILayoutable control, Size constraints)
         {
-            var controlWidth = control.Width;
-            var controlHeight = control.Height;
-
-            double width = (controlWidth > 0) ? controlWidth : constraints.Width;
-            double height = (controlHeight > 0) ? controlHeight : constraints.Height;
-            width = Math.Min(width, control.MaxWidth);
-            width = Math.Max(width, control.MinWidth);
-            height = Math.Min(height, control.MaxHeight);
-            height = Math.Max(height, control.MinHeight);
-            return new Size(width, height);
+            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,
@@ -61,5 +55,123 @@ namespace Avalonia.Layout
 
             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>
+        /// 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
index 1792655a13..fc988a8d6c 100644
--- a/src/Avalonia.Layout/LayoutManager.cs
+++ b/src/Avalonia.Layout/LayoutManager.cs
@@ -1,35 +1,49 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 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
+    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()
+        public LayoutManager(ILayoutRoot owner)
         {
+            _owner = owner ?? throw new ArgumentNullException(nameof(owner));
             _executeLayoutPass = ExecuteLayoutPass;
         }
 
+        public virtual event EventHandler? LayoutUpdated;
+
         /// <inheritdoc/>
-        public void InvalidateMeasure(ILayoutable control)
+        public virtual void InvalidateMeasure(ILayoutable control)
         {
-            Contract.Requires<ArgumentNullException>(control != null);
+            control = control ?? throw new ArgumentNullException(nameof(control));
             Dispatcher.UIThread.VerifyAccess();
 
+            if (_disposed)
+            {
+                return;
+            }
+
             if (!control.IsAttachedToVisualTree)
             {
 #if DEBUG
@@ -40,17 +54,27 @@ namespace Avalonia.Layout
 #endif
             }
 
+            if (control.VisualRoot != _owner)
+            {
+                throw new ArgumentException("Attempt to call InvalidateMeasure on wrong LayoutManager.");
+            }
+
             _toMeasure.Enqueue(control);
             _toArrange.Enqueue(control);
             QueueLayoutPass();
         }
 
         /// <inheritdoc/>
-        public void InvalidateArrange(ILayoutable control)
+        public virtual void InvalidateArrange(ILayoutable control)
         {
-            Contract.Requires<ArgumentNullException>(control != null);
+            control = control ?? throw new ArgumentNullException(nameof(control));
             Dispatcher.UIThread.VerifyAccess();
 
+            if (_disposed)
+            {
+                return;
+            }
+
             if (!control.IsAttachedToVisualTree)
             {
 #if DEBUG
@@ -61,30 +85,35 @@ namespace Avalonia.Layout
 #endif
             }
 
+            if (control.VisualRoot != _owner)
+            {
+                throw new ArgumentException("Attempt to call InvalidateArrange on wrong LayoutManager.");
+            }
+
             _toArrange.Enqueue(control);
             QueueLayoutPass();
         }
 
         /// <inheritdoc/>
-        public void ExecuteLayoutPass()
+        public virtual void ExecuteLayoutPass()
         {
-            const int MaxPasses = 3;
-
             Dispatcher.UIThread.VerifyAccess();
 
-            if (!_running)
+            if (_disposed)
             {
-                _running = true;
+                return;
+            }
 
-                Stopwatch stopwatch = null;
+            if (!_running)
+            {
+                Stopwatch? stopwatch = null;
 
                 const LogEventLevel timingLogLevel = LogEventLevel.Information;
-                bool captureTiming = Logger.IsEnabled(timingLogLevel);
+                bool captureTiming = Logger.IsEnabled(timingLogLevel, LogArea.Layout);
 
                 if (captureTiming)
                 {
-                    Logger.TryGet(timingLogLevel)?.Log(
-                        LogArea.Layout,
+                    Logger.TryGet(timingLogLevel, LogArea.Layout)?.Log(
                         this,
                         "Started layout pass. To measure: {Measure} To arrange: {Arrange}",
                         _toMeasure.Count,
@@ -99,12 +128,13 @@ namespace Avalonia.Layout
 
                 try
                 {
+                    _running = true;
+
                     for (var pass = 0; pass < MaxPasses; ++pass)
                     {
-                        ExecuteMeasurePass();
-                        ExecuteArrangePass();
+                        InnerLayoutPass();
 
-                        if (_toMeasure.Count == 0)
+                        if (!RaiseEffectiveViewportChanged())
                         {
                             break;
                         }
@@ -120,20 +150,34 @@ namespace Avalonia.Layout
 
                 if (captureTiming)
                 {
-                    stopwatch.Stop();
+                    stopwatch!.Stop();
 
-                    Logger.TryGet(timingLogLevel)?.Log(LogArea.Layout, this, "Layout pass finished in {Time}", stopwatch.Elapsed);
+                    Logger.TryGet(timingLogLevel, LogArea.Layout)?.Log(this, "Layout pass finished in {Time}", stopwatch.Elapsed);
                 }
             }
 
             _queued = false;
+            LayoutUpdated?.Invoke(this, EventArgs.Empty);
         }
 
         /// <inheritdoc/>
-        public void ExecuteInitialLayoutPass(ILayoutRoot root)
+        public virtual void ExecuteInitialLayoutPass()
         {
-            Measure(root);
-            Arrange(root);
+            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
@@ -142,6 +186,60 @@ namespace Avalonia.Layout
             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)
@@ -225,5 +323,97 @@ namespace Avalonia.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/LayoutQueue.cs b/src/Avalonia.Layout/LayoutQueue.cs
index 96f893e7b0..1a9eb6b785 100644
--- a/src/Avalonia.Layout/LayoutQueue.cs
+++ b/src/Avalonia.Layout/LayoutQueue.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Avalonia.Layout
 {
-    internal class LayoutQueue<T> : IReadOnlyCollection<T>
+    internal class LayoutQueue<T> : IReadOnlyCollection<T>, IDisposable
     {
         private struct Info
         {
@@ -77,12 +77,19 @@ namespace Avalonia.Layout
             {
                 if (_shouldEnqueue(item.Key))
                 {
-                    _loopQueueInfo[item.Key] = new Info() { Active = true, Count = item.Value.Count + 1 };
+                    _loopQueueInfo[item.Key] = new Info() { Active = true, Count = 0 };
                     _inner.Enqueue(item.Key);
                 }
             }
 
             _notFinalizedBuffer.Clear();
         }
+
+        public void Dispose()
+        {
+            _inner.Clear();
+            _loopQueueInfo.Clear();
+            _notFinalizedBuffer.Clear();
+        }
     }
 }
diff --git a/src/Avalonia.Layout/Layoutable.cs b/src/Avalonia.Layout/Layoutable.cs
index 4732808b91..aca2965ea6 100644
--- a/src/Avalonia.Layout/Layoutable.cs
+++ b/src/Avalonia.Layout/Layoutable.cs
@@ -1,11 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Linq;
 using Avalonia.Logging;
 using Avalonia.VisualTree;
 
+#nullable enable
+
 namespace Avalonia.Layout
 {
     /// <summary>
@@ -134,6 +132,8 @@ namespace Avalonia.Layout
         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.
@@ -153,10 +153,57 @@ namespace Avalonia.Layout
                 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;
+        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.
@@ -329,7 +376,7 @@ namespace Avalonia.Layout
                 DesiredSize = desiredSize;
                 _previousMeasure = availableSize;
 
-                Logger.TryGet(LogEventLevel.Verbose)?.Log(LogArea.Layout, this, "Measure requested {DesiredSize}", DesiredSize);
+                Logger.TryGet(LogEventLevel.Verbose, LogArea.Layout)?.Log(this, "Measure requested {DesiredSize}", DesiredSize);
 
                 if (DesiredSize != previousDesiredSize)
                 {
@@ -356,24 +403,14 @@ namespace Avalonia.Layout
 
             if (!IsArrangeValid || _previousArrange != rect)
             {
-                Logger.TryGet(LogEventLevel.Verbose)?.Log(LogArea.Layout, this, "Arrange to {Rect} ", rect);
+                Logger.TryGet(LogEventLevel.Verbose, LogArea.Layout)?.Log(this, "Arrange to {Rect} ", rect);
 
                 IsArrangeValid = true;
                 ArrangeCore(rect);
                 _previousArrange = rect;
-
-                LayoutUpdated?.Invoke(this, EventArgs.Empty);
             }
         }
 
-
-        /// <summary>
-        /// Called by InvalidateMeasure
-        /// </summary>
-        protected virtual void OnMeasureInvalidated()
-        {
-        }
-
         /// <summary>
         /// Invalidates the measurement of the control and queues a new layout pass.
         /// </summary>
@@ -381,7 +418,7 @@ namespace Avalonia.Layout
         {
             if (IsMeasureValid)
             {
-                Logger.TryGet(LogEventLevel.Verbose)?.Log(LogArea.Layout, this, "Invalidated measure");
+                Logger.TryGet(LogEventLevel.Verbose, LogArea.Layout)?.Log(this, "Invalidated measure");
 
                 IsMeasureValid = false;
                 IsArrangeValid = false;
@@ -402,7 +439,7 @@ namespace Avalonia.Layout
         {
             if (IsArrangeValid)
             {
-                Logger.TryGet(LogEventLevel.Verbose)?.Log(LogArea.Layout, this, "Invalidated arrange");
+                Logger.TryGet(LogEventLevel.Verbose, LogArea.Layout)?.Log(this, "Invalidated arrange");
 
                 IsArrangeValid = false;
                 (VisualRoot as ILayoutRoot)?.LayoutManager?.InvalidateArrange(this);
@@ -419,6 +456,11 @@ namespace Avalonia.Layout
             }
         }
 
+        void ILayoutable.EffectiveViewportChanged(EffectiveViewportChangedEventArgs e)
+        {
+            _effectiveViewportChanged?.Invoke(this, e);
+        }
+
         /// <summary>
         /// Marks a property as affecting the control's measurement.
         /// </summary>
@@ -508,6 +550,7 @@ namespace Avalonia.Layout
             {
                 var margin = Margin;
 
+                ApplyStyling();
                 ApplyTemplate();
 
                 var constrained = LayoutHelper.ApplyLayoutConstraints(
@@ -548,8 +591,8 @@ namespace Avalonia.Layout
                 if (UseLayoutRounding)
                 {
                     var scale = GetLayoutScale();
-                    width = Math.Ceiling(width * scale) / scale;
-                    height = Math.Ceiling(height * scale) / scale;
+                    width = LayoutHelper.RoundLayoutValue(width, scale);
+                    height = LayoutHelper.RoundLayoutValue(height, scale);
                 }
 
                 return NonNegative(new Size(width, height).Inflate(margin));
@@ -626,12 +669,8 @@ namespace Avalonia.Layout
 
                 if (useLayoutRounding)
                 {
-                    size = new Size(
-                        Math.Ceiling(size.Width * scale) / scale, 
-                        Math.Ceiling(size.Height * scale) / scale);
-                    availableSizeMinusMargins = new Size(
-                        Math.Ceiling(availableSizeMinusMargins.Width * scale) / scale, 
-                        Math.Ceiling(availableSizeMinusMargins.Height * scale) / scale);
+                    size = LayoutHelper.RoundLayoutSize(size, scale, scale);
+                    availableSizeMinusMargins = LayoutHelper.RoundLayoutSize(availableSizeMinusMargins, scale, scale);
                 }
 
                 size = ArrangeOverride(size).Constrain(size);
@@ -660,8 +699,8 @@ namespace Avalonia.Layout
 
                 if (useLayoutRounding)
                 {
-                    originX = Math.Floor(originX * scale) / scale;
-                    originY = Math.Floor(originY * scale) / scale;
+                    originX = LayoutHelper.RoundLayoutValue(originX, scale);
+                    originY = LayoutHelper.RoundLayoutValue(originY, scale);
                 }
 
                 Bounds = new Rect(originX, originY, size.Width, size.Height);
@@ -693,17 +732,70 @@ namespace Avalonia.Layout
             return finalSize;
         }
 
-        /// <inheritdoc/>
-        protected override sealed void OnVisualParentChanged(IVisual oldParent, IVisual newParent)
+        protected sealed override void InvalidateStyles()
         {
-            foreach (ILayoutable i in this.GetSelfAndVisualDescendants())
+            base.InvalidateStyles();
+            InvalidateMeasure();
+        }
+
+        protected override void OnAttachedToVisualTreeCore(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTreeCore(e);
+
+            if (e.Root is ILayoutRoot r)
             {
-                i.InvalidateMeasure();
+                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.
diff --git a/src/Avalonia.Layout/NonVirtualizingLayout.cs b/src/Avalonia.Layout/NonVirtualizingLayout.cs
index fba91e66c7..fb6b0dd4c9 100644
--- a/src/Avalonia.Layout/NonVirtualizingLayout.cs
+++ b/src/Avalonia.Layout/NonVirtualizingLayout.cs
@@ -17,30 +17,6 @@ namespace Avalonia.Layout
     /// </remarks>
     public abstract class NonVirtualizingLayout : AttachedLayout
     {
-        /// <inheritdoc/>
-        public sealed override void InitializeForContext(LayoutContext context)
-        {
-            InitializeForContextCore((VirtualizingLayoutContext)context);
-        }
-
-        /// <inheritdoc/>
-        public sealed override void UninitializeForContext(LayoutContext context)
-        {
-            UninitializeForContextCore((VirtualizingLayoutContext)context);
-        }
-
-        /// <inheritdoc/>
-        public sealed override Size Measure(LayoutContext context, Size availableSize)
-        {
-            return MeasureOverride((VirtualizingLayoutContext)context, availableSize);
-        }
-
-        /// <inheritdoc/>
-        public sealed override Size Arrange(LayoutContext context, Size finalSize)
-        {
-            return ArrangeOverride((VirtualizingLayoutContext)context, finalSize);
-        }
-
         /// <summary>
         /// When overridden in a derived class, initializes any per-container state the layout
         /// requires when it is attached to an ILayoutable container.
@@ -49,7 +25,7 @@ namespace Avalonia.Layout
         /// The context object that facilitates communication between the layout and its host
         /// container.
         /// </param>
-        protected virtual void InitializeForContextCore(VirtualizingLayoutContext context)
+        protected internal virtual void InitializeForContextCore(LayoutContext context)
         {
         }
 
@@ -61,7 +37,7 @@ namespace Avalonia.Layout
         /// The context object that facilitates communication between the layout and its host
         /// container.
         /// </param>
-        protected virtual void UninitializeForContextCore(VirtualizingLayoutContext context)
+        protected internal virtual void UninitializeForContextCore(LayoutContext context)
         {
         }
 
@@ -83,7 +59,9 @@ namespace Avalonia.Layout
         /// of the allocated sizes for child objects or based on other considerations such as a
         /// fixed container size.
         /// </returns>
-        protected abstract Size MeasureOverride(VirtualizingLayoutContext context, Size availableSize);
+        protected internal abstract Size MeasureOverride(
+            NonVirtualizingLayoutContext context,
+            Size availableSize);
 
         /// <summary>
         /// When implemented in a derived class, provides the behavior for the "Arrange" pass of
@@ -98,6 +76,8 @@ namespace Avalonia.Layout
         /// its children.
         /// </param>
         /// <returns>The actual size that is used after the element is arranged in layout.</returns>
-        protected virtual Size ArrangeOverride(VirtualizingLayoutContext context, Size finalSize) => finalSize;
+        protected internal virtual Size ArrangeOverride(
+            NonVirtualizingLayoutContext context,
+            Size finalSize) => finalSize;
     }
 }
diff --git a/src/Avalonia.Layout/NonVirtualizingLayoutContext.cs b/src/Avalonia.Layout/NonVirtualizingLayoutContext.cs
new file mode 100644
index 0000000000..cef551f32e
--- /dev/null
+++ b/src/Avalonia.Layout/NonVirtualizingLayoutContext.cs
@@ -0,0 +1,31 @@
+// 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.Collections.Generic;
+
+namespace Avalonia.Layout
+{
+    /// <summary>
+    /// Represents the base class for layout context types that do not support virtualization.
+    /// </summary>
+    public abstract class NonVirtualizingLayoutContext : LayoutContext
+    {
+        private VirtualizingLayoutContext _contextAdapter;
+
+        /// <summary>
+        /// Gets the collection of child controls from the container that provides the context.
+        /// </summary>
+        public IReadOnlyList<ILayoutable> Children => ChildrenCore;
+
+        /// <summary>
+        /// Implements the behavior for getting the return value of <see cref="Children"/> in a
+        /// derived or custom <see cref="NonVirtualizingLayoutContext"/>.
+        /// </summary>
+        protected abstract IReadOnlyList<ILayoutable> ChildrenCore { get; }
+
+        internal VirtualizingLayoutContext GetVirtualizingContextAdapter() =>
+            _contextAdapter ?? (_contextAdapter = new LayoutContextAdapter(this));
+    }
+}
diff --git a/src/Avalonia.Layout/NonVirtualizingStackLayout.cs b/src/Avalonia.Layout/NonVirtualizingStackLayout.cs
new file mode 100644
index 0000000000..6fa8601916
--- /dev/null
+++ b/src/Avalonia.Layout/NonVirtualizingStackLayout.cs
@@ -0,0 +1,162 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Data;
+
+namespace Avalonia.Layout
+{
+    public class NonVirtualizingStackLayout : NonVirtualizingLayout
+    {
+        /// <summary>
+        /// Defines the <see cref="Orientation"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Orientation> OrientationProperty =
+            StackLayout.OrientationProperty.AddOwner<NonVirtualizingStackLayout>();
+
+        /// <summary>
+        /// Defines the <see cref="Spacing"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> SpacingProperty =
+            StackLayout.SpacingProperty.AddOwner<NonVirtualizingStackLayout>();
+
+        /// <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);
+        }
+
+        protected internal override Size MeasureOverride(
+            NonVirtualizingLayoutContext context,
+            Size availableSize)
+        {
+            var extentU = 0.0;
+            var extentV = 0.0;
+            var childCount = context.Children.Count;
+            var isVertical = Orientation == Orientation.Vertical;
+            var spacing = Spacing;
+            var constraint = isVertical ?
+                availableSize.WithHeight(double.PositiveInfinity) :
+                availableSize.WithWidth(double.PositiveInfinity);
+
+            for (var i = 0; i < childCount; ++i)
+            {
+                var element = context.Children[i];
+
+                if (!element.IsVisible)
+                {
+                    continue;
+                }
+
+                element.Measure(constraint);
+                
+                if (isVertical)
+                {
+                    extentU += element.DesiredSize.Height;
+                    extentV = Math.Max(extentV, element.DesiredSize.Width);
+                }
+                else
+                {
+                    extentU += element.DesiredSize.Width;
+                    extentV = Math.Max(extentV, element.DesiredSize.Height);
+                }
+
+                if (i < childCount - 1)
+                {
+                    extentU += spacing;
+                }
+            }
+
+            return isVertical ? new Size(extentV, extentU) : new Size(extentU, extentV);
+        }
+
+        protected internal override Size ArrangeOverride(
+            NonVirtualizingLayoutContext context,
+            Size finalSize)
+        {
+            var u = 0.0;
+            var childCount = context.Children.Count;
+            var isVertical = Orientation == Orientation.Vertical;
+            var spacing = Spacing;
+            var bounds = new Rect();
+
+            for (var i = 0; i < childCount; ++i)
+            {
+                var element = context.Children[i];
+
+                if (!element.IsVisible)
+                {
+                    continue;
+                }
+
+                bounds = isVertical ?
+                    LayoutVertical(element, u, finalSize) :
+                    LayoutHorizontal(element, u, finalSize);
+                element.Arrange(bounds);
+                u = (isVertical ? bounds.Bottom : bounds.Right) + spacing;
+            }
+
+            return new Size(
+                Math.Max(finalSize.Width, bounds.Width),
+                Math.Max(finalSize.Height, bounds.Height));
+        }
+
+        private static Rect LayoutVertical(ILayoutable element, double y, Size constraint)
+        {
+            var x = 0.0;
+            var width = element.DesiredSize.Width;
+
+            switch (element.HorizontalAlignment)
+            {
+                case HorizontalAlignment.Center:
+                    x += (constraint.Width - element.DesiredSize.Width) / 2;
+                    break;
+                case HorizontalAlignment.Right:
+                    x += constraint.Width - element.DesiredSize.Width;
+                    break;
+                case HorizontalAlignment.Stretch:
+                    width = constraint.Width;
+                    break;
+            }
+
+            return new Rect(x, y, width, element.DesiredSize.Height);
+        }
+
+        private static Rect LayoutHorizontal(ILayoutable element, double x, Size constraint)
+        {
+            var y = 0.0;
+            var height = element.DesiredSize.Height;
+
+            switch (element.VerticalAlignment)
+            {
+                case VerticalAlignment.Center:
+                    y += (constraint.Height - element.DesiredSize.Height) / 2;
+                    break;
+                case VerticalAlignment.Bottom:
+                    y += constraint.Height - element.DesiredSize.Height;
+                    break;
+                case VerticalAlignment.Stretch:
+                    height = constraint.Height;
+                    break;
+            }
+
+            return new Rect(x, y, element.DesiredSize.Width, height);
+        }
+    }
+}
diff --git a/src/Avalonia.Layout/Orientation.cs b/src/Avalonia.Layout/Orientation.cs
index f03b087adc..54f09b5877 100644
--- a/src/Avalonia.Layout/Orientation.cs
+++ b/src/Avalonia.Layout/Orientation.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Layout
+namespace Avalonia.Layout
 {
     /// <summary>
     /// Defines vertical or horizontal orientation.
diff --git a/src/Avalonia.Layout/Properties/AssemblyInfo.cs b/src/Avalonia.Layout/Properties/AssemblyInfo.cs
index 392ad323e5..63afaa8e3e 100644
--- a/src/Avalonia.Layout/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Layout/Properties/AssemblyInfo.cs
@@ -1,10 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Runtime.CompilerServices;
 using Avalonia.Metadata;
-
+#if SIGNED_BUILD
+[assembly: InternalsVisibleTo("Avalonia.Layout.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+#else
 [assembly: InternalsVisibleTo("Avalonia.Layout.UnitTests")]
-
+#endif
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Layout")]
 
diff --git a/src/Avalonia.Layout/StackLayout.cs b/src/Avalonia.Layout/StackLayout.cs
index e9735b9b31..4a93c8344f 100644
--- a/src/Avalonia.Layout/StackLayout.cs
+++ b/src/Avalonia.Layout/StackLayout.cs
@@ -5,6 +5,8 @@
 
 using System;
 using System.Collections.Specialized;
+using Avalonia.Data;
+using Avalonia.Logging;
 
 namespace Avalonia.Layout
 {
@@ -13,6 +15,12 @@ namespace Avalonia.Layout
     /// </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>
@@ -35,6 +43,15 @@ namespace Avalonia.Layout
             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>
@@ -91,8 +108,15 @@ namespace Avalonia.Layout
                             _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;
         }
 
@@ -225,15 +249,15 @@ namespace Avalonia.Layout
                     realizationWindowOffsetInExtent + _orientation.MajorSize(realizationRect) >= 0 && realizationWindowOffsetInExtent <= majorSize)
                 {
                     anchorIndex = (int) (realizationWindowOffsetInExtent / averageElementSize);
-                    offset = anchorIndex* averageElementSize + _orientation.MajorStart(lastExtent);
                     anchorIndex = Math.Max(0, Math.Min(itemsCount - 1, anchorIndex));
+                    offset = anchorIndex* averageElementSize + _orientation.MajorStart(lastExtent);
                 }
         }
 
             return new FlowLayoutAnchorInfo { Index = anchorIndex, Offset = offset, };
         }
 
-        protected override void InitializeForContextCore(VirtualizingLayoutContext context)
+        protected internal override void InitializeForContextCore(VirtualizingLayoutContext context)
         {
             var state = context.LayoutState;
             var stackState = state as StackLayoutState;
@@ -253,36 +277,39 @@ namespace Avalonia.Layout
             stackState.InitializeForContext(context, this);
         }
 
-        protected override void UninitializeForContextCore(VirtualizingLayoutContext context)
+        protected internal override void UninitializeForContextCore(VirtualizingLayoutContext context)
         {
             var stackState = (StackLayoutState)context.LayoutState;
             stackState.UninitializeForContext(context);
         }
 
-        protected override Size MeasureOverride(VirtualizingLayoutContext context, Size availableSize)
+        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 override Size ArrangeOverride(VirtualizingLayoutContext context, Size finalSize)
+        protected internal override Size ArrangeOverride(VirtualizingLayoutContext context, Size finalSize)
         {
             var value = GetFlowAlgorithm(context).Arrange(
                finalSize,
                context,
+               false,
                FlowLayoutAlgorithm.LineAlignment.Start,
                LayoutId);
 
-            ((StackLayoutState)context.LayoutState).OnArrangeLayoutEnd();
-
             return new Size(value.Width, value.Height);
         }
 
@@ -293,11 +320,11 @@ namespace Avalonia.Layout
             InvalidateLayout();
         }
 
-        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
         {
-            if (e.Property == OrientationProperty)
+            if (change.Property == OrientationProperty)
             {
-                var orientation = (Orientation)e.NewValue;
+                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.
diff --git a/src/Avalonia.Layout/StackLayoutState.cs b/src/Avalonia.Layout/StackLayoutState.cs
index 05ad9bca8e..e6164e02e6 100644
--- a/src/Avalonia.Layout/StackLayoutState.cs
+++ b/src/Avalonia.Layout/StackLayoutState.cs
@@ -56,6 +56,6 @@ namespace Avalonia.Layout
             MaxArrangeBounds = Math.Max(MaxArrangeBounds, minorSize);
         }
 
-        internal void OnArrangeLayoutEnd() => MaxArrangeBounds = 0;
+        internal void OnMeasureStart() => MaxArrangeBounds = 0;
     }
 }
diff --git a/src/Avalonia.Layout/UniformGridLayout.cs b/src/Avalonia.Layout/UniformGridLayout.cs
index edc2042922..68f08d7cbb 100644
--- a/src/Avalonia.Layout/UniformGridLayout.cs
+++ b/src/Avalonia.Layout/UniformGridLayout.cs
@@ -5,6 +5,8 @@
 
 using System;
 using System.Collections.Specialized;
+using Avalonia.Data;
+using Avalonia.Logging;
 
 namespace Avalonia.Layout
 {
@@ -110,6 +112,12 @@ namespace Avalonia.Layout
         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>
@@ -123,6 +131,7 @@ namespace Avalonia.Layout
         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.
@@ -219,6 +228,15 @@ namespace Avalonia.Layout
             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>
@@ -269,15 +287,17 @@ namespace Avalonia.Layout
             {
                 var gridState = (UniformGridLayoutState)context.LayoutState;
                 var lastExtent = gridState.FlowAlgorithm.LastExtent;
-                int itemsPerLine = Math.Max(1, (int)(_orientation.Minor(availableSize) / GetMinorSizeWithSpacing(context)));
-                double majorSize = (itemsCount / itemsPerLine) * GetMajorSizeWithSpacing(context);
-                double realizationWindowStartWithinExtent = _orientation.MajorStart(realizationRect) - _orientation.MajorStart(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 = Math.Max(0, Math.Min(itemsCount - 1, anchorRowIndex * itemsPerLine));
+                    anchorIndex = (int)Math.Max(0, Math.Min(itemsCount - 1, anchorRowIndex * itemsPerLine));
                     bounds = GetLayoutRectForDataIndex(availableSize, anchorIndex, lastExtent, context);
                 }
             }
@@ -299,7 +319,9 @@ namespace Avalonia.Layout
             int count = context.ItemCount;
             if (targetIndex >= 0 && targetIndex < count)
             {
-                int itemsPerLine = Math.Max(1, (int)(_orientation.Minor(availableSize) / GetMinorSizeWithSpacing(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 indexOfFirstInLine = (targetIndex / itemsPerLine) * itemsPerLine;
                 index = indexOfFirstInLine;
                 var state = context.LayoutState as UniformGridLayoutState;
@@ -329,17 +351,21 @@ namespace Avalonia.Layout
             // Constants
             int itemsCount = context.ItemCount;
             double availableSizeMinor = _orientation.Minor(availableSize);
-            int itemsPerLine = Math.Max(1, !double.IsInfinity(availableSizeMinor) ?
-                (int)(availableSizeMinor / GetMinorSizeWithSpacing(context)) : itemsCount);
+            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) ?
+                    !double.IsInfinity(availableSizeMinor) && _itemsStretch == UniformGridLayoutItemsStretch.Fill ?
                     availableSizeMinor :
-                    Math.Max(0.0, itemsCount * GetMinorSizeWithSpacing(context) - (double)MinItemSpacing));
+                    Math.Max(0.0, itemsPerLine * GetMinorSizeWithSpacing(context) - (double)MinItemSpacing));
                 _orientation.SetMajorSize(
                     ref extent,
                     Math.Max(0.0, (itemsCount / itemsPerLine) * lineSize - (double)LineSpacing));
@@ -354,8 +380,14 @@ namespace Avalonia.Layout
                         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;
         }
 
@@ -367,7 +399,7 @@ namespace Avalonia.Layout
         {
         }
 
-        protected override void InitializeForContextCore(VirtualizingLayoutContext context)
+        protected internal override void InitializeForContextCore(VirtualizingLayoutContext context)
         {
             var state = context.LayoutState;
             var gridState = state as UniformGridLayoutState;
@@ -387,18 +419,18 @@ namespace Avalonia.Layout
             gridState.InitializeForContext(context, this);
         }
 
-        protected override void UninitializeForContextCore(VirtualizingLayoutContext context)
+        protected internal override void UninitializeForContextCore(VirtualizingLayoutContext context)
         {
             var gridState = (UniformGridLayoutState)context.LayoutState;
             gridState.UninitializeForContext(context);
         }
 
-        protected override Size MeasureOverride(VirtualizingLayoutContext context, Size availableSize)
+        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);
+            gridState.EnsureElementSize(availableSize, context, _minItemWidth, _minItemHeight, _itemsStretch, Orientation, MinRowSpacing, MinColumnSpacing, _maximumRowsOrColumns);
 
             var desiredSize = GetFlowAlgorithm(context).Measure(
                 availableSize,
@@ -406,7 +438,9 @@ namespace Avalonia.Layout
                 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,
@@ -416,11 +450,12 @@ namespace Avalonia.Layout
             return new Size(desiredSize.Width, desiredSize.Height);
         }
 
-        protected override Size ArrangeOverride(VirtualizingLayoutContext context, Size finalSize)
+        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);
@@ -436,40 +471,44 @@ namespace Avalonia.Layout
             gridState.ClearElementOnDataSourceChange(context, args);
         }
 
-        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs args)
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
         {
-            if (args.Property == OrientationProperty)
+            if (change.Property == OrientationProperty)
             {
-                var orientation = (Orientation)args.NewValue;
+                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 (args.Property == MinColumnSpacingProperty)
+            else if (change.Property == MinColumnSpacingProperty)
+            {
+                _minColumnSpacing = change.NewValue.GetValueOrDefault<double>();
+            }
+            else if (change.Property == MinRowSpacingProperty)
             {
-                _minColumnSpacing = (double)args.NewValue;
+                _minRowSpacing = change.NewValue.GetValueOrDefault<double>();
             }
-            else if (args.Property == MinRowSpacingProperty)
+            else if (change.Property == ItemsJustificationProperty)
             {
-                _minRowSpacing = (double)args.NewValue;
+                _itemsJustification = change.NewValue.GetValueOrDefault<UniformGridLayoutItemsJustification>();
             }
-            else if (args.Property == ItemsJustificationProperty)
+            else if (change.Property == ItemsStretchProperty)
             {
-                _itemsJustification = (UniformGridLayoutItemsJustification)args.NewValue;
+                _itemsStretch = change.NewValue.GetValueOrDefault<UniformGridLayoutItemsStretch>();
             }
-            else if (args.Property == ItemsStretchProperty)
+            else if (change.Property == MinItemWidthProperty)
             {
-                _itemsStretch = (UniformGridLayoutItemsStretch)args.NewValue;
+                _minItemWidth = change.NewValue.GetValueOrDefault<double>();
             }
-            else if (args.Property == MinItemWidthProperty)
+            else if (change.Property == MinItemHeightProperty)
             {
-                _minItemWidth = (double)args.NewValue;
+                _minItemHeight = change.NewValue.GetValueOrDefault<double>();
             }
-            else if (args.Property == MinItemHeightProperty)
+            else if (change.Property == MaximumRowsOrColumnsProperty)
             {
-                _minItemHeight = (double)args.NewValue;
+                _maximumRowsOrColumns = change.NewValue.GetValueOrDefault<int>();
             }
 
             InvalidateLayout();
@@ -499,7 +538,9 @@ namespace Avalonia.Layout
             Rect lastExtent,
             VirtualizingLayoutContext context)
         {
-            int itemsPerLine = Math.Max(1, (int)(_orientation.Minor(availableSize) / GetMinorSizeWithSpacing(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);
 
diff --git a/src/Avalonia.Layout/UniformGridLayoutState.cs b/src/Avalonia.Layout/UniformGridLayoutState.cs
index e6d75bcf35..62c5174775 100644
--- a/src/Avalonia.Layout/UniformGridLayoutState.cs
+++ b/src/Avalonia.Layout/UniformGridLayoutState.cs
@@ -48,8 +48,14 @@ namespace Avalonia.Layout
             UniformGridLayoutItemsStretch stretch,
             Orientation orientation,
             double minRowSpacing,
-            double minColumnSpacing)
+            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
@@ -57,7 +63,7 @@ namespace Avalonia.Layout
                 if (realizedElement != null)
                 {
                     realizedElement.Measure(availableSize);
-                    SetSize(realizedElement, layoutItemWidth, LayoutItemHeight, availableSize, stretch, orientation, minRowSpacing, minColumnSpacing);
+                    SetSize(realizedElement, layoutItemWidth, LayoutItemHeight, availableSize, stretch, orientation, minRowSpacing, minColumnSpacing, maxItemsPerLine);
                     _cachedFirstElement = null;
                 }
                 else
@@ -72,7 +78,7 @@ namespace Avalonia.Layout
 
                     _cachedFirstElement.Measure(availableSize);
 
-                    SetSize(_cachedFirstElement, layoutItemWidth, LayoutItemHeight, availableSize, stretch, orientation, minRowSpacing, minColumnSpacing);
+                    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);
@@ -92,8 +98,14 @@ namespace Avalonia.Layout
             UniformGridLayoutItemsStretch stretch,
             Orientation orientation,
             double minRowSpacing,
-            double minColumnSpacing)
+            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);
 
@@ -101,11 +113,17 @@ namespace Avalonia.Layout
             var minorItemSpacing = orientation == Orientation.Vertical ? minRowSpacing : minColumnSpacing;
 
             var itemSizeMinor = orientation == Orientation.Horizontal ? EffectiveItemWidth : EffectiveItemHeight;
-            itemSizeMinor += minorItemSpacing;
 
-            var numItemsPerColumn = (int)(Math.Max(1.0, availableSizeMinor / itemSizeMinor));
-            var remainingSpace = ((int)availableSizeMinor) % ((int)itemSizeMinor);
-            var extraMinorPixelsForEachItem = remainingSpace / numItemsPerColumn;
+            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)
             {
diff --git a/src/Avalonia.Layout/VirtualLayoutContextAdapter.cs b/src/Avalonia.Layout/VirtualLayoutContextAdapter.cs
new file mode 100644
index 0000000000..80ccee2114
--- /dev/null
+++ b/src/Avalonia.Layout/VirtualLayoutContextAdapter.cs
@@ -0,0 +1,42 @@
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Avalonia.Layout
+{
+    public class VirtualLayoutContextAdapter : NonVirtualizingLayoutContext
+    {
+        private readonly VirtualizingLayoutContext _virtualizingContext;
+        private ChildrenCollection _children;
+
+        public VirtualLayoutContextAdapter(VirtualizingLayoutContext virtualizingContext)
+        {
+            _virtualizingContext = virtualizingContext;
+        }
+
+        protected override object LayoutStateCore
+        {
+            get => _virtualizingContext.LayoutState;
+            set => _virtualizingContext.LayoutState = value;
+        }
+
+        protected override IReadOnlyList<ILayoutable> ChildrenCore =>
+            _children ?? (_children = new ChildrenCollection(_virtualizingContext));
+
+        private class ChildrenCollection : IReadOnlyList<ILayoutable>
+        {
+            private readonly VirtualizingLayoutContext _context;
+            public ChildrenCollection(VirtualizingLayoutContext context) => _context = context;
+            public ILayoutable this[int index] => _context.GetOrCreateElementAt(index);
+            public int Count => _context.ItemCount;
+            IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+            public IEnumerator<ILayoutable> GetEnumerator()
+            {
+                for (var i = 0; i < Count; ++i)
+                {
+                    yield return this[i];
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Layout/VirtualizingLayout.cs b/src/Avalonia.Layout/VirtualizingLayout.cs
index 4c601175f3..15c7749dfe 100644
--- a/src/Avalonia.Layout/VirtualizingLayout.cs
+++ b/src/Avalonia.Layout/VirtualizingLayout.cs
@@ -19,30 +19,6 @@ namespace Avalonia.Layout
     /// </remarks>
     public abstract class VirtualizingLayout : AttachedLayout
     {
-        /// <inheritdoc/>
-        public sealed override void InitializeForContext(LayoutContext context)
-        {
-            InitializeForContextCore((VirtualizingLayoutContext)context);
-        }
-
-        /// <inheritdoc/>
-        public sealed override void UninitializeForContext(LayoutContext context)
-        {
-            UninitializeForContextCore((VirtualizingLayoutContext)context);
-        }
-
-        /// <inheritdoc/>
-        public sealed override Size Measure(LayoutContext context, Size availableSize)
-        {
-            return MeasureOverride((VirtualizingLayoutContext)context, availableSize);
-        }
-
-        /// <inheritdoc/>
-        public sealed override Size Arrange(LayoutContext context, Size finalSize)
-        {
-            return ArrangeOverride((VirtualizingLayoutContext)context, finalSize);
-        }
-
         /// <summary>
         /// Notifies the layout when the data collection assigned to the container element (Items)
         /// has changed.
@@ -70,7 +46,7 @@ namespace Avalonia.Layout
         /// The context object that facilitates communication between the layout and its host
         /// container.
         /// </param>
-        protected virtual void InitializeForContextCore(VirtualizingLayoutContext context)
+        protected internal virtual void InitializeForContextCore(VirtualizingLayoutContext context)
         {
         }
 
@@ -82,7 +58,7 @@ namespace Avalonia.Layout
         /// The context object that facilitates communication between the layout and its host
         /// container.
         /// </param>
-        protected virtual void UninitializeForContextCore(VirtualizingLayoutContext context)
+        protected internal virtual void UninitializeForContextCore(VirtualizingLayoutContext context)
         {
         }
 
@@ -104,7 +80,9 @@ namespace Avalonia.Layout
         /// of the allocated sizes for child objects or based on other considerations such as a
         /// fixed container size.
         /// </returns>
-        protected abstract Size MeasureOverride(VirtualizingLayoutContext context, Size availableSize);
+        protected internal abstract Size MeasureOverride(
+            VirtualizingLayoutContext context,
+            Size availableSize);
 
         /// <summary>
         /// When implemented in a derived class, provides the behavior for the "Arrange" pass of
@@ -119,7 +97,9 @@ namespace Avalonia.Layout
         /// its children.
         /// </param>
         /// <returns>The actual size that is used after the element is arranged in layout.</returns>
-        protected virtual Size ArrangeOverride(VirtualizingLayoutContext context, Size finalSize) => finalSize;
+        protected internal virtual Size ArrangeOverride(
+            VirtualizingLayoutContext context,
+            Size finalSize) => finalSize;
 
         /// <summary>
         /// Notifies the layout when the data collection assigned to the container element (Items)
diff --git a/src/Avalonia.Layout/VirtualizingLayoutContext.cs b/src/Avalonia.Layout/VirtualizingLayoutContext.cs
index 980daec2eb..079b91a90f 100644
--- a/src/Avalonia.Layout/VirtualizingLayoutContext.cs
+++ b/src/Avalonia.Layout/VirtualizingLayoutContext.cs
@@ -43,6 +43,8 @@ namespace Avalonia.Layout
     /// </summary>
     public abstract class VirtualizingLayoutContext : LayoutContext
     {
+        private NonVirtualizingLayoutContext _contextAdapter;
+
         /// <summary>
         /// Gets the number of items in the data.
         /// </summary>
@@ -186,5 +188,8 @@ namespace Avalonia.Layout
         /// </summary>
         /// <param name="element">The element to clear.</param>
         protected abstract void RecycleElementCore(ILayoutable element);
+
+        internal NonVirtualizingLayoutContext GetNonVirtualizingContextAdapter() =>
+            _contextAdapter ?? (_contextAdapter = new VirtualLayoutContextAdapter(this));
     }
 }
diff --git a/src/Avalonia.Layout/WrapLayout/UvBounds.cs b/src/Avalonia.Layout/WrapLayout/UvBounds.cs
new file mode 100644
index 0000000000..1c69788732
--- /dev/null
+++ b/src/Avalonia.Layout/WrapLayout/UvBounds.cs
@@ -0,0 +1,37 @@
+// 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.Layout;
+
+namespace Avalonia.Layout
+{
+    internal struct UvBounds
+    {
+        public UvBounds(Orientation orientation, Rect rect)
+        {
+            if (orientation == Orientation.Horizontal)
+            {
+                UMin = rect.Left;
+                UMax = rect.Right;
+                VMin = rect.Top;
+                VMax = rect.Bottom;
+            }
+            else
+            {
+                UMin = rect.Top;
+                UMax = rect.Bottom;
+                VMin = rect.Left;
+                VMax = rect.Right;
+            }
+        }
+
+        public double UMin { get; }
+
+        public double UMax { get; }
+
+        public double VMin { get; }
+
+        public double VMax { get; }
+    }
+}
diff --git a/src/Avalonia.Layout/WrapLayout/UvMeasure.cs b/src/Avalonia.Layout/WrapLayout/UvMeasure.cs
new file mode 100644
index 0000000000..e10e6bd0f8
--- /dev/null
+++ b/src/Avalonia.Layout/WrapLayout/UvMeasure.cs
@@ -0,0 +1,45 @@
+// 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.Layout;
+
+namespace Avalonia.Layout
+{    
+    internal struct UvMeasure
+    {
+        internal static readonly UvMeasure Zero = default(UvMeasure);
+
+        internal double U { get; set; }
+
+        internal double V { get; set; }
+
+        public UvMeasure(Orientation orientation, double width, double height)
+        {
+            if (orientation == Orientation.Horizontal)
+            {
+                U = width;
+                V = height;
+            }
+            else
+            {
+                U = height;
+                V = width;
+            }
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is UvMeasure measure)
+            {
+                return (measure.U == U) && (measure.V == V);
+            }
+
+            return false;
+        }
+
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
+    }
+}
diff --git a/src/Avalonia.Layout/WrapLayout/WrapItem.cs b/src/Avalonia.Layout/WrapLayout/WrapItem.cs
new file mode 100644
index 0000000000..2f0b39a2d1
--- /dev/null
+++ b/src/Avalonia.Layout/WrapLayout/WrapItem.cs
@@ -0,0 +1,25 @@
+// 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.Controls;
+using Avalonia.Layout;
+
+namespace Avalonia.Layout
+{
+    internal class WrapItem
+    {
+        public WrapItem(int index)
+        {
+            this.Index = index;
+        }
+
+        public int Index { get; }
+
+        public UvMeasure? Measure { get; internal set; }
+
+        public UvMeasure? Position { get; internal set; }
+
+        public ILayoutable Element { get; internal set; }
+    }
+}
diff --git a/src/Avalonia.Layout/WrapLayout/WrapLayout.cs b/src/Avalonia.Layout/WrapLayout/WrapLayout.cs
new file mode 100644
index 0000000000..dccbb2205e
--- /dev/null
+++ b/src/Avalonia.Layout/WrapLayout/WrapLayout.cs
@@ -0,0 +1,327 @@
+// 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;
+            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.Layout/WrapLayout/WrapLayoutState.cs b/src/Avalonia.Layout/WrapLayout/WrapLayoutState.cs
new file mode 100644
index 0000000000..7955ea983c
--- /dev/null
+++ b/src/Avalonia.Layout/WrapLayout/WrapLayoutState.cs
@@ -0,0 +1,143 @@
+// 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 System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Avalonia.Layout
+{
+    internal class WrapLayoutState
+    {
+        private List<WrapItem> _items = new List<WrapItem>();
+        private VirtualizingLayoutContext _context;
+
+        public WrapLayoutState(VirtualizingLayoutContext context)
+        {
+            this._context = context;
+        }
+
+        public Orientation Orientation { get; private set; }
+
+        public UvMeasure Spacing { get; internal set; }
+
+        public double AvailableU { get; internal set; }
+
+        internal WrapItem GetItemAt(int index)
+        {
+            if (index < 0)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            if (index <= (_items.Count - 1))
+            {
+                return _items[index];
+            }
+            else
+            {
+                WrapItem item = new WrapItem(index);
+                _items.Add(item);
+                return item;
+            }
+        }
+
+        internal void Clear()
+        {
+            _items.Clear();
+        }
+
+        internal void RemoveFromIndex(int index)
+        {
+            if (index >= _items.Count)
+            {
+                // Item was added/removed but we haven't realized that far yet
+                return;
+            }
+
+            int numToRemove = _items.Count - index;
+            _items.RemoveRange(index, numToRemove);
+        }
+
+        internal void SetOrientation(Orientation orientation)
+        {
+            foreach (var item in _items.Where(i => i.Measure.HasValue))
+            {
+                UvMeasure measure = item.Measure.Value;
+                double v = measure.V;
+                measure.V = measure.U;
+                measure.U = v;
+                item.Measure = measure;
+                item.Position = null;
+            }
+
+            Orientation = orientation;
+            AvailableU = 0;
+        }
+
+        internal void ClearPositions()
+        {
+            foreach (var item in _items)
+            {
+                item.Position = null;
+            }
+        }
+
+        internal double GetHeight()
+        {
+            if (_items.Count == 0)
+            {
+                return 0;
+            }
+
+            bool calculateAverage = true;
+            if ((_items.Count == _context.ItemCount) && _items[_items.Count - 1].Position.HasValue)
+            {
+                calculateAverage = false;
+            }
+
+            UvMeasure? lastPosition = null;
+            double maxV = 0;
+
+            int itemCount = _items.Count;
+            for (int i = _items.Count - 1; i >= 0; i--)
+            {
+                var item = _items[i];
+                if (item.Position == null)
+                {
+                    itemCount--;
+                    continue;
+                }
+
+                if (lastPosition != null)
+                {
+                    if (lastPosition.Value.V > item.Position.Value.V)
+                    {
+                        // This is a row above the last item. Exit and calculate the average
+                        break;
+                    }
+                }
+
+                lastPosition = item.Position;
+                maxV = Math.Max(maxV, item.Measure.Value.V);
+            }
+
+            double totalHeight = lastPosition.Value.V + maxV;
+            if (calculateAverage)
+            {
+                return (totalHeight / itemCount) * _context.ItemCount;
+            }
+            else
+            {
+                return totalHeight;
+            }
+        }
+
+        internal void RecycleElementAt(int index)
+        {
+            var element = _context.GetOrCreateElementAt(index);
+            _context.RecycleElement(element);
+        }
+    }
+}
diff --git a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj
deleted file mode 100644
index 3e76001556..0000000000
--- a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
-  </ItemGroup>  
-  <Import Project="..\..\build\Serilog.props" />
-</Project>
diff --git a/src/Avalonia.Logging.Serilog/SerilogExtensions.cs b/src/Avalonia.Logging.Serilog/SerilogExtensions.cs
deleted file mode 100644
index 2ce38769da..0000000000
--- a/src/Avalonia.Logging.Serilog/SerilogExtensions.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using System;
-using Avalonia.Controls;
-using Serilog;
-using Serilog.Configuration;
-using Serilog.Filters;
-using SerilogLevel = Serilog.Events.LogEventLevel;
-
-namespace Avalonia.Logging.Serilog
-{
-    /// <summary>
-    /// Extension methods for Serilog logging.
-    /// </summary>
-    public static class SerilogExtensions
-    {
-        private const string DefaultTemplate = "[{Area}] {Message} ({SourceType} #{SourceHash})";
-
-        /// <summary>
-        /// Logs Avalonia events to the <see cref="System.Diagnostics.Debug"/> sink.
-        /// </summary>
-        /// <typeparam name="T">The application class type.</typeparam>
-        /// <param name="builder">The app builder instance.</param>
-        /// <param name="level">The minimum level to log.</param>
-        /// <returns>The app builder instance.</returns>
-        public static T LogToDebug<T>(
-            this T builder,
-            LogEventLevel level = LogEventLevel.Warning)
-                where T : AppBuilderBase<T>, new()
-        {
-            SerilogLogger.Initialize(new LoggerConfiguration()
-                .MinimumLevel.Is((SerilogLevel)level)
-                .Enrich.FromLogContext()
-                .WriteTo.Debug(outputTemplate: DefaultTemplate)
-                .CreateLogger());
-            return builder;
-        }
-
-        /// <summary>
-        /// Logs Avalonia events to the <see cref="System.Diagnostics.Debug"/> sink.
-        /// </summary>
-        /// <typeparam name="T">The application class type.</typeparam>
-        /// <param name="builder">The app builder instance.</param>
-        /// <param name="area">The area to log. Valid values are listed in <see cref="LogArea"/>.</param>
-        /// <param name="level">The minimum level to log.</param>
-        /// <returns>The app builder instance.</returns>
-        public static T LogToDebug<T>(
-            this T builder,
-            string area,
-            LogEventLevel level = LogEventLevel.Warning)
-                where T : AppBuilderBase<T>, new()
-        {
-            SerilogLogger.Initialize(new LoggerConfiguration()
-                .MinimumLevel.Is((SerilogLevel)level)
-                .Filter.ByIncludingOnly(Matching.WithProperty("Area", area))
-                .Enrich.FromLogContext()
-                .WriteTo.Debug(outputTemplate: DefaultTemplate)
-                .CreateLogger());
-            return builder;
-        }
-
-        /// <summary>
-        /// Logs Avalonia events to the <see cref="System.Diagnostics.Trace"/> sink.
-        /// </summary>
-        /// <typeparam name="T">The application class type.</typeparam>
-        /// <param name="builder">The app builder instance.</param>
-        /// <param name="level">The minimum level to log.</param>
-        /// <returns>The app builder instance.</returns>
-        public static T LogToTrace<T>(
-            this T builder,
-            LogEventLevel level = LogEventLevel.Warning)
-                where T : AppBuilderBase<T>, new()
-        {
-            SerilogLogger.Initialize(new LoggerConfiguration()
-                .MinimumLevel.Is((SerilogLevel)level)
-                .Enrich.FromLogContext()
-                .WriteTo.Trace(outputTemplate: DefaultTemplate)
-                .CreateLogger());
-            return builder;
-        }
-
-        /// <summary>
-        /// Logs Avalonia events to the <see cref="System.Diagnostics.Trace"/> sink.
-        /// </summary>
-        /// <typeparam name="T">The application class type.</typeparam>
-        /// <param name="builder">The app builder instance.</param>
-        /// <param name="area">The area to log. Valid values are listed in <see cref="LogArea"/>.</param>
-        /// <param name="level">The minimum level to log.</param>
-        /// <returns>The app builder instance.</returns>
-        public static T LogToTrace<T>(
-            this T builder,
-            string area,
-            LogEventLevel level = LogEventLevel.Warning)
-                where T : AppBuilderBase<T>, new()
-        {
-            SerilogLogger.Initialize(new LoggerConfiguration()
-                .MinimumLevel.Is((SerilogLevel)level)
-                .Filter.ByIncludingOnly(Matching.WithProperty("Area", area))
-                .Enrich.FromLogContext()
-                .WriteTo.Trace(outputTemplate: DefaultTemplate)
-                .CreateLogger());
-            return builder;
-        }
-    }
-}
diff --git a/src/Avalonia.Logging.Serilog/SerilogLogger.cs b/src/Avalonia.Logging.Serilog/SerilogLogger.cs
deleted file mode 100644
index 895ee268d2..0000000000
--- a/src/Avalonia.Logging.Serilog/SerilogLogger.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using Serilog;
-using Serilog.Context;
-using AvaloniaLogEventLevel = Avalonia.Logging.LogEventLevel;
-using SerilogLogEventLevel = Serilog.Events.LogEventLevel;
-
-namespace Avalonia.Logging.Serilog
-{
-    /// <summary>
-    /// Sends log output to serilog.
-    /// </summary>
-    public class SerilogLogger : ILogSink
-    {
-        private readonly ILogger _output;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SerilogLogger"/> class.
-        /// </summary>
-        /// <param name="output">The serilog logger to use.</param>
-        public SerilogLogger(ILogger output)
-        {
-            _output = output;
-        }
-
-        /// <summary>
-        /// Initializes the Avalonia logging with a new instance of a <see cref="SerilogLogger"/>.
-        /// </summary>
-        /// <param name="output">The serilog logger to use.</param>
-        public static void Initialize(ILogger output)
-        {
-            Logger.Sink = new SerilogLogger(output);
-        }
-
-        public bool IsEnabled(LogEventLevel level)
-        {
-            return _output.IsEnabled((SerilogLogEventLevel)level);
-        }
-
-        public void Log(
-            LogEventLevel level,
-            string area,
-            object source,
-            string messageTemplate)
-        {
-            Contract.Requires<ArgumentNullException>(area != null);
-            Contract.Requires<ArgumentNullException>(messageTemplate != null);
-
-            using (PushLogContextProperties(area, source))
-            {
-                _output.Write((SerilogLogEventLevel)level, messageTemplate);
-            }
-        }
-
-        public void Log<T0>(
-            LogEventLevel level, 
-            string area, object source,
-            string messageTemplate, 
-            T0 propertyValue0)
-        {
-            Contract.Requires<ArgumentNullException>(area != null);
-            Contract.Requires<ArgumentNullException>(messageTemplate != null);
-
-            using (PushLogContextProperties(area, source))
-            {
-                _output.Write((SerilogLogEventLevel)level, messageTemplate, propertyValue0);
-            }
-        }
-
-        public void Log<T0, T1>(
-            LogEventLevel level, 
-            string area,
-            object source,
-            string messageTemplate,
-            T0 propertyValue0,
-            T1 propertyValue1)
-        {
-            Contract.Requires<ArgumentNullException>(area != null);
-            Contract.Requires<ArgumentNullException>(messageTemplate != null);
-
-            using (PushLogContextProperties(area, source))
-            {
-                _output.Write((SerilogLogEventLevel)level, messageTemplate, propertyValue0, propertyValue1);
-            }
-        }
-
-        public void Log<T0, T1, T2>(
-            LogEventLevel level, 
-            string area, 
-            object source, 
-            string messageTemplate, 
-            T0 propertyValue0,
-            T1 propertyValue1, 
-            T2 propertyValue2)
-        {
-            Contract.Requires<ArgumentNullException>(area != null);
-            Contract.Requires<ArgumentNullException>(messageTemplate != null);
-
-            using (PushLogContextProperties(area, source))
-            {
-                _output.Write((SerilogLogEventLevel)level, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Log(
-            AvaloniaLogEventLevel level,
-            string area,
-            object source,
-            string messageTemplate,
-            params object[] propertyValues)
-        {
-            Contract.Requires<ArgumentNullException>(area != null);
-            Contract.Requires<ArgumentNullException>(messageTemplate != null);
-
-            using (PushLogContextProperties(area, source))
-            {
-                _output.Write((SerilogLogEventLevel)level, messageTemplate, propertyValues);
-            }
-        }
-
-        private static LogContextDisposable PushLogContextProperties(string area, object source)
-        {
-            return new LogContextDisposable(
-                LogContext.PushProperty("Area", area),
-                LogContext.PushProperty("SourceType", source?.GetType()),
-                LogContext.PushProperty("SourceHash", source?.GetHashCode())
-                );
-        }
-        
-        private readonly struct LogContextDisposable : IDisposable
-        {
-            private readonly IDisposable _areaDisposable;
-            private readonly IDisposable _sourceTypeDisposable;
-            private readonly IDisposable _sourceHashDisposable;
-
-            public LogContextDisposable(IDisposable areaDisposable, IDisposable sourceTypeDisposable, IDisposable sourceHashDisposable)
-            {
-                _areaDisposable = areaDisposable;
-                _sourceTypeDisposable = sourceTypeDisposable;
-                _sourceHashDisposable = sourceHashDisposable;
-            }
-
-            public void Dispose()
-            {
-                _areaDisposable.Dispose();
-                _sourceTypeDisposable.Dispose();
-                _sourceHashDisposable.Dispose();
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj b/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
new file mode 100644
index 0000000000..b796e173c4
--- /dev/null
+++ b/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+      <TargetFramework>netstandard2.0</TargetFramework>
+      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_AvaloniaPatchComInterop>true</_AvaloniaPatchComInterop>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <ExcludeAssets>all</ExcludeAssets>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="..\..\build\BuildTargets.targets" />
+</Project>
diff --git a/src/Avalonia.MicroCom/IMicroComExceptionCallback.cs b/src/Avalonia.MicroCom/IMicroComExceptionCallback.cs
new file mode 100644
index 0000000000..08f20339ec
--- /dev/null
+++ b/src/Avalonia.MicroCom/IMicroComExceptionCallback.cs
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 0000000000..a33d3a9811
--- /dev/null
+++ b/src/Avalonia.MicroCom/IMicroComShadowContainer.cs
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 0000000000..0dc4106423
--- /dev/null
+++ b/src/Avalonia.MicroCom/IUnknown.cs
@@ -0,0 +1,8 @@
+using System;
+
+namespace Avalonia.MicroCom
+{
+    public interface IUnknown : IDisposable
+    {
+    }
+}
diff --git a/src/Avalonia.MicroCom/LocalInterop.cs b/src/Avalonia.MicroCom/LocalInterop.cs
new file mode 100644
index 0000000000..785f4e03a5
--- /dev/null
+++ b/src/Avalonia.MicroCom/LocalInterop.cs
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000..140af3e4ef
--- /dev/null
+++ b/src/Avalonia.MicroCom/MicroComProxyBase.cs
@@ -0,0 +1,110 @@
+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
new file mode 100644
index 0000000000..85507674d2
--- /dev/null
+++ b/src/Avalonia.MicroCom/MicroComRuntime.cs
@@ -0,0 +1,122 @@
+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 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
new file mode 100644
index 0000000000..a6a0fd519e
--- /dev/null
+++ b/src/Avalonia.MicroCom/MicroComShadow.cs
@@ -0,0 +1,171 @@
+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
new file mode 100644
index 0000000000..2f0607c0a8
--- /dev/null
+++ b/src/Avalonia.MicroCom/MicroComVtblBase.cs
@@ -0,0 +1,42 @@
+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(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/.gitignore b/src/Avalonia.Native/.gitignore
index b1153e777c..b270c05962 100644
--- a/src/Avalonia.Native/.gitignore
+++ b/src/Avalonia.Native/.gitignore
@@ -1 +1,2 @@
 Generated/*.cs
+*.Generated.cs
diff --git a/src/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Native/Avalonia.Native.csproj
index 88a6da8945..3913484431 100644
--- a/src/Avalonia.Native/Avalonia.Native.csproj
+++ b/src/Avalonia.Native/Avalonia.Native.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <IsPackable>false</IsPackable>
+    <PackAvaloniaNative Condition="'$(PackAvaloniaNative)' == ''">$([MSBuild]::IsOSPlatform(OSX))</PackAvaloniaNative>
+    <IsPackable>$(PackAvaloniaNative)</IsPackable>
     <IsPackable Condition="'$([MSBuild]::IsOSPlatform(OSX))' == 'True'">true</IsPackable>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <CastXmlPath Condition="Exists('/usr/bin/castxml')">/usr/bin/castxml</CastXmlPath>
-    <CastXmlPath Condition="Exists('/usr/local/bin/castxml')">/usr/local/bin/castxml</CastXmlPath>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(Configuration)' == 'Release' AND '$([MSBuild]::IsOSPlatform(OSX))' == 'true'">
+  <ItemGroup Condition="'$(PackAvaloniaNative)' == 'true'">
     <Content Include="../../Build/Products/Release/libAvalonia.Native.OSX.dylib">
+      <Link>libAvaloniaNative.dylib</Link>
       <PackagePath>runtimes/osx/native/libAvaloniaNative.dylib</PackagePath>
       <Pack>true</Pack>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -18,10 +18,9 @@
   </ItemGroup>
   
   <ItemGroup>
-    <SharpGenMapping Include="Mappings.xml" />
-    <PackageReference Include="SharpGenTools.Sdk" Version="1.1.2" PrivateAssets="all" />
-    <PackageReference Include="SharpGen.Runtime.COM" Version="1.1.0" />
     <ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />
-    <ProjectReference Include="..\..\packages\Avalonia\Avalonia.Dialogs.csproj" />
+    <ProjectReference Include="..\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
+    <AvnComIdl Include="avn.idl" OutputFile="Interop.Generated.cs" />
   </ItemGroup>
+  <Import Project="../../build/MicroCom.targets" />
 </Project>
diff --git a/src/Avalonia.Native/AvaloniaNativeDeferredRendererLock.cs b/src/Avalonia.Native/AvaloniaNativeDeferredRendererLock.cs
deleted file mode 100644
index ce2b03e355..0000000000
--- a/src/Avalonia.Native/AvaloniaNativeDeferredRendererLock.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Threading;
-using Avalonia.Native.Interop;
-using Avalonia.Rendering;
-
-namespace Avalonia.Native
-{
-    public class AvaloniaNativeDeferredRendererLock : IDeferredRendererLock
-    {
-        private readonly IAvnWindowBase _window;
-
-        public AvaloniaNativeDeferredRendererLock(IAvnWindowBase window)
-        {
-            _window = window;
-        }
-
-        public IDisposable TryLock()
-        {
-            if (_window.TryLock())
-                return new UnlockDisposable(_window);
-            return null;
-        }
-
-        private sealed class UnlockDisposable : IDisposable
-        {
-            private IAvnWindowBase _window;
-
-            public UnlockDisposable(IAvnWindowBase window)
-            {
-                _window = window;
-            }
-
-            public void Dispose()
-            {
-                Interlocked.Exchange(ref _window, null)?.Unlock();
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Native/AvaloniaNativeDragSource.cs b/src/Avalonia.Native/AvaloniaNativeDragSource.cs
new file mode 100644
index 0000000000..80d54d8a10
--- /dev/null
+++ b/src/Avalonia.Native/AvaloniaNativeDragSource.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Input.Platform;
+using Avalonia.Interactivity;
+using Avalonia.Native.Interop;
+using Avalonia.Platform;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Native
+{
+    class AvaloniaNativeDragSource : IPlatformDragSource
+    {
+        private readonly IAvaloniaNativeFactory _factory;
+
+        public AvaloniaNativeDragSource(IAvaloniaNativeFactory factory)
+        {
+            _factory = factory;
+        }
+        
+        TopLevel FindRoot(IInteractive interactive)
+        {
+            while (interactive != null && !(interactive is IVisual))
+                interactive = interactive.InteractiveParent;
+            if (interactive == null)
+                return null;
+            var visual = (IVisual)interactive;
+            return visual.VisualRoot as TopLevel;
+        }
+
+        class DndCallback : CallbackBase, IAvnDndResultCallback
+        {
+            private TaskCompletionSource<DragDropEffects> _tcs;
+
+            public DndCallback(TaskCompletionSource<DragDropEffects> tcs)
+            {
+                _tcs = tcs;
+            }
+            public void OnDragAndDropComplete(AvnDragDropEffects effect)
+            {
+                _tcs?.TrySetResult((DragDropEffects)effect);
+                _tcs = null;
+            }
+        }
+        
+        public Task<DragDropEffects> DoDragDrop(PointerEventArgs triggerEvent, IDataObject data, DragDropEffects allowedEffects)
+        {
+            // Sanity check
+            var tl = FindRoot(triggerEvent.Source);
+            var view = tl?.PlatformImpl as WindowBaseImpl;
+            if (view == null)
+                throw new ArgumentException();
+
+            triggerEvent.Pointer.Capture(null);
+            
+            var tcs = new TaskCompletionSource<DragDropEffects>();
+            
+            var clipboardImpl = _factory.CreateDndClipboard();
+            using (var clipboard = new ClipboardImpl(clipboardImpl))
+            using (var cb = new DndCallback(tcs))
+            {
+                if (data.Contains(DataFormats.Text))
+                    // API is synchronous, so it's OK
+                    clipboard.SetTextAsync(data.GetText()).Wait();
+                
+                view.BeginDraggingSession((AvnDragDropEffects)allowedEffects,
+                    triggerEvent.GetPosition(tl).ToAvnPoint(), clipboardImpl, cb,
+                    GCHandle.ToIntPtr(GCHandle.Alloc(data)));
+            }
+
+            return tcs.Task;
+        }
+    }
+}
diff --git a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
index 95c2aabb3d..2e3408eca5 100644
--- a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
+++ b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
@@ -1,185 +1,22 @@
 using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Text;
-using Avalonia.Collections;
 using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Platform;
-using Avalonia.Input;
+using Avalonia.Dialogs;
 using Avalonia.Native.Interop;
-using Avalonia.Platform.Interop;
+using Avalonia.Native.Interop.Impl;
 using Avalonia.Threading;
-using Avalonia.Dialogs;
-using Avalonia.Controls.ApplicationLifetimes;
 
 namespace Avalonia.Native
 {
-    enum OsxUnicodeSpecialKey
-    {
-        NSUpArrowFunctionKey = 0xF700,
-        NSDownArrowFunctionKey = 0xF701,
-        NSLeftArrowFunctionKey = 0xF702,
-        NSRightArrowFunctionKey = 0xF703,
-        NSF1FunctionKey = 0xF704,
-        NSF2FunctionKey = 0xF705,
-        NSF3FunctionKey = 0xF706,
-        NSF4FunctionKey = 0xF707,
-        NSF5FunctionKey = 0xF708,
-        NSF6FunctionKey = 0xF709,
-        NSF7FunctionKey = 0xF70A,
-        NSF8FunctionKey = 0xF70B,
-        NSF9FunctionKey = 0xF70C,
-        NSF10FunctionKey = 0xF70D,
-        NSF11FunctionKey = 0xF70E,
-        NSF12FunctionKey = 0xF70F,
-        NSF13FunctionKey = 0xF710,
-        NSF14FunctionKey = 0xF711,
-        NSF15FunctionKey = 0xF712,
-        NSF16FunctionKey = 0xF713,
-        NSF17FunctionKey = 0xF714,
-        NSF18FunctionKey = 0xF715,
-        NSF19FunctionKey = 0xF716,
-        NSF20FunctionKey = 0xF717,
-        NSF21FunctionKey = 0xF718,
-        NSF22FunctionKey = 0xF719,
-        NSF23FunctionKey = 0xF71A,
-        NSF24FunctionKey = 0xF71B,
-        NSF25FunctionKey = 0xF71C,
-        NSF26FunctionKey = 0xF71D,
-        NSF27FunctionKey = 0xF71E,
-        NSF28FunctionKey = 0xF71F,
-        NSF29FunctionKey = 0xF720,
-        NSF30FunctionKey = 0xF721,
-        NSF31FunctionKey = 0xF722,
-        NSF32FunctionKey = 0xF723,
-        NSF33FunctionKey = 0xF724,
-        NSF34FunctionKey = 0xF725,
-        NSF35FunctionKey = 0xF726,
-        NSInsertFunctionKey = 0xF727,
-        NSDeleteFunctionKey = 0xF728,
-        NSHomeFunctionKey = 0xF729,
-        NSBeginFunctionKey = 0xF72A,
-        NSEndFunctionKey = 0xF72B,
-        NSPageUpFunctionKey = 0xF72C,
-        NSPageDownFunctionKey = 0xF72D,
-        NSPrintScreenFunctionKey = 0xF72E,
-        NSScrollLockFunctionKey = 0xF72F,
-        NSPauseFunctionKey = 0xF730,
-        NSSysReqFunctionKey = 0xF731,
-        NSBreakFunctionKey = 0xF732,
-        NSResetFunctionKey = 0xF733,
-        NSStopFunctionKey = 0xF734,
-        NSMenuFunctionKey = 0xF735,
-        NSUserFunctionKey = 0xF736,
-        NSSystemFunctionKey = 0xF737,
-        NSPrintFunctionKey = 0xF738,
-        NSClearLineFunctionKey = 0xF739,
-        NSClearDisplayFunctionKey = 0xF73A,
-        NSInsertLineFunctionKey = 0xF73B,
-        NSDeleteLineFunctionKey = 0xF73C,
-        NSInsertCharFunctionKey = 0xF73D,
-        NSDeleteCharFunctionKey = 0xF73E,
-        NSPrevFunctionKey = 0xF73F,
-        NSNextFunctionKey = 0xF740,
-        NSSelectFunctionKey = 0xF741,
-        NSExecuteFunctionKey = 0xF742,
-        NSUndoFunctionKey = 0xF743,
-        NSRedoFunctionKey = 0xF744,
-        NSFindFunctionKey = 0xF745,
-        NSHelpFunctionKey = 0xF746,
-        NSModeSwitchFunctionKey = 0xF747
-    }
-
-    public class MenuActionCallback : CallbackBase, IAvnActionCallback
-    {
-        private Action _action;
-
-        public MenuActionCallback(Action action)
-        {
-            _action = action;
-        }
-
-        void IAvnActionCallback.Run()
-        {
-            _action?.Invoke();
-        }
-    }
-
-    public class PredicateCallback : CallbackBase, IAvnPredicateCallback
-    {
-        private Func<bool> _predicate;
-
-        public PredicateCallback(Func<bool> predicate)
-        {
-            _predicate = predicate;
-        }
-
-        bool IAvnPredicateCallback.Evaluate()
-        {
-            return _predicate();
-        }
-    }
-
     class AvaloniaNativeMenuExporter : ITopLevelNativeMenuExporter
     {
         private IAvaloniaNativeFactory _factory;
-        private NativeMenu _menu;
-        private bool _resetQueued;
+        private bool _resetQueued = true;
         private bool _exported = false;
         private IAvnWindow _nativeWindow;
-        private List<NativeMenuItem> _menuItems = new List<NativeMenuItem>();
-
-        private static Dictionary<Key, OsxUnicodeSpecialKey> osxKeys = new Dictionary<Key, OsxUnicodeSpecialKey>
-        {
-            {Key.Up, OsxUnicodeSpecialKey.NSUpArrowFunctionKey },
-            {Key.Down, OsxUnicodeSpecialKey.NSDownArrowFunctionKey },
-            {Key.Left, OsxUnicodeSpecialKey.NSLeftArrowFunctionKey },
-            {Key.Right, OsxUnicodeSpecialKey.NSRightArrowFunctionKey },
-            { Key.F1, OsxUnicodeSpecialKey.NSF1FunctionKey },
-            { Key.F2, OsxUnicodeSpecialKey.NSF2FunctionKey },
-            { Key.F3, OsxUnicodeSpecialKey.NSF3FunctionKey },
-            { Key.F4, OsxUnicodeSpecialKey.NSF4FunctionKey },
-            { Key.F5, OsxUnicodeSpecialKey.NSF5FunctionKey },
-            { Key.F6, OsxUnicodeSpecialKey.NSF6FunctionKey },
-            { Key.F7, OsxUnicodeSpecialKey.NSF7FunctionKey },
-            { Key.F8, OsxUnicodeSpecialKey.NSF8FunctionKey },
-            { Key.F9, OsxUnicodeSpecialKey.NSF9FunctionKey },
-            { Key.F10, OsxUnicodeSpecialKey.NSF10FunctionKey },
-            { Key.F11, OsxUnicodeSpecialKey.NSF11FunctionKey },
-            { Key.F12, OsxUnicodeSpecialKey.NSF12FunctionKey },
-            { Key.F13, OsxUnicodeSpecialKey.NSF13FunctionKey },
-            { Key.F14, OsxUnicodeSpecialKey.NSF14FunctionKey },
-            { Key.F15, OsxUnicodeSpecialKey.NSF15FunctionKey },
-            { Key.F16, OsxUnicodeSpecialKey.NSF16FunctionKey },
-            { Key.F17, OsxUnicodeSpecialKey.NSF17FunctionKey },
-            { Key.F18, OsxUnicodeSpecialKey.NSF18FunctionKey },
-            { Key.F19, OsxUnicodeSpecialKey.NSF19FunctionKey },
-            { Key.F20, OsxUnicodeSpecialKey.NSF20FunctionKey },
-            { Key.F21, OsxUnicodeSpecialKey.NSF21FunctionKey },
-            { Key.F22, OsxUnicodeSpecialKey.NSF22FunctionKey },
-            { Key.F23, OsxUnicodeSpecialKey.NSF23FunctionKey },
-            { Key.F24, OsxUnicodeSpecialKey.NSF24FunctionKey },
-            { Key.Insert, OsxUnicodeSpecialKey.NSInsertFunctionKey },
-            { Key.Delete, OsxUnicodeSpecialKey.NSDeleteFunctionKey },
-            { Key.Home, OsxUnicodeSpecialKey.NSHomeFunctionKey },
-            //{ Key.Begin, OsxUnicodeSpecialKey.NSBeginFunctionKey },
-            { Key.End, OsxUnicodeSpecialKey.NSEndFunctionKey },
-            { Key.PageUp, OsxUnicodeSpecialKey.NSPageUpFunctionKey },
-            { Key.PageDown, OsxUnicodeSpecialKey.NSPageDownFunctionKey },
-            { Key.PrintScreen, OsxUnicodeSpecialKey.NSPrintScreenFunctionKey },
-            { Key.Scroll, OsxUnicodeSpecialKey.NSScrollLockFunctionKey },
-            //{ Key.SysReq, OsxUnicodeSpecialKey.NSSysReqFunctionKey },
-            //{ Key.Break, OsxUnicodeSpecialKey.NSBreakFunctionKey },
-            //{ Key.Reset, OsxUnicodeSpecialKey.NSResetFunctionKey },
-            //{ Key.Stop, OsxUnicodeSpecialKey.NSStopFunctionKey },
-            //{ Key.Menu, OsxUnicodeSpecialKey.NSMenuFunctionKey },
-            //{ Key.UserFunction, OsxUnicodeSpecialKey.NSUserFunctionKey },
-            //{ Key.SystemFunction, OsxUnicodeSpecialKey.NSSystemFunctionKey },
-            { Key.Print, OsxUnicodeSpecialKey.NSPrintFunctionKey },
-            //{ Key.ClearLine, OsxUnicodeSpecialKey.NSClearLineFunctionKey },
-            //{ Key.ClearDisplay, OsxUnicodeSpecialKey.NSClearDisplayFunctionKey },
-        };
+        private NativeMenu _menu;
+        private __MicroComIAvnMenuProxy _nativeMenu;
 
         public AvaloniaNativeMenuExporter(IAvnWindow nativeWindow, IAvaloniaNativeFactory factory)
         {
@@ -193,7 +30,6 @@ namespace Avalonia.Native
         {
             _factory = factory;
 
-            _menu = NativeMenu.GetMenu(Application.Current);
             DoLayoutReset();
         }
 
@@ -203,15 +39,16 @@ namespace Avalonia.Native
 
         public void SetNativeMenu(NativeMenu menu)
         {
-            if (menu == null)
-                menu = new NativeMenu();
-
-            if (_menu != null)
-                ((INotifyCollectionChanged)_menu.Items).CollectionChanged -= OnMenuItemsChanged;
-            _menu = menu;
-            ((INotifyCollectionChanged)_menu.Items).CollectionChanged += OnMenuItemsChanged;
+            _menu = menu == null ? new NativeMenu() : menu;
+            DoLayoutReset(true);
+        }
 
-            DoLayoutReset();
+        internal void UpdateIfNeeded()
+        {
+            if (_resetQueued)
+            {
+                DoLayoutReset();
+            }
         }
 
         private static NativeMenu CreateDefaultAppMenu()
@@ -223,7 +60,7 @@ namespace Avalonia.Native
                 Header = "About Avalonia",
             };
 
-            aboutItem.Clicked += async (sender, e) =>
+            aboutItem.Click += async (sender, e) =>
             {
                 var dialog = new AboutAvaloniaDialog();
 
@@ -237,239 +74,102 @@ namespace Avalonia.Native
             return result;
         }
 
-        private void OnItemPropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
-        {
-            QueueReset();
-        }
-
-        private void OnMenuItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
+        private void DoLayoutReset(bool forceUpdate = false)
         {
-            QueueReset();
-        }
-
-        void DoLayoutReset()
-        {
-            _resetQueued = false;
-            foreach (var i in _menuItems)
+            if (_resetQueued || forceUpdate)
             {
-                i.PropertyChanged -= OnItemPropertyChanged;
-                if (i.Menu != null)
-                    ((INotifyCollectionChanged)i.Menu.Items).CollectionChanged -= OnMenuItemsChanged;
-            }
+                _resetQueued = false;
 
-            _menuItems.Clear();
+                if (_nativeWindow is null)
+                {
+                    var appMenu = NativeMenu.GetMenu(Application.Current);
 
-            if(_nativeWindow is null)
-            {
-                _menu = NativeMenu.GetMenu(Application.Current);
+                    if (appMenu == null)
+                    {
+                        appMenu = CreateDefaultAppMenu();
+                        NativeMenu.SetMenu(Application.Current, appMenu);
+                    }
 
-                if(_menu != null)
-                {
-                    SetMenu(_menu);
+                    SetMenu(appMenu);
                 }
                 else
                 {
-                    SetMenu(CreateDefaultAppMenu());
+                    if (_menu != null)
+                    {
+                        SetMenu(_nativeWindow, _menu);
+                    }
                 }
-            }
-            else
-            {
-                SetMenu(_nativeWindow, _menu?.Items);
-            }
 
-            _exported = true;
+                _exported = true;
+            }
         }
 
-        private void QueueReset()
+        internal void QueueReset()
         {
             if (_resetQueued)
                 return;
             _resetQueued = true;
-            Dispatcher.UIThread.Post(DoLayoutReset, DispatcherPriority.Background);
+            Dispatcher.UIThread.Post(() => DoLayoutReset(), DispatcherPriority.Background);
         }
 
-        private IAvnAppMenu CreateSubmenu(ICollection<NativeMenuItemBase> children)
+        private void SetMenu(NativeMenu menu)
         {
-            var menu = _factory.CreateMenu();
-
-            SetChildren(menu, children);
+            var menuItem = menu.Parent;
 
-            return menu;
-        }
+            var appMenuHolder = menuItem?.Parent;
 
-        private void AddMenuItem(NativeMenuItem item)
-        {
-            if (item.Menu?.Items != null)
+            if (menu.Parent is null)
             {
-                ((INotifyCollectionChanged)item.Menu.Items).CollectionChanged += OnMenuItemsChanged;
-            }
-        }
-
-        private static string ConvertOSXSpecialKeyCodes(Key key)
-        {
-            if (osxKeys.ContainsKey(key))
-            {
-                return ((char)osxKeys[key]).ToString();
-            }
-            else
-            {
-                return key.ToString().ToLower();
+                menuItem = new NativeMenuItem();
             }
-        }
 
-        private void SetChildren(IAvnAppMenu menu, ICollection<NativeMenuItemBase> children)
-        {
-            foreach (var i in children)
+            if (appMenuHolder is null)
             {
-                if (i is NativeMenuItem item)
-                {
-                    AddMenuItem(item);
-
-                    var menuItem = _factory.CreateMenuItem();
-
-                    using (var buffer = new Utf8Buffer(item.Header))
-                    {
-                        menuItem.Title = buffer.DangerousGetHandle();
-                    }
-
-                    if (item.Gesture != null)
-                    {
-                        using (var buffer = new Utf8Buffer(ConvertOSXSpecialKeyCodes(item.Gesture.Key)))
-                        {
-                            menuItem.SetGesture(buffer.DangerousGetHandle(), (AvnInputModifiers)item.Gesture.KeyModifiers);
-                        }
-                    }
-
-                    menuItem.SetAction(new PredicateCallback(() =>
-                    {
-                        if (item.Command != null || item.HasClickHandlers)
-                        {
-                            return item.Enabled;
-                        }
-
-                        return false;
-                    }), new MenuActionCallback(() => { item.RaiseClick(); }));
-                    menu.AddItem(menuItem);
-
-                    if (item.Menu?.Items?.Count >= 0)
-                    {
-                        var submenu = _factory.CreateMenu();
-
-                        using (var buffer = new Utf8Buffer(item.Header))
-                        {
-                            submenu.Title = buffer.DangerousGetHandle();
-                        }
-
-                        menuItem.SetSubMenu(submenu);
+                appMenuHolder = new NativeMenu();
 
-                        AddItemsToMenu(submenu, item.Menu?.Items);
-                    }
-                }
-                else if (i is NativeMenuItemSeperator seperator)
-                {
-                    menu.AddItem(_factory.CreateMenuItemSeperator());
-                }
+                appMenuHolder.Add(menuItem);
             }
-        }
-
-        private void AddItemsToMenu(IAvnAppMenu menu, ICollection<NativeMenuItemBase> items, bool isMainMenu = false)
-        {
-            foreach (var i in items)
-            {
-                if (i is NativeMenuItem item)
-                {
-                    var menuItem = _factory.CreateMenuItem();
 
-                    AddMenuItem(item);
-
-                    menuItem.SetAction(new PredicateCallback(() =>
-                    {
-                        if (item.Command != null || item.HasClickHandlers)
-                        {
-                            return item.Enabled;
-                        }
+            menuItem.Menu = menu;
 
-                        return false;
-                    }), new MenuActionCallback(() => { item.RaiseClick(); }));
+            var setMenu = false;
 
-                    if (item.Menu?.Items.Count >= 0 || isMainMenu)
-                    {
-                        var subMenu = CreateSubmenu(item.Menu?.Items);
+            if (_nativeMenu is null)
+            {
+                _nativeMenu = (__MicroComIAvnMenuProxy)__MicroComIAvnMenuProxy.Create(_factory);
 
-                        menuItem.SetSubMenu(subMenu);
+                _nativeMenu.Initialise(this, appMenuHolder, "");
 
-                        using (var buffer = new Utf8Buffer(item.Header))
-                        {
-                            subMenu.Title = buffer.DangerousGetHandle();
-                        }
-                    }
-                    else
-                    {
-                        using (var buffer = new Utf8Buffer(item.Header))
-                        {
-                            menuItem.Title = buffer.DangerousGetHandle();
-                        }
-
-                        if (item.Gesture != null)
-                        {
-                            using (var buffer = new Utf8Buffer(item.Gesture.Key.ToString().ToLower()))
-                            {
-                                menuItem.SetGesture(buffer.DangerousGetHandle(), (AvnInputModifiers)item.Gesture.KeyModifiers);
-                            }
-                        }
-                    }
-
-                    menu.AddItem(menuItem);
-                }
-                else if(i is NativeMenuItemSeperator seperator)
-                {
-                    menu.AddItem(_factory.CreateMenuItemSeperator());
-                }
+                setMenu = true;
             }
-        }
 
-        private void SetMenu(NativeMenu menu)
-        {
-            var appMenu = _factory.ObtainAppMenu();
+            _nativeMenu.Update(_factory, appMenuHolder);
 
-            if (appMenu is null)
+            if (setMenu)
             {
-                appMenu = _factory.CreateMenu();
+                _factory.SetAppMenu(_nativeMenu);
             }
+        }
 
-            var menuItem = menu.Parent;
+        private void SetMenu(IAvnWindow avnWindow, NativeMenu menu)
+        {
+            var setMenu = false;
 
-            if(menu.Parent is null)
+            if (_nativeMenu is null)
             {
-                menuItem = new NativeMenuItem();
-            }
+                _nativeMenu = __MicroComIAvnMenuProxy.Create(_factory);
 
-            menuItem.Menu = menu;
+                _nativeMenu.Initialise(this, menu, "");     
 
-            appMenu.Clear();
-            AddItemsToMenu(appMenu, new List<NativeMenuItemBase> { menuItem });
-
-            _factory.SetAppMenu(appMenu);
-        }
-
-        private void SetMenu(IAvnWindow avnWindow, ICollection<NativeMenuItemBase> menuItems)
-        {
-            if (menuItems is null)
-            {
-                menuItems = new List<NativeMenuItemBase>();
+                setMenu = true;           
             }
 
-            var appMenu = avnWindow.ObtainMainMenu();
+            _nativeMenu.Update(_factory, menu);
 
-            if (appMenu is null)
+            if(setMenu)
             {
-                appMenu = _factory.CreateMenu();
+                avnWindow.SetMainMenu(_nativeMenu);
             }
-
-            appMenu.Clear();
-            AddItemsToMenu(appMenu, menuItems);
-
-            avnWindow.SetMainMenu(appMenu);
         }
     }
 }
diff --git a/src/Avalonia.Native/AvaloniaNativePlatform.cs b/src/Avalonia.Native/AvaloniaNativePlatform.cs
index 571475c7ea..6ce55e17b3 100644
--- a/src/Avalonia.Native/AvaloniaNativePlatform.cs
+++ b/src/Avalonia.Native/AvaloniaNativePlatform.cs
@@ -1,10 +1,10 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
 using System;
 using System.Runtime.InteropServices;
+using System.Security.Cryptography;
 using Avalonia.Controls.Platform;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
+using Avalonia.MicroCom;
 using Avalonia.Native.Interop;
 using Avalonia.OpenGL;
 using Avalonia.Platform;
@@ -17,6 +17,7 @@ namespace Avalonia.Native
     {
         private readonly IAvaloniaNativeFactory _factory;
         private AvaloniaNativePlatformOptions _options;
+        private AvaloniaNativePlatformOpenGlInterface _platformGl;
 
         [DllImport("libAvaloniaNative")]
         static extern IntPtr CreateAvaloniaNative();
@@ -29,7 +30,7 @@ namespace Avalonia.Native
 
         public static AvaloniaNativePlatform Initialize(IntPtr factory, AvaloniaNativePlatformOptions options)
         {
-            var result =  new AvaloniaNativePlatform(new IAvaloniaNativeFactory(factory));
+            var result =  new AvaloniaNativePlatform(MicroComRuntime.CreateProxyFor<IAvaloniaNativeFactory>(factory, true));
             result.DoInitialize(options);
 
             return result;
@@ -65,10 +66,7 @@ namespace Avalonia.Native
         {
             if(!string.IsNullOrWhiteSpace(Application.Current.Name))
             {
-                using (var buffer = new Utf8Buffer(Application.Current.Name))
-                {
-                    _factory.MacOptions.SetApplicationTitle(buffer.DangerousGetHandle());
-                }
+                _factory.MacOptions.SetApplicationTitle(Application.Current.Name);
             }
         }
 
@@ -77,15 +75,23 @@ namespace Avalonia.Native
             _factory = factory;
         }
 
+        class GCHandleDeallocator : CallbackBase, IAvnGCHandleDeallocatorCallback
+        {
+            public void FreeGCHandle(IntPtr handle)
+            {
+                GCHandle.FromIntPtr(handle).Free();
+            }
+        }
+        
         void DoInitialize(AvaloniaNativePlatformOptions options)
         {
             _options = options;
-            _factory.Initialize();
+            _factory.Initialize(new GCHandleDeallocator());
             if (_factory.MacOptions != null)
             {
                 var macOpts = AvaloniaLocator.Current.GetService<MacOSPlatformOptions>();
 
-                _factory.MacOptions.ShowInDock = macOpts?.ShowInDock != false ? 1 : 0;
+                _factory.MacOptions.SetShowInDock(macOpts?.ShowInDock != false ? 1 : 0);
             }
 
             AvaloniaLocator.CurrentMutable
@@ -100,17 +106,30 @@ namespace Avalonia.Native
                 .Bind<IRenderLoop>().ToConstant(new RenderLoop())
                 .Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(60))
                 .Bind<ISystemDialogImpl>().ToConstant(new SystemDialogs(_factory.CreateSystemDialogs()))
-                .Bind<IWindowingPlatformGlFeature>().ToConstant(new GlPlatformFeature(_factory.ObtainGlFeature()))
-                .Bind<PlatformHotkeyConfiguration>().ToConstant(new PlatformHotkeyConfiguration(InputModifiers.Windows))
-                .Bind<IMountedVolumeInfoProvider>().ToConstant(new MacOSMountedVolumeInfoProvider());
+                .Bind<PlatformHotkeyConfiguration>().ToConstant(new PlatformHotkeyConfiguration(KeyModifiers.Meta))
+                .Bind<IMountedVolumeInfoProvider>().ToConstant(new MacOSMountedVolumeInfoProvider())
+                .Bind<IPlatformDragSource>().ToConstant(new AvaloniaNativeDragSource(_factory));
+
+            if (_options.UseGpu)
+            {
+                try
+                {
+                    AvaloniaLocator.CurrentMutable.Bind<IPlatformOpenGlInterface>()
+                        .ToConstant(_platformGl = new AvaloniaNativePlatformOpenGlInterface(_factory.ObtainGlDisplay()));
+                }
+                catch (Exception)
+                {
+                    // ignored
+                }
+            }
         }
 
         public IWindowImpl CreateWindow()
         {
-            return new WindowImpl(_factory, _options);
+            return new WindowImpl(_factory, _options, _platformGl);
         }
 
-        public IEmbeddableWindowImpl CreateEmbeddableWindow()
+        public IWindowImpl CreateEmbeddableWindow()
         {
             throw new NotImplementedException();
         }
@@ -132,7 +151,7 @@ namespace Avalonia.Native
             set
             {
                 _showInDock = value;
-                _opts.ShowInDock = value ? 1 : 0;
+                _opts.SetShowInDock(value ? 1 : 0);
             }
         }
     }
diff --git a/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs b/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs
index 091056142f..545659f813 100644
--- a/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs
+++ b/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Controls;
 using Avalonia.Native;
diff --git a/src/Avalonia.Native/AvaloniaNativePlatformOpenGlInterface.cs b/src/Avalonia.Native/AvaloniaNativePlatformOpenGlInterface.cs
new file mode 100644
index 0000000000..3b3d8836fd
--- /dev/null
+++ b/src/Avalonia.Native/AvaloniaNativePlatformOpenGlInterface.cs
@@ -0,0 +1,186 @@
+using System;
+using Avalonia.OpenGL;
+using Avalonia.Native.Interop;
+using System.Drawing;
+using Avalonia.OpenGL.Surfaces;
+using Avalonia.Threading;
+
+namespace Avalonia.Native
+{
+    class AvaloniaNativePlatformOpenGlInterface : IPlatformOpenGlInterface
+    {
+        private readonly IAvnGlDisplay _display;
+
+        public AvaloniaNativePlatformOpenGlInterface(IAvnGlDisplay display)
+        {
+            _display = display;
+            var immediate = display.CreateContext(null);
+            
+            int major, minor;
+            GlInterface glInterface;
+            using (immediate.MakeCurrent())
+            {
+                var basic = new GlBasicInfoInterface(display.GetProcAddress);
+                basic.GetIntegerv(GlConsts.GL_MAJOR_VERSION, out major);
+                basic.GetIntegerv(GlConsts.GL_MINOR_VERSION, out minor);
+                _version = new GlVersion(GlProfileType.OpenGL, major, minor);
+                glInterface = new GlInterface(_version, (name) =>
+                {
+                    var rv = _display.GetProcAddress(name);
+                    return rv;
+                });
+            }
+
+            GlDisplay = new GlDisplay(display, glInterface, immediate.SampleCount, immediate.StencilSize);
+            MainContext = new GlContext(GlDisplay, null, immediate, _version);
+        }
+
+        internal GlContext MainContext { get; }
+        public IGlContext PrimaryContext => MainContext;
+        
+        public bool CanShareContexts => true;
+        public bool CanCreateContexts => true;
+        internal GlDisplay GlDisplay;
+        private readonly GlVersion _version;
+
+        public IGlContext CreateSharedContext() => new GlContext(GlDisplay,
+            MainContext, _display.CreateContext(MainContext.Context), _version);
+
+        public IGlContext CreateContext() => new GlContext(GlDisplay,
+            null, _display.CreateContext(null), _version);
+    }
+
+    class GlDisplay
+    {
+        private readonly IAvnGlDisplay _display;
+
+        public GlDisplay(IAvnGlDisplay display, GlInterface glInterface, int sampleCount, int stencilSize)
+        {
+            _display = display;
+            SampleCount = sampleCount;
+            StencilSize = stencilSize;
+            GlInterface = glInterface;
+        }
+
+        public GlInterface GlInterface { get; }
+
+        public int SampleCount { get; }
+
+        public int StencilSize { get; }
+
+        public void ClearContext() => _display.LegacyClearCurrentContext();
+    }
+
+    class GlContext : IGlContext
+    {
+        private readonly GlDisplay _display;
+        private readonly GlContext _sharedWith;
+        public IAvnGlContext Context { get; private set; }
+
+        public GlContext(GlDisplay display, GlContext sharedWith, IAvnGlContext context, GlVersion version)
+        {
+            _display = display;
+            _sharedWith = sharedWith;
+            Context = context;
+            Version = version;
+        }
+
+        public GlVersion Version { get; }
+        public GlInterface GlInterface => _display.GlInterface;
+        public int SampleCount => _display.SampleCount;
+        public int StencilSize => _display.StencilSize;
+        public IDisposable MakeCurrent() => Context.MakeCurrent();
+        public IDisposable EnsureCurrent() => MakeCurrent();
+
+        public bool IsSharedWith(IGlContext context)
+        {
+            var c = (GlContext)context;
+            return c == this
+                   || c._sharedWith == this
+                   || _sharedWith == context
+                   || _sharedWith != null && _sharedWith == c._sharedWith;
+        }
+
+
+        public void Dispose()
+        {
+            Context.Dispose();
+            Context = null;
+        }
+    }
+
+
+    class GlPlatformSurfaceRenderTarget : IGlPlatformSurfaceRenderTarget
+    {
+        private IAvnGlSurfaceRenderTarget _target;
+        private readonly IGlContext _context;
+
+        public GlPlatformSurfaceRenderTarget(IAvnGlSurfaceRenderTarget target, IGlContext context)
+        {
+            _target = target;
+            _context = context;
+        }
+
+        public IGlPlatformSurfaceRenderingSession BeginDraw()
+        {
+            var feature = (AvaloniaNativePlatformOpenGlInterface)AvaloniaLocator.Current.GetService<IPlatformOpenGlInterface>();
+            return new GlPlatformSurfaceRenderingSession(_context, _target.BeginDrawing());
+        }
+
+        public void Dispose()
+        {
+            _target?.Dispose();
+            _target = null;
+        }
+    }
+
+    class GlPlatformSurfaceRenderingSession : IGlPlatformSurfaceRenderingSession
+    {
+        private IAvnGlSurfaceRenderingSession _session;
+
+        public GlPlatformSurfaceRenderingSession(IGlContext context, IAvnGlSurfaceRenderingSession session)
+        {
+            Context = context;
+            _session = session;
+        }
+
+        public IGlContext Context { get; }
+
+        public PixelSize Size
+        {
+            get
+            {
+                var s = _session.PixelSize;
+                return new PixelSize(s.Width, s.Height);
+            }
+        }
+
+        public double Scaling => _session.Scaling;
+
+
+        public bool IsYFlipped => true;
+        
+        public void Dispose()
+        {
+            _session?.Dispose();
+            _session = null;
+        }
+    }
+
+    class GlPlatformSurface : IGlPlatformSurface
+    {
+        private readonly IAvnWindowBase _window;
+        private readonly IGlContext _context;
+
+        public GlPlatformSurface(IAvnWindowBase window, IGlContext context)
+        {
+            _window = window;
+            _context = context;
+        }
+        public IGlPlatformSurfaceRenderTarget CreateGlRenderTarget()
+        {
+            return new GlPlatformSurfaceRenderTarget(_window.CreateGlRenderTarget(), _context);
+        }
+
+    }
+}
diff --git a/src/Avalonia.Native/AvnString.cs b/src/Avalonia.Native/AvnString.cs
new file mode 100644
index 0000000000..dcd473bae3
--- /dev/null
+++ b/src/Avalonia.Native/AvnString.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Native.Interop
+{
+    partial interface IAvnString
+    {
+        public string String { get; }
+        public byte[] Bytes { get; }
+    }
+
+    partial interface IAvnStringArray
+    {
+        string[] ToStringArray();
+    }
+}
+namespace Avalonia.Native.Interop.Impl
+{
+    unsafe partial class __MicroComIAvnStringProxy
+    {
+        private string _managed;
+        private byte[] _bytes;
+
+        public string String
+        {
+            get
+            {
+                if (_managed == null)
+                {
+                    var ptr = Pointer();
+                    if (ptr == null)
+                        return null;
+                    _managed = System.Text.Encoding.UTF8.GetString((byte*)ptr, Length());
+                }
+
+                return _managed;
+            }
+        }
+
+        public byte[] Bytes
+        {
+            get
+            {
+                if (_bytes == null)
+                {
+                    _bytes = new byte[Length()];
+                    Marshal.Copy(new IntPtr(Pointer()), _bytes, 0, _bytes.Length);
+                }
+
+                return _bytes;
+            }
+        }
+
+        public override string ToString() => String;
+    }
+    
+    partial class __MicroComIAvnStringArrayProxy
+    {
+        public string[] ToStringArray()
+        {
+            var arr = new string[Count];
+            for(uint c = 0; c<arr.Length;c++)
+                using (var s = Get(c))
+                    arr[c] = s.String;
+            return arr;
+        }
+    }
+}
diff --git a/src/Avalonia.Native/CallbackBase.cs b/src/Avalonia.Native/CallbackBase.cs
index 67c383f6ae..455ed4b159 100644
--- a/src/Avalonia.Native/CallbackBase.cs
+++ b/src/Avalonia.Native/CallbackBase.cs
@@ -1,80 +1,67 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using SharpGen.Runtime;
+using System;
+using System.Runtime.ExceptionServices;
+using Avalonia.MicroCom;
+using Avalonia.Platform;
 
 namespace Avalonia.Native
 {
-    public class CallbackBase : SharpGen.Runtime.IUnknown
+    public class CallbackBase : IUnknown, IMicroComShadowContainer, IMicroComExceptionCallback
     {
-        private uint _refCount;
-        private bool _disposed;
         private readonly object _lock = new object();
-        private ShadowContainer _shadow;
+        private bool _referencedFromManaged = true;
+        private bool _referencedFromNative = false;
+        private bool _destroyed;
+        
 
-        public CallbackBase()
+        protected virtual void Destroyed()
         {
-            _refCount = 1;
+
         }
 
-        public ShadowContainer Shadow
+        public void RaiseException(Exception e)
         {
-            get => _shadow;
-            set
+            if (AvaloniaLocator.Current.GetService<IPlatformThreadingInterface>() is PlatformThreadingInterface threadingInterface)
             {
-                lock (_lock)
-                {
-                    if (_disposed && value != null)
-                    {
-                        throw new ObjectDisposedException("CallbackBase");
-                    }
+                threadingInterface.TerminateNativeApp();
 
-                    _shadow = value;
-                }
+                threadingInterface.DispatchException(ExceptionDispatchInfo.Capture(e));
             }
         }
 
-        public uint AddRef()
+        public void Dispose()
         {
             lock (_lock)
             {
-                return ++_refCount;
+                _referencedFromManaged = false;
+                DestroyIfNeeded();
             }
         }
 
-        public void Dispose()
+        void DestroyIfNeeded()
         {
-            lock (_lock)
+            if(_destroyed)
+                return;
+            if (_referencedFromManaged == false && _referencedFromNative == false)
             {
-                if (!_disposed)
-                {
-                    _disposed = true;
-                    Release();
-                }
+                _destroyed = true;
+                Destroyed();
             }
         }
 
-        public uint Release()
+        public MicroComShadow Shadow { get; set; }
+        public void OnReferencedFromNative()
         {
-            lock (_lock)
-            {
-                _refCount--;
-
-                if (_refCount == 0)
-                {
-                    Shadow?.Dispose();
-                    Shadow = null;
-                    Destroyed();
-                }
-
-                return _refCount;
-            }
+            lock (_lock) 
+                _referencedFromNative = true;
         }
 
-        protected virtual void Destroyed()
+        public void OnUnreferencedFromNative()
         {
-
+            lock (_lock)
+            {
+                _referencedFromNative = false;
+                DestroyIfNeeded();
+            }
         }
     }
 }
diff --git a/src/Avalonia.Native/ClipboardImpl.cs b/src/Avalonia.Native/ClipboardImpl.cs
index c756a6d9c2..4ee590516b 100644
--- a/src/Avalonia.Native/ClipboardImpl.cs
+++ b/src/Avalonia.Native/ClipboardImpl.cs
@@ -1,18 +1,22 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using System.Runtime.InteropServices;
+using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.Native.Interop;
 using Avalonia.Platform.Interop;
 
 namespace Avalonia.Native
 {
-    class ClipboardImpl : IClipboard
+    class ClipboardImpl : IClipboard, IDisposable
     {
         private IAvnClipboard _native;
-
+        private const string NSPasteboardTypeString = "public.utf8-plain-text";
+        private const string NSFilenamesPboardType = "NSFilenamesPboardType";
+        private const string NSPasteboardTypeFileUrl = "public.file-url";
+        
         public ClipboardImpl(IAvnClipboard native)
         {
             _native = native;
@@ -25,29 +29,124 @@ namespace Avalonia.Native
             return Task.CompletedTask;
         }
 
-        public unsafe Task<string> GetTextAsync()
+        public Task<string> GetTextAsync()
         {
-            using (var text = _native.GetText())
-            {
-                var result = System.Text.Encoding.UTF8.GetString((byte*)text.Pointer(), text.Length());
-
-                return Task.FromResult(result);
-            }
+            using (var text = _native.GetText(NSPasteboardTypeString))
+                return Task.FromResult(text.String);
         }
 
-        public Task SetTextAsync(string text)
+        public unsafe Task SetTextAsync(string text)
         {
             _native.Clear();
 
-            if (text != null)
+            if (text != null) 
+                _native.SetText(NSPasteboardTypeString, text);
+
+            return Task.CompletedTask;
+        }
+
+        public IEnumerable<string> GetFormats()
+        {
+            var rv = new List<string>();
+            using (var formats = _native.ObtainFormats())
             {
-                using (var buffer = new Utf8Buffer(text))
+                var cnt = formats.Count;
+                for (uint c = 0; c < cnt; c++)
                 {
-                    _native.SetText(buffer.DangerousGetHandle());
+                    using (var fmt = formats.Get(c))
+                    {
+                         if(fmt.String == NSPasteboardTypeString)
+                             rv.Add(DataFormats.Text);
+                         if(fmt.String == NSFilenamesPboardType)
+                             rv.Add(DataFormats.FileNames);
+                    }
                 }
             }
 
+            return rv;
+        }
+        
+        public void Dispose()
+        {
+            _native?.Dispose();
+            _native = null;
+        }
+
+        public IEnumerable<string> GetFileNames()
+        {
+            using (var strings = _native.GetStrings(NSFilenamesPboardType))
+                return strings.ToStringArray();
+        }
+
+        public unsafe Task SetDataObjectAsync(IDataObject data)
+        {
+            _native.Clear();
+            foreach (var fmt in data.GetDataFormats())
+            {
+                var o = data.Get(fmt);
+                if(o is string s)
+                    _native.SetText(fmt, s);
+                else if(o is byte[] bytes)
+                    fixed (byte* pbytes = bytes)
+                        _native.SetBytes(fmt, pbytes, bytes.Length);
+            }
             return Task.CompletedTask;
         }
+
+        public Task<string[]> GetFormatsAsync()
+        {
+            using (var n = _native.ObtainFormats())
+                return Task.FromResult(n.ToStringArray());
+        }
+
+        public async Task<object> GetDataAsync(string format)
+        {
+            if (format == DataFormats.Text)
+                return await GetTextAsync();
+            if (format == DataFormats.FileNames)
+                return GetFileNames();
+            using (var n = _native.GetBytes(format))
+                return n.Bytes;
+        }
+    }
+    
+    class ClipboardDataObject : IDataObject, IDisposable
+    {
+        private ClipboardImpl _clipboard;
+        private List<string> _formats;
+
+        public ClipboardDataObject(IAvnClipboard clipboard)
+        {
+            _clipboard = new ClipboardImpl(clipboard);
+        }
+
+        public void Dispose()
+        {
+            _clipboard?.Dispose();
+            _clipboard = null;
+        }
+
+        List<string> Formats => _formats ??= _clipboard.GetFormats().ToList();
+
+        public IEnumerable<string> GetDataFormats() => Formats;
+
+        public bool Contains(string dataFormat) => Formats.Contains(dataFormat);
+
+        public string GetText()
+        {
+            // bad idea in general, but API is synchronous anyway
+            return _clipboard.GetTextAsync().Result;
+        }
+
+        public IEnumerable<string> GetFileNames() => _clipboard.GetFileNames();
+
+        public object Get(string dataFormat)
+        {
+            if (dataFormat == DataFormats.Text)
+                return GetText();
+            if (dataFormat == DataFormats.FileNames)
+                return GetFileNames();
+            return null;
+        }
     }
 }
diff --git a/src/Avalonia.Native/Cursor.cs b/src/Avalonia.Native/Cursor.cs
index 1093eca1a4..3c65367c12 100644
--- a/src/Avalonia.Native/Cursor.cs
+++ b/src/Avalonia.Native/Cursor.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using Avalonia.Input;
 using Avalonia.Platform;
 using Avalonia.Native.Interop;
diff --git a/src/Avalonia.Native/DeferredFramebuffer.cs b/src/Avalonia.Native/DeferredFramebuffer.cs
index adc721de42..950b6a3197 100644
--- a/src/Avalonia.Native/DeferredFramebuffer.cs
+++ b/src/Avalonia.Native/DeferredFramebuffer.cs
@@ -1,15 +1,11 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Runtime.InteropServices;
 using Avalonia.Native.Interop;
 using Avalonia.Platform;
-using SharpGen.Runtime;
 
 namespace Avalonia.Native
 {
-    public class DeferredFramebuffer : ILockedFramebuffer
+    internal unsafe class DeferredFramebuffer : ILockedFramebuffer
     {
         private readonly Func<Action<IAvnWindowBase>, bool> _lockWindow;
 
@@ -21,7 +17,7 @@ namespace Avalonia.Native
             Size = new PixelSize(width, height);
             RowBytes = width * 4;
             Dpi = dpi;
-            Format = PixelFormat.Rgba8888;
+            Format = PixelFormat.Bgra8888;
         }
 
         public IntPtr Address { get; set; }
@@ -59,7 +55,7 @@ namespace Avalonia.Native
             {
                 var fb = new AvnFramebuffer
                 {
-                    Data = Address,
+                    Data = Address.ToPointer(),
                     Dpi = new AvnVector
                     {
                         X = Dpi.X,
@@ -73,7 +69,7 @@ namespace Avalonia.Native
 
                 using (var d = new Disposer(Address))
                 {
-                    win.ThreadSafeSetSwRenderedFrame(ref fb, d);
+                    win.ThreadSafeSetSwRenderedFrame(&fb, d);
                 }
             }))
             {
diff --git a/src/Avalonia.Native/DoubleClickHelper.cs b/src/Avalonia.Native/DoubleClickHelper.cs
new file mode 100644
index 0000000000..7618d6976a
--- /dev/null
+++ b/src/Avalonia.Native/DoubleClickHelper.cs
@@ -0,0 +1,31 @@
+using Avalonia.Platform;
+
+namespace Avalonia.Native
+{
+    internal class DoubleClickHelper
+    {
+        private int _clickCount;
+        private Rect _lastClickRect;
+        private ulong _lastClickTime;
+
+        public bool IsDoubleClick(
+            ulong timestamp,
+            Point p)
+        {
+            var settings = AvaloniaLocator.Current.GetService<IPlatformSettings>();
+            var doubleClickTime = settings.DoubleClickTime.TotalMilliseconds;
+
+            if (!_lastClickRect.Contains(p) || timestamp - _lastClickTime > doubleClickTime)
+            {
+                _clickCount = 0;
+            }
+
+            ++_clickCount;
+            _lastClickTime = timestamp;
+            _lastClickRect = new Rect(p, new Size())
+                .Inflate(new Thickness(settings.DoubleClickSize.Width / 2, settings.DoubleClickSize.Height / 2));
+
+            return _clickCount == 2;
+        }
+    }
+}
diff --git a/src/Avalonia.Native/DynLoader.cs b/src/Avalonia.Native/DynLoader.cs
index c9c064fb95..237ea8d0af 100644
--- a/src/Avalonia.Native/DynLoader.cs
+++ b/src/Avalonia.Native/DynLoader.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Runtime.InteropServices;
 
 /*
diff --git a/src/Avalonia.Native/Extensions.cs b/src/Avalonia.Native/Extensions.cs
new file mode 100644
index 0000000000..c0d90f7a85
--- /dev/null
+++ b/src/Avalonia.Native/Extensions.cs
@@ -0,0 +1,8 @@
+namespace Avalonia.Native
+{
+    internal static class Extensions
+    {
+        public static int AsComBool(this bool b) => b ? 1 : 0;
+        public static bool FromComBool(this int b) => b != 0;
+    }
+}
diff --git a/src/Avalonia.Native/GlPlatformFeature.cs b/src/Avalonia.Native/GlPlatformFeature.cs
deleted file mode 100644
index e39680bdee..0000000000
--- a/src/Avalonia.Native/GlPlatformFeature.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using System;
-using Avalonia.OpenGL;
-using Avalonia.Native.Interop;
-using System.Drawing;
-using Avalonia.Threading;
-
-namespace Avalonia.Native
-{
-    class GlPlatformFeature : IWindowingPlatformGlFeature
-    {
-
-        public GlPlatformFeature(IAvnGlFeature feature)
-        {
-            Display = new GlDisplay(feature.ObtainDisplay());
-            ImmediateContext = new GlContext(Display, feature.ObtainImmediateContext());
-        }
-
-        public IGlContext ImmediateContext { get; }
-        public GlDisplay Display { get; }
-    }
-
-    class GlDisplay : IGlDisplay
-    {
-        private readonly IAvnGlDisplay _display;
-
-        public GlDisplay(IAvnGlDisplay display)
-        {
-            _display = display;
-            GlInterface = new GlInterface((name, optional) =>
-            {
-                var rv = _display.GetProcAddress(name);
-                if (rv == IntPtr.Zero && !optional)
-                    throw new OpenGlException($"{name} not found in system OpenGL");
-                return rv;
-            });
-        }
-
-        public GlDisplayType Type => GlDisplayType.OpenGL2;
-
-        public GlInterface GlInterface { get; }
-
-        public int SampleCount => _display.GetSampleCount();
-
-        public int StencilSize => _display.GetStencilSize();
-
-        public void ClearContext() => _display.ClearContext();
-    }
-
-    class GlContext : IGlContext
-    {
-        public IAvnGlContext Context { get; }
-
-        public GlContext(GlDisplay display, IAvnGlContext context)
-        {
-            Display = display;
-            Context = context;
-        }
-
-        public IGlDisplay Display { get; }
-
-        public void MakeCurrent()
-        {
-            Context.MakeCurrent();
-        }
-    }
-
-
-    class GlPlatformSurfaceRenderTarget : IGlPlatformSurfaceRenderTarget
-    {
-        private IAvnGlSurfaceRenderTarget _target;
-        public GlPlatformSurfaceRenderTarget(IAvnGlSurfaceRenderTarget target)
-        {
-            _target = target;
-        }
-
-        public IGlPlatformSurfaceRenderingSession BeginDraw()
-        {
-            var feature = (GlPlatformFeature)AvaloniaLocator.Current.GetService<IWindowingPlatformGlFeature>();
-            return new GlPlatformSurfaceRenderingSession(feature.Display, _target.BeginDrawing());
-        }
-
-        public void Dispose()
-        {
-            _target?.Dispose();
-            _target = null;
-        }
-    }
-
-    class GlPlatformSurfaceRenderingSession : IGlPlatformSurfaceRenderingSession
-    {
-        private IAvnGlSurfaceRenderingSession _session;
-
-        public GlPlatformSurfaceRenderingSession(GlDisplay display, IAvnGlSurfaceRenderingSession session)
-        {
-            Display = display;
-            _session = session;
-        }
-
-        public IGlDisplay Display { get; }
-
-        public PixelSize Size
-        {
-            get
-            {
-                var s = _session.GetPixelSize();
-                return new PixelSize(s.Width, s.Height);
-            }
-        }
-
-        public double Scaling => _session.GetScaling();
-
-        public void Dispose()
-        {
-            _session?.Dispose();
-            _session = null;
-        }
-    }
-
-    class GlPlatformSurface : IGlPlatformSurface
-    {
-        private readonly IAvnWindowBase _window;
-
-        public GlPlatformSurface(IAvnWindowBase window)
-        {
-            _window = window;
-        }
-        public IGlPlatformSurfaceRenderTarget CreateGlRenderTarget()
-        {
-            return new GlPlatformSurfaceRenderTarget(_window.CreateGlRenderTarget());
-        }
-    }
-}
diff --git a/src/Avalonia.Native/Helpers.cs b/src/Avalonia.Native/Helpers.cs
index a77e7d4ff8..564434a04c 100644
--- a/src/Avalonia.Native/Helpers.cs
+++ b/src/Avalonia.Native/Helpers.cs
@@ -1,11 +1,8 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Native.Interop;
+using Avalonia.Native.Interop;
 
 namespace Avalonia.Native
 {
-    public static class Helpers
+    internal static class Helpers
     {
         public static Point ToAvaloniaPoint (this AvnPoint pt)
         {
diff --git a/src/Avalonia.Native/IAvnMenu.cs b/src/Avalonia.Native/IAvnMenu.cs
new file mode 100644
index 0000000000..dd9464284f
--- /dev/null
+++ b/src/Avalonia.Native/IAvnMenu.cs
@@ -0,0 +1,181 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Reactive.Disposables;
+using Avalonia.Controls;
+using Avalonia.Platform.Interop;
+
+namespace Avalonia.Native.Interop
+{
+    class MenuEvents : CallbackBase, IAvnMenuEvents
+    {
+        private IAvnMenu _parent;
+
+        public void Initialise(IAvnMenu parent)
+        {
+            _parent = parent;
+        }
+
+        public void NeedsUpdate()
+        {
+            _parent?.RaiseNeedsUpdate();
+        }
+    }
+
+    partial interface IAvnMenu
+    {
+        void RaiseNeedsUpdate();
+        void Deinitialise();
+    }
+}
+namespace Avalonia.Native.Interop.Impl
+{
+    partial class __MicroComIAvnMenuProxy
+    {
+        private MenuEvents _events;
+        private AvaloniaNativeMenuExporter _exporter;
+        private List<__MicroComIAvnMenuItemProxy> _menuItems = new List<__MicroComIAvnMenuItemProxy>();
+        private Dictionary<NativeMenuItemBase, __MicroComIAvnMenuItemProxy> _menuItemLookup = new Dictionary<NativeMenuItemBase, __MicroComIAvnMenuItemProxy>();
+        private CompositeDisposable _propertyDisposables = new CompositeDisposable();
+
+        public void RaiseNeedsUpdate()
+        {
+            (ManagedMenu as INativeMenuExporterEventsImplBridge).RaiseNeedsUpdate();
+
+            _exporter.UpdateIfNeeded();
+        }
+
+        internal NativeMenu ManagedMenu { get; private set; }
+
+        public static __MicroComIAvnMenuProxy Create(IAvaloniaNativeFactory factory)
+        {
+            var events = new MenuEvents();
+
+            var menu = (__MicroComIAvnMenuProxy)factory.CreateMenu(events);
+
+            events.Initialise(menu);
+
+            menu._events = events;
+
+            return menu;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                _events.Dispose();
+            }
+        }
+
+        private void RemoveAndDispose(__MicroComIAvnMenuItemProxy item)
+        {
+            _menuItemLookup.Remove(item.ManagedMenuItem);
+            _menuItems.Remove(item);
+            RemoveItem(item);
+
+            item.Deinitialise();
+            item.Dispose();
+        }
+
+        private void MoveExistingTo(int index, __MicroComIAvnMenuItemProxy item)
+        {
+            _menuItems.Remove(item);
+            _menuItems.Insert(index, item);
+
+            RemoveItem(item);
+            InsertItem(index, item);
+        }
+
+        private __MicroComIAvnMenuItemProxy CreateNewAt(IAvaloniaNativeFactory factory, int index, NativeMenuItemBase item)
+        {
+            var result = CreateNew(factory, item);
+
+            result.Initialise(item);
+
+            _menuItemLookup.Add(result.ManagedMenuItem, result);
+            _menuItems.Insert(index, result);
+
+            InsertItem(index, result);
+
+            return result;
+        }
+
+        private __MicroComIAvnMenuItemProxy CreateNew(IAvaloniaNativeFactory factory, NativeMenuItemBase item)
+        {
+            var nativeItem = (__MicroComIAvnMenuItemProxy)(item is NativeMenuItemSeperator ?
+                factory.CreateMenuItemSeperator() :
+                factory.CreateMenuItem());
+            nativeItem.ManagedMenuItem = item;
+
+            return nativeItem;
+        }
+
+        internal void Initialise(AvaloniaNativeMenuExporter exporter, NativeMenu managedMenu, string title)
+        {
+            _exporter = exporter;
+            ManagedMenu = managedMenu;
+
+            ((INotifyCollectionChanged)ManagedMenu.Items).CollectionChanged += OnMenuItemsChanged;
+
+            if (!string.IsNullOrWhiteSpace(title)) 
+                SetTitle(title);
+        }
+
+        public void Deinitialise()
+        {
+            ((INotifyCollectionChanged)ManagedMenu.Items).CollectionChanged -= OnMenuItemsChanged;
+
+            foreach (var item in _menuItems)
+            {
+                item.Deinitialise();
+                item.Dispose();
+            }
+        }
+
+        internal void Update(IAvaloniaNativeFactory factory, NativeMenu menu)
+        {
+            if (menu != ManagedMenu)
+            {
+                throw new ArgumentException("The menu being updated does not match.", nameof(menu));
+            }
+
+            for (int i = 0; i < menu.Items.Count; i++)
+            {
+                __MicroComIAvnMenuItemProxy nativeItem;
+
+                if (i >= _menuItems.Count)
+                {
+                    nativeItem = CreateNewAt(factory, i, menu.Items[i]);
+                }
+                else if (menu.Items[i] == _menuItems[i].ManagedMenuItem)
+                {
+                    nativeItem = _menuItems[i];
+                }
+                else if (_menuItemLookup.TryGetValue(menu.Items[i], out nativeItem))
+                {
+                    MoveExistingTo(i, nativeItem);
+                }
+                else
+                {
+                    nativeItem = CreateNewAt(factory, i, menu.Items[i]);
+                }
+
+                if (menu.Items[i] is NativeMenuItem nmi)
+                {
+                    nativeItem.Update(_exporter, factory, nmi);
+                }
+            }
+
+            while (_menuItems.Count > menu.Items.Count)
+            {
+                RemoveAndDispose(_menuItems[_menuItems.Count - 1]);
+            }
+        }
+
+        private void OnMenuItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            _exporter.QueueReset();
+        }
+    }
+}
diff --git a/src/Avalonia.Native/IAvnMenuItem.cs b/src/Avalonia.Native/IAvnMenuItem.cs
new file mode 100644
index 0000000000..97838f8dea
--- /dev/null
+++ b/src/Avalonia.Native/IAvnMenuItem.cs
@@ -0,0 +1,170 @@
+using System;
+using System.IO;
+using System.Reactive.Disposables;
+using Avalonia.Controls;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform.Interop;
+
+namespace Avalonia.Native.Interop
+{
+    partial interface IAvnMenuItem
+    {
+        
+    }
+}
+namespace Avalonia.Native.Interop.Impl
+{
+    partial class __MicroComIAvnMenuItemProxy
+    {
+        private __MicroComIAvnMenuProxy _subMenu;
+        private CompositeDisposable _propertyDisposables = new CompositeDisposable();
+        private IDisposable _currentActionDisposable;
+
+        public NativeMenuItemBase ManagedMenuItem { get; set; }
+
+        private void UpdateTitle(string title) => SetTitle(title ?? "");
+
+        private void UpdateIsChecked(bool isChecked) => SetIsChecked(isChecked.AsComBool());
+
+        private void UpdateToggleType(NativeMenuItemToggleType toggleType)
+        {
+            SetToggleType((AvnMenuItemToggleType)toggleType);
+        }
+
+        private unsafe void UpdateIcon (IBitmap icon)
+        {
+            if(icon is null)
+            {
+                SetIcon(null, IntPtr.Zero);
+            }
+            else
+            {
+                using(var ms = new MemoryStream())
+                {
+                    icon.Save(ms);
+
+                    var imageData = ms.ToArray();
+
+                    fixed(void* ptr = imageData)
+                    {
+                        SetIcon(ptr, new IntPtr(imageData.Length));
+                    }
+                }
+            }
+        }
+
+        private void UpdateGesture(Input.KeyGesture gesture)
+        {
+            var modifiers = gesture == null ? AvnInputModifiers.AvnInputModifiersNone : (AvnInputModifiers)gesture.KeyModifiers;
+            var key = gesture == null ? AvnKey.AvnKeyNone : (AvnKey)gesture.Key;
+            SetGesture(key, modifiers);
+        }
+
+        private void UpdateAction(NativeMenuItem item)
+        {
+            _currentActionDisposable?.Dispose();
+
+            var action = new PredicateCallback(() =>
+            {
+                if (item.Command != null || item.HasClickHandlers)
+                {
+                    return item.IsEnabled;
+                }
+
+                return false;
+            });
+
+            var callback = new MenuActionCallback(() => { (item as INativeMenuItemExporterEventsImplBridge)?.RaiseClicked(); });
+
+            _currentActionDisposable = Disposable.Create(() =>
+            {
+                action.Dispose();
+                callback.Dispose();
+            });
+
+            SetAction(action, callback);
+        }
+
+        internal void Initialise(NativeMenuItemBase nativeMenuItem)
+        {
+            ManagedMenuItem = nativeMenuItem;
+
+            if (ManagedMenuItem is NativeMenuItem item)
+            {
+                UpdateTitle(item.Header);
+
+                UpdateGesture(item.Gesture);
+
+                UpdateAction(ManagedMenuItem as NativeMenuItem);
+
+                UpdateToggleType(item.ToggleType);
+
+                UpdateIcon(item.Icon);
+
+                UpdateIsChecked(item.IsChecked);
+
+                _propertyDisposables.Add(ManagedMenuItem.GetObservable(NativeMenuItem.HeaderProperty)
+                    .Subscribe(x => UpdateTitle(x)));
+
+                _propertyDisposables.Add(ManagedMenuItem.GetObservable(NativeMenuItem.GestureProperty)
+                    .Subscribe(x => UpdateGesture(x)));
+
+                _propertyDisposables.Add(ManagedMenuItem.GetObservable(NativeMenuItem.CommandProperty)
+                    .Subscribe(x => UpdateAction(ManagedMenuItem as NativeMenuItem)));
+
+                _propertyDisposables.Add(ManagedMenuItem.GetObservable(NativeMenuItem.ToggleTypeProperty)
+                    .Subscribe(x => UpdateToggleType(x)));
+
+                _propertyDisposables.Add(ManagedMenuItem.GetObservable(NativeMenuItem.IsCheckedProperty)
+                    .Subscribe(x => UpdateIsChecked(x)));
+
+                _propertyDisposables.Add(ManagedMenuItem.GetObservable(NativeMenuItem.IconProperty)
+                    .Subscribe(x => UpdateIcon(x)));
+            }
+        }
+
+        internal void Deinitialise()
+        {
+            if (_subMenu != null)
+            {
+                SetSubMenu(null);
+                _subMenu.Deinitialise();
+                _subMenu.Dispose();
+                _subMenu = null;
+            }
+
+            _propertyDisposables?.Dispose();
+            _currentActionDisposable?.Dispose();
+        }
+
+        internal void Update(AvaloniaNativeMenuExporter exporter, IAvaloniaNativeFactory factory, NativeMenuItem item)
+        {
+            if (item != ManagedMenuItem)
+            {
+                throw new ArgumentException("The item does not match the menuitem being updated.", nameof(item));
+            }
+
+            if (item.Menu != null)
+            {
+                if (_subMenu == null)
+                {
+                    _subMenu = __MicroComIAvnMenuProxy.Create(factory);
+
+                    _subMenu.Initialise(exporter, item.Menu, item.Header);
+
+                    SetSubMenu(_subMenu);
+                }
+
+                _subMenu.Update(factory, item.Menu);
+            }
+
+            if (item.Menu == null && _subMenu != null)
+            {
+                _subMenu.Deinitialise();
+                _subMenu.Dispose();
+
+                SetSubMenu(null);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Native/IconLoader.cs b/src/Avalonia.Native/IconLoader.cs
index 608c24d031..edb8b94e83 100644
--- a/src/Avalonia.Native/IconLoader.cs
+++ b/src/Avalonia.Native/IconLoader.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.IO;
+using System.IO;
 using Avalonia.Platform;
 
 namespace Avalonia.Native
diff --git a/src/Avalonia.Native/Mappings.xml b/src/Avalonia.Native/Mappings.xml
index 7ac6377f78..fcaa31a249 100644
--- a/src/Avalonia.Native/Mappings.xml
+++ b/src/Avalonia.Native/Mappings.xml
@@ -19,5 +19,7 @@
         <map param=".*::.*::ppv" return="true"/>
         <map param=".*::.*::ret" return="true"/>
         <map param=".*::.*::retOut" attribute="out" return="true"/>
+        <map method="IAvnAppMenu:.*" visibility="private" />
+        <map method="IAvnAppMenuItem:.*" visibility="private" />
     </mapping>
 </config>
diff --git a/src/Avalonia.Native/MenuActionCallback.cs b/src/Avalonia.Native/MenuActionCallback.cs
new file mode 100644
index 0000000000..5318195f30
--- /dev/null
+++ b/src/Avalonia.Native/MenuActionCallback.cs
@@ -0,0 +1,20 @@
+using System;
+using Avalonia.Native.Interop;
+
+namespace Avalonia.Native
+{
+    public class MenuActionCallback : CallbackBase, IAvnActionCallback
+    {
+        private Action _action;
+
+        public MenuActionCallback(Action action)
+        {
+            _action = action;
+        }
+
+        void IAvnActionCallback.Run()
+        {
+            _action?.Invoke();
+        }
+    }
+}
diff --git a/src/Avalonia.Native/NativeControlHostImpl.cs b/src/Avalonia.Native/NativeControlHostImpl.cs
new file mode 100644
index 0000000000..2c9c1728d3
--- /dev/null
+++ b/src/Avalonia.Native/NativeControlHostImpl.cs
@@ -0,0 +1,135 @@
+using System;
+using Avalonia.Controls.Platform;
+using Avalonia.MicroCom;
+using Avalonia.Native.Interop;
+using Avalonia.Platform;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Native
+{
+    class NativeControlHostImpl : IDisposable, INativeControlHostImpl
+    {
+        private IAvnNativeControlHost _host;
+
+        public NativeControlHostImpl(IAvnNativeControlHost host)
+        {
+            _host = host;
+        }
+
+        public void Dispose()
+        {
+            _host?.Dispose();
+            _host = null;
+        }
+
+        class DestroyableNSView : INativeControlHostDestroyableControlHandle
+        {
+            private IAvnNativeControlHost _impl;
+            private IntPtr _nsView;
+
+            public DestroyableNSView(IAvnNativeControlHost impl)
+            {
+                _impl = MicroComRuntime.CloneReference(impl);
+                _nsView = _impl.CreateDefaultChild(IntPtr.Zero);
+            }
+
+            public IntPtr Handle => _nsView;
+            public string HandleDescriptor => "NSView";
+            public void Destroy()
+            {
+                if (_impl != null)
+                {
+                    _impl.DestroyDefaultChild(_nsView);
+                    _impl.Dispose();
+                    _impl = null;
+                    _nsView = IntPtr.Zero;
+                }
+            }
+        }
+        
+        public INativeControlHostDestroyableControlHandle CreateDefaultChild(IPlatformHandle parent) 
+            => new DestroyableNSView(_host);
+
+        public INativeControlHostControlTopLevelAttachment CreateNewAttachment(
+            Func<IPlatformHandle, IPlatformHandle> create)
+        {
+            var a = new Attachment(_host.CreateAttachment());
+            try
+            {
+                var child = create(a.GetParentHandle());
+                a.InitWithChild(child);
+                a.AttachedTo = this;
+                return a;
+            }
+            catch
+            {
+                a.Dispose();
+                throw;
+            }
+        }
+
+        public INativeControlHostControlTopLevelAttachment CreateNewAttachment(IPlatformHandle handle)
+        {
+            var a = new Attachment(_host.CreateAttachment());
+            a.InitWithChild(handle);
+            a.AttachedTo = this;
+            return a;
+        }
+
+        public bool IsCompatibleWith(IPlatformHandle handle) => handle.HandleDescriptor == "NSView";
+
+        class Attachment : INativeControlHostControlTopLevelAttachment
+        {
+            private IAvnNativeControlHostTopLevelAttachment _native;
+            private NativeControlHostImpl _attachedTo;
+            public IPlatformHandle GetParentHandle() => new PlatformHandle(_native.ParentHandle, "NSView");
+            public Attachment(IAvnNativeControlHostTopLevelAttachment native)
+            {
+                _native = native;
+            }
+            
+            public void Dispose()
+            {
+                if (_native != null)
+                {
+                    _native.ReleaseChild();
+                    _native.Dispose();
+                    _native = null;
+                }
+            }
+
+            public INativeControlHostImpl AttachedTo
+            {
+                get => _attachedTo;
+                set
+                {
+                    var host = (NativeControlHostImpl)value;
+                    if(host == null)
+                        _native.AttachTo(null);
+                    else
+                        _native.AttachTo(host._host);
+                    _attachedTo = host;
+                }
+            }
+
+            public bool IsCompatibleWith(INativeControlHostImpl host) => host is NativeControlHostImpl;
+
+            public void HideWithSize(Size size)
+            {
+                _native.HideWithSize(Math.Max(1, (float)size.Width), Math.Max(1, (float)size.Height));
+            }
+            
+            public void ShowInBounds(Rect bounds)
+            {
+                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));
+                _native.ShowInBounds((float) bounds.X, (float) bounds.Y, (float) bounds.Width, (float) bounds.Height);
+            }
+
+            public void InitWithChild(IPlatformHandle handle) 
+                => _native.InitializeWithChildHandle(handle.Handle);
+        }
+    }
+}
diff --git a/src/Avalonia.Native/OsxManagedPopupPositionerPopupImplHelper.cs b/src/Avalonia.Native/OsxManagedPopupPositionerPopupImplHelper.cs
deleted file mode 100644
index 6c98e3c0cc..0000000000
--- a/src/Avalonia.Native/OsxManagedPopupPositionerPopupImplHelper.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-using Avalonia.Controls.Primitives.PopupPositioning;
-using Avalonia.Platform;
-
-namespace Avalonia.Native
-{
-    class OsxManagedPopupPositionerPopupImplHelper : ManagedPopupPositionerPopupImplHelper
-    {
-        public OsxManagedPopupPositionerPopupImplHelper(IWindowBaseImpl parent, MoveResizeDelegate moveResize) : base(parent, moveResize)
-        {
-
-        }
-        public override Point TranslatePoint(Point pt) => pt;
-
-        public override Size TranslateSize(Size size) => size;
-    }
-}
diff --git a/src/Avalonia.Native/PlatformThreadingInterface.cs b/src/Avalonia.Native/PlatformThreadingInterface.cs
index 353124a9d1..882d5a2ed3 100644
--- a/src/Avalonia.Native/PlatformThreadingInterface.cs
+++ b/src/Avalonia.Native/PlatformThreadingInterface.cs
@@ -1,16 +1,13 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using System.Runtime.ExceptionServices;
 using System.Threading;
 using Avalonia.Native.Interop;
 using Avalonia.Platform;
 using Avalonia.Threading;
-using SharpGen.Runtime;
 
 namespace Avalonia.Native
 {
-    public class PlatformThreadingInterface : IPlatformThreadingInterface
+    internal class PlatformThreadingInterface : IPlatformThreadingInterface
     {
         class TimerCallback : CallbackBase, IAvnActionCallback
         {
@@ -36,53 +33,72 @@ namespace Avalonia.Native
                 _parent = parent;
             }
 
-            public void Signaled(int priority, bool priorityContainsMeaningfulValue)
+            public void Signaled(int priority, int priorityContainsMeaningfulValue)
             {
-                _parent.Signaled?.Invoke(priorityContainsMeaningfulValue ? (DispatcherPriority?)priority : null);
+                _parent.Signaled?.Invoke(priorityContainsMeaningfulValue.FromComBool() ? (DispatcherPriority?)priority : null);
             }
         }
 
         readonly IAvnPlatformThreadingInterface _native;
+        private ExceptionDispatchInfo _exceptionDispatchInfo;
+        private CancellationTokenSource _exceptionCancellationSource;
 
         public PlatformThreadingInterface(IAvnPlatformThreadingInterface native)
         {
             _native = native;
             using (var cb = new SignaledCallback(this))
-                _native.SignaledCallback = cb;
+                _native.SetSignaledCallback(cb);
         }
 
-        public bool CurrentThreadIsLoopThread => _native.CurrentThreadIsLoopThread;
+        public bool CurrentThreadIsLoopThread => _native.CurrentThreadIsLoopThread.FromComBool();
 
         public event Action<DispatcherPriority?> Signaled;
 
         public void RunLoop(CancellationToken cancellationToken)
         {
-            if (cancellationToken.CanBeCanceled == false)
-                _native.RunLoop(null);
-            else
+            _exceptionDispatchInfo?.Throw();
+            var l = new object();
+            _exceptionCancellationSource = new CancellationTokenSource();
+
+            var compositeCancellation = CancellationTokenSource
+                .CreateLinkedTokenSource(cancellationToken, _exceptionCancellationSource.Token).Token;
+
+            var cancellation = _native.CreateLoopCancellation();
+            compositeCancellation.Register(() =>
             {
-                var l = new object();
-                var cancellation = _native.CreateLoopCancellation();
-                cancellationToken.Register(() =>
+                lock (l)
                 {
-                    lock (l)
-                    {
-                        cancellation?.Cancel();
-                    }
-                });
-                try
-                {
-                    _native.RunLoop(cancellation);
+                    cancellation?.Cancel();
                 }
-                finally
+            });
+
+            try
+            {
+                _native.RunLoop(cancellation);
+            }
+            finally
+            {
+                lock (l)
                 {
-                    lock(l)
-                    {
-                        cancellation?.Dispose();
-                        cancellation = null;
-                    }
+                    cancellation?.Dispose();
+                    cancellation = null;
                 }
             }
+
+            if (_exceptionDispatchInfo != null)
+            {
+                _exceptionDispatchInfo.Throw();
+            }
+        }
+
+        public void DispatchException (ExceptionDispatchInfo exceptionInfo)
+        {
+            _exceptionDispatchInfo = exceptionInfo;
+        }
+
+        public void TerminateNativeApp()
+        {
+            _exceptionCancellationSource?.Cancel();
         }
 
         public void Signal(DispatcherPriority priority)
diff --git a/src/Avalonia.Native/PopupImpl.cs b/src/Avalonia.Native/PopupImpl.cs
index d7fa1052ff..c36675afcd 100644
--- a/src/Avalonia.Native/PopupImpl.cs
+++ b/src/Avalonia.Native/PopupImpl.cs
@@ -1,28 +1,32 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using Avalonia.Controls.Primitives.PopupPositioning;
 using Avalonia.Native.Interop;
 using Avalonia.Platform;
 
 namespace Avalonia.Native
 {
-    public class PopupImpl : WindowBaseImpl, IPopupImpl
+    class PopupImpl : WindowBaseImpl, IPopupImpl
     {
         private readonly IAvaloniaNativeFactory _factory;
         private readonly AvaloniaNativePlatformOptions _opts;
+        private readonly AvaloniaNativePlatformOpenGlInterface _glFeature;
+        private readonly IWindowBaseImpl _parent;
+
         public PopupImpl(IAvaloniaNativeFactory factory,
             AvaloniaNativePlatformOptions opts,
-            IWindowBaseImpl parent) : base(opts)
+            AvaloniaNativePlatformOpenGlInterface glFeature,
+            IWindowBaseImpl parent) : base(opts, glFeature)
         {
             _factory = factory;
             _opts = opts;
+            _glFeature = glFeature;
+            _parent = parent;
             using (var e = new PopupEvents(this))
             {
-                Init(factory.CreatePopup(e), factory.CreateScreens());
+                var context = _opts.UseGpu ? glFeature?.MainContext : null;
+                Init(factory.CreatePopup(e, context?.Context), factory.CreateScreens(), context);
             }
-            PopupPositioner = new ManagedPopupPositioner(new OsxManagedPopupPositionerPopupImplHelper(parent, MoveResize));
+            PopupPositioner = new ManagedPopupPositioner(new ManagedPopupPositionerPopupImplHelper(parent, MoveResize));
         }
 
         private void MoveResize(PixelPoint position, Size size, double scaling)
@@ -41,9 +45,14 @@ namespace Avalonia.Native
                 _parent = parent;
             }
 
-            bool IAvnWindowEvents.Closing()
+            public void GotInputWhenDisabled()
+            {
+                // NOP on Popup
+            }
+
+            int IAvnWindowEvents.Closing()
             {
-                return true;
+                return true.AsComBool();
             }
 
             void IAvnWindowEvents.WindowStateChanged(AvnWindowState state)
@@ -51,7 +60,22 @@ namespace Avalonia.Native
             }
         }
 
-        public override IPopupImpl CreatePopup() => new PopupImpl(_factory, _opts, this);
+        public override void Show(bool activate)
+        {
+            var parent = _parent;
+            while (parent is PopupImpl p) 
+                parent = p._parent;
+            if (parent is WindowImpl w)
+                w.Native.TakeFocusFromChildren();
+            base.Show(false);
+        }
+
+        public override IPopupImpl CreatePopup() => new PopupImpl(_factory, _opts, _glFeature, this);
+
+        public void SetWindowManagerAddShadowHint(bool enabled)
+        {
+        }
+
         public IPopupPositioner PopupPositioner { get; }
     }
 }
diff --git a/src/Avalonia.Native/PredicateCallback.cs b/src/Avalonia.Native/PredicateCallback.cs
new file mode 100644
index 0000000000..19c470bcb3
--- /dev/null
+++ b/src/Avalonia.Native/PredicateCallback.cs
@@ -0,0 +1,20 @@
+using System;
+using Avalonia.Native.Interop;
+
+namespace Avalonia.Native
+{
+    public class PredicateCallback : CallbackBase, IAvnPredicateCallback
+    {
+        private Func<bool> _predicate;
+
+        public PredicateCallback(Func<bool> predicate)
+        {
+            _predicate = predicate;
+        }
+
+        int IAvnPredicateCallback.Evaluate()
+        {
+            return _predicate().AsComBool();
+        }
+    }
+}
diff --git a/src/Avalonia.Native/ScreenImpl.cs b/src/Avalonia.Native/ScreenImpl.cs
index 3ec3be20d3..7b4a001486 100644
--- a/src/Avalonia.Native/ScreenImpl.cs
+++ b/src/Avalonia.Native/ScreenImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using Avalonia.Native.Interop;
@@ -17,27 +14,32 @@ namespace Avalonia.Native
             _native = native;
         }
 
-        public int ScreenCount => _native.GetScreenCount();
+        public int ScreenCount => _native.ScreenCount;
 
         public IReadOnlyList<Screen> AllScreens
         {
             get
             {
-                var count = ScreenCount;
-                var result = new Screen[count];
-
-                for(int i = 0; i < count; i++)
+                if (_native != null)
                 {
-                    var screen = _native.GetScreen(i);
+                    var count = ScreenCount;
+                    var result = new Screen[count];
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        var screen = _native.GetScreen(i);
+
+                        result[i] = new Screen(
+                            screen.PixelDensity,
+                            screen.Bounds.ToAvaloniaPixelRect(),
+                            screen.WorkingArea.ToAvaloniaPixelRect(),
+                            screen.Primary.FromComBool());
+                    }
 
-                    result[i] = new Screen(
-                        screen.PixelDensity,
-                        screen.Bounds.ToAvaloniaPixelRect(),
-                        screen.WorkingArea.ToAvaloniaPixelRect(),
-                        screen.Primary);
+                    return result;
                 }
 
-                return result;
+                return Array.Empty<Screen>();
             }
         }
 
diff --git a/src/Avalonia.Native/SystemDialogs.cs b/src/Avalonia.Native/SystemDialogs.cs
index 275c93dc45..8012813644 100644
--- a/src/Avalonia.Native/SystemDialogs.cs
+++ b/src/Avalonia.Native/SystemDialogs.cs
@@ -1,18 +1,14 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 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;
 
 namespace Avalonia.Native
 {
-    public class SystemDialogs : ISystemDialogImpl
+    internal class SystemDialogs : ISystemDialogImpl
     {
         IAvnSystemDialogs _native;
 
@@ -21,25 +17,27 @@ namespace Avalonia.Native
             _native = native;
         }
 
-        public Task<string[]> ShowFileDialogAsync(FileDialog dialog, IWindowImpl parent)
+        public Task<string[]> ShowFileDialogAsync(FileDialog dialog, Window parent)
         {
             var events = new SystemDialogEvents();
 
+            var nativeParent = GetNativeWindow(parent);
+
             if (dialog is OpenFileDialog ofd)
             {
-                _native.OpenFileDialog((parent as WindowImpl)?.Native,
-                                        events, ofd.AllowMultiple,
+                _native.OpenFileDialog(nativeParent,
+                                        events, ofd.AllowMultiple.AsComBool(),
                                         ofd.Title ?? "",
-                                        ofd.InitialDirectory ?? "",
+                                        ofd.Directory ?? "",
                                         ofd.InitialFileName ?? "",
                                         string.Join(";", dialog.Filters.SelectMany(f => f.Extensions)));
             }
             else
             {
-                _native.SaveFileDialog((parent as WindowImpl)?.Native,
+                _native.SaveFileDialog(nativeParent,
                                         events,
                                         dialog.Title ?? "",
-                                        dialog.InitialDirectory ?? "",
+                                        dialog.Directory ?? "",
                                         dialog.InitialFileName ?? "",
                                         string.Join(";", dialog.Filters.SelectMany(f => f.Extensions)));
             }
@@ -47,17 +45,24 @@ namespace Avalonia.Native
             return events.Task.ContinueWith(t => { events.Dispose(); return t.Result; });
         }
 
-        public Task<string> ShowFolderDialogAsync(OpenFolderDialog dialog, IWindowImpl parent)
+        public Task<string> ShowFolderDialogAsync(OpenFolderDialog dialog, Window parent)
         {
             var events = new SystemDialogEvents();
 
-            _native.SelectFolderDialog((parent as WindowImpl)?.Native, events, dialog.Title ?? "", dialog.InitialDirectory ?? "");
+            var nativeParent = GetNativeWindow(parent);
+
+            _native.SelectFolderDialog(nativeParent, events, dialog.Title ?? "", dialog.Directory ?? "");
 
             return events.Task.ContinueWith(t => { events.Dispose(); return t.Result.FirstOrDefault(); });
         }
+
+        private IAvnWindow GetNativeWindow(Window window)
+        {
+            return (window?.PlatformImpl as WindowImpl)?.Native;
+        }
     }
 
-    public class SystemDialogEvents : CallbackBase, IAvnSystemDialogEvents
+    internal unsafe class SystemDialogEvents : CallbackBase, IAvnSystemDialogEvents
     {
         private TaskCompletionSource<string[]> _tcs;
 
@@ -68,13 +73,13 @@ namespace Avalonia.Native
 
         public Task<string[]> Task => _tcs.Task;
 
-        public void OnCompleted(int numResults, IntPtr trFirstResultRef)
+        public void OnCompleted(int numResults, void* trFirstResultRef)
         {
             string[] results = new string[numResults];
 
             unsafe
             {
-                var ptr = (IntPtr*)trFirstResultRef.ToPointer();
+                var ptr = (IntPtr*)trFirstResultRef;
 
                 for (int i = 0; i < numResults; i++)
                 {
diff --git a/src/Avalonia.Native/WindowImpl.cs b/src/Avalonia.Native/WindowImpl.cs
index a7828bedaf..f3b60f07be 100644
--- a/src/Avalonia.Native/WindowImpl.cs
+++ b/src/Avalonia.Native/WindowImpl.cs
@@ -1,27 +1,38 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
 using Avalonia.Native.Interop;
+using Avalonia.OpenGL;
 using Avalonia.Platform;
 using Avalonia.Platform.Interop;
 
 namespace Avalonia.Native
 {
-    public class WindowImpl : WindowBaseImpl, IWindowImpl, ITopLevelImplWithNativeMenuExporter
+    internal class WindowImpl : WindowBaseImpl, IWindowImpl, ITopLevelImplWithNativeMenuExporter
     {
         private readonly IAvaloniaNativeFactory _factory;
         private readonly AvaloniaNativePlatformOptions _opts;
+        private readonly AvaloniaNativePlatformOpenGlInterface _glFeature;
         IAvnWindow _native;
-        public WindowImpl(IAvaloniaNativeFactory factory, AvaloniaNativePlatformOptions opts) : base(opts)
+        private double _extendTitleBarHeight = -1;
+        private DoubleClickHelper _doubleClickHelper;
+        
+
+        internal WindowImpl(IAvaloniaNativeFactory factory, AvaloniaNativePlatformOptions opts,
+            AvaloniaNativePlatformOpenGlInterface glFeature) : base(opts, glFeature)
         {
             _factory = factory;
             _opts = opts;
+            _glFeature = glFeature;
+            _doubleClickHelper = new DoubleClickHelper();
+            
             using (var e = new WindowEvents(this))
             {
-                Init(_native = factory.CreateWindow(e), factory.CreateScreens());
+                var context = _opts.UseGpu ? glFeature?.MainContext : null;
+                Init(_native = factory.CreateWindow(e, context?.Context), factory.CreateScreens(), context);
             }
 
             NativeMenuExporter = new AvaloniaNativeMenuExporter(_native, factory);
@@ -36,65 +47,148 @@ namespace Avalonia.Native
                 _parent = parent;
             }
 
-            bool IAvnWindowEvents.Closing()
+            int IAvnWindowEvents.Closing()
             {
-                if(_parent.Closing != null)
+                if (_parent.Closing != null)
                 {
-                    return _parent.Closing();
+                    return _parent.Closing().AsComBool();
                 }
 
-                return true;
+                return true.AsComBool();
             }
 
             void IAvnWindowEvents.WindowStateChanged(AvnWindowState state)
             {
+                _parent.InvalidateExtendedMargins();
+
                 _parent.WindowStateChanged?.Invoke((WindowState)state);
             }
+
+            void IAvnWindowEvents.GotInputWhenDisabled()
+            {
+                _parent.GotInputWhenDisabled?.Invoke();
+            }
         }
 
         public IAvnWindow Native => _native;
 
-        public void ShowDialog(IWindowImpl window)
+        public void CanResize(bool value)
         {
-            _native.ShowDialog(((WindowImpl)window).Native);
+            _native.SetCanResize(value.AsComBool());
         }
 
-        public void CanResize(bool value)
+        public void SetSystemDecorations(Controls.SystemDecorations enabled)
         {
-            _native.CanResize = value;
+            _native.SetDecorations((Interop.SystemDecorations)enabled);
         }
 
-        public void SetSystemDecorations(bool enabled)
+        public void SetTitleBarColor(Avalonia.Media.Color color)
         {
-            _native.HasDecorations = enabled;
+            _native.SetTitleBarColor(new AvnColor { Alpha = color.A, Red = color.R, Green = color.G, Blue = color.B });
         }
 
-        public void SetTitleBarColor (Avalonia.Media.Color color)
+        public void SetTitle(string title) => _native.SetTitle(title);
+
+        public WindowState WindowState
         {
-            _native.SetTitleBarColor(new AvnColor { Alpha = color.A, Red = color.R, Green = color.G, Blue = color.B });
+            get => (WindowState)_native.WindowState;
+            set => _native.SetWindowState((AvnWindowState)value);
         }
 
-        public void SetTitle(string title)
+        public Action<WindowState> WindowStateChanged { get; set; }        
+
+        public Action<bool> ExtendClientAreaToDecorationsChanged { get; set; }
+
+        public Thickness ExtendedMargins { get; private set; }
+
+        public Thickness OffScreenMargin { get; } = new Thickness();
+
+        private bool _isExtended;
+        public bool IsClientAreaExtendedToDecorations => _isExtended;
+
+        protected override bool ChromeHitTest (RawPointerEventArgs e)
         {
-            using (var buffer = new Utf8Buffer(title))
+            if(_isExtended)
             {
-                _native.SetTitle(buffer.DangerousGetHandle());
+                if(e.Type == RawPointerEventType.LeftButtonDown)
+                {
+                    var visual = (_inputRoot as Window).Renderer.HitTestFirst(e.Position, _inputRoot as Window, x =>
+                            {
+                                if (x is IInputElement ie && !ie.IsHitTestVisible)
+                                {
+                                    return false;
+                                }
+                                return true;
+                            });
+
+                    if(visual == null)
+                    {
+                        if (_doubleClickHelper.IsDoubleClick(e.Timestamp, e.Position))
+                        {
+                            // TOGGLE WINDOW STATE.
+                            if (WindowState == WindowState.Maximized || WindowState == WindowState.FullScreen)
+                            {
+                                WindowState = WindowState.Normal;
+                            }
+                            else
+                            {
+                                WindowState = WindowState.Maximized;
+                            }
+                        }
+                        else
+                        {
+                            _native.BeginMoveDrag();   
+                        }
+                    }
+                }
             }
-        }
 
-        public WindowState WindowState
+            return false;
+        }
+        
+        private void InvalidateExtendedMargins()
         {
-            get
+            if (WindowState ==  WindowState.FullScreen)
             {
-                return (WindowState)_native.GetWindowState();
+                ExtendedMargins = new Thickness();
             }
-            set
+            else
             {
-                _native.SetWindowState((AvnWindowState)value);
+                ExtendedMargins = _isExtended ? new Thickness(0, _extendTitleBarHeight == -1 ? _native.ExtendTitleBarHeight : _extendTitleBarHeight, 0, 0) : new Thickness();
             }
+
+            ExtendClientAreaToDecorationsChanged?.Invoke(_isExtended);
         }
 
-        public Action<WindowState> WindowStateChanged { get; set; }
+        /// <inheritdoc/>
+        public void SetExtendClientAreaToDecorationsHint(bool extendIntoClientAreaHint)
+        {
+            _isExtended = extendIntoClientAreaHint;
+
+            _native.SetExtendClientArea(extendIntoClientAreaHint.AsComBool());
+
+            InvalidateExtendedMargins();
+        }
+
+        /// <inheritdoc/>
+        public void SetExtendClientAreaChromeHints(ExtendClientAreaChromeHints hints)
+        {   
+            _native.SetExtendClientAreaHints ((AvnExtendClientAreaChromeHints)hints);
+        }
+
+        /// <inheritdoc/>
+        public void SetExtendClientAreaTitleBarHeightHint(double titleBarHeight)
+        {
+            _extendTitleBarHeight = titleBarHeight;
+            _native.SetExtendTitleBarHeight(titleBarHeight);
+
+            ExtendedMargins = _isExtended ? new Thickness(0, titleBarHeight == -1 ? _native.ExtendTitleBarHeight : titleBarHeight, 0, 0) : new Thickness();
+
+            ExtendClientAreaToDecorationsChanged?.Invoke(_isExtended);
+        }
+
+        /// <inheritdoc/>
+        public bool NeedsManagedDecorations => false;
 
         public void ShowTaskbarIcon(bool value)
         {
@@ -113,6 +207,18 @@ namespace Avalonia.Native
         public void Move(PixelPoint point) => Position = point;
 
         public override IPopupImpl CreatePopup() =>
-            _opts.OverlayPopups ? null : new PopupImpl(_factory, _opts, this);
+            _opts.OverlayPopups ? null : new PopupImpl(_factory, _opts, _glFeature, this);
+
+        public Action GotInputWhenDisabled { get; set; }
+
+        public void SetParent(IWindowImpl parent)
+        {
+            _native.SetParent(((WindowImpl)parent).Native);
+        }
+
+        public void SetEnabled(bool enable)
+        {
+            _native.SetEnabled(enable.AsComBool());
+        }
     }
 }
diff --git a/src/Avalonia.Native/WindowImplBase.cs b/src/Avalonia.Native/WindowImplBase.cs
index 8b397403ca..927b739b0c 100644
--- a/src/Avalonia.Native/WindowImplBase.cs
+++ b/src/Avalonia.Native/WindowImplBase.cs
@@ -1,10 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
 using Avalonia.Controls;
+using Avalonia.Controls.Platform;
 using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
@@ -16,10 +15,38 @@ using Avalonia.Threading;
 
 namespace Avalonia.Native
 {
-    public abstract class WindowBaseImpl : IWindowBaseImpl,
-        IFramebufferPlatformSurface
+    internal class MacOSTopLevelWindowHandle : IPlatformHandle, IMacOSTopLevelPlatformHandle
     {
-        IInputRoot _inputRoot;
+        IAvnWindowBase _native;
+
+        public MacOSTopLevelWindowHandle(IAvnWindowBase native)
+        {
+            _native = native;
+        }
+
+        public IntPtr Handle => NSWindow;
+
+        public string HandleDescriptor => "NSWindow";
+
+        public IntPtr NSView => _native.ObtainNSViewHandle();
+
+        public IntPtr NSWindow => _native.ObtainNSWindowHandle();
+
+        public IntPtr GetNSViewRetained()
+        {
+            return _native.ObtainNSViewHandleRetained();
+        }
+
+        public IntPtr GetNSWindowRetained()
+        {
+            return _native.ObtainNSWindowHandleRetained();
+        }
+    }
+
+    internal abstract class WindowBaseImpl : IWindowBaseImpl,
+        IFramebufferPlatformSurface, ITopLevelImplWithNativeControlHost
+    {
+        protected IInputRoot _inputRoot;
         IAvnWindowBase _native;
         private object _syncRoot = new object();
         private bool _deferredRendering = false;
@@ -31,10 +58,12 @@ namespace Avalonia.Native
         private Size _lastRenderedLogicalSize;
         private double _savedScaling;
         private GlPlatformSurface _glSurface;
+        private NativeControlHostImpl _nativeControlHost;
+        private IGlContext _glContext;
 
-        public WindowBaseImpl(AvaloniaNativePlatformOptions opts)
+        internal WindowBaseImpl(AvaloniaNativePlatformOptions opts, AvaloniaNativePlatformOpenGlInterface glFeature)
         {
-            _gpu = opts.UseGpu;
+            _gpu = opts.UseGpu && glFeature != null;
             _deferredRendering = opts.UseDeferredRendering;
 
             _keyboard = AvaloniaLocator.Current.GetService<IKeyboardDevice>();
@@ -42,13 +71,18 @@ namespace Avalonia.Native
             _cursorFactory = AvaloniaLocator.Current.GetService<IStandardCursorFactory>();
         }
 
-        protected void Init(IAvnWindowBase window, IAvnScreens screens)
+        protected void Init(IAvnWindowBase window, IAvnScreens screens, IGlContext glContext)
         {
             _native = window;
-            _glSurface = new GlPlatformSurface(window);
+            _glContext = glContext;
+
+            Handle = new MacOSTopLevelWindowHandle(window);
+            if (_gpu)
+                _glSurface = new GlPlatformSurface(window, _glContext);
             Screen = new ScreenImpl(screens);
             _savedLogicalSize = ClientSize;
-            _savedScaling = Scaling;
+            _savedScaling = RenderScaling;
+            _nativeControlHost = new NativeControlHostImpl(_native.CreateNativeControlHost());
 
             var monitor = Screen.AllScreens.OrderBy(x => x.PixelDensity)
                     .FirstOrDefault(m => m.Bounds.Contains(Position));
@@ -60,8 +94,13 @@ namespace Avalonia.Native
         {
             get
             {
-                var s = _native.GetClientSize();
-                return new Size(s.Width, s.Height);
+                if (_native != null)
+                {
+                    var s = _native.ClientSize;
+                    return new Size(s.Width, s.Height);
+                }
+
+                return default;
             }
         }
 
@@ -70,58 +109,35 @@ namespace Avalonia.Native
             this 
         };
 
+        public INativeControlHostImpl NativeControlHost => _nativeControlHost;
+
         public ILockedFramebuffer Lock()
         {
-            if(_deferredRendering)
+            var w = _savedLogicalSize.Width * _savedScaling;
+            var h = _savedLogicalSize.Height * _savedScaling;
+            var dpi = _savedScaling * 96;
+            return new DeferredFramebuffer(cb =>
             {
-                var w = _savedLogicalSize.Width * _savedScaling;
-                var h = _savedLogicalSize.Height * _savedScaling;
-                var dpi = _savedScaling * 96;
-                return new DeferredFramebuffer(cb =>
+                lock (_syncRoot)
                 {
-                    lock (_syncRoot)
-                    {
-                        if (_native == null)
-                            return false;
-                        cb(_native);
-                        _lastRenderedLogicalSize = _savedLogicalSize;
-                        return true;
-                    }
-                }, (int)w, (int)h, new Vector(dpi, dpi));
-           }
-
-            return new FramebufferWrapper(_native.GetSoftwareFramebuffer());
+                    if (_native == null)
+                        return false;
+                    cb(_native);
+                    _lastRenderedLogicalSize = _savedLogicalSize;
+                    return true;
+                }
+            }, (int)w, (int)h, new Vector(dpi, dpi));
         }
 
+        public Action LostFocus { get; set; }
+        
         public Action<Rect> Paint { get; set; }
         public Action<Size> Resized { get; set; }
         public Action Closed { get; set; }
         public IMouseDevice MouseDevice => _mouse;
         public abstract IPopupImpl CreatePopup();
 
-
-        class FramebufferWrapper : ILockedFramebuffer
-        {
-            public FramebufferWrapper(AvnFramebuffer fb)
-            {
-                Address = fb.Data;
-                Size = new PixelSize(fb.Width, fb.Height);
-                RowBytes = fb.Stride;
-                Dpi = new Vector(fb.Dpi.X, fb.Dpi.Y);
-                Format = (PixelFormat)fb.PixelFormat;
-            }
-            public IntPtr Address { get; set; }
-            public PixelSize Size { get; set; }
-            public int RowBytes {get;set;}
-            public Vector Dpi { get; set; }
-            public PixelFormat Format { get; }
-            public void Dispose()
-            {
-                // Do nothing
-            }
-        }
-
-        protected class WindowBaseEvents : CallbackBase, IAvnWindowBaseEvents
+        protected unsafe class WindowBaseEvents : CallbackBase, IAvnWindowBaseEvents
         {
             private readonly WindowBaseImpl _parent;
 
@@ -133,16 +149,16 @@ namespace Avalonia.Native
             void IAvnWindowBaseEvents.Closed()
             {
                 var n = _parent._native;
-                _parent._native = null;
                 try
                 {
                     _parent?.Closed?.Invoke();
                 }
                 finally
                 {
+                    
+                    _parent?.Dispose();
                     n?.Dispose();
                 }
-                _parent._mouse.Dispose();
             }
 
             void IAvnWindowBaseEvents.Activated() => _parent.Activated?.Invoke();
@@ -156,11 +172,14 @@ namespace Avalonia.Native
                 _parent.Paint?.Invoke(new Rect(0, 0, s.Width, s.Height));
             }
 
-            void IAvnWindowBaseEvents.Resized(AvnSize size)
+            void IAvnWindowBaseEvents.Resized(AvnSize* size)
             {
-                var s = new Size(size.Width, size.Height);
-                _parent._savedLogicalSize = s;
-                _parent.Resized?.Invoke(s);
+                if (_parent?._native != null)
+                {
+                    var s = new Size(size->Width, size->Height);
+                    _parent._savedLogicalSize = s;
+                    _parent.Resized?.Invoke(s);
+                }
             }
 
             void IAvnWindowBaseEvents.PositionChanged(AvnPoint position)
@@ -173,14 +192,14 @@ namespace Avalonia.Native
                 _parent.RawMouseEvent(type, timeStamp, modifiers, point, delta);
             }
 
-            bool IAvnWindowBaseEvents.RawKeyEvent(AvnRawKeyEventType type, uint timeStamp, AvnInputModifiers modifiers, uint key)
+            int IAvnWindowBaseEvents.RawKeyEvent(AvnRawKeyEventType type, uint timeStamp, AvnInputModifiers modifiers, uint key)
             {
-                return _parent.RawKeyEvent(type, timeStamp, modifiers, key);
+                return _parent.RawKeyEvent(type, timeStamp, modifiers, key).AsComBool();
             }
 
-            bool IAvnWindowBaseEvents.RawTextInputEvent(uint timeStamp, string text)
+            int IAvnWindowBaseEvents.RawTextInputEvent(uint timeStamp, string text)
             {
-                return _parent.RawTextInputEvent(timeStamp, text);
+                return _parent.RawTextInputEvent(timeStamp, text).AsComBool();
             }
 
 
@@ -194,6 +213,35 @@ namespace Avalonia.Native
             {
                 Dispatcher.UIThread.RunJobs(DispatcherPriority.Render);
             }
+            
+            void IAvnWindowBaseEvents.LostFocus()
+            {
+                _parent.LostFocus?.Invoke();
+            }
+
+            public AvnDragDropEffects DragEvent(AvnDragEventType type, AvnPoint position,
+                AvnInputModifiers modifiers,
+                AvnDragDropEffects effects,
+                IAvnClipboard clipboard, IntPtr dataObjectHandle)
+            {
+                var device = AvaloniaLocator.Current.GetService<IDragDropDevice>();
+
+                IDataObject dataObject = null;
+                if (dataObjectHandle != IntPtr.Zero)
+                    dataObject = GCHandle.FromIntPtr(dataObjectHandle).Target as IDataObject;
+                
+                using(var clipboardDataObject = new ClipboardDataObject(clipboard))
+                {
+                    if (dataObject == null)
+                        dataObject = clipboardDataObject;
+                    
+                    var args = new RawDragEvent(device, (RawDragEventType)type,
+                        _parent._inputRoot, position.ToAvaloniaPoint(), dataObject, (DragDropEffects)effects,
+                        (RawInputModifiers)modifiers);
+                    _parent.Input(args);
+                    return (AvnDragDropEffects)args.Effects;
+                }
+            }
         }
 
         public void Activate()
@@ -203,6 +251,9 @@ namespace Avalonia.Native
 
         public bool RawTextInputEvent(uint timeStamp, string text)
         {
+            if (_inputRoot is null) 
+                return false;
+            
             Dispatcher.UIThread.RunJobs(DispatcherPriority.Input + 1);
 
             var args = new RawTextInputEventArgs(_keyboard, timeStamp, _inputRoot, text);
@@ -214,6 +265,9 @@ namespace Avalonia.Native
 
         public bool RawKeyEvent(AvnRawKeyEventType type, uint timeStamp, AvnInputModifiers modifiers, uint key)
         {
+            if (_inputRoot is null) 
+                return false;
+            
             Dispatcher.UIThread.RunJobs(DispatcherPriority.Input + 1);
 
             var args = new RawKeyEventArgs(_keyboard, timeStamp, _inputRoot, (RawKeyEventType)type, (Key)key, (RawInputModifiers)modifiers);
@@ -223,8 +277,16 @@ namespace Avalonia.Native
             return args.Handled;
         }
 
+        protected virtual bool ChromeHitTest(RawPointerEventArgs e)
+        {
+            return false;
+        }
+
         public void RawMouseEvent(AvnRawMouseEventType type, uint timeStamp, AvnInputModifiers modifiers, AvnPoint point, AvnVector delta)
         {
+            if (_inputRoot is null) 
+                return;
+            
             Dispatcher.UIThread.RunJobs(DispatcherPriority.Input + 1);
 
             switch (type)
@@ -234,7 +296,12 @@ namespace Avalonia.Native
                     break;
 
                 default:
-                    Input?.Invoke(new RawPointerEventArgs(_mouse, timeStamp, _inputRoot, (RawPointerEventType)type, point.ToAvaloniaPoint(), (RawInputModifiers)modifiers));
+                    var e = new RawPointerEventArgs(_mouse, timeStamp, _inputRoot, (RawPointerEventType)type, point.ToAvaloniaPoint(), (RawInputModifiers)modifiers);
+                    
+                    if(!ChromeHitTest(e))
+                    {
+                        Input?.Invoke(e);
+                    }
                     break;
             }
         }
@@ -247,9 +314,15 @@ namespace Avalonia.Native
         public IRenderer CreateRenderer(IRenderRoot root)
         {
             if (_deferredRendering)
-                return new DeferredRenderer(root, AvaloniaLocator.Current.GetService<IRenderLoop>(),
-                    rendererLock:
-                    _gpu ? new AvaloniaNativeDeferredRendererLock(_native) : null);
+            {
+                var loop = AvaloniaLocator.Current.GetService<IRenderLoop>();
+                var customRendererFactory = AvaloniaLocator.Current.GetService<IRendererFactory>();
+
+                if (customRendererFactory != null)
+                    return customRendererFactory.Create(root, loop);
+                return new DeferredRenderer(root, loop);
+            }
+
             return new ImmediateRenderer(root);
         }
 
@@ -259,14 +332,17 @@ namespace Avalonia.Native
             _native?.Dispose();
             _native = null;
 
+            _nativeControlHost?.Dispose();
+            _nativeControlHost = null;
+            
             (Screen as ScreenImpl)?.Dispose();
+            _mouse.Dispose();
         }
 
 
         public void Invalidate(Rect rect)
         {
-            if (!_deferredRendering && _native != null)
-                _native.Invalidate(new AvnRect { Height = rect.Height, Width = rect.Width, X = rect.X, Y = rect.Y });
+            _native?.Invalidate(new AvnRect { Height = rect.Height, Width = rect.Width, X = rect.X, Y = rect.Y });
         }
 
         public void SetInputRoot(IInputRoot inputRoot)
@@ -275,26 +351,26 @@ namespace Avalonia.Native
         }
 
 
-        public void Show()
+        public virtual void Show(bool activate)
         {
-            _native.Show();
+            _native.Show(activate.AsComBool());
         }
 
 
         public PixelPoint Position
         {
-            get => _native.GetPosition().ToAvaloniaPixelPoint();
+            get => _native.Position.ToAvaloniaPixelPoint();
             set => _native.SetPosition(value.ToAvnPoint());
         }
 
         public Point PointToClient(PixelPoint point)
         {
-            return _native.PointToClient(point.ToAvnPoint()).ToAvaloniaPoint();
+            return _native?.PointToClient(point.ToAvnPoint()).ToAvaloniaPoint() ?? default;
         }
 
         public PixelPoint PointToScreen(Point point)
         {
-            return _native.PointToScreen(point.ToAvnPoint()).ToAvaloniaPixelPoint();
+            return _native?.PointToScreen(point.ToAvnPoint()).ToAvaloniaPixelPoint() ?? default;
         }
 
         public void Hide()
@@ -307,24 +383,31 @@ namespace Avalonia.Native
             _native.BeginMoveDrag();
         }
 
-        public Size MaxClientSize => Screen.AllScreens.Select(s => s.Bounds.Size.ToSize(s.PixelDensity))
+        public Size MaxAutoSizeHint => Screen.AllScreens.Select(s => s.Bounds.Size.ToSize(s.PixelDensity))
             .OrderByDescending(x => x.Width + x.Height).FirstOrDefault();
 
         public void SetTopmost(bool value)
         {
-            _native.SetTopMost(value);
+            _native.SetTopMost(value.AsComBool());
         }
 
-        public double Scaling => _native.GetScaling();
+        public double RenderScaling => _native?.Scaling ?? 1;
+
+        public double DesktopScaling => 1;
 
         public Action Deactivated { get; set; }
         public Action Activated { get; set; }
 
         public void SetCursor(IPlatformHandle cursor)
         {
+            if (_native == null)
+            {
+                return;
+            }
+            
             var newCursor = cursor as AvaloniaNativeCursor;
             newCursor = newCursor ?? (_cursorFactory.GetCursor(StandardCursorType.Arrow) as AvaloniaNativeCursor);
-            _native.Cursor = newCursor.Cursor;
+            _native.SetCursor(newCursor.Cursor);
         }
 
         public Action<PixelPoint> PositionChanged { get; set; }
@@ -335,6 +418,8 @@ namespace Avalonia.Native
 
         Action<double> ITopLevelImpl.ScalingChanged { get; set; }
 
+        public Action<WindowTransparencyLevel> TransparencyLevelChanged { get; set; }
+
         public IScreenImpl Screen { get; private set; }
 
         // TODO
@@ -349,6 +434,37 @@ namespace Avalonia.Native
 
         }
 
-        public IPlatformHandle Handle => new PlatformHandle(IntPtr.Zero, "NOT SUPPORTED");
+        internal void BeginDraggingSession(AvnDragDropEffects effects, AvnPoint point, IAvnClipboard clipboard,
+            IAvnDndResultCallback callback, IntPtr sourceHandle)
+        {
+            _native.BeginDragAndDropOperation(effects, point, clipboard, callback, sourceHandle);
+        }
+
+        public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel) 
+        {
+            if (TransparencyLevel != transparencyLevel)
+            {
+                if (transparencyLevel >= WindowTransparencyLevel.Blur)
+                {
+                    transparencyLevel = WindowTransparencyLevel.AcrylicBlur;
+                }
+
+                if(transparencyLevel == WindowTransparencyLevel.None)
+                {
+                    transparencyLevel = WindowTransparencyLevel.Transparent;
+                }
+
+                TransparencyLevel = transparencyLevel;
+
+                _native?.SetBlurEnabled((TransparencyLevel >= WindowTransparencyLevel.Blur).AsComBool());
+                TransparencyLevelChanged?.Invoke(TransparencyLevel);
+            }
+        }
+
+        public WindowTransparencyLevel TransparencyLevel { get; private set; } = WindowTransparencyLevel.Transparent;
+
+        public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; } = new AcrylicPlatformCompensationLevels(1, 0, 0);
+
+        public IPlatformHandle Handle { get; private set; }
     }
 }
diff --git a/src/Avalonia.Native/avn.idl b/src/Avalonia.Native/avn.idl
new file mode 100644
index 0000000000..166046ca24
--- /dev/null
+++ b/src/Avalonia.Native/avn.idl
@@ -0,0 +1,728 @@
+@clr-namespace Avalonia.Native.Interop
+@clr-access internal
+@clr-map bool int
+@cpp-preamble @@
+#include "com.h"
+#include "stddef.h"
+@@
+
+enum AvnKey
+{
+    AvnKeyNone = 0,
+    AvnKeyCancel = 1,
+    AvnKeyBack = 2,
+    AvnKeyTab = 3,
+    AvnKeyLineFeed = 4,
+    AvnKeyClear = 5,
+    AvnKeyReturn = 6,
+    AvnKeyEnter = 6,
+    AvnKeyPause = 7,
+    AvnKeyCapsLock = 8,
+    AvnKeyCapital = 8,
+    AvnKeyHangulMode = 9,
+    AvnKeyKanaMode = 9,
+    AvnKeyJunjaMode = 10,
+    AvnKeyFinalMode = 11,
+    AvnKeyKanjiMode = 12,
+    HanjaMode = 12,
+    Escape = 13,
+    ImeConvert = 14,
+    ImeNonConvert = 15,
+    ImeAccept = 16,
+    ImeModeChange = 17,
+    Space = 18,
+    PageUp = 19,
+    Prior = 19,
+    PageDown = 20,
+    Next = 20,
+    End = 21,
+    Home = 22,
+    Left = 23,
+    Up = 24,
+    Right = 25,
+    Down = 26,
+    Select = 27,
+    Print = 28,
+    Execute = 29,
+    Snapshot = 30,
+    PrintScreen = 30,
+    Insert = 31,
+    Delete = 32,
+    Help = 33,
+    D0 = 34,
+    D1 = 35,
+    D2 = 36,
+    D3 = 37,
+    D4 = 38,
+    D5 = 39,
+    D6 = 40,
+    D7 = 41,
+    D8 = 42,
+    D9 = 43,
+    A = 44,
+    B = 45,
+    C = 46,
+    D = 47,
+    E = 48,
+    F = 49,
+    G = 50,
+    H = 51,
+    I = 52,
+    J = 53,
+    AvnKeyK = 54,
+    L = 55,
+    M = 56,
+    N = 57,
+    O = 58,
+    P = 59,
+    Q = 60,
+    R = 61,
+    S = 62,
+    T = 63,
+    U = 64,
+    V = 65,
+    W = 66,
+    X = 67,
+    Y = 68,
+    Z = 69,
+    LWin = 70,
+    RWin = 71,
+    Apps = 72,
+    Sleep = 73,
+    NumPad0 = 74,
+    NumPad1 = 75,
+    NumPad2 = 76,
+    NumPad3 = 77,
+    NumPad4 = 78,
+    NumPad5 = 79,
+    NumPad6 = 80,
+    NumPad7 = 81,
+    NumPad8 = 82,
+    NumPad9 = 83,
+    Multiply = 84,
+    Add = 85,
+    Separator = 86,
+    Subtract = 87,
+    Decimal = 88,
+    Divide = 89,
+    F1 = 90,
+    F2 = 91,
+    F3 = 92,
+    F4 = 93,
+    F5 = 94,
+    F6 = 95,
+    F7 = 96,
+    F8 = 97,
+    F9 = 98,
+    F10 = 99,
+    F11 = 100,
+    F12 = 101,
+    F13 = 102,
+    F14 = 103,
+    F15 = 104,
+    F16 = 105,
+    F17 = 106,
+    F18 = 107,
+    F19 = 108,
+    F20 = 109,
+    F21 = 110,
+    F22 = 111,
+    F23 = 112,
+    F24 = 113,
+    NumLock = 114,
+    Scroll = 115,
+    LeftShift = 116,
+    RightShift = 117,
+    LeftCtrl = 118,
+    RightCtrl = 119,
+    LeftAlt = 120,
+    RightAlt = 121,
+    BrowserBack = 122,
+    BrowserForward = 123,
+    BrowserRefresh = 124,
+    BrowserStop = 125,
+    BrowserSearch = 126,
+    BrowserFavorites = 127,
+    BrowserHome = 128,
+    VolumeMute = 129,
+    VolumeDown = 130,
+    VolumeUp = 131,
+    MediaNextTrack = 132,
+    MediaPreviousTrack = 133,
+    MediaStop = 134,
+    MediaPlayPause = 135,
+    LaunchMail = 136,
+    SelectMedia = 137,
+    LaunchApplication1 = 138,
+    LaunchApplication2 = 139,
+    OemSemicolon = 140,
+    Oem1 = 140,
+    OemPlus = 141,
+    OemComma = 142,
+    OemMinus = 143,
+    OemPeriod = 144,
+    OemQuestion = 145,
+    Oem2 = 145,
+    OemTilde = 146,
+    Oem3 = 146,
+    AbntC1 = 147,
+    AbntC2 = 148,
+    OemOpenBrackets = 149,
+    Oem4 = 149,
+    OemPipe = 150,
+    Oem5 = 150,
+    OemCloseBrackets = 151,
+    Oem6 = 151,
+    OemQuotes = 152,
+    Oem7 = 152,
+    Oem8 = 153,
+    OemBackslash = 154,
+    Oem102 = 154,
+    ImeProcessed = 155,
+    System = 156,
+    OemAttn = 157,
+    DbeAlphanumeric = 157,
+    OemFinish = 158,
+    DbeKatakana = 158,
+    DbeHiragana = 159,
+    OemCopy = 159,
+    DbeSbcsChar = 160,
+    OemAuto = 160,
+    DbeDbcsChar = 161,
+    OemEnlw = 161,
+    OemBackTab = 162,
+    DbeRoman = 162,
+    DbeNoRoman = 163,
+    Attn = 163,
+    CrSel = 164,
+    DbeEnterWordRegisterMode = 164,
+    ExSel = 165,
+    DbeEnterImeConfigureMode = 165,
+    EraseEof = 166,
+    DbeFlushString = 166,
+    Play = 167,
+    DbeCodeInput = 167,
+    DbeNoCodeInput = 168,
+    Zoom = 168,
+    NoName = 169,
+    DbeDetermineString = 169,
+    DbeEnterDialogConversionMode = 170,
+    Pa1 = 170,
+    OemClear = 171,
+    DeadCharProcessed = 172,
+};
+
+enum SystemDecorations {
+    SystemDecorationsNone = 0,
+    SystemDecorationsBorderOnly = 1,
+    SystemDecorationsFull = 2,
+}
+
+struct AvnSize
+{
+    double Width, Height;
+}
+
+struct AvnPixelSize
+{
+    int Width, Height;
+}
+
+struct AvnRect
+{
+    double X, Y, Width, Height;
+}
+
+struct AvnVector
+{
+    double X, Y;
+}
+
+struct AvnPoint
+{
+    double X, Y;
+}
+
+struct AvnScreen
+{
+    AvnRect Bounds;
+    AvnRect WorkingArea;
+    float PixelDensity;
+    bool Primary;
+}
+
+enum AvnPixelFormat
+{
+    kAvnRgb565,
+    kAvnRgba8888,
+    kAvnBgra8888
+}
+
+struct AvnFramebuffer
+{
+    void* Data;
+    int Width;
+    int Height;
+    int Stride;
+    AvnVector Dpi;
+    AvnPixelFormat PixelFormat;
+}
+
+struct AvnColor
+{
+    byte Alpha;
+    byte Red;
+    byte Green;
+    byte Blue;
+}
+
+enum AvnRawMouseEventType
+{
+    LeaveWindow,
+    LeftButtonDown,
+    LeftButtonUp,
+    RightButtonDown,
+    RightButtonUp,
+    MiddleButtonDown,
+    MiddleButtonUp,
+    XButton1Down,
+    XButton1Up,
+    XButton2Down,
+    XButton2Up,
+    Move,
+    Wheel,
+    NonClientLeftButtonDown,
+    TouchBegin,
+    TouchUpdate,
+    TouchEnd,
+    TouchCancel
+}
+
+enum AvnRawKeyEventType
+{
+    KeyDown,
+    KeyUp
+}
+
+enum AvnInputModifiers
+{
+    AvnInputModifiersNone = 0,
+    Alt = 1,
+    Control = 2,
+    Shift = 4,
+    Windows = 8,
+    LeftMouseButton = 16,
+    RightMouseButton = 32,
+    MiddleMouseButton = 64,
+    XButton1MouseButton = 128,
+    XButton2MouseButton = 256
+}
+
+[class-enum]
+enum AvnDragDropEffects
+{
+    None = 0,
+    Copy = 1,
+    Move = 2,
+    Link = 4,
+}
+
+[class-enum]
+enum AvnDragEventType
+{
+    Enter,
+    Over,
+    Leave,
+    Drop
+}
+
+enum AvnWindowState
+{
+    Normal,
+    Minimized,
+    Maximized,
+    FullScreen,
+}
+
+enum AvnStandardCursorType
+{
+    CursorArrow,
+    CursorIbeam,
+    CursorWait,
+    CursorCross,
+    CursorUpArrow,
+    CursorSizeWestEast,
+    CursorSizeNorthSouth,
+    CursorSizeAll,
+    CursorNo,
+    CursorHand,
+    CursorAppStarting,
+    CursorHelp,
+    CursorTopSide,
+    CursorBottomSize,
+    CursorLeftSide,
+    CursorRightSide,
+    CursorTopLeftCorner,
+    CursorTopRightCorner,
+    CursorBottomLeftCorner,
+    CursorBottomRightCorner,
+    CursorDragMove,
+    CursorDragCopy,
+    CursorDragLink,
+    CursorNone
+}
+
+enum AvnWindowEdge
+{
+    WindowEdgeNorthWest,
+    WindowEdgeNorth,
+    WindowEdgeNorthEast,
+    WindowEdgeWest,
+    WindowEdgeEast,
+    WindowEdgeSouthWest,
+    WindowEdgeSouth,
+    WindowEdgeSouthEast
+}
+
+enum AvnMenuItemToggleType
+{
+    None,
+    CheckMark,
+    Radio
+}
+
+enum AvnExtendClientAreaChromeHints
+{
+    AvnNoChrome = 0,
+    AvnSystemChrome = 0x01,
+    AvnPreferSystemChrome = 0x02,
+    AvnOSXThickTitleBar = 0x08,
+    AvnDefaultChrome = AvnSystemChrome,
+}
+
+[uuid(809c652e-7396-11d2-9771-00a0c9b4d50c)]
+interface IAvaloniaNativeFactory : IUnknown
+{
+     HRESULT Initialize(IAvnGCHandleDeallocatorCallback* deallocator);
+     IAvnMacOptions* GetMacOptions();
+     HRESULT CreateWindow(IAvnWindowEvents* cb, IAvnGlContext* gl, IAvnWindow** ppv);
+     HRESULT CreatePopup(IAvnWindowEvents* cb, IAvnGlContext* gl, IAvnPopup** ppv);
+     HRESULT CreatePlatformThreadingInterface(IAvnPlatformThreadingInterface** ppv);
+     HRESULT CreateSystemDialogs(IAvnSystemDialogs** ppv);
+     HRESULT CreateScreens(IAvnScreens** ppv);
+     HRESULT CreateClipboard(IAvnClipboard** ppv);
+     HRESULT CreateDndClipboard(IAvnClipboard** ppv);
+     HRESULT CreateCursorFactory(IAvnCursorFactory** ppv);
+     HRESULT ObtainGlDisplay(IAvnGlDisplay** ppv);
+     HRESULT SetAppMenu(IAvnMenu* menu);
+     HRESULT CreateMenu(IAvnMenuEvents* cb, IAvnMenu** ppv);
+     HRESULT CreateMenuItem(IAvnMenuItem** ppv);
+     HRESULT CreateMenuItemSeperator(IAvnMenuItem** ppv);
+}
+
+[uuid(233e094f-9b9f-44a3-9a6e-6948bbdd9fb1)]
+interface IAvnString : IUnknown
+{
+     HRESULT Pointer(void**retOut);
+     HRESULT Length(int*ret);
+}
+
+[uuid(e5aca675-02b7-4129-aa79-d6e417210bda)]
+interface IAvnWindowBase : IUnknown
+{
+     HRESULT Show(bool activate);
+     HRESULT Hide();
+     HRESULT Close();
+     HRESULT Activate();
+     HRESULT GetClientSize(AvnSize*ret);
+     HRESULT GetScaling(double*ret);
+     HRESULT SetMinMaxSize(AvnSize minSize, AvnSize maxSize);
+     HRESULT Resize(double width, double height);
+     HRESULT Invalidate(AvnRect rect);
+     HRESULT BeginMoveDrag();
+     HRESULT BeginResizeDrag(AvnWindowEdge edge);
+     HRESULT GetPosition(AvnPoint*ret);
+     HRESULT SetPosition(AvnPoint point);
+     HRESULT PointToClient(AvnPoint point, AvnPoint*ret);
+     HRESULT PointToScreen(AvnPoint point, AvnPoint*ret);
+     HRESULT ThreadSafeSetSwRenderedFrame(AvnFramebuffer* fb, IUnknown* dispose);
+     HRESULT SetTopMost(bool value);
+     HRESULT SetCursor(IAvnCursor* cursor);
+     HRESULT CreateGlRenderTarget(IAvnGlSurfaceRenderTarget** ret);
+     HRESULT SetMainMenu(IAvnMenu* menu);
+     HRESULT ObtainNSWindowHandle([intptr]void** retOut);
+     HRESULT ObtainNSWindowHandleRetained([intptr]void** retOut);
+     HRESULT ObtainNSViewHandle([intptr]void** retOut);
+     HRESULT ObtainNSViewHandleRetained([intptr]void** retOut);
+     HRESULT CreateNativeControlHost(IAvnNativeControlHost** retOut);
+     HRESULT BeginDragAndDropOperation(AvnDragDropEffects effects, AvnPoint point,
+                                              IAvnClipboard* clipboard, IAvnDndResultCallback* cb, [intptr]void* sourceHandle);
+     HRESULT SetBlurEnabled(bool enable);
+}
+
+[uuid(83e588f3-6981-4e48-9ea0-e1e569f79a91), cpp-virtual-inherits]
+interface IAvnPopup : IAvnWindowBase
+{
+    
+}
+
+[uuid(cab661de-49d6-4ead-b59c-eac9b2b6c28d), cpp-virtual-inherits]
+interface IAvnWindow : IAvnWindowBase
+{
+     HRESULT SetEnabled(bool enable);
+     HRESULT SetParent(IAvnWindow* parent);
+     HRESULT SetCanResize(bool value);
+     HRESULT SetDecorations(SystemDecorations value);
+     HRESULT SetTitle(char* utf8Title);
+     HRESULT SetTitleBarColor(AvnColor color);
+     HRESULT SetWindowState(AvnWindowState state);
+     HRESULT GetWindowState(AvnWindowState*ret);
+     HRESULT TakeFocusFromChildren();
+     HRESULT SetExtendClientArea(bool enable);
+     HRESULT SetExtendClientAreaHints(AvnExtendClientAreaChromeHints hints);
+     HRESULT GetExtendTitleBarHeight(double*ret);
+     HRESULT SetExtendTitleBarHeight(double value);
+}
+
+[uuid(939b6599-40a8-4710-a4c8-5d72d8f174fb)]
+interface IAvnWindowBaseEvents : IUnknown
+{
+     HRESULT Paint();
+     void Closed();
+     void Activated();
+     void Deactivated();
+     void Resized([const] AvnSize& size);
+     void PositionChanged(AvnPoint position);
+     void RawMouseEvent(AvnRawMouseEventType type,
+                                uint timeStamp,
+                                AvnInputModifiers modifiers,
+                                AvnPoint point,
+                                AvnVector delta);
+     bool RawKeyEvent(AvnRawKeyEventType type, uint timeStamp, AvnInputModifiers modifiers, uint key);
+     bool RawTextInputEvent(uint timeStamp, [const] char* text);
+     void ScalingChanged(double scaling);
+     void RunRenderPriorityJobs();
+     void LostFocus();
+     AvnDragDropEffects DragEvent(AvnDragEventType type, AvnPoint position,
+                                         AvnInputModifiers modifiers, AvnDragDropEffects effects,
+                                         IAvnClipboard* clipboard, [intptr]void* dataObjectHandle);
+}
+
+[uuid(1ae178ee-1fcc-447f-b6dd-b7bb727f934c)]
+interface IAvnWindowEvents : IAvnWindowBaseEvents
+{
+    /**
+     * Closing Event
+     * Called when the user presses the OS window close button.
+     * return true to allow the close, return false to prevent close.
+     */
+     bool Closing();
+    
+     void WindowStateChanged(AvnWindowState state);
+    
+     void GotInputWhenDisabled();
+}
+
+[uuid(e34ae0f8-18b4-48a3-b09d-2e6b19a3cf5e)]
+interface IAvnMacOptions : IUnknown
+{
+     HRESULT SetShowInDock(int show);
+     HRESULT SetApplicationTitle(char* utf8string);
+}
+
+[uuid(04c1b049-1f43-418a-9159-cae627ec1367)]
+interface IAvnActionCallback : IUnknown
+{
+     void Run();
+}
+
+[uuid(6df4d2db-0b80-4f59-ad88-0baa5e21eb14)]
+interface IAvnSignaledCallback : IUnknown
+{
+     void Signaled(int priority, bool priorityContainsMeaningfulValue);
+}
+
+[uuid(97330f88-c22b-4a8e-a130-201520091b01)]
+interface IAvnLoopCancellation : IUnknown
+{
+     void Cancel();
+}
+
+[uuid(fbc06f3d-7860-42df-83fd-53c4b02dd9c3)]
+interface IAvnPlatformThreadingInterface : IUnknown
+{
+     bool GetCurrentThreadIsLoopThread();
+     void SetSignaledCallback(IAvnSignaledCallback* cb);
+     IAvnLoopCancellation* CreateLoopCancellation();
+     HRESULT RunLoop(IAvnLoopCancellation* cancel);
+    // Can't pass int* to sharpgentools for some reason
+     void Signal(int priority);
+     IUnknown* StartTimer(int priority, int ms, IAvnActionCallback* callback);
+}
+
+[uuid(6c621a6e-e4c1-4ae3-9749-83eeeffa09b6)]
+interface IAvnSystemDialogEvents : IUnknown
+{
+     void OnCompleted(int numResults, void* ptrFirstResult);
+}
+
+[uuid(4d7a47db-a944-4061-abe7-62cb6aa0ffd5)]
+interface IAvnSystemDialogs : IUnknown
+{
+     void SelectFolderDialog(IAvnWindow* parentWindowHandle,
+                                     IAvnSystemDialogEvents* events,
+                                     [const] char* title,
+                                     [const] char* initialPath);
+    
+     void OpenFileDialog(IAvnWindow* parentWindowHandle,
+                                 IAvnSystemDialogEvents* events,
+                                 bool allowMultiple,
+                                 [const] char* title,
+                                 [const] char* initialDirectory,
+                                 [const] char* initialFile,
+                                 [const] char* filters);
+    
+     void SaveFileDialog(IAvnWindow* parentWindowHandle,
+                                 IAvnSystemDialogEvents* events,
+                                 [const] char* title,
+                                 [const] char* initialDirectory,
+                                 [const] char* initialFile,
+                                 [const] char* filters);
+}
+
+[uuid(9a52bc7a-d8c7-4230-8d34-704a0b70a933)]
+interface IAvnScreens : IUnknown
+{
+     HRESULT GetScreenCount(int* ret);
+     HRESULT GetScreen(int index, AvnScreen* ret);
+}
+
+[uuid(792b1bd4-76cc-46ea-bfd0-9d642154b1b3)]
+interface IAvnClipboard : IUnknown
+{
+     HRESULT GetText(char* type, IAvnString**ppv);
+     HRESULT SetText(char* type, char* utf8Text);
+     HRESULT ObtainFormats(IAvnStringArray**ppv);
+     HRESULT GetStrings(char* type, IAvnStringArray**ppv);
+     HRESULT SetBytes(char* type, void* utf8Text, int len);
+     HRESULT GetBytes(char* type, IAvnString**ppv);
+    
+     HRESULT Clear();
+}
+
+[uuid(3f998545-f027-4d4d-bd2a-1a80926d984e)]
+interface IAvnCursor : IUnknown
+{
+}
+
+[uuid(51ecfb12-c427-4757-a2c9-1596bfce53ef)]
+interface IAvnCursorFactory : IUnknown
+{
+     HRESULT GetCursor(AvnStandardCursorType cursorType, IAvnCursor** retOut);
+}
+
+[uuid(60452465-8616-40af-bc00-042e69828ce7)]
+interface IAvnGlDisplay : IUnknown
+{
+     HRESULT CreateContext(IAvnGlContext* share, IAvnGlContext**ppv);
+     void LegacyClearCurrentContext();
+     HRESULT WrapContext([intptr]void* native, IAvnGlContext**ppv);
+     [intptr]void* GetProcAddress(char* proc);
+}
+
+[uuid(78c5711e-2a98-40d2-bac4-0cc9a49dc4f3)]
+interface IAvnGlContext : IUnknown
+{
+     HRESULT MakeCurrent(IUnknown** ppv);
+     HRESULT LegacyMakeCurrent();
+     int GetSampleCount();
+     int GetStencilSize();
+     [intptr]void* GetNativeHandle();
+}
+
+[uuid(931062d2-5bc8-4062-8588-83dd8deb99c2)]
+interface IAvnGlSurfaceRenderTarget : IUnknown
+{
+     HRESULT BeginDrawing(IAvnGlSurfaceRenderingSession** ret);
+}
+
+[uuid(e625b406-f04c-484e-946a-4abd2c6015ad)]
+interface IAvnGlSurfaceRenderingSession : IUnknown
+{
+     HRESULT GetPixelSize(AvnPixelSize* ret);
+     HRESULT GetScaling(double* ret);
+}
+
+[uuid(a7724dc1-cf6b-4fa8-9d23-228bf2593edc)]
+interface IAvnMenu : IUnknown
+{
+     HRESULT InsertItem(int index, IAvnMenuItem* item);
+     HRESULT RemoveItem(IAvnMenuItem* item);
+     HRESULT SetTitle(char* utf8String);
+     HRESULT Clear();
+}
+
+[uuid(59e0586d-bd1c-4b85-9882-80d448b0fed9)]
+interface IAvnPredicateCallback : IUnknown
+{
+     bool Evaluate();
+}
+
+[uuid(f890219a-1720-4cd5-9a26-cd95fccbf53c)]
+interface IAvnMenuItem : IUnknown
+{
+     HRESULT SetSubMenu(IAvnMenu* menu);
+     HRESULT SetTitle(char* utf8String);
+     HRESULT SetGesture(AvnKey key, AvnInputModifiers modifiers);
+     HRESULT SetAction(IAvnPredicateCallback* predicate, IAvnActionCallback* callback);
+     HRESULT SetIsChecked(bool isChecked);
+     HRESULT SetToggleType(AvnMenuItemToggleType toggleType);
+     HRESULT SetIcon(void* data, size_t length);
+}
+
+[uuid(0af7df53-7632-42f4-a650-0992c361b477)]
+interface IAvnMenuEvents : IUnknown
+{
+    /**
+     * NeedsUpdate
+     */
+     void NeedsUpdate();
+}
+
+[uuid(5142bb41-66ab-49e7-bb37-cd079c000f27)]
+interface IAvnStringArray : IUnknown
+{
+     uint GetCount();
+     HRESULT Get(uint index, IAvnString**ppv);
+}
+
+[uuid(a13d2382-3b3a-4d1c-9b27-8f34653d3f01)]
+interface IAvnDndResultCallback : IUnknown
+{
+     void OnDragAndDropComplete(AvnDragDropEffects effecct);
+}
+
+[uuid(f07c608e-52e9-422d-836e-c70f6e9b80f5)]
+interface IAvnGCHandleDeallocatorCallback : IUnknown
+{
+     void FreeGCHandle([intptr]void* handle);
+}
+
+[uuid(91c7f677-f26b-4ff3-93cc-cf15aa966ffa)]
+interface IAvnNativeControlHost : IUnknown
+{
+     HRESULT CreateDefaultChild([intptr]void* parent, [intptr]void** retOut);
+     IAvnNativeControlHostTopLevelAttachment* CreateAttachment();
+     void DestroyDefaultChild([intptr]void* child);
+}
+
+[uuid(14a9e164-1aae-4271-bb78-7b5230999b52)]
+interface IAvnNativeControlHostTopLevelAttachment : IUnknown
+{
+     [intptr]void* GetParentHandle();
+     HRESULT InitializeWithChildHandle([intptr]void* child);
+     HRESULT AttachTo(IAvnNativeControlHost* host);
+     void ShowInBounds(float x, float y, float width, float height);
+     void HideWithSize(float width, float height);
+     void ReleaseChild();
+}
diff --git a/src/Avalonia.OpenGL/Angle/AngleEglInterface.cs b/src/Avalonia.OpenGL/Angle/AngleEglInterface.cs
new file mode 100644
index 0000000000..3a332f37ad
--- /dev/null
+++ b/src/Avalonia.OpenGL/Angle/AngleEglInterface.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Runtime.InteropServices;
+using Avalonia.OpenGL.Egl;
+
+namespace Avalonia.OpenGL.Angle
+{
+    public class AngleEglInterface : EglInterface
+    {
+        [DllImport("av_libGLESv2.dll", CharSet = CharSet.Ansi)]
+        static extern IntPtr EGL_GetProcAddress(string proc);
+
+        public AngleEglInterface() : base(LoadAngle())
+        {
+
+        }
+
+        static Func<string, IntPtr> LoadAngle()
+        {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                var disp = EGL_GetProcAddress("eglGetPlatformDisplayEXT");
+
+                if (disp == IntPtr.Zero)
+                {
+                    throw new OpenGlException("libegl.dll doesn't have eglGetPlatformDisplayEXT entry point");
+                }
+
+                return EGL_GetProcAddress;
+            }
+            
+            throw new PlatformNotSupportedException();
+        }
+
+    }
+}
diff --git a/src/Avalonia.OpenGL/Angle/AngleWin32EglDisplay.cs b/src/Avalonia.OpenGL/Angle/AngleWin32EglDisplay.cs
new file mode 100644
index 0000000000..94e7728d68
--- /dev/null
+++ b/src/Avalonia.OpenGL/Angle/AngleWin32EglDisplay.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using Avalonia.OpenGL.Egl;
+using static Avalonia.OpenGL.Egl.EglConsts;
+
+namespace Avalonia.OpenGL.Angle
+{
+    public class AngleWin32EglDisplay : EglDisplay
+    {
+        struct AngleInfo
+        {
+            public IntPtr Display { get; set; }
+            public AngleOptions.PlatformApi PlatformApi { get; set; }
+        }
+        
+        static AngleInfo CreateAngleDisplay(EglInterface _egl)
+        {
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                throw new PlatformNotSupportedException();
+            var display = IntPtr.Zero;
+            AngleOptions.PlatformApi angleApi = default;
+            {
+                if (_egl.GetPlatformDisplayEXT == null)
+                    throw new OpenGlException("eglGetPlatformDisplayEXT is not supported by libegl.dll");
+
+                var allowedApis = AvaloniaLocator.Current.GetService<AngleOptions>()?.AllowedPlatformApis
+                                  ?? new [] { AngleOptions.PlatformApi.DirectX11, AngleOptions.PlatformApi.DirectX9 };
+
+                foreach (var platformApi in allowedApis)
+                {
+                    int dapi;
+                    if (platformApi == AngleOptions.PlatformApi.DirectX9)
+                        dapi = EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE;
+                    else if (platformApi == AngleOptions.PlatformApi.DirectX11)
+                        dapi = EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE;
+                    else
+                        continue;
+
+                    display = _egl.GetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, IntPtr.Zero,
+                        new[] { EGL_PLATFORM_ANGLE_TYPE_ANGLE, dapi, EGL_NONE });
+                    if (display != IntPtr.Zero)
+                    {
+                        angleApi = platformApi;
+                        break;
+                    }
+                }
+
+                if (display == IntPtr.Zero)
+                    throw new OpenGlException("Unable to create ANGLE display");
+                return new AngleInfo { Display = display, PlatformApi = angleApi };
+            }
+        }
+
+        private AngleWin32EglDisplay(EglInterface egl, AngleInfo info) : base(egl, false, info.Display)
+        {
+            PlatformApi = info.PlatformApi;
+        }
+
+        public AngleWin32EglDisplay(EglInterface egl) : this(egl, CreateAngleDisplay(egl))
+        {
+            
+        }
+
+        public AngleWin32EglDisplay() : this(new AngleEglInterface())
+        {
+
+        }
+
+        public AngleOptions.PlatformApi PlatformApi { get; }
+
+        public IntPtr GetDirect3DDevice()
+        {
+            if (!EglInterface.QueryDisplayAttribExt(Handle, EglConsts.EGL_DEVICE_EXT, out var eglDevice))
+                throw new OpenGlException("Unable to get EGL_DEVICE_EXT");
+            if (!EglInterface.QueryDeviceAttribExt(eglDevice, PlatformApi == AngleOptions.PlatformApi.DirectX9 ? EGL_D3D9_DEVICE_ANGLE : EGL_D3D11_DEVICE_ANGLE, out var d3dDeviceHandle))
+                throw new OpenGlException("Unable to get EGL_D3D9_DEVICE_ANGLE");
+            return d3dDeviceHandle;
+        }
+
+        public EglSurface WrapDirect3D11Texture(EglPlatformOpenGlInterface egl, IntPtr handle)
+        {
+            if (PlatformApi != AngleOptions.PlatformApi.DirectX11)
+                throw new InvalidOperationException("Current platform API is " + PlatformApi);
+            return  egl.CreatePBufferFromClientBuffer(EGL_D3D_TEXTURE_ANGLE, handle, new[] { EGL_NONE, EGL_NONE });            
+        }
+
+        public EglSurface WrapDirect3D11Texture(EglPlatformOpenGlInterface egl, IntPtr handle, int offsetX, int offsetY, int width, int height)
+        {
+            if (PlatformApi != AngleOptions.PlatformApi.DirectX11)
+                throw new InvalidOperationException("Current platform API is " + PlatformApi);
+            return egl.CreatePBufferFromClientBuffer(EGL_D3D_TEXTURE_ANGLE, handle, new[] { EGL_WIDTH, width, EGL_HEIGHT, height, EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE, EGL_TRUE, EGL_TEXTURE_OFFSET_X_ANGLE, offsetX, EGL_TEXTURE_OFFSET_Y_ANGLE, offsetY, EGL_NONE });
+        }
+    }
+}
diff --git a/src/Avalonia.OpenGL/AngleOptions.cs b/src/Avalonia.OpenGL/AngleOptions.cs
index 4b9c04f4e6..0807eb7ab4 100644
--- a/src/Avalonia.OpenGL/AngleOptions.cs
+++ b/src/Avalonia.OpenGL/AngleOptions.cs
@@ -10,9 +10,12 @@ namespace Avalonia.OpenGL
 			DirectX11
         }
 
-        public List<PlatformApi> AllowedPlatformApis = new List<PlatformApi>
+        public IList<GlVersion> GlProfiles { get; set; } = new List<GlVersion>
         {
-            PlatformApi.DirectX9
+            new GlVersion(GlProfileType.OpenGLES, 3, 0),
+            new GlVersion(GlProfileType.OpenGLES, 2, 0)
         };
+
+        public IList<PlatformApi> AllowedPlatformApis { get; set; } = null;
     }
 }
diff --git a/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
index 310d0c8dba..d761e60c07 100644
--- a/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
+++ b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
@@ -2,11 +2,12 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
 
     <ItemGroup>
       <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
+      <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
       <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    </ItemGroup>
-
+    </ItemGroup>    
 </Project>
diff --git a/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs b/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs
new file mode 100644
index 0000000000..33773ed8e2
--- /dev/null
+++ b/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs
@@ -0,0 +1,241 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Logging;
+using Avalonia.Media;
+using Avalonia.OpenGL.Imaging;
+using static Avalonia.OpenGL.GlConsts;
+
+namespace Avalonia.OpenGL.Controls
+{
+    public abstract class OpenGlControlBase : Control
+    {
+        private IGlContext _context;
+        private int _fb, _depthBuffer;
+        private OpenGlBitmap _bitmap;
+        private IOpenGlBitmapAttachment _attachment;
+        private PixelSize _depthBufferSize;
+        private bool _glFailed;
+        private bool _initialized;
+        protected GlVersion GlVersion { get; private set; }
+        public sealed override void Render(DrawingContext context)
+        {
+            if(!EnsureInitialized())
+                return;
+            
+            using (_context.MakeCurrent())
+            {
+                _context.GlInterface.BindFramebuffer(GL_FRAMEBUFFER, _fb);
+                EnsureTextureAttachment();
+                EnsureDepthBufferAttachment(_context.GlInterface);
+                if(!CheckFramebufferStatus(_context.GlInterface))
+                    return;
+                
+                OnOpenGlRender(_context.GlInterface, _fb);
+                _attachment.Present();
+            }
+
+            context.DrawImage(_bitmap, new Rect(_bitmap.Size), Bounds);
+            base.Render(context);
+        }
+        
+        private void CheckError(GlInterface gl)
+        {
+            int err;
+            while ((err = gl.GetError()) != GL_NO_ERROR)
+                Console.WriteLine(err);
+        }
+
+        void EnsureTextureAttachment()
+        {
+            _context.GlInterface.BindFramebuffer(GL_FRAMEBUFFER, _fb);
+            if (_bitmap == null || _attachment == null || _bitmap.PixelSize != GetPixelSize())
+            {
+                _attachment?.Dispose();
+                _attachment = null;
+                _bitmap?.Dispose();
+                _bitmap = null;
+                _bitmap = new OpenGlBitmap(GetPixelSize(), new Vector(96, 96));
+                _attachment = _bitmap.CreateFramebufferAttachment(_context);
+            }
+        }
+        
+        void EnsureDepthBufferAttachment(GlInterface gl)
+        {
+            var size = GetPixelSize();
+            if (size == _depthBufferSize && _depthBuffer != 0)
+                return;
+                    
+            gl.GetIntegerv(GL_RENDERBUFFER_BINDING, out var oldRenderBuffer);
+            if (_depthBuffer != 0) gl.DeleteRenderbuffers(1, new[] { _depthBuffer });
+
+            var oneArr = new int[1];
+            gl.GenRenderbuffers(1, oneArr);
+            _depthBuffer = oneArr[0];
+            gl.BindRenderbuffer(GL_RENDERBUFFER, _depthBuffer);
+            gl.RenderbufferStorage(GL_RENDERBUFFER,
+                GlVersion.Type == GlProfileType.OpenGLES ? GL_DEPTH_COMPONENT16 : GL_DEPTH_COMPONENT,
+                size.Width, size.Height);
+            gl.FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, _depthBuffer);
+            gl.BindRenderbuffer(GL_RENDERBUFFER, oldRenderBuffer);
+        }
+
+        void DoCleanup()
+        {
+            if (_context != null)
+            {
+                using (_context.MakeCurrent())
+                {
+                    var gl = _context.GlInterface;
+                    gl.BindTexture(GL_TEXTURE_2D, 0);
+                    gl.BindFramebuffer(GL_FRAMEBUFFER, 0);
+                    gl.DeleteFramebuffers(1, new[] { _fb });
+                    gl.DeleteRenderbuffers(1, new[] { _depthBuffer });
+                    _attachment?.Dispose();
+                    _attachment = null;
+                    _bitmap?.Dispose();
+                    _bitmap = null;
+                    
+                    try
+                    {
+                        if (_initialized)
+                        {
+                            _initialized = false;
+                            OnOpenGlDeinit(_context.GlInterface, _fb);
+                        }
+                    }
+                    finally
+                    {
+                        _context.Dispose();
+                        _context = null;
+                    }
+                }
+            }
+        }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            DoCleanup();
+            base.OnDetachedFromVisualTree(e);
+        }
+
+        private bool EnsureInitializedCore()
+        {
+            if (_context != null)
+                return true;
+            
+            if (_glFailed)
+                return false;
+            
+            var feature = AvaloniaLocator.Current.GetService<IPlatformOpenGlInterface>();
+            if (feature == null)
+                return false;
+            if (!feature.CanShareContexts)
+            {
+                Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("OpenGlControlBase",
+                    "Unable to initialize OpenGL: current platform does not support multithreaded context sharing");
+                return false;
+            }
+            try
+            {
+                _context = feature.CreateSharedContext();
+            }
+            catch (Exception e)
+            {
+                Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("OpenGlControlBase",
+                    "Unable to initialize OpenGL: unable to create additional OpenGL context: {exception}", e);
+                return false;
+            }
+
+            GlVersion = _context.Version;
+            try
+            {
+                _bitmap = new OpenGlBitmap(GetPixelSize(), new Vector(96, 96));
+                if (!_bitmap.SupportsContext(_context))
+                {
+                    Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("OpenGlControlBase",
+                        "Unable to initialize OpenGL: unable to create OpenGlBitmap: OpenGL context is not compatible");
+                    return false;
+                }
+            }
+            catch (Exception e)
+            {
+                _context.Dispose();
+                _context = null;
+                Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("OpenGlControlBase",
+                    "Unable to initialize OpenGL: unable to create OpenGlBitmap: {exception}", e);
+                return false;
+            }
+
+            using (_context.MakeCurrent())
+            {
+                try
+                {
+                    _depthBufferSize = GetPixelSize();
+                    var gl = _context.GlInterface;
+                    var oneArr = new int[1];
+                    gl.GenFramebuffers(1, oneArr);
+                    _fb = oneArr[0];
+                    gl.BindFramebuffer(GL_FRAMEBUFFER, _fb);
+                    
+                    EnsureDepthBufferAttachment(gl);
+                    EnsureTextureAttachment();
+
+                    return CheckFramebufferStatus(gl);
+                }
+                catch(Exception e)
+                {
+                    Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("OpenGlControlBase",
+                        "Unable to initialize OpenGL FBO: {exception}", e);
+                    return false;
+                }
+            }
+        }
+
+        private bool CheckFramebufferStatus(GlInterface gl)
+        {
+            var status = gl.CheckFramebufferStatus(GL_FRAMEBUFFER);
+            if (status != GL_FRAMEBUFFER_COMPLETE)
+            {
+                int code;
+                while ((code = gl.GetError()) != 0)
+                    Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("OpenGlControlBase",
+                        "Unable to initialize OpenGL FBO: {code}", code);
+                return false;
+            }
+
+            return true;
+        }
+
+        private bool EnsureInitialized()
+        {
+            if (_initialized)
+                return true;
+            _glFailed = !(_initialized = EnsureInitializedCore());
+            if (_glFailed)
+                return false;
+            using (_context.MakeCurrent())
+                OnOpenGlInit(_context.GlInterface, _fb);
+            return true;
+        }
+        
+        private PixelSize GetPixelSize()
+        {
+            var scaling = VisualRoot.RenderScaling;
+            return new PixelSize(Math.Max(1, (int)(Bounds.Width * scaling)),
+                Math.Max(1, (int)(Bounds.Height * scaling)));
+        }
+
+
+        protected virtual void OnOpenGlInit(GlInterface gl, int fb)
+        {
+            
+        }
+
+        protected virtual void OnOpenGlDeinit(GlInterface gl, int fb)
+        {
+            
+        }
+        
+        protected abstract void OnOpenGlRender(GlInterface gl, int fb);
+    }
+}
diff --git a/src/Avalonia.OpenGL/EglConsts.cs b/src/Avalonia.OpenGL/Egl/EglConsts.cs
similarity index 93%
rename from src/Avalonia.OpenGL/EglConsts.cs
rename to src/Avalonia.OpenGL/Egl/EglConsts.cs
index 62fb3faef6..530d3401f6 100644
--- a/src/Avalonia.OpenGL/EglConsts.cs
+++ b/src/Avalonia.OpenGL/Egl/EglConsts.cs
@@ -1,6 +1,6 @@
 // ReSharper disable UnusedMember.Global
 // ReSharper disable IdentifierTypo
-namespace Avalonia.OpenGL
+namespace Avalonia.OpenGL.Egl
 {
     public static class EglConsts
     {
@@ -186,11 +186,30 @@ namespace Avalonia.OpenGL
         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;
         
         //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;
+        
+        //EXT_device_query
+        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_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_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE = 0x33A6;
     }
 }
diff --git a/src/Avalonia.OpenGL/Egl/EglContext.cs b/src/Avalonia.OpenGL/Egl/EglContext.cs
new file mode 100644
index 0000000000..58137dfff0
--- /dev/null
+++ b/src/Avalonia.OpenGL/Egl/EglContext.cs
@@ -0,0 +1,121 @@
+using System;
+using System.Reactive.Disposables;
+using System.Threading;
+using static Avalonia.OpenGL.Egl.EglConsts;
+
+namespace Avalonia.OpenGL.Egl
+{
+    public class EglContext : IGlContext
+    {
+        private readonly EglDisplay _disp;
+        private readonly EglInterface _egl;
+        private readonly EglContext _sharedWith;
+        private readonly object _lock = new object();
+
+        public EglContext(EglDisplay display, EglInterface egl, EglContext sharedWith, IntPtr ctx, Func<EglContext, EglSurface> offscreenSurface,
+            GlVersion version, int sampleCount, int stencilSize)
+        {
+            _disp = display;
+            _egl = egl;
+            _sharedWith = sharedWith;
+            Context = ctx;
+            OffscreenSurface = offscreenSurface(this);
+            Version = version;
+            SampleCount = sampleCount;
+            StencilSize = stencilSize;
+            using (MakeCurrent())
+                GlInterface = GlInterface.FromNativeUtf8GetProcAddress(version, b => _egl.GetProcAddress(b));
+        }
+
+        public IntPtr Context { get; }
+        public EglSurface OffscreenSurface { get; }
+        public GlVersion Version { get; }
+        public GlInterface GlInterface { get; }
+        public int SampleCount { get; }
+        public int StencilSize { get; }
+        public EglDisplay Display => _disp;
+
+        class RestoreContext : IDisposable
+        {
+            private readonly EglInterface _egl;
+            private readonly object _l;
+            private readonly IntPtr _display;
+            private IntPtr _context, _read, _draw;
+
+            public RestoreContext(EglInterface egl, IntPtr defDisplay, object l)
+            {
+                _egl = egl;
+                _l = l;
+                _display = _egl.GetCurrentDisplay();
+                if (_display == IntPtr.Zero)
+                    _display = defDisplay;
+                _context = _egl.GetCurrentContext();
+                _read = _egl.GetCurrentSurface(EGL_READ);
+                _draw = _egl.GetCurrentSurface(EGL_DRAW);
+            }
+
+            public void Dispose() 
+            {
+                _egl.MakeCurrent(_display, _draw, _read, _context);
+                Monitor.Exit(_l);
+            }
+
+        }
+
+        public IDisposable MakeCurrent() => MakeCurrent(OffscreenSurface);
+
+        public IDisposable MakeCurrent(EglSurface surface)
+        {
+            Monitor.Enter(_lock);
+            var success = false;
+            try
+            {
+                var old = new RestoreContext(_egl, _disp.Handle, _lock);
+                var surf = surface ?? OffscreenSurface;
+                _egl.MakeCurrent(_disp.Handle, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
+                if (!_egl.MakeCurrent(_disp.Handle, surf?.DangerousGetHandle() ?? IntPtr.Zero,
+                    surf?.DangerousGetHandle() ?? IntPtr.Zero, Context))
+                    throw OpenGlException.GetFormattedException("eglMakeCurrent", _egl);
+                success = true;
+                return old;
+            }
+            finally
+            {
+                if(!success)
+                    Monitor.Enter(_lock);
+            }
+        }
+        
+        public IDisposable EnsureCurrent()
+        {
+            if(IsCurrent)
+                return Disposable.Empty;
+            return MakeCurrent();
+        }
+
+        public IDisposable EnsureLocked()
+        {
+            if (IsCurrent)
+                return Disposable.Empty;
+            Monitor.Enter(_lock);
+            return Disposable.Create(() => Monitor.Exit(_lock));
+        }
+
+        public bool IsSharedWith(IGlContext context)
+        {
+            var c = (EglContext)context;
+            return c == this
+                   || c._sharedWith == this
+                   || _sharedWith == context
+                   || _sharedWith != null && _sharedWith == c._sharedWith;
+        }
+
+        public bool IsCurrent => _egl.GetCurrentDisplay() == _disp.Handle && _egl.GetCurrentContext() == Context;
+
+        public void Dispose()
+        {
+            _egl.DestroyContext(_disp.Handle, Context);
+            OffscreenSurface?.Dispose();
+        }
+    }
+}
diff --git a/src/Avalonia.OpenGL/Egl/EglDisplay.cs b/src/Avalonia.OpenGL/Egl/EglDisplay.cs
new file mode 100644
index 0000000000..623364866b
--- /dev/null
+++ b/src/Avalonia.OpenGL/Egl/EglDisplay.cs
@@ -0,0 +1,193 @@
+using System;
+using System.Linq;
+using static Avalonia.OpenGL.Egl.EglConsts;
+
+namespace Avalonia.OpenGL.Egl
+{
+    public class EglDisplay
+    {
+        private readonly EglInterface _egl;
+        public bool SupportsSharing { get; }
+        private readonly IntPtr _display;
+        private readonly IntPtr _config;
+        private readonly int[] _contextAttributes;
+        private readonly int _surfaceType;
+
+        public IntPtr Handle => _display;
+        public IntPtr Config => _config;
+        private int _sampleCount;
+        private int _stencilSize;
+        private GlVersion _version;
+
+        public EglDisplay(EglInterface egl, bool supportsSharing) : this(egl, supportsSharing, -1, IntPtr.Zero, null)
+        {
+            
+        }
+
+        static IntPtr CreateDisplay(EglInterface egl, int platformType, IntPtr platformDisplay, int[] attrs)
+        {
+            var display = IntPtr.Zero;
+            if (platformType == -1 && platformDisplay == IntPtr.Zero)
+            {
+                if (display == IntPtr.Zero)
+                    display = egl.GetDisplay(IntPtr.Zero);
+            }
+            else
+            {
+                if (egl.GetPlatformDisplayEXT == null)
+                    throw new OpenGlException("eglGetPlatformDisplayEXT is not supported by libegl");
+                display = egl.GetPlatformDisplayEXT(platformType, platformDisplay, attrs);
+            }
+            
+            if (display == IntPtr.Zero)
+                throw OpenGlException.GetFormattedException("eglGetDisplay", egl);
+            return display;
+        }
+
+        public EglDisplay(EglInterface egl, bool supportsSharing, int platformType, IntPtr platformDisplay, int[] attrs)
+            : this(egl, supportsSharing, CreateDisplay(egl, platformType, platformDisplay, attrs))
+        {
+
+        }
+
+        public EglDisplay(EglInterface egl, bool supportsSharing, IntPtr display)
+        {
+            _egl = egl;
+            SupportsSharing = supportsSharing;
+            _display = display;
+            if(_display == IntPtr.Zero)
+                throw new ArgumentException();
+            
+            
+            if (!_egl.Initialize(_display, out var major, out var minor))
+                throw OpenGlException.GetFormattedException("eglInitialize", _egl);
+
+            var glProfiles = AvaloniaLocator.Current.GetService<AngleOptions>()?.GlProfiles
+                                    ?? new[]
+                                    {
+                                        new GlVersion(GlProfileType.OpenGLES, 3, 0),
+                                        new GlVersion(GlProfileType.OpenGLES, 2, 0)
+                                    };
+
+            var cfgs = glProfiles.Select(x =>
+            {
+                var typeBit = EGL_OPENGL_ES3_BIT;
+
+                switch (x.Major)
+                {
+                    case 2:
+                        typeBit = EGL_OPENGL_ES2_BIT;
+                        break;
+
+                    case 1:
+                        typeBit = EGL_OPENGL_ES_BIT;
+                        break;
+                }
+
+                return new
+                {
+                    Attributes = new[]
+                    {
+                        EGL_CONTEXT_MAJOR_VERSION, x.Major,
+                        EGL_CONTEXT_MINOR_VERSION, x.Minor,
+                        EGL_NONE
+                    },
+                    Api = EGL_OPENGL_ES_API,
+                    RenderableTypeBit = typeBit,
+                    Version = x
+                };
+            });
+
+            foreach (var cfg in cfgs)
+            {
+                if (!_egl.BindApi(cfg.Api))
+                    continue;
+                foreach(var surfaceType in new[]{EGL_PBUFFER_BIT|EGL_WINDOW_BIT, EGL_WINDOW_BIT})
+                foreach(var stencilSize in new[]{8, 1, 0})
+                foreach (var depthSize in new []{8, 1, 0})
+                {
+                    var attribs = new[]
+                    {
+                        EGL_SURFACE_TYPE, surfaceType,
+                        EGL_RENDERABLE_TYPE, cfg.RenderableTypeBit,
+                        EGL_RED_SIZE, 8,
+                        EGL_GREEN_SIZE, 8,
+                        EGL_BLUE_SIZE, 8,
+                        EGL_ALPHA_SIZE, 8,
+                        EGL_STENCIL_SIZE, stencilSize,
+                        EGL_DEPTH_SIZE, depthSize,
+                        EGL_NONE
+                    };
+                    if (!_egl.ChooseConfig(_display, attribs, out _config, 1, out int numConfigs))
+                        continue;
+                    if (numConfigs == 0)
+                        continue;
+                    _contextAttributes = cfg.Attributes;
+                    _surfaceType = surfaceType;
+                    _version = cfg.Version;
+                    _egl.GetConfigAttrib(_display, _config, EGL_SAMPLES, out _sampleCount);
+                    _egl.GetConfigAttrib(_display, _config, EGL_STENCIL_SIZE, out _stencilSize);
+                    goto Found;
+                }
+
+            }
+            Found:
+            if (_contextAttributes == null)
+                throw new OpenGlException("No suitable EGL config was found");
+        }
+
+        public EglDisplay() : this(false)
+        {
+            
+        }
+        
+        public EglDisplay(bool supportsSharing) : this(new EglInterface(), supportsSharing)
+        {
+            
+        }
+        
+        public EglInterface EglInterface => _egl;
+        public EglContext CreateContext(IGlContext share)
+        {
+            if (share != null && !SupportsSharing)
+                throw new NotSupportedException("Context sharing is not supported by this display");
+            
+            if((_surfaceType|EGL_PBUFFER_BIT) == 0)
+                throw new InvalidOperationException("Platform doesn't support PBUFFER surfaces");
+            var shareCtx = (EglContext)share;
+            var ctx = _egl.CreateContext(_display, _config, shareCtx?.Context ?? IntPtr.Zero, _contextAttributes);
+            if (ctx == IntPtr.Zero)
+                throw OpenGlException.GetFormattedException("eglCreateContext", _egl);
+            
+            var extensions = _egl.QueryString(Handle, EGL_EXTENSIONS);
+            
+            IntPtr surf = IntPtr.Zero;
+            if (extensions?.Contains("EGL_KHR_surfaceless_context") != true)
+            {
+                surf = _egl.CreatePBufferSurface(_display, _config,
+                    new[] { EGL_WIDTH, 1, EGL_HEIGHT, 1, EGL_NONE });
+                if (surf == IntPtr.Zero)
+                    throw OpenGlException.GetFormattedException("eglCreatePBufferSurface", _egl);
+            }
+
+            var rv = new EglContext(this, _egl, shareCtx, ctx,
+                context =>
+                    surf == IntPtr.Zero ? null : new EglSurface(this, context, surf),
+                _version, _sampleCount, _stencilSize);
+            return rv;
+        }
+
+        public EglContext CreateContext(EglContext share, EglSurface offscreenSurface)
+        {
+            if (share != null && !SupportsSharing)
+                throw new NotSupportedException("Context sharing is not supported by this display");
+
+            var ctx = _egl.CreateContext(_display, _config, share?.Context ?? IntPtr.Zero, _contextAttributes);
+            if (ctx == IntPtr.Zero)
+                throw OpenGlException.GetFormattedException("eglCreateContext", _egl);
+            var rv = new EglContext(this, _egl, share, ctx, _ => offscreenSurface, _version, _sampleCount, _stencilSize);
+            rv.MakeCurrent(null);
+            return rv;
+        }
+    }
+}
diff --git a/src/Avalonia.OpenGL/EglErrors.cs b/src/Avalonia.OpenGL/Egl/EglErrors.cs
similarity index 96%
rename from src/Avalonia.OpenGL/EglErrors.cs
rename to src/Avalonia.OpenGL/Egl/EglErrors.cs
index bfe46f2b69..d89bbb499f 100644
--- a/src/Avalonia.OpenGL/EglErrors.cs
+++ b/src/Avalonia.OpenGL/Egl/EglErrors.cs
@@ -1,4 +1,4 @@
-namespace Avalonia.OpenGL
+namespace Avalonia.OpenGL.Egl
 {
     public enum EglErrors
     {
diff --git a/src/Avalonia.OpenGL/Egl/EglGlPlatformSurface.cs b/src/Avalonia.OpenGL/Egl/EglGlPlatformSurface.cs
new file mode 100644
index 0000000000..3d58660d47
--- /dev/null
+++ b/src/Avalonia.OpenGL/Egl/EglGlPlatformSurface.cs
@@ -0,0 +1,54 @@
+using Avalonia.OpenGL.Surfaces;
+
+namespace Avalonia.OpenGL.Egl
+{
+    public class EglGlPlatformSurface : EglGlPlatformSurfaceBase
+    {
+        private readonly EglPlatformOpenGlInterface _egl;
+        private readonly IEglWindowGlPlatformSurfaceInfo _info;
+        
+        public EglGlPlatformSurface(EglPlatformOpenGlInterface egl, IEglWindowGlPlatformSurfaceInfo info) : base()
+        {
+            _egl = egl;
+            _info = info;
+        }
+
+        public override IGlPlatformSurfaceRenderTarget CreateGlRenderTarget()
+        {
+            var glSurface = _egl.CreateWindowSurface(_info.Handle);
+            return new RenderTarget(_egl, glSurface, _info);
+        }
+
+        class RenderTarget : EglPlatformSurfaceRenderTargetBase
+        {
+            private readonly EglPlatformOpenGlInterface _egl;
+            private EglSurface _glSurface;
+            private readonly IEglWindowGlPlatformSurfaceInfo _info;
+            private PixelSize _currentSize;
+
+            public RenderTarget(EglPlatformOpenGlInterface egl,
+                EglSurface glSurface, IEglWindowGlPlatformSurfaceInfo info) : base(egl)
+            {
+                _egl = egl;
+                _glSurface = glSurface;
+                _info = info;
+                _currentSize = info.Size;
+            }
+
+            public override void Dispose() => _glSurface.Dispose();
+            
+            public override IGlPlatformSurfaceRenderingSession BeginDraw()
+            {
+                if (_info.Size != _currentSize || _glSurface == null)
+                {
+                    _glSurface?.Dispose();
+                    _glSurface = null;
+                    _glSurface = _egl.CreateWindowSurface(_info.Handle);
+                    _currentSize = _info.Size;
+                }
+                return base.BeginDraw(_glSurface, _info);
+            }
+        }
+    }
+}
+
diff --git a/src/Avalonia.OpenGL/Egl/EglGlPlatformSurfaceBase.cs b/src/Avalonia.OpenGL/Egl/EglGlPlatformSurfaceBase.cs
new file mode 100644
index 0000000000..4ea6766de2
--- /dev/null
+++ b/src/Avalonia.OpenGL/Egl/EglGlPlatformSurfaceBase.cs
@@ -0,0 +1,100 @@
+using System;
+using Avalonia.OpenGL.Surfaces;
+
+namespace Avalonia.OpenGL.Egl
+{
+    public abstract class EglGlPlatformSurfaceBase : IGlPlatformSurface
+    {
+        public interface IEglWindowGlPlatformSurfaceInfo
+        {
+            IntPtr Handle { get; }
+            PixelSize Size { get; }
+            double Scaling { get; }
+        }
+
+        public abstract IGlPlatformSurfaceRenderTarget CreateGlRenderTarget();
+    }
+
+    public abstract class EglPlatformSurfaceRenderTargetBase  : IGlPlatformSurfaceRenderTarget
+    {
+        private readonly EglPlatformOpenGlInterface _egl;
+
+        protected EglPlatformSurfaceRenderTargetBase(EglPlatformOpenGlInterface egl)
+        {
+            _egl = egl;
+        }
+
+        public virtual void Dispose()
+        {
+            
+        }
+
+        public abstract IGlPlatformSurfaceRenderingSession BeginDraw();
+
+        protected IGlPlatformSurfaceRenderingSession BeginDraw(EglSurface surface,
+            EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo info, Action onFinish = null, bool isYFlipped = false)
+        {
+
+            var restoreContext = _egl.PrimaryEglContext.MakeCurrent(surface);
+            var success = false;
+            try
+            {
+                var egli = _egl.Display.EglInterface;
+                egli.WaitClient();
+                egli.WaitGL();
+                egli.WaitNative(EglConsts.EGL_CORE_NATIVE_ENGINE);
+                
+                _egl.PrimaryContext.GlInterface.BindFramebuffer(GlConsts.GL_FRAMEBUFFER, 0);
+                
+                success = true;
+                return new Session(_egl.Display, _egl.PrimaryEglContext, surface, info,  restoreContext, onFinish, isYFlipped);
+            }
+            finally
+            {
+                if(!success)
+                    restoreContext.Dispose();
+            }
+        }
+        
+        class Session : IGlPlatformSurfaceRenderingSession
+        {
+            private readonly EglContext _context;
+            private readonly EglSurface _glSurface;
+            private readonly EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo _info;
+            private readonly EglDisplay _display;
+            private readonly IDisposable _restoreContext;
+            private readonly Action _onFinish;
+
+
+            public Session(EglDisplay display, EglContext context,
+                EglSurface glSurface, EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo info,
+                 IDisposable restoreContext, Action onFinish, bool isYFlipped)
+            {
+                IsYFlipped = isYFlipped;
+                _context = context;
+                _display = display;
+                _glSurface = glSurface;
+                _info = info;
+                _restoreContext = restoreContext;
+                _onFinish = onFinish;
+            }
+
+            public void Dispose()
+            {
+                _context.GlInterface.Flush();
+                _display.EglInterface.WaitGL();
+                _glSurface.SwapBuffers();
+                _display.EglInterface.WaitClient();
+                _display.EglInterface.WaitGL();
+                _display.EglInterface.WaitNative(EglConsts.EGL_CORE_NATIVE_ENGINE);
+                _restoreContext.Dispose();
+                _onFinish?.Invoke();
+            }
+
+            public IGlContext Context => _context;
+            public PixelSize Size => _info.Size;
+            public double Scaling => _info.Scaling;
+            public bool IsYFlipped { get; }
+        }
+    }
+}
diff --git a/src/Avalonia.OpenGL/EglInterface.cs b/src/Avalonia.OpenGL/Egl/EglInterface.cs
similarity index 69%
rename from src/Avalonia.OpenGL/EglInterface.cs
rename to src/Avalonia.OpenGL/Egl/EglInterface.cs
index 47088972a4..8055226042 100644
--- a/src/Avalonia.OpenGL/EglInterface.cs
+++ b/src/Avalonia.OpenGL/Egl/EglInterface.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 using Avalonia.Platform;
 using Avalonia.Platform.Interop;
 
-namespace Avalonia.OpenGL
+namespace Avalonia.OpenGL.Egl
 {
     public class EglInterface : GlInterfaceBase
     {
@@ -17,40 +17,30 @@ namespace Avalonia.OpenGL
             
         }
         
+        public EglInterface(Func<string, IntPtr> getProcAddress) : base(getProcAddress)
+        {
+            
+        }
+        
         public EglInterface(string library) : base(Load(library))
         {
         }
 
-        [DllImport("libegl.dll", CharSet = CharSet.Ansi)]
-        static extern IntPtr eglGetProcAddress(string proc);
         
-        static Func<string, bool, IntPtr> Load()
+        static Func<string, IntPtr> Load()
         {
             var os = AvaloniaLocator.Current.GetService<IRuntimePlatform>().GetRuntimeInfo().OperatingSystem;
             if(os == OperatingSystemType.Linux || os == OperatingSystemType.Android)
                 return Load("libEGL.so.1");
-            if (os == OperatingSystemType.WinNT)
-            {
-                var disp = eglGetProcAddress("eglGetPlatformDisplayEXT");
-                if (disp == IntPtr.Zero)
-                    throw new OpenGlException("libegl.dll doesn't have eglGetPlatformDisplayEXT entry point");
-                return (name, optional) =>
-                {
-                    var r = eglGetProcAddress(name);
-                    if (r == IntPtr.Zero && !optional)
-                        throw new OpenGlException($"Entry point {r} is not found");
-                    return r;
-                };
-            }
 
             throw new PlatformNotSupportedException();
         }
 
-        static Func<string, bool, IntPtr> Load(string library)
+        static Func<string, IntPtr> Load(string library)
         {
             var dyn = AvaloniaLocator.Current.GetService<IDynamicLibraryLoader>();
             var lib = dyn.LoadLibrary(library);
-            return (s, o) => dyn.GetProcAddress(lib, s, o);
+            return (s) => dyn.GetProcAddress(lib, s, true);
         }
 
         // ReSharper disable UnassignedGetOnlyAutoProperty
@@ -63,7 +53,8 @@ namespace Avalonia.OpenGL
         public EglGetDisplay GetDisplay { get; }
         
         public delegate IntPtr EglGetPlatformDisplayEXT(int platform, IntPtr nativeDisplay, int[] attrs);
-        [GlEntryPoint("eglGetPlatformDisplayEXT", true)]
+        [GlEntryPoint("eglGetPlatformDisplayEXT")]
+        [GlOptionalEntryPoint]
         public EglGetPlatformDisplayEXT GetPlatformDisplayEXT { get; }
 
         public delegate bool EglInitialize(IntPtr display, out int major, out int minor);
@@ -87,6 +78,10 @@ namespace Avalonia.OpenGL
             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")]
@@ -96,6 +91,18 @@ namespace Avalonia.OpenGL
         [GlEntryPoint("eglMakeCurrent")]
         public EglMakeCurrent MakeCurrent { get; }
 
+        public delegate IntPtr EglGetCurrentContext();
+        [GlEntryPoint("eglGetCurrentContext")]
+        public EglGetCurrentContext GetCurrentContext { get; }
+        
+        public delegate IntPtr EglGetCurrentDisplay();
+        [GlEntryPoint("eglGetCurrentDisplay")]
+        public EglGetCurrentContext GetCurrentDisplay { get; }
+
+        public delegate IntPtr EglGetCurrentSurface(int readDraw);
+        [GlEntryPoint("eglGetCurrentSurface")] 
+        public EglGetCurrentSurface GetCurrentSurface { get; }
+
         public delegate void EglDisplaySurfaceVoidDelegate(IntPtr display, IntPtr surface);
         [GlEntryPoint("eglDestroySurface")]
         public EglDisplaySurfaceVoidDelegate DestroySurface { get; }
@@ -120,9 +127,9 @@ namespace Avalonia.OpenGL
         [GlEntryPoint("eglWaitClient")]
         public EglWaitGL WaitClient { get; }
         
-        public delegate bool EglWaitNative();
+        public delegate bool EglWaitNative(int engine);
         [GlEntryPoint("eglWaitNative")]
-        public EglWaitGL WaitNative { get; }
+        public EglWaitNative WaitNative { get; }
         
         public delegate IntPtr EglQueryString(IntPtr display, int i);
         
@@ -136,6 +143,21 @@ namespace Avalonia.OpenGL
                 return null;
             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; }
+        
+        public delegate bool EglQueryDisplayAttribEXT(IntPtr display, int attr, out IntPtr res);
+
+        [GlEntryPoint("eglQueryDisplayAttribEXT"), GlOptionalEntryPoint]
+        public EglQueryDisplayAttribEXT QueryDisplayAttribExt { get; }
+
+        public delegate bool EglQueryDeviceAttribEXT(IntPtr display, int attr, out IntPtr res);
+
+        [GlEntryPoint("eglQueryDeviceAttribEXT"), GlOptionalEntryPoint]
+        public EglQueryDisplayAttribEXT QueryDeviceAttribExt { get; }
 
         // ReSharper restore UnassignedGetOnlyAutoProperty
     }
diff --git a/src/Avalonia.OpenGL/Egl/EglPlatformOpenGlInterface.cs b/src/Avalonia.OpenGL/Egl/EglPlatformOpenGlInterface.cs
new file mode 100644
index 0000000000..476f65a774
--- /dev/null
+++ b/src/Avalonia.OpenGL/Egl/EglPlatformOpenGlInterface.cs
@@ -0,0 +1,72 @@
+using System;
+using Avalonia.Logging;
+using static Avalonia.OpenGL.Egl.EglConsts;
+
+namespace Avalonia.OpenGL.Egl
+{
+    public class EglPlatformOpenGlInterface : IPlatformOpenGlInterface
+    {
+        public EglDisplay Display { get; private set; }
+        public bool CanCreateContexts => true;
+        public bool CanShareContexts => Display.SupportsSharing;
+        
+        public EglContext PrimaryEglContext { get; }
+        public IGlContext PrimaryContext => PrimaryEglContext;
+        
+        public EglPlatformOpenGlInterface(EglDisplay display)
+        {
+            Display = display;
+            PrimaryEglContext = display.CreateContext(null);
+        }
+        
+        public static void TryInitialize()
+        {
+            var feature = TryCreate();
+            if (feature != null)
+                AvaloniaLocator.CurrentMutable.Bind<IPlatformOpenGlInterface>().ToConstant(feature);
+        }
+        
+        public static EglPlatformOpenGlInterface TryCreate() => TryCreate(() => new EglDisplay());
+        public static EglPlatformOpenGlInterface TryCreate(Func<EglDisplay> displayFactory)
+        {
+            try
+            {
+                return new EglPlatformOpenGlInterface(displayFactory());
+            }
+            catch(Exception e)
+            {
+                Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log(null, "Unable to initialize EGL-based rendering: {0}", e);
+                return null;
+            }
+        }
+
+        public IGlContext CreateContext() => Display.CreateContext(null);
+        public IGlContext CreateSharedContext() => Display.CreateContext(PrimaryEglContext);
+        
+
+        public EglSurface CreateWindowSurface(IntPtr window)
+        {
+            using (PrimaryContext.MakeCurrent())
+            {
+                var s = Display.EglInterface.CreateWindowSurface(Display.Handle, Display.Config, window,
+                    new[] { EGL_NONE, EGL_NONE });
+                if (s == IntPtr.Zero)
+                    throw OpenGlException.GetFormattedException("eglCreateWindowSurface", Display.EglInterface);
+                return new EglSurface(Display, PrimaryEglContext, s);
+            }
+        }
+        
+        public EglSurface CreatePBufferFromClientBuffer (int bufferType, IntPtr handle, int[] attribs)
+        {
+            using (PrimaryContext.MakeCurrent())
+            {
+                var s = Display.EglInterface.CreatePbufferFromClientBuffer(Display.Handle, bufferType, handle,
+                    Display.Config, attribs);
+
+                if (s == IntPtr.Zero)
+                    throw OpenGlException.GetFormattedException("eglCreatePbufferFromClientBuffer", Display.EglInterface);
+                return new EglSurface(Display, PrimaryEglContext, s);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.OpenGL/EglSurface.cs b/src/Avalonia.OpenGL/Egl/EglSurface.cs
similarity index 57%
rename from src/Avalonia.OpenGL/EglSurface.cs
rename to src/Avalonia.OpenGL/Egl/EglSurface.cs
index 90bb1e36d0..a93751ca9e 100644
--- a/src/Avalonia.OpenGL/EglSurface.cs
+++ b/src/Avalonia.OpenGL/Egl/EglSurface.cs
@@ -1,28 +1,29 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Avalonia.OpenGL
+namespace Avalonia.OpenGL.Egl
 {
     public class EglSurface : SafeHandle
     {
         private readonly EglDisplay _display;
+        private readonly EglContext _context;
         private readonly EglInterface _egl;
 
-        public EglSurface(EglDisplay display, EglInterface egl, IntPtr surface)  : base(surface, true)
+        public EglSurface(EglDisplay display, EglContext context, IntPtr surface)  : base(surface, true)
         {
             _display = display;
-            _egl = egl;
+            _context = context;
+            _egl = display.EglInterface;
         }
 
         protected override bool ReleaseHandle()
         {
-            _egl.DestroySurface(_display.Handle, handle);
+            using (_context.MakeCurrent())
+                _egl.DestroySurface(_display.Handle, handle);
             return true;
         }
 
         public override bool IsInvalid => handle == IntPtr.Zero;
-
-        public IGlDisplay Display => _display;
         public void SwapBuffers() => _egl.SwapBuffers(_display.Handle, handle);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.OpenGL/EglContext.cs b/src/Avalonia.OpenGL/EglContext.cs
deleted file mode 100644
index a39000f198..0000000000
--- a/src/Avalonia.OpenGL/EglContext.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Reactive.Disposables;
-using System.Threading;
-
-namespace Avalonia.OpenGL
-{
-    public class EglContext : IGlContext
-    {
-        private readonly EglDisplay _disp;
-        private readonly EglInterface _egl;
-        private readonly object _lock = new object();
-
-        public EglContext(EglDisplay display, EglInterface egl, IntPtr ctx, EglSurface offscreenSurface)
-        {
-            _disp = display;
-            _egl = egl;
-            Context = ctx;
-            OffscreenSurface = offscreenSurface;
-        }
-
-        public IntPtr Context { get; }
-        public EglSurface OffscreenSurface { get; }
-        public IGlDisplay Display => _disp;
-
-        public IDisposable Lock()
-        {
-            Monitor.Enter(_lock);
-            return Disposable.Create(() => Monitor.Exit(_lock));
-        }
-
-        public void MakeCurrent()
-        {
-            if (!_egl.MakeCurrent(_disp.Handle, IntPtr.Zero, IntPtr.Zero, Context))
-                throw OpenGlException.GetFormattedException("eglMakeCurrent", _egl);
-        }
-        
-        public void MakeCurrent(EglSurface surface)
-        {
-            var surf = surface ?? OffscreenSurface;
-            if (!_egl.MakeCurrent(_disp.Handle, surf.DangerousGetHandle(), surf.DangerousGetHandle(), Context))
-                throw OpenGlException.GetFormattedException("eglMakeCurrent", _egl);
-        }
-    }
-}
diff --git a/src/Avalonia.OpenGL/EglDisplay.cs b/src/Avalonia.OpenGL/EglDisplay.cs
deleted file mode 100644
index 66418c0e15..0000000000
--- a/src/Avalonia.OpenGL/EglDisplay.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using Avalonia.Platform.Interop;
-using static Avalonia.OpenGL.EglConsts;
-
-namespace Avalonia.OpenGL
-{
-    public class EglDisplay : IGlDisplay
-    {
-        private readonly EglInterface _egl;
-        private readonly IntPtr _display;
-        private readonly IntPtr _config;
-        private readonly int[] _contextAttributes;
-        private readonly int _surfaceType;
-
-        public IntPtr Handle => _display;
-        private AngleOptions.PlatformApi? _angleApi;
-
-        public EglDisplay(EglInterface egl) : this(egl, -1, IntPtr.Zero, null)
-        {
-            
-        }
-        public EglDisplay(EglInterface egl, int platformType, IntPtr platformDisplay, int[] attrs)
-        {
-            _egl = egl;
-
-            if (platformType == -1 && platformDisplay == IntPtr.Zero)
-            {
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                {
-                    if (_egl.GetPlatformDisplayEXT == null)
-                        throw new OpenGlException("eglGetPlatformDisplayEXT is not supported by libegl.dll");
-
-                    var allowedApis = AvaloniaLocator.Current.GetService<AngleOptions>()?.AllowedPlatformApis
-                                      ?? new List<AngleOptions.PlatformApi> {AngleOptions.PlatformApi.DirectX9};
-
-                    foreach (var platformApi in allowedApis)
-                    {
-                        int dapi;
-                        if (platformApi == AngleOptions.PlatformApi.DirectX9)
-                            dapi = EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE;
-                        else if (platformApi == AngleOptions.PlatformApi.DirectX11)
-                            dapi = EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE;
-                        else
-                            continue;
-
-                        _display = _egl.GetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, IntPtr.Zero,
-                            new[] {EGL_PLATFORM_ANGLE_TYPE_ANGLE, dapi, EGL_NONE});
-                        if (_display != IntPtr.Zero)
-                        {
-                            _angleApi = platformApi;
-                            break;
-                        }
-                    }
-
-                    if (_display == IntPtr.Zero)
-                        throw new OpenGlException("Unable to create ANGLE display");
-                }
-
-                if (_display == IntPtr.Zero)
-                    _display = _egl.GetDisplay(IntPtr.Zero);
-            }
-            else
-            {
-                if (_egl.GetPlatformDisplayEXT == null)
-                    throw new OpenGlException("eglGetPlatformDisplayEXT is not supported by libegl");
-                _display = _egl.GetPlatformDisplayEXT(platformType, platformDisplay, attrs);
-            }
-
-            if (_display == IntPtr.Zero)
-                throw OpenGlException.GetFormattedException("eglGetDisplay", _egl);
-
-            if (!_egl.Initialize(_display, out var major, out var minor))
-                throw OpenGlException.GetFormattedException("eglInitialize", _egl);
-
-            foreach (var cfg in new[]
-            {
-                new
-                {
-                    Attributes = new[] {EGL_NONE},
-                    Api = EGL_OPENGL_API,
-                    RenderableTypeBit = EGL_OPENGL_BIT,
-                    Type = GlDisplayType.OpenGL2
-                },
-                new
-                {
-                    Attributes = new[]
-                    {
-                        EGL_CONTEXT_CLIENT_VERSION, 2,
-                        EGL_NONE
-                    },
-                    Api = EGL_OPENGL_ES_API,
-                    RenderableTypeBit = EGL_OPENGL_ES2_BIT,
-                    Type = GlDisplayType.OpenGLES2
-                }
-            })
-            {
-                if (!_egl.BindApi(cfg.Api))
-                    continue;
-                foreach(var surfaceType in new[]{EGL_PBUFFER_BIT|EGL_WINDOW_BIT, EGL_WINDOW_BIT})
-                foreach(var stencilSize in new[]{8, 1, 0})
-                foreach (var depthSize in new []{8, 1, 0})
-                {
-                    var attribs = new[]
-                    {
-                        EGL_SURFACE_TYPE, surfaceType,
-                        EGL_RENDERABLE_TYPE, cfg.RenderableTypeBit,
-                        EGL_RED_SIZE, 8,
-                        EGL_GREEN_SIZE, 8,
-                        EGL_BLUE_SIZE, 8,
-                        EGL_ALPHA_SIZE, 8,
-                        EGL_STENCIL_SIZE, stencilSize,
-                        EGL_DEPTH_SIZE, depthSize,
-                        EGL_NONE
-                    };
-                    if (!_egl.ChooseConfig(_display, attribs, out _config, 1, out int numConfigs))
-                        continue;
-                    if (numConfigs == 0)
-                        continue;
-                    _contextAttributes = cfg.Attributes;
-                    _surfaceType = surfaceType;
-                    Type = cfg.Type;
-                }
-            }
-
-            if (_contextAttributes == null)
-                throw new OpenGlException("No suitable EGL config was found");
-               
-            GlInterface = GlInterface.FromNativeUtf8GetProcAddress(b => _egl.GetProcAddress(b));
-        }
-
-        public EglDisplay() : this(new EglInterface())
-        {
-            
-        }
-        
-        public GlDisplayType Type { get; }
-        public GlInterface GlInterface { get; }
-        public EglInterface EglInterface => _egl;
-        public EglContext CreateContext(IGlContext share)
-        {
-            if((_surfaceType|EGL_PBUFFER_BIT) == 0)
-                throw new InvalidOperationException("Platform doesn't support PBUFFER surfaces");
-            var shareCtx = (EglContext)share;
-            var ctx = _egl.CreateContext(_display, _config, shareCtx?.Context ?? IntPtr.Zero, _contextAttributes);
-            if (ctx == IntPtr.Zero)
-                throw OpenGlException.GetFormattedException("eglCreateContext", _egl);
-            var surf = _egl.CreatePBufferSurface(_display, _config, new[]
-            {
-                EGL_WIDTH, 1,
-                EGL_HEIGHT, 1,
-                EGL_NONE
-            });
-            if (surf == IntPtr.Zero)
-                throw OpenGlException.GetFormattedException("eglCreatePBufferSurface", _egl);
-            var rv = new EglContext(this, _egl, ctx, new EglSurface(this, _egl, surf));
-            rv.MakeCurrent(null);
-            return rv;
-        }
-
-        public EglContext CreateContext(EglContext share, EglSurface offscreenSurface)
-        {
-            var ctx = _egl.CreateContext(_display, _config, share?.Context ?? IntPtr.Zero, _contextAttributes);
-            if (ctx == IntPtr.Zero)
-                throw OpenGlException.GetFormattedException("eglCreateContext", _egl);
-            var rv = new EglContext(this, _egl, ctx, offscreenSurface);
-            rv.MakeCurrent(null);
-            return rv;
-        }
-
-        public void ClearContext()
-        {
-            if (!_egl.MakeCurrent(_display, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero))
-                throw OpenGlException.GetFormattedException("eglMakeCurrent", _egl);
-        }
-
-        public EglSurface CreateWindowSurface(IntPtr window)
-        {
-            var s = _egl.CreateWindowSurface(_display, _config, window, new[] {EGL_NONE, EGL_NONE});
-            if (s == IntPtr.Zero)
-                throw OpenGlException.GetFormattedException("eglCreateWindowSurface", _egl);
-            return new EglSurface(this, _egl, s);
-        }
-
-        public int SampleCount
-        {
-            get
-            {
-                _egl.GetConfigAttrib(_display, _config, EGL_SAMPLES, out var rv);
-                return rv;
-            }
-        }
-
-        public int StencilSize
-        {
-            get
-            {
-                _egl.GetConfigAttrib(_display, _config, EGL_STENCIL_SIZE, out var rv);
-                return rv;
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.OpenGL/EglGlPlatformFeature.cs b/src/Avalonia.OpenGL/EglGlPlatformFeature.cs
deleted file mode 100644
index 5f5064fba5..0000000000
--- a/src/Avalonia.OpenGL/EglGlPlatformFeature.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using Avalonia.Logging;
-
-namespace Avalonia.OpenGL
-{
-    public class EglGlPlatformFeature : IWindowingPlatformGlFeature
-    {
-        public IGlDisplay Display { get; set; }
-        public IGlContext ImmediateContext { get; set; }
-        public EglContext DeferredContext { get; set; }
-
-        public static void TryInitialize()
-        {
-            var feature = TryCreate();
-            if (feature != null)
-                AvaloniaLocator.CurrentMutable.Bind<IWindowingPlatformGlFeature>().ToConstant(feature);
-        }
-        
-        public static EglGlPlatformFeature TryCreate()
-        {
-            try
-            {
-                var disp = new EglDisplay();
-                var ctx = disp.CreateContext(null);
-                return new EglGlPlatformFeature
-                {
-                    Display = disp,
-                    ImmediateContext = ctx,
-                    DeferredContext = (EglContext)disp.CreateContext(ctx)
-                };
-            }
-            catch(Exception e)
-            {
-                Logger.TryGet(LogEventLevel.Error)?.Log("OpenGL", null, "Unable to initialize EGL-based rendering: {0}", e);
-                return null;
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.OpenGL/EglGlPlatformSurface.cs b/src/Avalonia.OpenGL/EglGlPlatformSurface.cs
deleted file mode 100644
index d2e4543af3..0000000000
--- a/src/Avalonia.OpenGL/EglGlPlatformSurface.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-using System;
-using System.Threading;
-
-namespace Avalonia.OpenGL
-{
-    public class EglGlPlatformSurface : IGlPlatformSurface
-    {
-        public interface IEglWindowGlPlatformSurfaceInfo
-        {
-            IntPtr Handle { get; }
-            PixelSize Size { get; }
-            double Scaling { get; }
-        }
-
-        private readonly EglDisplay _display;
-        private readonly EglContext _context;
-        private readonly IEglWindowGlPlatformSurfaceInfo _info;
-        
-        public EglGlPlatformSurface(EglDisplay display, EglContext context, IEglWindowGlPlatformSurfaceInfo info)
-        {
-            _display = display;
-            _context = context;
-            _info = info;
-        }
-        
-        public IGlPlatformSurfaceRenderTarget CreateGlRenderTarget()
-        {
-            var glSurface = _display.CreateWindowSurface(_info.Handle);
-            return new RenderTarget(_display, _context, glSurface, _info);
-        }
-
-        class RenderTarget : IGlPlatformSurfaceRenderTargetWithCorruptionInfo
-        {
-            private readonly EglDisplay _display;
-            private readonly EglContext _context;
-            private readonly EglSurface _glSurface;
-            private readonly IEglWindowGlPlatformSurfaceInfo _info;
-            private PixelSize _initialSize;
-
-            public RenderTarget(EglDisplay display, EglContext context,
-                EglSurface glSurface, IEglWindowGlPlatformSurfaceInfo info)
-            {
-                _display = display;
-                _context = context;
-                _glSurface = glSurface;
-                _info = info;
-                _initialSize = info.Size;
-            }
-
-            public void Dispose() => _glSurface.Dispose();
-
-            public bool IsCorrupted => _initialSize != _info.Size;
-            
-            public IGlPlatformSurfaceRenderingSession BeginDraw()
-            {
-                var l = _context.Lock();
-                try
-                {
-                    if (IsCorrupted)
-                        throw new RenderTargetCorruptedException();
-                    _context.MakeCurrent(_glSurface);
-                    _display.EglInterface.WaitClient();
-                    _display.EglInterface.WaitGL();
-                    _display.EglInterface.WaitNative();
-                    
-                    return new Session(_display, _context, _glSurface, _info, l);
-                }
-                catch
-                {
-                    l.Dispose();
-                    throw;
-                }
-            }
-            
-            class Session : IGlPlatformSurfaceRenderingSession
-            {
-                private readonly EglContext _context;
-                private readonly EglSurface _glSurface;
-                private readonly IEglWindowGlPlatformSurfaceInfo _info;
-                private readonly EglDisplay _display;
-                private IDisposable _lock;
-                
-
-                public Session(EglDisplay display, EglContext context,
-                    EglSurface glSurface, IEglWindowGlPlatformSurfaceInfo info,
-                    IDisposable @lock)
-                {
-                    _context = context;
-                    _display = display;
-                    _glSurface = glSurface;
-                    _info = info;
-                    _lock = @lock;
-                }
-
-                public void Dispose()
-                {
-                    _context.Display.GlInterface.Flush();
-                    _display.EglInterface.WaitGL();
-                    _glSurface.SwapBuffers();
-                    _display.EglInterface.WaitClient();
-                    _display.EglInterface.WaitGL();
-                    _display.EglInterface.WaitNative();
-                    _context.Display.ClearContext();
-                    _lock.Dispose();
-                }
-
-                public IGlDisplay Display => _context.Display;
-                public PixelSize Size => _info.Size;
-                public double Scaling => _info.Scaling;
-            }
-        }
-    }
-}
-
diff --git a/src/Avalonia.OpenGL/GlBasicInfoInterface.cs b/src/Avalonia.OpenGL/GlBasicInfoInterface.cs
new file mode 100644
index 0000000000..a3383ac5ae
--- /dev/null
+++ b/src/Avalonia.OpenGL/GlBasicInfoInterface.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using Avalonia.Platform.Interop;
+
+namespace Avalonia.OpenGL
+{
+    public class GlBasicInfoInterface : GlBasicInfoInterface<object>
+    {
+        public GlBasicInfoInterface(Func<string, IntPtr> getProcAddress) : base(getProcAddress, null)
+        {
+        }
+
+        public GlBasicInfoInterface(Func<Utf8Buffer, IntPtr> nativeGetProcAddress) : base(nativeGetProcAddress, null)
+        {
+        }
+        
+        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)
+        {
+        }
+
+        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; }
+
+        public string GetString(int v)
+        {
+            var ptr = GetStringNative(v);
+            if (ptr != IntPtr.Zero)
+                return Marshal.PtrToStringAnsi(ptr);
+            return null;
+        }
+        
+        public string GetString(int v, int index)
+        {
+            var ptr = GetStringiNative(v, index);
+            if (ptr != IntPtr.Zero)
+                return Marshal.PtrToStringAnsi(ptr);
+            return null;
+        }
+
+        public List<string> GetExtensions()
+        {
+            var sp = GetString(GlConsts.GL_EXTENSIONS);
+            if (sp != null)
+                return sp.Split(' ').ToList();
+            GetIntegerv(GlConsts.GL_NUM_EXTENSIONS, out int count);
+            var rv = new List<string>(count);
+            for (var c = 0; c < count; c++)
+                rv.Add(GetString(GlConsts.GL_EXTENSIONS, c));
+            return rv;
+        }
+    }
+}
diff --git a/src/Avalonia.OpenGL/GlConsts.cs b/src/Avalonia.OpenGL/GlConsts.cs
index 275f351e3e..2a6aa0d14d 100644
--- a/src/Avalonia.OpenGL/GlConsts.cs
+++ b/src/Avalonia.OpenGL/GlConsts.cs
@@ -786,7 +786,4679 @@ namespace Avalonia.OpenGL
 
         
         // 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_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_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_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_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_COMPILE_STATUS = 0x8B81;
+        public const int GL_LINK_STATUS = 0x8B82;
+        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_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_DEPTH_STENCIL = 0x84F9;
+        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_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_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_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_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_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;
     }
 }
diff --git a/src/Avalonia.OpenGL/GlDisplayType.cs b/src/Avalonia.OpenGL/GlDisplayType.cs
deleted file mode 100644
index 2e5178bc37..0000000000
--- a/src/Avalonia.OpenGL/GlDisplayType.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Avalonia.OpenGL
-{
-    public enum GlDisplayType
-    {
-        OpenGL2,
-        OpenGLES2
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.OpenGL/GlEntryPointAttribute.cs b/src/Avalonia.OpenGL/GlEntryPointAttribute.cs
index 016c3d0af9..2ffdaca8fe 100644
--- a/src/Avalonia.OpenGL/GlEntryPointAttribute.cs
+++ b/src/Avalonia.OpenGL/GlEntryPointAttribute.cs
@@ -2,16 +2,117 @@ using System;
 
 namespace Avalonia.OpenGL
 {
+    public interface IGlEntryPointAttribute
+    {
+        IntPtr GetProcAddress(Func<string, IntPtr> getProcAddress);
+    }
+    
+    public interface IGlEntryPointAttribute<in TContext>
+    {
+        IntPtr GetProcAddress(TContext context, Func<string, IntPtr> getProcAddress);
+    }
+
     [AttributeUsage(AttributeTargets.Property)]
-    public class GlEntryPointAttribute : Attribute
+    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)
+        {
+            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>
     {
-        public string EntryPoint { get; }
-        public bool Optional { get; }
+        private readonly string _entry;
+        private readonly GlProfileType? _profile;
+        private readonly int _minVersionMajor;
+        private readonly int _minVersionMinor;
 
-        public GlEntryPointAttribute(string entryPoint, bool optional = false)
+        public GlMinVersionEntryPoint(string entry, GlProfileType profile, int minVersionMajor,
+            int minVersionMinor)
         {
-            EntryPoint = entryPoint;
-            Optional = optional;
+            _entry = entry;
+            _profile = profile;
+            _minVersionMajor = minVersionMajor;
+            _minVersionMinor = minVersionMinor;
+        }
+        
+        public GlMinVersionEntryPoint(string entry, int minVersionMajor,
+            int minVersionMinor)
+        {
+            _entry = entry;
+            _minVersionMajor = minVersionMajor;
+            _minVersionMinor = minVersionMinor;
+        }
+        
+        public IntPtr GetProcAddress(GlInterface.GlContextInfo context, Func<string, IntPtr> getProcAddress)
+        {
+            if(_profile.HasValue && context.Version.Type != _profile)
+                return IntPtr.Zero;
+            if(context.Version.Major<_minVersionMajor)
+                return IntPtr.Zero;
+            if (context.Version.Major == _minVersionMajor && context.Version.Minor < _minVersionMinor)
+                return IntPtr.Zero;
+            return getProcAddress(_entry);
+        }
+    }
+    
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = true)]
+    public class GlExtensionEntryPoint : Attribute, IGlEntryPointAttribute<GlInterface.GlContextInfo>
+    {
+        private readonly string _entry;
+        private readonly GlProfileType? _profile;
+        private readonly string _extension;
+
+        public GlExtensionEntryPoint(string entry, GlProfileType profile, string extension)
+        {
+            _entry = entry;
+            _profile = profile;
+            _extension = extension;
+        }
+        
+        public GlExtensionEntryPoint(string entry, string extension)
+        {
+            _entry = entry;
+            _extension = extension;
+        }
+        
+        public IntPtr GetProcAddress(GlInterface.GlContextInfo context, Func<string, IntPtr> getProcAddress)
+        {
+            // Ignore different profile 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))
+                return IntPtr.Zero;
+
+            return getProcAddress(_entry);
         }
     }
 }
diff --git a/src/Avalonia.OpenGL/GlInterface.cs b/src/Avalonia.OpenGL/GlInterface.cs
index 30f7d67152..28b62136da 100644
--- a/src/Avalonia.OpenGL/GlInterface.cs
+++ b/src/Avalonia.OpenGL/GlInterface.cs
@@ -1,31 +1,60 @@
 using System;
+using System.Collections.Generic;
 using System.Runtime.InteropServices;
+using System.Text;
 using Avalonia.Platform.Interop;
+using static Avalonia.OpenGL.GlConsts;
 
 namespace Avalonia.OpenGL
 {
     public delegate IntPtr GlGetProcAddressDelegate(string procName);
     
-    public class GlInterface : GlInterfaceBase
+    public unsafe class GlInterface : GlBasicInfoInterface<GlInterface.GlContextInfo>
     {
         public string Version { get; }
         public string Vendor { get; }
         public string Renderer { get; }
+        public GlContextInfo ContextInfo { get; }
 
-        public GlInterface(Func<string, bool, IntPtr> getProcAddress) : base(getProcAddress)
+        public class GlContextInfo
         {
+            public GlVersion Version { get; }
+            public HashSet<string> Extensions { get; }
+
+            public GlContextInfo(GlVersion version, HashSet<string> extensions)
+            {
+                Version = version;
+                Extensions = extensions;
+            }
+
+            public static GlContextInfo Create(GlVersion version, Func<string, IntPtr> getProcAddress)
+            {
+                var basicInfoInterface = new GlBasicInfoInterface(getProcAddress);
+                var exts = basicInfoInterface.GetExtensions();
+                return new GlContextInfo(version, new HashSet<string>(exts));
+            }
+        }
+
+        private GlInterface(GlContextInfo info, Func<string, IntPtr> getProcAddress) : base(getProcAddress, info)
+        {
+            ContextInfo = info;
             Version = GetString(GlConsts.GL_VERSION);
             Renderer = GetString(GlConsts.GL_RENDERER);
-            Vendor = GetString(GlConsts.GL_VENDOR);
+            Vendor = GetString(GlConsts.GL_VENDOR);   
         }
 
-        public GlInterface(Func<Utf8Buffer, IntPtr> n) : this(ConvertNative(n))
+        public GlInterface(GlVersion version, Func<string, IntPtr> getProcAddress) : this(
+            GlContextInfo.Create(version, getProcAddress), getProcAddress)
+        {
+        }
+
+        public GlInterface(GlVersion version, Func<Utf8Buffer, IntPtr> n) : this(version, ConvertNative(n))
         {
             
         }
 
-        public static GlInterface FromNativeUtf8GetProcAddress(Func<Utf8Buffer, IntPtr> getProcAddress) =>
-            new GlInterface(getProcAddress);
+        public static GlInterface FromNativeUtf8GetProcAddress(GlVersion version, Func<Utf8Buffer, IntPtr> getProcAddress) =>
+            new GlInterface(version, getProcAddress);
 
         
         public T GetProcAddress<T>(string proc) => Marshal.GetDelegateForFunctionPointer<T>(GetProcAddress(proc));
@@ -53,6 +82,9 @@ namespace Avalonia.OpenGL
         
         [GlEntryPoint("glFlush")]
         public Action Flush { get; }
+        
+        [GlEntryPoint("glFinish")]
+        public Action Finish { get; }
 
         public delegate IntPtr GlGetString(int v);
         [GlEntryPoint("glGetString")]
@@ -70,6 +102,272 @@ namespace Avalonia.OpenGL
         [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,
+            int srcY0,
+            int srcX1,
+            int srcY1,
+            int dstX0,
+            int dstY0,
+            int dstX1,
+            int dstY1,
+            int mask,
+            int filter);
+        [GlMinVersionEntryPoint("glBlitFramebuffer", 3, 0)]
+        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,
+            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,
+            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,
+            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; }
+
+        public delegate void GlFramebufferTexture2D(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; }
+
+        public void ShaderSourceString(int shader, string source)
+        {
+            using (var b = new Utf8Buffer(source))
+            {
+                var ptr = b.DangerousGetHandle();
+                var len = new IntPtr(b.ByteLen);
+                ShaderSource(shader, 1, new IntPtr(&ptr), new IntPtr(&len));
+            }
+        }
+
+        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; }
+
+        public delegate void GlGetShaderInfoLog(int shader, int maxLength, out int length, void*infoLog);
+        [GlEntryPoint("glGetShaderInfoLog")]
+        public GlGetShaderInfoLog GetShaderInfoLog { get; }
+
+        public unsafe string CompileShaderAndGetError(int shader, string source)
+        {
+            ShaderSourceString(shader, source);
+            CompileShader(shader);
+            int compiled;
+            GetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
+            if (compiled != 0)
+                return null;
+            int logLength;
+            GetShaderiv(shader, GL_INFO_LOG_LENGTH, &logLength);
+            if (logLength == 0)
+                logLength = 4096;
+            var logData = new byte[logLength];
+            int len;
+            fixed (void* ptr = logData)
+                GetShaderInfoLog(shader, logLength, out len, ptr);
+            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; }
+
+        public unsafe string LinkProgramAndGetError(int program)
+        {
+            LinkProgram(program);
+            int compiled;
+            GetProgramiv(program, GL_LINK_STATUS, &compiled);
+            if (compiled != 0)
+                return null;
+            int logLength;
+            GetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength);
+            var logData = new byte[logLength];
+            int len;
+            fixed (void* ptr = logData)
+                GetProgramInfoLog(program, logLength, out len, ptr);
+            return Encoding.UTF8.GetString(logData,0, len);
+        }
+
+        public delegate void GlBindAttribLocation(int program, int index, IntPtr name);
+        [GlEntryPoint("glBindAttribLocation")]
+        public GlBindAttribLocation BindAttribLocation { get; }
+
+        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; }
+
+        public int GenBuffer()
+        {
+            var rv = new int[1];
+            GenBuffers(1, rv);
+            return rv[0];
+        }
+        
+        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; }
+
+        public int GetAttribLocationString(int program, string name)
+        {
+            using (var b = new Utf8Buffer(name))
+                return GetAttribLocation(program, b.DangerousGetHandle());
+        }
+
+        public delegate void GlVertexAttribPointer(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; }
+
+        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; }
         // ReSharper restore UnassignedGetOnlyAutoProperty
     }
 }
diff --git a/src/Avalonia.OpenGL/GlInterfaceBase.cs b/src/Avalonia.OpenGL/GlInterfaceBase.cs
index 89ec0e77d4..e7dd440e36 100644
--- a/src/Avalonia.OpenGL/GlInterfaceBase.cs
+++ b/src/Avalonia.OpenGL/GlInterfaceBase.cs
@@ -1,53 +1,79 @@
 using System;
+using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using Avalonia.Platform.Interop;
 
 namespace Avalonia.OpenGL
 {
-    public class GlInterfaceBase
+    public class GlInterfaceBase : GlInterfaceBase<object>
     {
-        
-        private readonly Func<string, bool, IntPtr> _getProcAddress;
-        public GlInterfaceBase(Func<string, bool, IntPtr> getProcAddress)
+        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 a = prop.GetCustomAttribute<GlEntryPointAttribute>();
-                if (a != null)
+                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)
                 {
-                    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}");
-                    var proc = getProcAddress(a.EntryPoint, a.Optional);
+                    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)
-                        field.SetValue(this, Marshal.GetDelegateForFunctionPointer(proc, prop.PropertyType));
+                        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, bool, IntPtr> ConvertNative(Func<Utf8Buffer, IntPtr> func) =>
-            (proc, optional) =>
+        protected static Func<string, IntPtr> ConvertNative(Func<Utf8Buffer, IntPtr> func) =>
+            (proc) =>
             {
                 using (var u = new Utf8Buffer(proc))
                 {
                     var rv = func(u);
-                    if (rv == IntPtr.Zero && !optional)
-                        throw new OpenGlException("Missing function " + proc);
                     return rv;
                 }
             };
         
-        public GlInterfaceBase(Func<Utf8Buffer, IntPtr> nativeGetProcAddress) : this(ConvertNative(nativeGetProcAddress))
+        public GlInterfaceBase(Func<Utf8Buffer, IntPtr> nativeGetProcAddress, TContext context) : this(ConvertNative(nativeGetProcAddress), context)
         {
             
         }
         
-        public IntPtr GetProcAddress(string proc) => _getProcAddress(proc, true);
-        public IntPtr GetProcAddress(string proc, bool optional) => _getProcAddress(proc, optional);
-
+        public IntPtr GetProcAddress(string proc) => _getProcAddress(proc);
     }
 }
diff --git a/src/Avalonia.OpenGL/GlVersion.cs b/src/Avalonia.OpenGL/GlVersion.cs
new file mode 100644
index 0000000000..042ff4c2f0
--- /dev/null
+++ b/src/Avalonia.OpenGL/GlVersion.cs
@@ -0,0 +1,22 @@
+namespace Avalonia.OpenGL
+{
+    public enum GlProfileType
+    {
+        OpenGL,
+        OpenGLES
+    }
+    
+    public struct GlVersion
+    {
+        public GlProfileType Type { get; }
+        public int Major { get; }
+        public int Minor { get; }
+
+        public GlVersion(GlProfileType type, int major, int minor)
+        {
+            Type = type;
+            Major = major;
+            Minor = minor;
+        }
+    }
+}
diff --git a/src/Avalonia.OpenGL/IGlContext.cs b/src/Avalonia.OpenGL/IGlContext.cs
index 04aa1b98e4..50868db873 100644
--- a/src/Avalonia.OpenGL/IGlContext.cs
+++ b/src/Avalonia.OpenGL/IGlContext.cs
@@ -1,8 +1,15 @@
+using System;
+
 namespace Avalonia.OpenGL
 {
-    public interface IGlContext
+    public interface IGlContext : IDisposable
     {
-        IGlDisplay Display { get; }
-        void MakeCurrent();
+        GlVersion Version { get; }
+        GlInterface GlInterface { get; }
+        int SampleCount { get; }
+        int StencilSize { get; }
+        IDisposable MakeCurrent();
+        IDisposable EnsureCurrent();
+        bool IsSharedWith(IGlContext context);
     }
 }
diff --git a/src/Avalonia.OpenGL/IGlDisplay.cs b/src/Avalonia.OpenGL/IGlDisplay.cs
deleted file mode 100644
index e7568bd5e7..0000000000
--- a/src/Avalonia.OpenGL/IGlDisplay.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Avalonia.OpenGL
-{
-    public interface IGlDisplay
-    {
-        GlDisplayType Type { get; }
-        GlInterface GlInterface { get; }
-        void ClearContext();
-        int SampleCount { get; }
-        int StencilSize { get; }
-    }
-}
diff --git a/src/Avalonia.OpenGL/IOpenGlAwarePlatformRenderInterface.cs b/src/Avalonia.OpenGL/IOpenGlAwarePlatformRenderInterface.cs
new file mode 100644
index 0000000000..fdb9162164
--- /dev/null
+++ b/src/Avalonia.OpenGL/IOpenGlAwarePlatformRenderInterface.cs
@@ -0,0 +1,9 @@
+using Avalonia.OpenGL.Imaging;
+
+namespace Avalonia.OpenGL
+{
+    public interface IOpenGlAwarePlatformRenderInterface
+    {
+        IOpenGlBitmapImpl CreateOpenGlBitmap(PixelSize size, Vector dpi);
+    }
+}
diff --git a/src/Avalonia.OpenGL/IPlatformOpenGlInterface.cs b/src/Avalonia.OpenGL/IPlatformOpenGlInterface.cs
new file mode 100644
index 0000000000..5ee5df1e85
--- /dev/null
+++ b/src/Avalonia.OpenGL/IPlatformOpenGlInterface.cs
@@ -0,0 +1,13 @@
+namespace Avalonia.OpenGL
+{
+    public interface IPlatformOpenGlInterface
+    {
+        IGlContext PrimaryContext { get; }
+        IGlContext CreateSharedContext();
+        bool CanShareContexts { get; }
+        bool CanCreateContexts { get; }
+        IGlContext CreateContext();
+        /*IGlContext TryCreateContext(GlVersion version);
+        */
+    }
+}
diff --git a/src/Avalonia.OpenGL/IWindowingPlatformGlFeature.cs b/src/Avalonia.OpenGL/IWindowingPlatformGlFeature.cs
deleted file mode 100644
index 2c4a8b64b3..0000000000
--- a/src/Avalonia.OpenGL/IWindowingPlatformGlFeature.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Avalonia.OpenGL
-{
-    public interface IWindowingPlatformGlFeature
-    {
-        IGlContext ImmediateContext { get; }
-    }
-}
diff --git a/src/Avalonia.OpenGL/Imaging/IOpenGlBitmapImpl.cs b/src/Avalonia.OpenGL/Imaging/IOpenGlBitmapImpl.cs
new file mode 100644
index 0000000000..aef4f601be
--- /dev/null
+++ b/src/Avalonia.OpenGL/Imaging/IOpenGlBitmapImpl.cs
@@ -0,0 +1,17 @@
+using System;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+
+namespace Avalonia.OpenGL.Imaging
+{
+    public interface IOpenGlBitmapImpl : IBitmapImpl
+    {
+        IOpenGlBitmapAttachment CreateFramebufferAttachment(IGlContext context, Action presentCallback);
+        bool SupportsContext(IGlContext context);
+    }
+
+    public interface IOpenGlBitmapAttachment : IDisposable
+    {
+        void Present();
+    }
+}
diff --git a/src/Avalonia.OpenGL/Imaging/OpenGlBitmap.cs b/src/Avalonia.OpenGL/Imaging/OpenGlBitmap.cs
new file mode 100644
index 0000000000..7af44cd624
--- /dev/null
+++ b/src/Avalonia.OpenGL/Imaging/OpenGlBitmap.cs
@@ -0,0 +1,44 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+using Avalonia.Threading;
+
+namespace Avalonia.OpenGL.Imaging
+{
+    public class OpenGlBitmap : Bitmap, IAffectsRender
+    {
+        private IOpenGlBitmapImpl _impl;
+
+        public OpenGlBitmap(PixelSize size, Vector dpi) 
+            : base(CreateOrThrow(size, dpi))
+        {
+            _impl = (IOpenGlBitmapImpl)PlatformImpl.Item;
+        }
+        
+        static IOpenGlBitmapImpl CreateOrThrow(PixelSize size, Vector dpi)
+        {
+            if (!(AvaloniaLocator.Current.GetService<IPlatformRenderInterface>() is IOpenGlAwarePlatformRenderInterface
+                glAware))
+                throw new PlatformNotSupportedException("Rendering platform does not support OpenGL integration");
+            return glAware.CreateOpenGlBitmap(size, dpi);
+        }
+
+        public IOpenGlBitmapAttachment CreateFramebufferAttachment(IGlContext context) =>
+            _impl.CreateFramebufferAttachment(context, SetIsDirty);
+
+        public bool SupportsContext(IGlContext context) => _impl.SupportsContext(context);
+        
+        void SetIsDirty()
+        {
+            if (Dispatcher.UIThread.CheckAccess())
+                CallInvalidated();
+            else
+                Dispatcher.UIThread.Post(CallInvalidated);
+        }
+
+        private void CallInvalidated() => Invalidated?.Invoke(this, EventArgs.Empty);
+
+        public event EventHandler Invalidated;
+    }
+}
diff --git a/src/Avalonia.OpenGL/OpenGlException.cs b/src/Avalonia.OpenGL/OpenGlException.cs
index d3cd7d059e..196f507ad8 100644
--- a/src/Avalonia.OpenGL/OpenGlException.cs
+++ b/src/Avalonia.OpenGL/OpenGlException.cs
@@ -1,4 +1,5 @@
 using System;
+using Avalonia.OpenGL.Egl;
 
 namespace Avalonia.OpenGL
 {
diff --git a/src/Avalonia.OpenGL/IGlPlatformSurface.cs b/src/Avalonia.OpenGL/Surfaces/IGlPlatformSurface.cs
similarity index 77%
rename from src/Avalonia.OpenGL/IGlPlatformSurface.cs
rename to src/Avalonia.OpenGL/Surfaces/IGlPlatformSurface.cs
index 22d36b4472..875c215336 100644
--- a/src/Avalonia.OpenGL/IGlPlatformSurface.cs
+++ b/src/Avalonia.OpenGL/Surfaces/IGlPlatformSurface.cs
@@ -1,4 +1,4 @@
-namespace Avalonia.OpenGL
+namespace Avalonia.OpenGL.Surfaces
 {
     public interface IGlPlatformSurface
     {
diff --git a/src/Avalonia.OpenGL/IGlPlatformSurfaceRenderTarget.cs b/src/Avalonia.OpenGL/Surfaces/IGlPlatformSurfaceRenderTarget.cs
similarity index 89%
rename from src/Avalonia.OpenGL/IGlPlatformSurfaceRenderTarget.cs
rename to src/Avalonia.OpenGL/Surfaces/IGlPlatformSurfaceRenderTarget.cs
index d198d46e5c..f89b6f04f5 100644
--- a/src/Avalonia.OpenGL/IGlPlatformSurfaceRenderTarget.cs
+++ b/src/Avalonia.OpenGL/Surfaces/IGlPlatformSurfaceRenderTarget.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Avalonia.OpenGL
+namespace Avalonia.OpenGL.Surfaces
 {
     public interface IGlPlatformSurfaceRenderTarget : IDisposable
     {
diff --git a/src/Avalonia.OpenGL/IGlPlatformSurfaceRenderingSession.cs b/src/Avalonia.OpenGL/Surfaces/IGlPlatformSurfaceRenderingSession.cs
similarity index 61%
rename from src/Avalonia.OpenGL/IGlPlatformSurfaceRenderingSession.cs
rename to src/Avalonia.OpenGL/Surfaces/IGlPlatformSurfaceRenderingSession.cs
index 4b0de05b77..da06eab1e7 100644
--- a/src/Avalonia.OpenGL/IGlPlatformSurfaceRenderingSession.cs
+++ b/src/Avalonia.OpenGL/Surfaces/IGlPlatformSurfaceRenderingSession.cs
@@ -1,11 +1,12 @@
 using System;
 
-namespace Avalonia.OpenGL
+namespace Avalonia.OpenGL.Surfaces
 {
     public interface IGlPlatformSurfaceRenderingSession : IDisposable
     {
-        IGlDisplay Display { get; }
+        IGlContext Context { get; }
         PixelSize Size { get; }
         double Scaling { get; }
+        bool IsYFlipped { get; }
     }
 }
diff --git a/src/Avalonia.ReactiveUI.Events/Avalonia.ReactiveUI.Events.csproj b/src/Avalonia.ReactiveUI.Events/Avalonia.ReactiveUI.Events.csproj
new file mode 100644
index 0000000000..7f58e455f9
--- /dev/null
+++ b/src/Avalonia.ReactiveUI.Events/Avalonia.ReactiveUI.Events.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageId>Avalonia.ReactiveUI.Events</PackageId>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Pharmacist.Common" Version="1.8.1" />
+   </ItemGroup>
+</Project>
diff --git a/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs b/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs
index ced26a3004..6771d3e179 100644
--- a/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs
+++ b/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls;
 using Avalonia.Threading;
 using ReactiveUI;
@@ -18,7 +15,7 @@ namespace Avalonia.ReactiveUI
         public static TAppBuilder UseReactiveUI<TAppBuilder>(this TAppBuilder builder)
             where TAppBuilder : AppBuilderBase<TAppBuilder>, new()
         {
-            return builder.AfterSetup(_ =>
+            return builder.AfterPlatformServicesSetup(_ =>
             {
                 RxApp.MainThreadScheduler = AvaloniaScheduler.Instance;
                 Locator.CurrentMutable.RegisterConstant(new AvaloniaActivationForViewFetcher(), typeof(IActivationForViewFetcher));
diff --git a/src/Avalonia.ReactiveUI/Attributes.cs b/src/Avalonia.ReactiveUI/Attributes.cs
index e908d1de80..31c374392f 100644
--- a/src/Avalonia.ReactiveUI/Attributes.cs
+++ b/src/Avalonia.ReactiveUI/Attributes.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// 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;
diff --git a/src/Avalonia.ReactiveUI/AutoDataTemplateBindingHook.cs b/src/Avalonia.ReactiveUI/AutoDataTemplateBindingHook.cs
index 4881c77034..fe4e9dd94a 100644
--- a/src/Avalonia.ReactiveUI/AutoDataTemplateBindingHook.cs
+++ b/src/Avalonia.ReactiveUI/AutoDataTemplateBindingHook.cs
@@ -48,6 +48,10 @@ namespace Avalonia.ReactiveUI
             if (itemsControl.ItemTemplate != null)
                 return true;
 
+            if (itemsControl.DataTemplates != null &&
+                itemsControl.DataTemplates.Count > 0)
+                return true;
+
             itemsControl.ItemTemplate = DefaultItemTemplate;
             return true;
         }
diff --git a/src/Avalonia.ReactiveUI/AutoSuspendHelper.cs b/src/Avalonia.ReactiveUI/AutoSuspendHelper.cs
index b404ea57cb..bd21503a58 100644
--- a/src/Avalonia.ReactiveUI/AutoSuspendHelper.cs
+++ b/src/Avalonia.ReactiveUI/AutoSuspendHelper.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia;
 using Avalonia.VisualTree;
 using Avalonia.Controls;
diff --git a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
index 64145b9c3c..624c5772a9 100644
--- a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
+++ b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
@@ -2,10 +2,12 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageId>Avalonia.ReactiveUI</PackageId>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ReactiveUI.props" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>
diff --git a/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs b/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs
index 5a4d625c41..5c713804e9 100644
--- a/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs
+++ b/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs
@@ -1,10 +1,5 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Reflection;
 using System.Reactive.Linq;
-using Avalonia;
 using Avalonia.VisualTree;
 using Avalonia.Controls;
 using ReactiveUI;
@@ -21,7 +16,7 @@ namespace Avalonia.ReactiveUI
         /// </summary>
         public int GetAffinityForView(Type view)
         {
-            return typeof(IVisual).GetTypeInfo().IsAssignableFrom(view.GetTypeInfo()) ? 10 : 0;
+            return typeof(IVisual).IsAssignableFrom(view) ? 10 : 0;
         }
 
         /// <summary>
diff --git a/src/Avalonia.ReactiveUI/ReactiveUserControl.cs b/src/Avalonia.ReactiveUI/ReactiveUserControl.cs
index 010acc3ae0..f4824ade0a 100644
--- a/src/Avalonia.ReactiveUI/ReactiveUserControl.cs
+++ b/src/Avalonia.ReactiveUI/ReactiveUserControl.cs
@@ -1,6 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using System;
+using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using Avalonia;
 using Avalonia.VisualTree;
 using Avalonia.Controls;
@@ -9,13 +9,15 @@ using ReactiveUI;
 namespace Avalonia.ReactiveUI
 {
     /// <summary>
-    /// A ReactiveUI UserControl that implements <see cref="IViewFor{TViewModel}"/> 
-    /// and will activate your ViewModel automatically if it supports activation.
+    /// A ReactiveUI <see cref="UserControl"/> that implements the <see cref="IViewFor{TViewModel}"/> interface and
+    /// will activate your ViewModel automatically if the view model implements <see cref="IActivatableViewModel"/>.
+    /// When the DataContext property changes, this class will update the ViewModel property with the new DataContext
+    /// value, and vice versa.
     /// </summary>
     /// <typeparam name="TViewModel">ViewModel type.</typeparam>
     public class ReactiveUserControl<TViewModel> : UserControl, IViewFor<TViewModel> where TViewModel : class
     {
-        public static readonly AvaloniaProperty<TViewModel> ViewModelProperty = AvaloniaProperty
+        public static readonly StyledProperty<TViewModel> ViewModelProperty = AvaloniaProperty
             .Register<ReactiveUserControl<TViewModel>, TViewModel>(nameof(ViewModel));
 
         /// <summary>
@@ -23,7 +25,10 @@ namespace Avalonia.ReactiveUI
         /// </summary>
         public ReactiveUserControl()
         {
-            DataContextChanged += (sender, args) => ViewModel = DataContext as TViewModel;
+            // This WhenActivated block calls ViewModel's WhenActivated
+            // block if the ViewModel implements IActivatableViewModel.
+            this.WhenActivated(disposables => { });
+            this.GetObservable(ViewModelProperty).Subscribe(OnViewModelChanged);
         }
 
         /// <summary>
@@ -40,5 +45,22 @@ namespace Avalonia.ReactiveUI
             get => ViewModel;
             set => ViewModel = (TViewModel)value;
         }
+
+        protected override void OnDataContextChanged(EventArgs e)
+        {
+            ViewModel = DataContext as TViewModel;
+        }
+
+        private void OnViewModelChanged(object value)
+        {
+            if (value == null)
+            {
+                ClearValue(DataContextProperty);
+            }
+            else if (DataContext != value)
+            {
+                DataContext = value;
+            }
+        }
     }
 }
diff --git a/src/Avalonia.ReactiveUI/ReactiveWindow.cs b/src/Avalonia.ReactiveUI/ReactiveWindow.cs
index f0f115afbc..758a807bfc 100644
--- a/src/Avalonia.ReactiveUI/ReactiveWindow.cs
+++ b/src/Avalonia.ReactiveUI/ReactiveWindow.cs
@@ -1,6 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using System;
+using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using Avalonia;
 using Avalonia.VisualTree;
 using Avalonia.Controls;
@@ -9,13 +9,15 @@ using ReactiveUI;
 namespace Avalonia.ReactiveUI
 {
     /// <summary>
-    /// A ReactiveUI Window that implements <see cref="IViewFor{TViewModel}"/>
-    /// and will activate your ViewModel automatically if it supports activation.
+    /// A ReactiveUI <see cref="Window"/> that implements the <see cref="IViewFor{TViewModel}"/> interface and will
+    /// activate your ViewModel automatically if the view model implements <see cref="IActivatableViewModel"/>. When
+    /// the DataContext property changes, this class will update the ViewModel property with the new DataContext value,
+    /// and vice versa.
     /// </summary>
     /// <typeparam name="TViewModel">ViewModel type.</typeparam>
     public class ReactiveWindow<TViewModel> : Window, IViewFor<TViewModel> where TViewModel : class
     {
-        public static readonly AvaloniaProperty<TViewModel> ViewModelProperty = AvaloniaProperty
+        public static readonly StyledProperty<TViewModel> ViewModelProperty = AvaloniaProperty
             .Register<ReactiveWindow<TViewModel>, TViewModel>(nameof(ViewModel));
 
         /// <summary>
@@ -23,7 +25,11 @@ namespace Avalonia.ReactiveUI
         /// </summary>
         public ReactiveWindow()
         {
-            DataContextChanged += (sender, args) => ViewModel = DataContext as TViewModel;
+            // This WhenActivated block calls ViewModel's WhenActivated
+            // block if the ViewModel implements IActivatableViewModel.
+            this.WhenActivated(disposables => { });
+            this.GetObservable(DataContextProperty).Subscribe(OnDataContextChanged);
+            this.GetObservable(ViewModelProperty).Subscribe(OnViewModelChanged);
         }
             
         /// <summary>
@@ -40,5 +46,29 @@ namespace Avalonia.ReactiveUI
             get => ViewModel;
             set => ViewModel = (TViewModel)value;
         }
+
+        private void OnDataContextChanged(object value)
+        {
+            if (value is TViewModel viewModel)
+            {
+                ViewModel = viewModel;
+            }
+            else
+            {
+                ViewModel = null;
+            }
+        }
+
+        private void OnViewModelChanged(object value)
+        {
+            if (value == null)
+            {
+                ClearValue(DataContextProperty);
+            }
+            else if (DataContext != value)
+            {
+                DataContext = value;
+            }
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.ReactiveUI/RoutedViewHost.cs b/src/Avalonia.ReactiveUI/RoutedViewHost.cs
index ac5db32c14..421633cd58 100644
--- a/src/Avalonia.ReactiveUI/RoutedViewHost.cs
+++ b/src/Avalonia.ReactiveUI/RoutedViewHost.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
@@ -58,7 +55,7 @@ namespace Avalonia.ReactiveUI
         /// <summary>
         /// <see cref="AvaloniaProperty"/> for the <see cref="Router"/> property.
         /// </summary>
-        public static readonly AvaloniaProperty<RoutingState> RouterProperty =
+        public static readonly StyledProperty<RoutingState> RouterProperty =
             AvaloniaProperty.Register<RoutedViewHost, RoutingState>(nameof(Router));
     
         /// <summary>
@@ -68,8 +65,15 @@ namespace Avalonia.ReactiveUI
         {
             this.WhenActivated(disposables =>
             {
-                this.WhenAnyObservable(x => x.Router.CurrentViewModel)
-                    .DistinctUntilChanged()
+                var routerRemoved = this
+                    .WhenAnyValue(x => x.Router)
+                    .Where(router => router == null)
+                    .Cast<object>();
+
+                this.WhenAnyValue(x => x.Router)
+                    .Where(router => router != null)
+                    .SelectMany(router => router.CurrentViewModel)
+                    .Merge(routerRemoved)
                     .Subscribe(NavigateToViewModel)
                     .DisposeWith(disposables);
             });
@@ -95,6 +99,13 @@ namespace Avalonia.ReactiveUI
         /// <param name="viewModel">ViewModel to which the user navigates.</param>
         private void NavigateToViewModel(object viewModel)
         {
+            if (Router == null)
+            {
+                this.Log().Warn("Router property is null. Falling back to default content.");
+                Content = DefaultContent;
+                return;
+            }
+
             if (viewModel == null)
             {
                 this.Log().Info("ViewModel is null. Falling back to default content.");
@@ -113,9 +124,9 @@ namespace Avalonia.ReactiveUI
     
             this.Log().Info($"Ready to show {viewInstance} with autowired {viewModel}.");
             viewInstance.ViewModel = viewModel;
-            if (viewInstance is IStyledElement styled)
-                styled.DataContext = viewModel;
+            if (viewInstance is IDataContextProvider provider)
+                provider.DataContext = viewModel;
             Content = viewInstance;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.ReactiveUI/TransitioningContentControl.cs b/src/Avalonia.ReactiveUI/TransitioningContentControl.cs
index 1bec5fc365..cc1613ce19 100644
--- a/src/Avalonia.ReactiveUI/TransitioningContentControl.cs
+++ b/src/Avalonia.ReactiveUI/TransitioningContentControl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Animation;
 using Avalonia.Controls;
@@ -16,14 +13,14 @@ namespace Avalonia.ReactiveUI
         /// <summary>
         /// <see cref="AvaloniaProperty"/> for the <see cref="PageTransition"/> property.
         /// </summary>
-        public static readonly AvaloniaProperty<IPageTransition> PageTransitionProperty =
+        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 AvaloniaProperty<object> DefaultContentProperty =
+        public static readonly StyledProperty<object> DefaultContentProperty =
             AvaloniaProperty.Register<TransitioningContentControl, object>(nameof(DefaultContent));
         
         /// <summary>
@@ -72,4 +69,4 @@ namespace Avalonia.ReactiveUI
                 await PageTransition.Start(null, this, true);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.ReactiveUI/ViewModelViewHost.cs b/src/Avalonia.ReactiveUI/ViewModelViewHost.cs
index 5cfa464c37..0169b268ca 100644
--- a/src/Avalonia.ReactiveUI/ViewModelViewHost.cs
+++ b/src/Avalonia.ReactiveUI/ViewModelViewHost.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Disposables;
 using ReactiveUI;
diff --git a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
index 6684772bfe..6c241bbc75 100644
--- a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
+++ b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
@@ -4,8 +4,10 @@
     <DefineConstants>AVALONIA_REMOTE_PROTOCOL;$(DefineConstants)</DefineConstants>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
+    <PackageId>Avalonia.Remote.Protocol</PackageId>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\Avalonia.Input\Key.cs" />
   </ItemGroup>
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs b/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs
index 78712985d9..c58aafa4e0 100644
--- a/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs
+++ b/src/Avalonia.Remote.Protocol/BsonStreamTransport.cs
@@ -144,5 +144,9 @@ namespace Avalonia.Remote.Protocol
 
         public event Action<IAvaloniaRemoteTransportConnection, object> OnMessage;
         public event Action<IAvaloniaRemoteTransportConnection, Exception> OnException;
+        public void Start()
+        {
+            
+        }
     }
 }
diff --git a/src/Avalonia.Remote.Protocol/DesignMessages.cs b/src/Avalonia.Remote.Protocol/DesignMessages.cs
index 5ff16c574d..5c769ad48c 100644
--- a/src/Avalonia.Remote.Protocol/DesignMessages.cs
+++ b/src/Avalonia.Remote.Protocol/DesignMessages.cs
@@ -1,4 +1,7 @@
 using System;
+using System.Reflection;
+using System.Runtime.ExceptionServices;
+using System.Xml;
 
 namespace Avalonia.Remote.Protocol.Designer
 {
@@ -26,6 +29,27 @@ namespace Avalonia.Remote.Protocol.Designer
     
     public class ExceptionDetails
     {
+        public ExceptionDetails()
+        {
+        }
+
+        public ExceptionDetails(Exception e)
+        {
+            if (e is TargetInvocationException)
+            {
+                e = e.InnerException;
+            }
+
+            ExceptionType = e.GetType().Name;
+            Message = e.Message;
+
+            if (e is XmlException xml)
+            {
+                LineNumber = xml.LineNumber;
+                LinePosition = xml.LinePosition;
+            }
+        }
+
         public string ExceptionType { get; set; }
         public string Message { get; set; }
         public int? LineNumber { get; set; }
diff --git a/src/Avalonia.Remote.Protocol/ITransport.cs b/src/Avalonia.Remote.Protocol/ITransport.cs
index 0f419b95ae..6772fa75b2 100644
--- a/src/Avalonia.Remote.Protocol/ITransport.cs
+++ b/src/Avalonia.Remote.Protocol/ITransport.cs
@@ -8,5 +8,6 @@ namespace Avalonia.Remote.Protocol
         Task Send(object data);
         event Action<IAvaloniaRemoteTransportConnection, object> OnMessage;
         event Action<IAvaloniaRemoteTransportConnection, Exception> OnException;
+        void Start();
     }
 }
diff --git a/src/Avalonia.Remote.Protocol/TransportConnectionWrapper.cs b/src/Avalonia.Remote.Protocol/TransportConnectionWrapper.cs
index d7919af9d9..77c77a70ad 100644
--- a/src/Avalonia.Remote.Protocol/TransportConnectionWrapper.cs
+++ b/src/Avalonia.Remote.Protocol/TransportConnectionWrapper.cs
@@ -98,5 +98,7 @@ namespace Avalonia.Remote.Protocol
             add => _onException.Add(value);
             remove => _onException.Remove(value);
         }
+
+        public void Start() => _conn.Start();
     }
 }
diff --git a/src/Avalonia.Remote.Protocol/TransportMessages.cs b/src/Avalonia.Remote.Protocol/TransportMessages.cs
new file mode 100644
index 0000000000..08486806c7
--- /dev/null
+++ b/src/Avalonia.Remote.Protocol/TransportMessages.cs
@@ -0,0 +1,9 @@
+namespace Avalonia.Remote.Protocol
+{
+    [AvaloniaRemoteMessageGuid("53778004-78fa-4381-8ec3-176a6f2328b6")]
+    public class HtmlTransportStartedMessage
+    {
+        public string Uri { get; set; }
+        
+    }
+}
diff --git a/src/Avalonia.Remote.Protocol/ViewportMessages.cs b/src/Avalonia.Remote.Protocol/ViewportMessages.cs
index dc4550b846..06881f2c7f 100644
--- a/src/Avalonia.Remote.Protocol/ViewportMessages.cs
+++ b/src/Avalonia.Remote.Protocol/ViewportMessages.cs
@@ -60,6 +60,8 @@
         public int Width { get; set; }
         public int Height { get; set; }
         public int Stride { get; set; }
+        public double DpiX { get; set; }
+        public double DpiY { get; set; }
     }
 
 }
diff --git a/src/Avalonia.Styling/Avalonia.Styling.csproj b/src/Avalonia.Styling/Avalonia.Styling.csproj
index a396cee35f..d9f0cef3da 100644
--- a/src/Avalonia.Styling/Avalonia.Styling.csproj
+++ b/src/Avalonia.Styling/Avalonia.Styling.csproj
@@ -8,5 +8,5 @@
     <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
   </ItemGroup>
-  <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>
diff --git a/src/Avalonia.Styling/Controls/Classes.cs b/src/Avalonia.Styling/Controls/Classes.cs
index 3981ec01ad..51dca57928 100644
--- a/src/Avalonia.Styling/Controls/Classes.cs
+++ b/src/Avalonia.Styling/Controls/Classes.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using Avalonia.Collections;
diff --git a/src/Avalonia.Styling/Controls/INameScope.cs b/src/Avalonia.Styling/Controls/INameScope.cs
index b4f4c8e57b..2d5295fe45 100644
--- a/src/Avalonia.Styling/Controls/INameScope.cs
+++ b/src/Avalonia.Styling/Controls/INameScope.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Threading.Tasks;
 using Avalonia.Utilities;
diff --git a/src/Avalonia.Styling/Controls/IPseudoClasses.cs b/src/Avalonia.Styling/Controls/IPseudoClasses.cs
index 6c59078ebc..27290716d0 100644
--- a/src/Avalonia.Styling/Controls/IPseudoClasses.cs
+++ b/src/Avalonia.Styling/Controls/IPseudoClasses.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 
 namespace Avalonia.Controls
 {
diff --git a/src/Avalonia.Styling/Controls/IResourceDictionary.cs b/src/Avalonia.Styling/Controls/IResourceDictionary.cs
index 2a395f44b4..3a68dde31e 100644
--- a/src/Avalonia.Styling/Controls/IResourceDictionary.cs
+++ b/src/Avalonia.Styling/Controls/IResourceDictionary.cs
@@ -1,14 +1,13 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
+using System.Collections.Generic;
 
-using System.Collections.Generic;
+#nullable enable
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// An indexed dictionary of resources.
     /// </summary>
-    public interface IResourceDictionary : IResourceProvider, IDictionary<object, object>
+    public interface IResourceDictionary : IResourceProvider, IDictionary<object, object?>
     {
         /// <summary>
         /// Gets a collection of child resource dictionaries.
diff --git a/src/Avalonia.Styling/Controls/IResourceHost.cs b/src/Avalonia.Styling/Controls/IResourceHost.cs
new file mode 100644
index 0000000000..fed9359d94
--- /dev/null
+++ b/src/Avalonia.Styling/Controls/IResourceHost.cs
@@ -0,0 +1,32 @@
+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
index b6a6cdc3e3..73bfeaf161 100644
--- a/src/Avalonia.Styling/Controls/IResourceNode.cs
+++ b/src/Avalonia.Styling/Controls/IResourceNode.cs
@@ -1,15 +1,35 @@
 using System;
 
+#nullable enable
+
 namespace Avalonia.Controls
 {
     /// <summary>
-    /// Represents resource provider in a tree.
+    /// Represents an object that can be queried for resources.
     /// </summary>
-    public interface IResourceNode : IResourceProvider
+    /// <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 the parent resource node, if any.
+        /// Gets a value indicating whether the object has resources.
+        /// </summary>
+        bool HasResources { get; }
+
+        /// <summary>
+        /// Tries to find a resource within the object.
         /// </summary>
-        IResourceNode ResourceParent { get; }
+        /// <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.Styling/Controls/IResourceProvider.cs
index cbaacee012..27a8c2da68 100644
--- a/src/Avalonia.Styling/Controls/IResourceProvider.cs
+++ b/src/Avalonia.Styling/Controls/IResourceProvider.cs
@@ -1,33 +1,42 @@
 using System;
+using Avalonia.Styling;
+
+#nullable enable
 
 namespace Avalonia.Controls
 {
     /// <summary>
-    /// Represents an object that can be queried for resources.
+    /// Represents an object that can be queried for resources but does not appear in the logical tree.
     /// </summary>
-    public interface IResourceProvider
+    /// <remarks>
+    /// This interface is implemented by <see cref="ResourceDictionary"/>, <see cref="Style"/> and
+    /// <see cref="Styles"/>
+    /// </remarks>
+    public interface IResourceProvider : IResourceNode
     {
         /// <summary>
-        /// Raised when resources in the provider are changed.
+        /// Gets the owner of the resource provider.
+        /// </summary>
+        /// <remarks>
+        /// If multiple owners are added, returns the first.
+        /// </remarks>
+        IResourceHost? Owner { get; }
+
+        /// <summary>
+        /// Raised when the <see cref="Owner"/> of the resource provider changes.
         /// </summary>
-        event EventHandler<ResourcesChangedEventArgs> ResourcesChanged;
+        event EventHandler OwnerChanged;
 
         /// <summary>
-        /// Gets a value indicating whether the element has resources.
+        /// Adds an owner to the resource provider.
         /// </summary>
-        bool HasResources { get; }
+        /// <param name="owner">The owner.</param>
+        void AddOwner(IResourceHost owner);
 
         /// <summary>
-        /// Tries to find a resource within the provider.
+        /// Removes a resource provider owner.
         /// </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);
+        /// <param name="owner">The owner.</param>
+        void RemoveOwner(IResourceHost owner);
     }
 }
diff --git a/src/Avalonia.Styling/Controls/ISetInheritanceParent.cs b/src/Avalonia.Styling/Controls/ISetInheritanceParent.cs
index 1a778fa0f9..ef3c1d5b89 100644
--- a/src/Avalonia.Styling/Controls/ISetInheritanceParent.cs
+++ b/src/Avalonia.Styling/Controls/ISetInheritanceParent.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Controls
 {
     /// <summary>
diff --git a/src/Avalonia.Styling/Controls/ISetLogicalParent.cs b/src/Avalonia.Styling/Controls/ISetLogicalParent.cs
index 5fb450c896..0c0cd1c1bb 100644
--- a/src/Avalonia.Styling/Controls/ISetLogicalParent.cs
+++ b/src/Avalonia.Styling/Controls/ISetLogicalParent.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.LogicalTree;
 
 namespace Avalonia.Controls
diff --git a/src/Avalonia.Styling/Controls/Metadata/PseudoClassesAttribute.cs b/src/Avalonia.Styling/Controls/Metadata/PseudoClassesAttribute.cs
new file mode 100644
index 0000000000..0060767565
--- /dev/null
+++ b/src/Avalonia.Styling/Controls/Metadata/PseudoClassesAttribute.cs
@@ -0,0 +1,18 @@
+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
index ec01a53cfd..62a04eac8b 100644
--- a/src/Avalonia.Styling/Controls/NameScope.cs
+++ b/src/Avalonia.Styling/Controls/NameScope.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
diff --git a/src/Avalonia.Styling/Controls/NameScopeEventArgs.cs b/src/Avalonia.Styling/Controls/NameScopeEventArgs.cs
index 8fc4d12799..3e9eaa6057 100644
--- a/src/Avalonia.Styling/Controls/NameScopeEventArgs.cs
+++ b/src/Avalonia.Styling/Controls/NameScopeEventArgs.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Controls
diff --git a/src/Avalonia.Styling/Controls/NameScopeExtensions.cs b/src/Avalonia.Styling/Controls/NameScopeExtensions.cs
index 5921acd3b6..75630711b8 100644
--- a/src/Avalonia.Styling/Controls/NameScopeExtensions.cs
+++ b/src/Avalonia.Styling/Controls/NameScopeExtensions.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/Avalonia.Styling/Controls/NameScopeLocator.cs b/src/Avalonia.Styling/Controls/NameScopeLocator.cs
index 354ed33657..51f4c5c4eb 100644
--- a/src/Avalonia.Styling/Controls/NameScopeLocator.cs
+++ b/src/Avalonia.Styling/Controls/NameScopeLocator.cs
@@ -1,11 +1,5 @@
 using System;
-using System.Linq;
 using System.Reactive.Disposables;
-using System.Reactive.Threading.Tasks;
-using System.Reflection;
-using System.Threading.Tasks;
-using Avalonia.LogicalTree;
-using Avalonia.Reactive;
 using Avalonia.Utilities;
 
 namespace Avalonia.Controls
diff --git a/src/Avalonia.Styling/Controls/PseudoClassesExtensions.cs b/src/Avalonia.Styling/Controls/PseudoClassesExtensions.cs
new file mode 100644
index 0000000000..7b28d1a911
--- /dev/null
+++ b/src/Avalonia.Styling/Controls/PseudoClassesExtensions.cs
@@ -0,0 +1,28 @@
+using System;
+
+namespace Avalonia.Controls
+{
+    public static class PseudolassesExtensions
+    {
+        /// <summary>
+        /// Adds or removes a pseudoclass depending on a boolean value.
+        /// </summary>
+        /// <param name="classes">The pseudoclasses collection.</param>
+        /// <param name="name">The name of the pseudoclass to set.</param>
+        /// <param name="value">True to add the pseudoclass or false to remove.</param>
+        public static void Set(this IPseudoClasses classes, string name, bool value)
+        {
+            Contract.Requires<ArgumentNullException>(classes != null);
+
+            if (value)
+            {
+                classes.Add(name);
+            }
+            else
+            {
+                classes.Remove(name);
+            }
+        }
+
+    }
+}
diff --git a/src/Avalonia.Styling/Controls/ResourceDictionary.cs b/src/Avalonia.Styling/Controls/ResourceDictionary.cs
index 901e27b7b7..c56dd74143 100644
--- a/src/Avalonia.Styling/Controls/ResourceDictionary.cs
+++ b/src/Avalonia.Styling/Controls/ResourceDictionary.cs
@@ -1,20 +1,20 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
 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
+    public class ResourceDictionary : AvaloniaDictionary<object, object?>, IResourceDictionary
     {
-        private AvaloniaList<IResourceProvider> _mergedDictionaries;
+        private IResourceHost? _owner;
+        private AvaloniaList<IResourceProvider>? _mergedDictionaries;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ResourceDictionary"/> class.
@@ -24,10 +24,28 @@ namespace Avalonia.Controls
             CollectionChanged += OnCollectionChanged;
         }
 
-        /// <inheritdoc/>
-        public event EventHandler<ResourcesChangedEventArgs> ResourcesChanged;
+        /// <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);
+                }
+            }
+        }
 
-        /// <inheritdoc/>
         public IList<IResourceProvider> MergedDictionaries
         {
             get
@@ -39,37 +57,51 @@ namespace Avalonia.Controls
                     _mergedDictionaries.ForEachItem(
                         x =>
                         {
-                            if (x.HasResources)
+                            if (Owner is object)
                             {
-                                OnResourcesChanged();
+                                x.AddOwner(Owner);
                             }
-
-                            x.ResourcesChanged += MergedDictionaryResourcesChanged;
                         },
                         x =>
                         {
-                            if (x.HasResources)
+                            if (Owner is object)
                             {
-                                OnResourcesChanged();
+                                x.RemoveOwner(Owner);
                             }
-
-                            x.ResourcesChanged -= MergedDictionaryResourcesChanged;
-                        },
-                        () => { });
+                        }, null);
                 }
 
                 return _mergedDictionaries;
             }
         }
 
-        /// <inheritdoc/>
-        bool IResourceProvider.HasResources
+        bool IResourceNode.HasResources
         {
-            get => Count > 0 || (_mergedDictionaries?.Any(x => x.HasResources) ?? false);
+            get
+            {
+                if (Count > 0)
+                {
+                    return true;
+                }
+
+                if (_mergedDictionaries?.Count > 0)
+                {
+                    foreach (var i in _mergedDictionaries)
+                    {
+                        if (i.HasResources)
+                        {
+                            return true;
+                        }
+                    }
+                }
+
+                return false;
+            }
         }
 
-        /// <inheritdoc/>
-        public bool TryGetResource(object key, out object value)
+        public event EventHandler? OwnerChanged;
+
+        public bool TryGetResource(object key, out object? value)
         {
             if (TryGetValue(key, out value))
             {
@@ -90,12 +122,63 @@ namespace Avalonia.Controls
             return false;
         }
 
-        private void OnResourcesChanged()
+        void IResourceProvider.AddOwner(IResourceHost owner)
         {
-            ResourcesChanged?.Invoke(this, new ResourcesChangedEventArgs());
+            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);
+            }
         }
 
-        private void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e) => OnResourcesChanged();
-        private void MergedDictionaryResourcesChanged(object sender, ResourcesChangedEventArgs e) => OnResourcesChanged();
+        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
index 19a16f86c4..be1069a4da 100644
--- a/src/Avalonia.Styling/Controls/ResourceNodeExtensions.cs
+++ b/src/Avalonia.Styling/Controls/ResourceNodeExtensions.cs
@@ -1,6 +1,10 @@
 using System;
+using Avalonia.Data.Converters;
+using Avalonia.LogicalTree;
 using Avalonia.Reactive;
 
+#nullable enable
+
 namespace Avalonia.Controls
 {
     public static class ResourceNodeExtensions
@@ -11,8 +15,11 @@ namespace Avalonia.Controls
         /// <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 IResourceNode control, object key)
+        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;
@@ -28,16 +35,16 @@ namespace Avalonia.Controls
         /// <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 IResourceNode control, object key, out object value)
+        public static bool TryFindResource(this IResourceHost control, object key, out object? value)
         {
-            Contract.Requires<ArgumentNullException>(control != null);
-            Contract.Requires<ArgumentNullException>(key != null);
+            control = control ?? throw new ArgumentNullException(nameof(control));
+            key = key ?? throw new ArgumentNullException(nameof(key));
 
-            var current = control;
+            IResourceHost? current = control;
 
             while (current != null)
             {
-                if (current is IResourceNode host)
+                if (current is IResourceHost host)
                 {
                     if (host.TryGetResource(key, out value))
                     {
@@ -45,27 +52,46 @@ namespace Avalonia.Controls
                     }
                 }
 
-                current = current.ResourceParent;
+                current = (current as IStyledElement)?.StylingParent as IResourceHost;
             }
 
             value = null;
             return false;
         }
 
-        public static IObservable<object> GetResourceObservable(this IResourceNode target, object key)
+        public static IObservable<object?> GetResourceObservable(
+            this IResourceHost control,
+            object key,
+            Func<object?, object?>? converter = null)
         {
-            return new ResourceObservable(target, key);
+            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 class ResourceObservable : LightweightObservableBase<object?>
         {
-            private readonly IResourceNode _target;
+            private readonly IResourceHost _target;
             private readonly object _key;
+            private readonly Func<object?, object?>? _converter;
 
-            public ResourceObservable(IResourceNode target, object key)
+            public ResourceObservable(IResourceHost target, object key, Func<object?, object?>? converter)
             {
                 _target = target;
                 _key = key;
+                _converter = converter;
             }
 
             protected override void Initialize()
@@ -78,15 +104,84 @@ namespace Avalonia.Controls
                 _target.ResourcesChanged -= ResourcesChanged;
             }
 
-            protected override void Subscribed(IObserver<object> observer, bool first)
+            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()
             {
-                observer.OnNext(_target.FindResource(_key));
+                _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(_target.FindResource(_key));
+                PublishNext();
             }
+
+            private object? Convert(object? value) => _converter?.Invoke(value) ?? value;
         }
     }
 }
diff --git a/src/Avalonia.Styling/Controls/ResourcesChangedEventArgs.cs b/src/Avalonia.Styling/Controls/ResourcesChangedEventArgs.cs
index 68c7a58ab9..ee2ece8a26 100644
--- a/src/Avalonia.Styling/Controls/ResourcesChangedEventArgs.cs
+++ b/src/Avalonia.Styling/Controls/ResourcesChangedEventArgs.cs
@@ -1,11 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Controls
 {
     public class ResourcesChangedEventArgs : EventArgs
     {
+        public static new readonly ResourcesChangedEventArgs Empty = new ResourcesChangedEventArgs();
     }
 }
diff --git a/src/Avalonia.Styling/IDataContextProvider.cs b/src/Avalonia.Styling/IDataContextProvider.cs
new file mode 100644
index 0000000000..31639c5784
--- /dev/null
+++ b/src/Avalonia.Styling/IDataContextProvider.cs
@@ -0,0 +1,13 @@
+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/INamed.cs b/src/Avalonia.Styling/INamed.cs
index 21bd233e41..1f8d269b07 100644
--- a/src/Avalonia.Styling/INamed.cs
+++ b/src/Avalonia.Styling/INamed.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia
 {
     /// <summary>
diff --git a/src/Avalonia.Styling/IStyledElement.cs b/src/Avalonia.Styling/IStyledElement.cs
index bcf1898c4c..37e6ed6fbb 100644
--- a/src/Avalonia.Styling/IStyledElement.cs
+++ b/src/Avalonia.Styling/IStyledElement.cs
@@ -9,8 +9,8 @@ namespace Avalonia
         IStyleable,
         IStyleHost,
         ILogical,
-        IResourceProvider,
-        IResourceNode
+        IResourceHost,
+        IDataContextProvider
     {
         /// <summary>
         /// Occurs when the control has finished initialization.
@@ -27,11 +27,6 @@ namespace Avalonia
         /// </summary>
         new Classes Classes { get; set; }
 
-        /// <summary>
-        /// Gets or sets the control's data context.
-        /// </summary>
-        object DataContext { get; set; }
-
         /// <summary>
         /// Gets the control's logical parent.
         /// </summary>
diff --git a/src/Avalonia.Styling/LogicalTree/ControlLocator.cs b/src/Avalonia.Styling/LogicalTree/ControlLocator.cs
index 491f38c153..6d0302ace4 100644
--- a/src/Avalonia.Styling/LogicalTree/ControlLocator.cs
+++ b/src/Avalonia.Styling/LogicalTree/ControlLocator.cs
@@ -1,11 +1,5 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Linq;
-using System.Reactive.Linq;
-using System.Reflection;
-using Avalonia.Controls;
 using Avalonia.Reactive;
 
 namespace Avalonia.LogicalTree
@@ -25,7 +19,7 @@ namespace Avalonia.LogicalTree
             private readonly ILogical _relativeTo;
             private readonly int _ancestorLevel;
             private readonly Type _ancestorType;
-            ILogical _value;
+            private ILogical _value;
 
             public ControlTracker(ILogical relativeTo, int ancestorLevel, Type ancestorType)
             {
@@ -69,7 +63,7 @@ namespace Avalonia.LogicalTree
             private void Update()
             {
                 _value = _relativeTo.GetLogicalAncestors()
-                    .Where(x => _ancestorType?.GetTypeInfo().IsAssignableFrom(x.GetType().GetTypeInfo()) ?? true)
+                    .Where(x => _ancestorType?.IsAssignableFrom(x.GetType()) ?? true)
                     .ElementAtOrDefault(_ancestorLevel);
             }
         }
diff --git a/src/Avalonia.Styling/LogicalTree/ILogical.cs b/src/Avalonia.Styling/LogicalTree/ILogical.cs
index 8ee3c9ea4f..9c4223618f 100644
--- a/src/Avalonia.Styling/LogicalTree/ILogical.cs
+++ b/src/Avalonia.Styling/LogicalTree/ILogical.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Collections;
 using Avalonia.Controls;
diff --git a/src/Avalonia.Styling/LogicalTree/ILogicalRoot.cs b/src/Avalonia.Styling/LogicalTree/ILogicalRoot.cs
new file mode 100644
index 0000000000..4a61544a6f
--- /dev/null
+++ b/src/Avalonia.Styling/LogicalTree/ILogicalRoot.cs
@@ -0,0 +1,9 @@
+namespace Avalonia.LogicalTree
+{
+    /// <summary>
+    /// Represents a root of a logical tree.
+    /// </summary>
+    public interface ILogicalRoot : ILogical
+    {
+    }
+}
diff --git a/src/Avalonia.Styling/LogicalTree/LogicalExtensions.cs b/src/Avalonia.Styling/LogicalTree/LogicalExtensions.cs
index 276ea6c060..458ab0fce2 100644
--- a/src/Avalonia.Styling/LogicalTree/LogicalExtensions.cs
+++ b/src/Avalonia.Styling/LogicalTree/LogicalExtensions.cs
@@ -1,14 +1,18 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Avalonia.LogicalTree
 {
+    /// <summary>
+    /// Provides extension methods for working with the logical tree.
+    /// </summary>
     public static class LogicalExtensions
     {
+        /// <summary>
+        /// Enumerates the ancestors of an <see cref="ILogical"/> in the logical tree.
+        /// </summary>
+        /// <param name="logical">The logical.</param>
+        /// <returns>The logical's ancestors.</returns>
         public static IEnumerable<ILogical> GetLogicalAncestors(this ILogical logical)
         {
             Contract.Requires<ArgumentNullException>(logical != null);
@@ -22,6 +26,11 @@ namespace Avalonia.LogicalTree
             }
         }
 
+        /// <summary>
+        /// Enumerates an <see cref="ILogical"/> and its ancestors in the logical tree.
+        /// </summary>
+        /// <param name="logical">The logical.</param>
+        /// <returns>The logical and its ancestors.</returns>
         public static IEnumerable<ILogical> GetSelfAndLogicalAncestors(this ILogical logical)
         {
             yield return logical;
@@ -32,11 +41,50 @@ namespace Avalonia.LogicalTree
             }
         }
 
+        /// <summary>
+        /// Finds first ancestor of given type.
+        /// </summary>
+        /// <typeparam name="T">Ancestor type.</typeparam>
+        /// <param name="logical">The logical.</param>
+        /// <param name="includeSelf">If given logical should be included in search.</param>
+        /// <returns>First ancestor of given type.</returns>
+        public static T FindLogicalAncestorOfType<T>(this ILogical logical, bool includeSelf = false) where T : class
+        {
+            if (logical is null)
+            {
+                return null;
+            }
+
+            ILogical parent = includeSelf ? logical : logical.LogicalParent;
+
+            while (parent != null)
+            {
+                if (parent is T result)
+                {
+                    return result;
+                }
+
+                parent = parent.LogicalParent;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Enumerates the children of an <see cref="ILogical"/> in the logical tree.
+        /// </summary>
+        /// <param name="logical">The logical.</param>
+        /// <returns>The logical children.</returns>
         public static IEnumerable<ILogical> GetLogicalChildren(this ILogical logical)
         {
             return logical.LogicalChildren;
         }
 
+        /// <summary>
+        /// Enumerates the descendants of an <see cref="ILogical"/> in the logical tree.
+        /// </summary>
+        /// <param name="logical">The logical.</param>
+        /// <returns>The logical's ancestors.</returns>
         public static IEnumerable<ILogical> GetLogicalDescendants(this ILogical logical)
         {
             foreach (ILogical child in logical.LogicalChildren)
@@ -50,6 +98,11 @@ namespace Avalonia.LogicalTree
             }
         }
 
+        /// <summary>
+        /// Enumerates an <see cref="ILogical"/> and its descendants in the logical tree.
+        /// </summary>
+        /// <param name="logical">The logical.</param>
+        /// <returns>The logical and its ancestors.</returns>
         public static IEnumerable<ILogical> GetSelfAndLogicalDescendants(this ILogical logical)
         {
             yield return logical;
@@ -60,16 +113,56 @@ namespace Avalonia.LogicalTree
             }
         }
 
+        /// <summary>
+        /// Finds first descendant of given type.
+        /// </summary>
+        /// <typeparam name="T">Descendant type.</typeparam>
+        /// <param name="logical">The logical.</param>
+        /// <param name="includeSelf">If given logical should be included in search.</param>
+        /// <returns>First descendant of given type.</returns>
+        public static T FindLogicalDescendantOfType<T>(this ILogical logical, bool includeSelf = false) where T : class
+        {
+            if (logical is null)
+            {
+                return null;
+            }
+
+            if (includeSelf && logical is T result)
+            {
+                return result;
+            }
+
+            return FindDescendantOfTypeCore<T>(logical);
+        }
+
+        /// <summary>
+        /// Gets the logical parent of an <see cref="ILogical"/>.
+        /// </summary>
+        /// <param name="logical">The logical.</param>
+        /// <returns>The parent, or null if the logical is unparented.</returns>
         public static ILogical GetLogicalParent(this ILogical logical)
         {
             return logical.LogicalParent;
         }
 
+        /// <summary>
+        /// Gets the logical parent of an <see cref="ILogical"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of the logical parent.</typeparam>
+        /// <param name="logical">The logical.</param>
+        /// <returns>
+        /// The parent, or null if the logical is unparented or its parent is not of type <typeparamref name="T"/>.
+        /// </returns>
         public static T GetLogicalParent<T>(this ILogical logical) where T : class
         {
             return logical.LogicalParent as T;
         }
 
+        /// <summary>
+        /// Enumerates the siblings of an <see cref="ILogical"/> in the logical tree.
+        /// </summary>
+        /// <param name="logical">The logical.</param>
+        /// <returns>The logical siblings.</returns>
         public static IEnumerable<ILogical> GetLogicalSiblings(this ILogical logical)
         {
             ILogical parent = logical.LogicalParent;
@@ -83,9 +176,55 @@ namespace Avalonia.LogicalTree
             }
         }
 
-        public static bool IsLogicalParentOf(this ILogical logical, ILogical target)
+        /// <summary>
+        /// Tests whether an <see cref="ILogical"/> is an ancestor of another logical.
+        /// </summary>
+        /// <param name="logical">The logical.</param>
+        /// <param name="target">The potential descendant.</param>
+        /// <returns>
+        /// True if <paramref name="logical"/> is an ancestor of <paramref name="target"/>;
+        /// otherwise false.
+        /// </returns>
+        public static bool IsLogicalAncestorOf(this ILogical logical, ILogical target)
+        {
+            ILogical current = target?.LogicalParent;
+
+            while (current != null)
+            {
+                if (current == logical)
+                {
+                    return true;
+                }
+
+                current = current.LogicalParent;
+            }
+
+            return false;
+        }
+
+        private static T FindDescendantOfTypeCore<T>(ILogical logical) where T : class
         {
-            return target.GetLogicalAncestors().Any(x => x == logical);
+            var logicalChildren = logical.LogicalChildren;
+            var logicalChildrenCount = logicalChildren.Count;
+
+            for (var i = 0; i < logicalChildrenCount; i++)
+            {
+                ILogical child = logicalChildren[i];
+
+                if (child is T result)
+                {
+                    return result;
+                }
+
+                var childResult = FindDescendantOfTypeCore<T>(child);
+
+                if (!(childResult is null))
+                {
+                    return childResult;
+                }
+            }
+
+            return null;
         }
     }
 }
diff --git a/src/Avalonia.Styling/LogicalTree/LogicalTreeAttachmentEventArgs.cs b/src/Avalonia.Styling/LogicalTree/LogicalTreeAttachmentEventArgs.cs
index 1b0eb2b61b..891724599c 100644
--- a/src/Avalonia.Styling/LogicalTree/LogicalTreeAttachmentEventArgs.cs
+++ b/src/Avalonia.Styling/LogicalTree/LogicalTreeAttachmentEventArgs.cs
@@ -1,8 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using Avalonia.Styling;
 
 namespace Avalonia.LogicalTree
 {
@@ -16,16 +12,44 @@ namespace Avalonia.LogicalTree
         /// Initializes a new instance of the <see cref="LogicalTreeAttachmentEventArgs"/> class.
         /// </summary>
         /// <param name="root">The root of the logical tree.</param>
-        public LogicalTreeAttachmentEventArgs(IStyleHost root)
+        /// <param name="source">The control being attached/detached.</param>
+        /// <param name="parent">The <see cref="Parent"/>.</param>
+        public LogicalTreeAttachmentEventArgs(
+            ILogicalRoot root,
+            ILogical source,
+            ILogical parent)
         {
             Contract.Requires<ArgumentNullException>(root != null);
+            Contract.Requires<ArgumentNullException>(source != null);
 
             Root = root;
+            Source = source;
+            Parent = parent;
         }
 
         /// <summary>
         /// Gets the root of the logical tree that the control is being attached to or detached from.
         /// </summary>
-        public IStyleHost Root { get; }
+        public ILogicalRoot Root { get; }
+
+        /// <summary>
+        /// Gets the control that was attached or detached from the logical tree.
+        /// </summary>
+        /// <remarks>
+        /// Logical tree attachment events travel down the attached logical tree from the point of
+        /// attachment/detachment, so this control may be different from the control that the
+        /// event is being raised on.
+        /// </remarks>
+        public ILogical Source { get; }
+
+        /// <summary>
+        /// Gets the control that <see cref="Source"/> is being attached to or detached from.
+        /// </summary>
+        /// <remarks>
+        /// For logical tree attachment, holds the new logical parent of <see cref="Source"/>. For
+        /// detachment, holds the old logical parent of <see cref="Source"/>. If the detachment event
+        /// was caused by a top-level control being closed, then this property will be null.
+        /// </remarks>
+        public ILogical Parent { get; }
     }
 }
diff --git a/src/Avalonia.Styling/Properties/AssemblyInfo.cs b/src/Avalonia.Styling/Properties/AssemblyInfo.cs
index 9f1794c700..34c71fffe3 100644
--- a/src/Avalonia.Styling/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Styling/Properties/AssemblyInfo.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// 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;
@@ -8,4 +5,8 @@ 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")]
\ No newline at end of file
+#if SIGNED_BUILD
+[assembly: InternalsVisibleTo("Avalonia.Styling.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+#else
+[assembly: InternalsVisibleTo("Avalonia.Styling.UnitTests")]
+#endif
diff --git a/src/Avalonia.Styling/StyledElement.cs b/src/Avalonia.Styling/StyledElement.cs
index de8093c048..cc8d91462d 100644
--- a/src/Avalonia.Styling/StyledElement.cs
+++ b/src/Avalonia.Styling/StyledElement.cs
@@ -1,10 +1,8 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Linq;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
 using Avalonia.Animation;
 using Avalonia.Collections;
 using Avalonia.Controls;
@@ -14,6 +12,8 @@ using Avalonia.Logging;
 using Avalonia.LogicalTree;
 using Avalonia.Styling;
 
+#nullable enable
+
 namespace Avalonia
 {
     /// <summary>
@@ -24,13 +24,13 @@ namespace Avalonia
     /// - Implements <see cref="ILogical"/> to form part of a logical tree.
     /// - A collection of class strings for custom styling.
     /// </summary>
-    public class StyledElement : Animatable, IStyledElement, ISetLogicalParent, ISetInheritanceParent
+    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>(
+        public static readonly StyledProperty<object?> DataContextProperty =
+            AvaloniaProperty.Register<StyledElement, object?>(
                 nameof(DataContext),
                 inherits: true,
                 notifying: DataContextNotifying);
@@ -38,34 +38,34 @@ namespace Avalonia
         /// <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);
+        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);
+        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>(
+        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 string? _name;
         private readonly Classes _classes = new Classes();
-        private bool _isAttachedToLogicalTree;
-        private IAvaloniaList<ILogical> _logicalChildren;
-        private IResourceDictionary _resources;
-        private Styles _styles;
+        private ILogicalRoot? _logicalRoot;
+        private IAvaloniaList<ILogical>? _logicalChildren;
+        private IResourceDictionary? _resources;
+        private Styles? _styles;
         private bool _styled;
-        private Subject<IStyleable> _styleDetach = new Subject<IStyleable>();
-        private ITemplatedControl _templatedParent;
+        private List<IStyleInstance>? _appliedStyles;
+        private ITemplatedControl? _templatedParent;
         private bool _dataContextUpdating;
 
         /// <summary>
@@ -81,18 +81,18 @@ namespace Avalonia
         /// </summary>
         public StyledElement()
         {
-            _isAttachedToLogicalTree = this is IStyleRoot;
+            _logicalRoot = this as ILogicalRoot;
         }
 
         /// <summary>
         /// Raised when the styled element is attached to a rooted logical tree.
         /// </summary>
-        public event EventHandler<LogicalTreeAttachmentEventArgs> AttachedToLogicalTree;
+        public event EventHandler<LogicalTreeAttachmentEventArgs>? AttachedToLogicalTree;
 
         /// <summary>
         /// Raised when the styled element is detached from a rooted logical tree.
         /// </summary>
-        public event EventHandler<LogicalTreeAttachmentEventArgs> DetachedFromLogicalTree;
+        public event EventHandler<LogicalTreeAttachmentEventArgs>? DetachedFromLogicalTree;
 
         /// <summary>
         /// Occurs when the <see cref="DataContext"/> property changes.
@@ -101,7 +101,7 @@ namespace Avalonia
         /// 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;
+        public event EventHandler? DataContextChanged;
 
         /// <summary>
         /// Occurs when the styled element has finished initialization.
@@ -114,12 +114,12 @@ namespace Avalonia
         /// <see cref="ISupportInitialize"/> is not used, it is called when the styled element is attached
         /// to the visual tree.
         /// </remarks>
-        public event EventHandler Initialized;
+        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;
+        public event EventHandler<ResourcesChangedEventArgs>? ResourcesChanged;
 
         /// <summary>
         /// Gets or sets the name of the styled element.
@@ -128,20 +128,12 @@ namespace Avalonia
         /// 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
+        public string? Name
         {
-            get
-            {
-                return _name;
-            }
+            get => _name;
 
             set
             {
-                if (String.IsNullOrWhiteSpace(value))
-                {
-                    throw new InvalidOperationException("Cannot set Name to null or empty string.");
-                }
-
                 if (_styled)
                 {
                     throw new InvalidOperationException("Cannot set Name : styled element already styled.");
@@ -189,7 +181,7 @@ namespace Avalonia
         /// The data context is an inherited property that specifies the default object that will
         /// be used for data binding.
         /// </remarks>
-        public object DataContext
+        public object? DataContext
         {
             get { return GetValue(DataContextProperty); }
             set { SetValue(DataContextProperty, value); }
@@ -212,65 +204,27 @@ namespace Avalonia
         /// 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
-        {
-            get { return _styles ?? (Styles = new Styles()); }
-            set
-            {
-                Contract.Requires<ArgumentNullException>(value != null);
-
-                if (_styles != value)
-                {
-                    if (_styles != null)
-                    {
-                        (_styles as ISetStyleParent)?.SetParent(null);
-                        _styles.ResourcesChanged -= ThisResourcesChanged;
-                    }
-
-                    _styles = value;
-
-                    if (value is ISetStyleParent setParent && setParent.ResourceParent == null)
-                    {
-                        setParent.SetParent(this);
-                    }
-
-                    _styles.ResourcesChanged += ThisResourcesChanged;
-                }
-            }
-        }
+        public Styles Styles => _styles ??= new Styles(this);
 
         /// <summary>
         /// Gets or sets the styled element's resource dictionary.
         /// </summary>
         public IResourceDictionary Resources
         {
-            get => _resources ?? (Resources = new ResourceDictionary());
+            get => _resources ??= new ResourceDictionary(this);
             set
             {
-                Contract.Requires<ArgumentNullException>(value != null);
-
-                var hadResources = false;
-
-                if (_resources != null)
-                {
-                    hadResources = _resources.Count > 0;
-                    _resources.ResourcesChanged -= ThisResourcesChanged;
-                }
-
+                value = value ?? throw new ArgumentNullException(nameof(value));
+                _resources?.RemoveOwner(this);
                 _resources = value;
-                _resources.ResourcesChanged += ThisResourcesChanged;
-
-                if (hadResources || _resources.Count > 0)
-                {
-                    ((ILogical)this).NotifyResourcesChanged(new ResourcesChangedEventArgs());
-                }
+                _resources.AddOwner(this);
             }
         }
 
         /// <summary>
         /// Gets the styled element whose lookless template this styled element is part of.
         /// </summary>
-        public ITemplatedControl TemplatedParent
+        public ITemplatedControl? TemplatedParent
         {
             get => _templatedParent;
             internal set => SetAndRaise(TemplatedParentProperty, ref _templatedParent, value);
@@ -288,7 +242,7 @@ namespace Avalonia
                     var list = new AvaloniaList<ILogical>
                     {
                         ResetBehavior = ResetBehavior.Remove,
-                        Validate = ValidateLogicalChild
+                        Validate = logical => ValidateLogicalChild(logical)
                     };
                     list.CollectionChanged += LogicalChildrenCollectionChanged;
                     _logicalChildren = list;
@@ -307,17 +261,17 @@ namespace Avalonia
         /// <summary>
         /// Gets a value indicating whether the element is attached to a rooted logical tree.
         /// </summary>
-        bool ILogical.IsAttachedToLogicalTree => _isAttachedToLogicalTree;
+        bool ILogical.IsAttachedToLogicalTree => _logicalRoot != null;
 
         /// <summary>
         /// Gets the styled element's logical parent.
         /// </summary>
-        public IStyledElement Parent { get; private set; }
+        public IStyledElement? Parent { get; private set; }
 
         /// <summary>
         /// Gets the styled element's logical parent.
         /// </summary>
-        ILogical ILogical.LogicalParent => Parent;
+        ILogical? ILogical.LogicalParent => Parent;
 
         /// <summary>
         /// Gets the styled element's logical children.
@@ -325,10 +279,8 @@ namespace Avalonia
         IAvaloniaReadOnlyList<ILogical> ILogical.LogicalChildren => LogicalChildren;
 
         /// <inheritdoc/>
-        bool IResourceProvider.HasResources => _resources?.Count > 0 || Styles.HasResources;
-
-        /// <inheritdoc/>
-        IResourceNode IResourceNode.ResourceParent => ((IStyleHost)this).StylingParent as IResourceNode;
+        bool IResourceNode.HasResources => (_resources?.HasResources ?? false) ||
+            (((IResourceNode?)_styles)?.HasResources ?? false);
 
         /// <inheritdoc/>
         IAvaloniaReadOnlyList<string> IStyleable.Classes => Classes;
@@ -344,14 +296,11 @@ namespace Avalonia
         /// </remarks>
         Type IStyleable.StyleKey => GetType();
 
-        /// <inheritdoc/>
-        IObservable<IStyleable> IStyleable.StyleDetach => _styleDetach;
-
         /// <inheritdoc/>
         bool IStyleHost.IsStylesInitialized => _styles != null;
 
         /// <inheritdoc/>
-        IStyleHost IStyleHost.StylingParent => (IStyleHost)InheritanceParent;
+        IStyleHost? IStyleHost.StylingParent => (IStyleHost)InheritanceParent;
 
         /// <inheritdoc/>
         public virtual void BeginInit()
@@ -367,23 +316,36 @@ namespace Avalonia
                 throw new InvalidOperationException("BeginInit was not called.");
             }
 
-            if (--_initCount == 0 && _isAttachedToLogicalTree)
+            if (--_initCount == 0 && _logicalRoot != null)
             {
-                InitializeStylesIfNeeded();
-
+                ApplyStyling();
                 InitializeIfNeeded();
             }
         }
 
-        private void InitializeStylesIfNeeded(bool force = false)
+        /// <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 || force))
+            if (_initCount == 0 && !_styled)
             {
-                ApplyStyling();
+                AvaloniaLocator.Current.GetService<IStyler>()?.ApplyStyles(this);
                 _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)
@@ -397,23 +359,23 @@ namespace Avalonia
         /// <inheritdoc/>
         void ILogical.NotifyAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
         {
-            this.OnAttachedToLogicalTreeCore(e);
+            OnAttachedToLogicalTreeCore(e);
         }
 
         /// <inheritdoc/>
         void ILogical.NotifyDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
         {
-            this.OnDetachedFromLogicalTreeCore(e);
+            OnDetachedFromLogicalTreeCore(e);
         }
 
         /// <inheritdoc/>
-        void ILogical.NotifyResourcesChanged(ResourcesChangedEventArgs e)
-        {
-            ResourcesChanged?.Invoke(this, new ResourcesChangedEventArgs());
-        }
+        void ILogical.NotifyResourcesChanged(ResourcesChangedEventArgs e) => NotifyResourcesChanged(e);
+
+        /// <inheritdoc/>
+        void IResourceHost.NotifyHostedResourcesChanged(ResourcesChangedEventArgs e) => NotifyResourcesChanged(e);
 
         /// <inheritdoc/>
-        bool IResourceProvider.TryGetResource(object key, out object value)
+        bool IResourceNode.TryGetResource(object key, out object? value)
         {
             value = null;
             return (_resources?.TryGetResource(key, out value) ?? false) ||
@@ -424,7 +386,7 @@ namespace Avalonia
         /// Sets the styled element's logical parent.
         /// </summary>
         /// <param name="parent">The parent.</param>
-        void ISetLogicalParent.SetParent(ILogical parent)
+        void ISetLogicalParent.SetParent(ILogical? parent)
         {
             var old = Parent;
 
@@ -435,50 +397,46 @@ namespace Avalonia
                     throw new InvalidOperationException("The Control already has a parent.");
                 }
 
-                if (_isAttachedToLogicalTree)
-                {
-                    var oldRoot = FindStyleRoot(old) ?? this as IStyleRoot;
-
-                    if (oldRoot == null)
-                    {
-                        throw new AvaloniaInternalException("Was attached to logical tree but cannot find root.");
-                    }
-
-                    var e = new LogicalTreeAttachmentEventArgs(oldRoot);
-                    OnDetachedFromLogicalTreeCore(e);
-                }
-
                 if (InheritanceParent == null || parent == null)
                 {
                     InheritanceParent = parent as AvaloniaObject;
                 }
 
-                Parent = (IStyledElement)parent;
+                Parent = (IStyledElement?)parent;
 
-                if (old != null)
+                if (_logicalRoot != null)
                 {
-                    old.ResourcesChanged -= ThisResourcesChanged;
-                }
-                if (Parent != null)
-                {
-                    Parent.ResourcesChanged += ThisResourcesChanged;
+                    var e = new LogicalTreeAttachmentEventArgs(_logicalRoot, this, old);
+                    OnDetachedFromLogicalTreeCore(e);
                 }
-                ((ILogical)this).NotifyResourcesChanged(new ResourcesChangedEventArgs());
 
-                if (Parent is IStyleRoot || Parent?.IsAttachedToLogicalTree == true || this is IStyleRoot)
-                {
-                    var newRoot = FindStyleRoot(this);
-
-                    if (newRoot == null)
-                    {
-                        throw new AvaloniaInternalException("Parent is attached to logical tree but cannot find root.");
-                    }
+                var newRoot = FindLogicalRoot(this);
 
-                    var e = new LogicalTreeAttachmentEventArgs(newRoot);
+                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();
+                }
 
-                RaisePropertyChanged(ParentProperty, old, Parent, BindingPriority.LocalValue);
+#nullable disable
+                RaisePropertyChanged(
+                    ParentProperty,
+                    new Optional<IStyledElement>(old),
+                    new BindingValue<IStyledElement>(Parent),
+                    BindingPriority.LocalValue);
+#nullable enable
             }
         }
 
@@ -491,81 +449,29 @@ namespace Avalonia
             InheritanceParent = parent;
         }
 
-        /// <summary>
-        /// Adds a pseudo-class to be set when a property is true.
-        /// </summary>
-        /// <param name="property">The property.</param>
-        /// <param name="className">The pseudo-class.</param>
-        [Obsolete("Use PseudoClass<TOwner> and specify the control type.")]
-        protected static void PseudoClass(AvaloniaProperty<bool> property, string className)
+        void IStyleable.StyleApplied(IStyleInstance instance)
         {
-            PseudoClass<StyledElement>(property, className);
-        }
+            instance = instance ?? throw new ArgumentNullException(nameof(instance));
 
-        /// <summary>
-        /// Adds a pseudo-class to be set when a property is true.
-        /// </summary>
-        /// <typeparam name="TOwner">The type to apply the pseudo-class to.</typeparam>
-        /// <param name="property">The property.</param>
-        /// <param name="className">The pseudo-class.</param>
-        protected static void PseudoClass<TOwner>(AvaloniaProperty<bool> property, string className)
-            where TOwner : class, IStyledElement
-        {
-            PseudoClass<TOwner, bool>(property, x => x, className);
+            _appliedStyles ??= new List<IStyleInstance>();
+            _appliedStyles.Add(instance);
         }
 
-        /// <summary>
-        /// Adds a pseudo-class to be set when a property equals a certain value.
-        /// </summary>
-        /// <typeparam name="TProperty">The type of the property.</typeparam>
-        /// <param name="property">The property.</param>
-        /// <param name="selector">Returns a boolean value based on the property value.</param>
-        /// <param name="className">The pseudo-class.</param>
-        [Obsolete("Use PseudoClass<TOwner, TProperty> and specify the control type.")]
-        protected static void PseudoClass<TProperty>(
-            AvaloniaProperty<TProperty> property,
-            Func<TProperty, bool> selector,
-            string className)
+        void IStyleable.DetachStyles() => DetachStyles();
+
+        void IStyleable.DetachStyles(IReadOnlyList<IStyle> styles) => DetachStyles(styles);
+
+        void IStyleable.InvalidateStyles() => InvalidateStyles();
+
+        void IStyleHost.StylesAdded(IReadOnlyList<IStyle> styles)
         {
-            PseudoClass<StyledElement, TProperty>(property, selector, className);
+            InvalidateStylesOnThisAndDescendents();
         }
 
-        /// <summary>
-        /// Adds a pseudo-class to be set when a property equals a certain value.
-        /// </summary>
-        /// <typeparam name="TProperty">The type of the property.</typeparam>
-        /// <typeparam name="TOwner">The type to apply the pseudo-class to.</typeparam>
-        /// <param name="property">The property.</param>
-        /// <param name="selector">Returns a boolean value based on the property value.</param>
-        /// <param name="className">The pseudo-class.</param>
-        protected static void PseudoClass<TOwner, TProperty>(
-            AvaloniaProperty<TProperty> property,
-            Func<TProperty, bool> selector,
-            string className)
-                where TOwner : class, IStyledElement
+        void IStyleHost.StylesRemoved(IReadOnlyList<IStyle> styles)
         {
-            Contract.Requires<ArgumentNullException>(property != null);
-            Contract.Requires<ArgumentNullException>(selector != null);
-            Contract.Requires<ArgumentNullException>(className != null);
-
-            if (string.IsNullOrWhiteSpace(className))
-            {
-                throw new ArgumentException("Cannot supply an empty className.");
-            }
-
-            property.Changed.Merge(property.Initialized)
-                .Where(e => e.Sender is TOwner)
-                .Subscribe(e =>
-                {
-                    if (selector((TProperty)e.NewValue))
-                    {
-                        ((StyledElement)e.Sender).PseudoClasses.Add(className);
-                    }
-                    else
-                    {
-                        ((StyledElement)e.Sender).PseudoClasses.Remove(className);
-                    }
-                });
+            var allStyles = RecurseStyles(styles);
+            DetachStylesFromThisAndDescendents(allStyles);
         }
 
         protected virtual void LogicalChildrenCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
@@ -573,16 +479,16 @@ namespace Avalonia
             switch (e.Action)
             {
                 case NotifyCollectionChangedAction.Add:
-                    SetLogicalParent(e.NewItems.Cast<ILogical>());
+                    SetLogicalParent(e.NewItems);
                     break;
 
                 case NotifyCollectionChangedAction.Remove:
-                    ClearLogicalParent(e.OldItems.Cast<ILogical>());
+                    ClearLogicalParent(e.OldItems);
                     break;
 
                 case NotifyCollectionChangedAction.Replace:
-                    ClearLogicalParent(e.OldItems.Cast<ILogical>());
-                    SetLogicalParent(e.NewItems.Cast<ILogical>());
+                    ClearLogicalParent(e.OldItems);
+                    SetLogicalParent(e.NewItems);
                     break;
 
                 case NotifyCollectionChangedAction.Reset:
@@ -590,6 +496,28 @@ namespace Avalonia
             }
         }
 
+        /// <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>
@@ -653,9 +581,12 @@ namespace Avalonia
                     element._dataContextUpdating = true;
                     element.OnDataContextBeginUpdate();
 
-                    foreach (var child in element.LogicalChildren)
+                    var logicalChildren = element.LogicalChildren;
+                    var logicalChildrenCount = logicalChildren.Count;
+
+                    for (var i = 0; i < logicalChildrenCount; i++)
                     {
-                        if (child is StyledElement s &&
+                        if (element.LogicalChildren[i] is StyledElement s &&
                             s.InheritanceParent == element &&
                             !s.IsSet(DataContextProperty))
                         {
@@ -674,11 +605,11 @@ namespace Avalonia
             }
         }
 
-        private static IStyleRoot FindStyleRoot(IStyleHost e)
+        private static ILogicalRoot? FindLogicalRoot(IStyleHost? e)
         {
             while (e != null)
             {
-                if (e is IStyleRoot root)
+                if (e is ILogicalRoot root)
                 {
                     return root;
                 }
@@ -689,11 +620,6 @@ namespace Avalonia
             return null;
         }
 
-        private void ApplyStyling()
-        {
-            AvaloniaLocator.Current.GetService<IStyler>()?.ApplyStyles(this);
-        }
-
         private static void ValidateLogicalChild(ILogical c)
         {
             if (c == null)
@@ -704,47 +630,65 @@ namespace Avalonia
 
         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 (!_isAttachedToLogicalTree)
+            if (_logicalRoot == null)
             {
-                _isAttachedToLogicalTree = true;
+                _logicalRoot = e.Root;
 
-                InitializeStylesIfNeeded(true);
+                ApplyStyling();
+                NotifyResourcesChanged(propagate: false);
 
                 OnAttachedToLogicalTree(e);
                 AttachedToLogicalTree?.Invoke(this, e);
             }
 
-            foreach (var child in LogicalChildren.OfType<StyledElement>())
+            var logicalChildren = LogicalChildren;
+            var logicalChildrenCount = logicalChildren.Count;
+
+            for (var i = 0; i < logicalChildrenCount; i++)
             {
-                child.OnAttachedToLogicalTreeCore(e);
+                if (logicalChildren[i] is StyledElement child)
+                {
+                    child.OnAttachedToLogicalTreeCore(e);
+                }
             }
         }
 
         private void OnDetachedFromLogicalTreeCore(LogicalTreeAttachmentEventArgs e)
         {
-            if (_isAttachedToLogicalTree)
+            if (_logicalRoot != null)
             {
-                _isAttachedToLogicalTree = false;
-                _styleDetach.OnNext(this);
+                _logicalRoot = null;
+                DetachStyles();
                 OnDetachedFromLogicalTree(e);
                 DetachedFromLogicalTree?.Invoke(this, e);
 
-                foreach (var child in LogicalChildren.OfType<StyledElement>())
+                var logicalChildren = LogicalChildren;
+                var logicalChildrenCount = logicalChildren.Count;
+
+                for (var i = 0; i < logicalChildrenCount; i++)
                 {
-                    child.OnDetachedFromLogicalTreeCore(e);
+                    if (logicalChildren[i] is StyledElement child)
+                    {
+                        child.OnDetachedFromLogicalTreeCore(e);
+                    }
                 }
 
 #if DEBUG
-                if (((INotifyCollectionChangedDebug)_classes).GetCollectionChangedSubscribers()?.Length > 0)
+                if (((INotifyCollectionChangedDebug)Classes).GetCollectionChangedSubscribers()?.Length > 0)
                 {
-                    Logger.TryGet(LogEventLevel.Warning)?.Log(
-                        LogArea.Control,
+                    Logger.TryGet(LogEventLevel.Warning, LogArea.Control)?.Log(
                         this,
                         "{Type} detached from logical tree but still has class listeners",
                         GetType());
@@ -758,31 +702,157 @@ namespace Avalonia
             OnDataContextChanged(EventArgs.Empty);
         }
 
-        private void SetLogicalParent(IEnumerable<ILogical> children)
+        private void SetLogicalParent(IList children)
         {
-            foreach (var i in 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++)
             {
-                if (i.LogicalParent == null)
+                var logical = (ILogical) children[i];
+                
+                if (logical.LogicalParent == this)
                 {
-                    ((ISetLogicalParent)i).SetParent(this);
+                    ((ISetLogicalParent)logical).SetParent(null);
                 }
             }
         }
 
-        private void ClearLogicalParent(IEnumerable<ILogical> children)
+        private void DetachStyles()
         {
-            foreach (var i in children)
+            if (_appliedStyles is object)
             {
-                if (i.LogicalParent == this)
+                foreach (var i in _appliedStyles)
                 {
-                    ((ISetLogicalParent)i).SetParent(null);
+                    i.Dispose();
                 }
+
+                _appliedStyles.Clear();
             }
+
+            _styled = false;
         }
 
-        private void ThisResourcesChanged(object sender, ResourcesChangedEventArgs e)
+        private void DetachStyles(IReadOnlyList<IStyle> styles)
         {
-            ((ILogical)this).NotifyResourcesChanged(e);
+            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/ActivatedObservable.cs b/src/Avalonia.Styling/Styling/ActivatedObservable.cs
deleted file mode 100644
index 5b2774943a..0000000000
--- a/src/Avalonia.Styling/Styling/ActivatedObservable.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// An observable which is switched on or off according to an activator observable.
-    /// </summary>
-    /// <remarks>
-    /// An <see cref="ActivatedObservable"/> has two inputs: an activator observable and a 
-    /// <see cref="Source"/> observable which produces the activated value. When the activator 
-    /// produces true, the <see cref="ActivatedObservable"/> will produce the current activated 
-    /// value. When the activator produces false it will produce
-    /// <see cref="AvaloniaProperty.UnsetValue"/>.
-    /// </remarks>
-    internal class ActivatedObservable : ActivatedValue, IDescription
-    {
-        private IDisposable _sourceSubscription;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ActivatedObservable"/> class.
-        /// </summary>
-        /// <param name="activator">The activator.</param>
-        /// <param name="source">An observable that produces the activated value.</param>
-        /// <param name="description">The binding description.</param>
-        public ActivatedObservable(
-            IObservable<bool> activator,
-            IObservable<object> source,
-            string description)
-            : base(activator, AvaloniaProperty.UnsetValue, description)
-        {
-            Contract.Requires<ArgumentNullException>(source != null);
-
-            Source = source;
-        }
-
-        /// <summary>
-        /// Gets an observable which produces the <see cref="ActivatedValue"/>.
-        /// </summary>
-        public IObservable<object> Source { get; }
-
-        protected override ActivatorListener CreateListener() => new ValueListener(this);
-
-        protected override void Deinitialize()
-        {
-            base.Deinitialize();
-            _sourceSubscription.Dispose();
-            _sourceSubscription = null;
-        }
-
-        protected override void Initialize()
-        {
-            base.Initialize();
-            _sourceSubscription = Source.Subscribe((ValueListener)Listener);
-        }
-
-        protected virtual void NotifyValue(object value)
-        {
-            Value = value;
-        }
-
-        private class ValueListener : ActivatorListener, IObserver<object>
-        {
-            public ValueListener(ActivatedObservable parent)
-                : base(parent)
-            {
-            }
-            protected new ActivatedObservable Parent => (ActivatedObservable)base.Parent;
-
-            void IObserver<object>.OnCompleted() => Parent.CompletedReceived();
-            void IObserver<object>.OnError(Exception error) => Parent.ErrorReceived(error);
-            void IObserver<object>.OnNext(object value) => Parent.NotifyValue(value);
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/ActivatedSubject.cs b/src/Avalonia.Styling/Styling/ActivatedSubject.cs
deleted file mode 100644
index a8446c4bfb..0000000000
--- a/src/Avalonia.Styling/Styling/ActivatedSubject.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Reactive.Subjects;
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// A subject which is switched on or off according to an activator observable.
-    /// </summary>
-    /// <remarks>
-    /// An <see cref="ActivatedSubject"/> extends <see cref="ActivatedObservable"/> to
-    /// be an <see cref="ISubject{Object}"/>. When the object is active then values
-    /// received via <see cref="OnNext(object)"/> will be passed to the source subject.
-    /// </remarks>
-    internal class ActivatedSubject : ActivatedObservable, ISubject<object>, IDescription
-    {
-        private bool _completed;
-        private object _pushValue;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ActivatedSubject"/> class.
-        /// </summary>
-        /// <param name="activator">The activator.</param>
-        /// <param name="source">An observable that produces the activated value.</param>
-        /// <param name="description">The binding description.</param>
-        public ActivatedSubject(
-            IObservable<bool> activator,
-            ISubject<object> source,
-            string description)
-            : base(activator, source, description)
-        {
-        }
-
-        /// <summary>
-        /// Gets the underlying subject.
-        /// </summary>
-        public new ISubject<object> Source
-        {
-            get { return (ISubject<object>)base.Source; }
-        }
-
-        public void OnCompleted()
-        {
-            Source.OnCompleted();
-        }
-
-        public void OnError(Exception error)
-        {
-            Source.OnError(error);
-        }
-
-        public void OnNext(object value)
-        {
-            _pushValue = value;
-
-            if (IsActive == true && !_completed)
-            {
-                Source.OnNext(_pushValue);
-            }
-        }
-
-        protected override void ActiveChanged(bool active)
-        {
-            bool first = !IsActive.HasValue;
-
-            base.ActiveChanged(active);
-
-            if (!first)
-            {
-                Source.OnNext(active ? _pushValue : AvaloniaProperty.UnsetValue);
-            }
-        }
-
-        protected override void CompletedReceived()
-        {
-            base.CompletedReceived();
-
-            if (!_completed)
-            {
-                Source.OnCompleted();
-                _completed = true;
-            }
-        }
-
-        protected override void ErrorReceived(Exception error)
-        {
-            base.ErrorReceived(error);
-
-            if (!_completed)
-            {
-                Source.OnError(error);
-                _completed = true;
-            }
-        }
-
-        private void ActivatorCompleted()
-        {
-            _completed = true;
-            Source.OnCompleted();
-        }
-
-        private void ActivatorError(Exception e)
-        {
-            _completed = true;
-            Source.OnError(e);
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/ActivatedValue.cs b/src/Avalonia.Styling/Styling/ActivatedValue.cs
deleted file mode 100644
index 908d89b751..0000000000
--- a/src/Avalonia.Styling/Styling/ActivatedValue.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using Avalonia.Reactive;
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// An value which is switched on or off according to an activator observable.
-    /// </summary>
-    /// <remarks>
-    /// An <see cref="ActivatedValue"/> has two inputs: an activator observable and an
-    /// <see cref="Value"/>. When the activator produces true, the 
-    /// <see cref="ActivatedValue"/> will produce the current value. When the activator 
-    /// produces false it will produce <see cref="AvaloniaProperty.UnsetValue"/>.
-    /// </remarks>
-    internal class ActivatedValue : LightweightObservableBase<object>, IDescription
-    {
-        private static readonly object NotSent = new object();
-        private IDisposable _activatorSubscription;
-        private object _value;
-        private object _last = NotSent;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ActivatedObservable"/> class.
-        /// </summary>
-        /// <param name="activator">The activator.</param>
-        /// <param name="value">The activated value.</param>
-        /// <param name="description">The binding description.</param>
-        public ActivatedValue(
-            IObservable<bool> activator,
-            object value,
-            string description)
-        {
-            Contract.Requires<ArgumentNullException>(activator != null);
-
-            Activator = activator;
-            Value = value;
-            Description = description;
-            Listener = CreateListener();
-        }
-
-        /// <summary>
-        /// Gets the activator observable.
-        /// </summary>
-        public IObservable<bool> Activator { get; }
-
-        /// <summary>
-        /// Gets a description of the binding.
-        /// </summary>
-        public string Description { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether the activator is active.
-        /// </summary>
-        public bool? IsActive { get; private set; }
-
-        /// <summary>
-        /// Gets the value that will be produced when <see cref="IsActive"/> is true.
-        /// </summary>
-        public object Value
-        {
-            get => _value;
-            protected set
-            {
-                _value = value;
-                PublishValue();
-            }
-        }
-
-        protected ActivatorListener Listener { get; }
-
-        protected virtual void ActiveChanged(bool active)
-        {
-            IsActive = active;
-            PublishValue();
-        }
-
-        protected virtual void CompletedReceived() => PublishCompleted();
-
-        protected virtual ActivatorListener CreateListener() => new ActivatorListener(this);
-
-        protected override void Deinitialize()
-        {
-            _activatorSubscription.Dispose();
-            _activatorSubscription = null;
-        }
-
-        protected virtual void ErrorReceived(Exception error) => PublishError(error);
-
-        protected override void Initialize()
-        {
-            _activatorSubscription = Activator.Subscribe(Listener);
-        }
-
-        protected override void Subscribed(IObserver<object> observer, bool first)
-        {
-            if (IsActive == true && !first)
-            {
-                observer.OnNext(Value);
-            }
-        }
-
-        private void PublishValue()
-        {
-            if (IsActive.HasValue)
-            {
-                var v = IsActive.Value ? Value : AvaloniaProperty.UnsetValue;
-
-                if (!Equals(v, _last))
-                {
-                    PublishNext(v);
-                    _last = v;
-                }
-            }
-        }
-
-        protected class ActivatorListener : IObserver<bool>
-        {
-            public ActivatorListener(ActivatedValue parent)
-            {
-                Parent = parent;
-            }
-
-            protected ActivatedValue Parent { get; }
-
-            void IObserver<bool>.OnCompleted() => Parent.CompletedReceived();
-            void IObserver<bool>.OnError(Exception error) => Parent.ErrorReceived(error);
-            void IObserver<bool>.OnNext(bool value) => Parent.ActiveChanged(value);
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/Activators/AndActivator.cs b/src/Avalonia.Styling/Styling/Activators/AndActivator.cs
new file mode 100644
index 0000000000..0e1e3b565b
--- /dev/null
+++ b/src/Avalonia.Styling/Styling/Activators/AndActivator.cs
@@ -0,0 +1,71 @@
+#nullable enable
+
+using System.Collections.Generic;
+
+namespace Avalonia.Styling.Activators
+{
+    /// <summary>
+    /// An aggregate <see cref="IStyleActivator"/> which is active when all of its inputs are
+    /// active.
+    /// </summary>
+    internal class AndActivator : StyleActivatorBase, IStyleActivatorSink
+    {
+        private List<IStyleActivator>? _sources;
+        private ulong _flags;
+        private ulong _mask;
+
+        public int Count => _sources?.Count ?? 0;
+
+        public void Add(IStyleActivator activator)
+        {
+            _sources ??= new List<IStyleActivator>();
+            _sources.Add(activator);
+        }
+
+        void IStyleActivatorSink.OnNext(bool value, int tag)
+        {
+            if (value)
+            {
+                _flags |= 1ul << tag;
+            }
+            else
+            {
+                _flags &= ~(1ul << tag);
+            }
+
+            if (_mask != 0)
+            {
+                PublishNext(_flags == _mask);
+            }
+        }
+
+        protected override void Initialize()
+        {
+            if (_sources is object)
+            {
+                var i = 0;
+
+                foreach (var source in _sources)
+                {
+                    source.Subscribe(this, i++);
+                }
+
+                _mask = (1ul << Count) - 1;
+                PublishNext(_flags == _mask);
+            }
+        }
+
+        protected override void Deinitialize()
+        {
+            if (_sources is object)
+            {
+                foreach (var source in _sources)
+                {
+                    source.Unsubscribe(this);
+                }
+            }
+
+            _mask = 0;
+        }
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/Activators/AndActivatorBuilder.cs b/src/Avalonia.Styling/Styling/Activators/AndActivatorBuilder.cs
new file mode 100644
index 0000000000..b831c330f8
--- /dev/null
+++ b/src/Avalonia.Styling/Styling/Activators/AndActivatorBuilder.cs
@@ -0,0 +1,43 @@
+#nullable enable
+
+namespace Avalonia.Styling.Activators
+{
+    /// <summary>
+    /// Builds an <see cref="AndActivator"/>.
+    /// </summary>
+    /// <remarks>
+    /// When ANDing style activators, if there is more than one input then creates an instance of
+    /// <see cref="AndActivator"/>. If there is only one input, returns the input directly.
+    /// </remarks>
+    internal struct AndActivatorBuilder
+    {
+        private IStyleActivator? _single;
+        private AndActivator? _multiple;
+
+        public void Add(IStyleActivator? activator)
+        {
+            if (activator == null)
+            {
+                return;
+            }
+
+            if (_single is null && _multiple is null)
+            {
+                _single = activator;
+            }
+            else
+            {
+                if (_multiple is null)
+                {
+                    _multiple = new AndActivator();
+                    _multiple.Add(_single!);
+                    _single = null;
+                }
+
+                _multiple.Add(activator);
+            }
+        }
+
+        public IStyleActivator Get() => _single ?? _multiple!;
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/Activators/IStyleActivator.cs b/src/Avalonia.Styling/Styling/Activators/IStyleActivator.cs
new file mode 100644
index 0000000000..479100ed8a
--- /dev/null
+++ b/src/Avalonia.Styling/Styling/Activators/IStyleActivator.cs
@@ -0,0 +1,33 @@
+#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
new file mode 100644
index 0000000000..a1a6ef5c28
--- /dev/null
+++ b/src/Avalonia.Styling/Styling/Activators/IStyleActivatorSink.cs
@@ -0,0 +1,17 @@
+#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/NotActivator.cs b/src/Avalonia.Styling/Styling/Activators/NotActivator.cs
new file mode 100644
index 0000000000..1bb6ed3cd2
--- /dev/null
+++ b/src/Avalonia.Styling/Styling/Activators/NotActivator.cs
@@ -0,0 +1,16 @@
+#nullable enable
+
+namespace Avalonia.Styling.Activators
+{
+    /// <summary>
+    /// An <see cref="IStyleActivator"/> which inverts the state of an input activator.
+    /// </summary>
+    internal class NotActivator : StyleActivatorBase, IStyleActivatorSink
+    {
+        private readonly IStyleActivator _source;
+        public NotActivator(IStyleActivator source) => _source = source;
+        void IStyleActivatorSink.OnNext(bool value, int tag) => PublishNext(!value);
+        protected override void Initialize() => _source.Subscribe(this, 0);
+        protected override void Deinitialize() => _source.Unsubscribe(this);
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/Activators/OrActivator.cs b/src/Avalonia.Styling/Styling/Activators/OrActivator.cs
new file mode 100644
index 0000000000..fcb7d71e60
--- /dev/null
+++ b/src/Avalonia.Styling/Styling/Activators/OrActivator.cs
@@ -0,0 +1,71 @@
+#nullable enable
+
+using System.Collections.Generic;
+
+namespace Avalonia.Styling.Activators
+{
+    /// <summary>
+    /// An aggregate <see cref="IStyleActivator"/> which is active when any of its inputs are
+    /// active.
+    /// </summary>
+    internal class OrActivator : StyleActivatorBase, IStyleActivatorSink
+    {
+        private List<IStyleActivator>? _sources;
+        private ulong _flags;
+        private bool _initializing;
+
+        public int Count => _sources?.Count ?? 0;
+
+        public void Add(IStyleActivator activator)
+        {
+            _sources ??= new List<IStyleActivator>();
+            _sources.Add(activator);
+        }
+
+        void IStyleActivatorSink.OnNext(bool value, int tag)
+        {
+            if (value)
+            {
+                _flags |= 1ul << tag;
+            }
+            else
+            {
+                _flags &= ~(1ul << tag);
+            }
+
+            if (!_initializing)
+            {
+                PublishNext(_flags != 0);
+            }
+        }
+
+        protected override void Initialize()
+        {
+            if (_sources is object)
+            {
+                var i = 0;
+
+                _initializing = true;
+
+                foreach (var source in _sources)
+                {
+                    source.Subscribe(this, i++);
+                }
+
+                _initializing = false;
+                PublishNext(_flags != 0);
+            }
+        }
+
+        protected override void Deinitialize()
+        {
+            if (_sources is object)
+            {
+                foreach (var source in _sources)
+                {
+                    source.Unsubscribe(this);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/Activators/OrActivatorBuilder.cs b/src/Avalonia.Styling/Styling/Activators/OrActivatorBuilder.cs
new file mode 100644
index 0000000000..4b3fbcfca5
--- /dev/null
+++ b/src/Avalonia.Styling/Styling/Activators/OrActivatorBuilder.cs
@@ -0,0 +1,45 @@
+#nullable enable
+
+namespace Avalonia.Styling.Activators
+{
+    /// <summary>
+    /// Builds an <see cref="OrActivator"/>.
+    /// </summary>
+    /// <remarks>
+    /// When ORing style activators, if there is more than one input then creates an instance of
+    /// <see cref="OrActivator"/>. If there is only one input, returns the input directly.
+    /// </remarks>
+    internal struct OrActivatorBuilder
+    {
+        private IStyleActivator? _single;
+        private OrActivator? _multiple;
+
+        public int Count => _multiple?.Count ?? (_single is object ? 1 : 0);
+
+        public void Add(IStyleActivator? activator)
+        {
+            if (activator == null)
+            {
+                return;
+            }
+
+            if (_single is null && _multiple is null)
+            {
+                _single = activator;
+            }
+            else
+            {
+                if (_multiple is null)
+                {
+                    _multiple = new OrActivator();
+                    _multiple.Add(_single!);
+                    _single = null;
+                }
+
+                _multiple.Add(activator);
+            }
+        }
+
+        public IStyleActivator Get() => _single ?? _multiple!;
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/Activators/PropertyEqualsActivator.cs b/src/Avalonia.Styling/Styling/Activators/PropertyEqualsActivator.cs
new file mode 100644
index 0000000000..9e30e4fa14
--- /dev/null
+++ b/src/Avalonia.Styling/Styling/Activators/PropertyEqualsActivator.cs
@@ -0,0 +1,38 @@
+using System;
+
+#nullable enable
+
+namespace Avalonia.Styling.Activators
+{
+    /// <summary>
+    /// An <see cref="IStyleActivator"/> which listens to a property value on a control.
+    /// </summary>
+    internal class PropertyEqualsActivator : StyleActivatorBase, IObserver<object>
+    {
+        private readonly IStyleable _control;
+        private readonly AvaloniaProperty _property;
+        private readonly object? _value;
+        private IDisposable? _subscription;
+
+        public PropertyEqualsActivator(
+            IStyleable control,
+            AvaloniaProperty property,
+            object? value)
+        {
+            _control = control ?? throw new ArgumentNullException(nameof(control));
+            _property = property ?? throw new ArgumentNullException(nameof(property));
+            _value = value;
+        }
+
+        protected override void Initialize()
+        {
+            _subscription = _control.GetObservable(_property).Subscribe(this);
+        }
+
+        protected override void Deinitialize() => _subscription?.Dispose();
+
+        void IObserver<object>.OnCompleted() { }
+        void IObserver<object>.OnError(Exception error) { }
+        void IObserver<object>.OnNext(object value) => PublishNext(Equals(value, _value));
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/Activators/StyleActivatorBase.cs b/src/Avalonia.Styling/Styling/Activators/StyleActivatorBase.cs
new file mode 100644
index 0000000000..578098b2b0
--- /dev/null
+++ b/src/Avalonia.Styling/Styling/Activators/StyleActivatorBase.cs
@@ -0,0 +1,58 @@
+#nullable enable
+
+namespace Avalonia.Styling.Activators
+{
+    /// <summary>
+    /// Base class implementation of <see cref="IStyleActivator"/>.
+    /// </summary>
+    internal abstract class StyleActivatorBase : IStyleActivator
+    {
+        private IStyleActivatorSink? _sink;
+        private int _tag;
+        private bool? _value;
+
+        public void Subscribe(IStyleActivatorSink sink, int tag = 0)
+        {
+            if (_sink is null)
+            {
+                _sink = sink;
+                _tag = tag;
+                _value = null;
+                Initialize();
+            }
+            else
+            {
+                throw new AvaloniaInternalException("Cannot subscribe to a StyleActivator more than once.");
+            }
+        }
+
+        public void Unsubscribe(IStyleActivatorSink sink)
+        {
+            if (_sink != sink)
+            {
+                throw new AvaloniaInternalException("StyleActivatorSink is not subscribed.");
+            }
+
+            _sink = null;
+            Deinitialize();
+        }
+
+        public void PublishNext(bool value)
+        {
+            if (_value != value)
+            {
+                _value = value;
+                _sink?.OnNext(value, _tag);
+            }
+        }
+
+        public void Dispose()
+        {
+            _sink = null;
+            Deinitialize();
+        }
+
+        protected abstract void Initialize();
+        protected abstract void Deinitialize();
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/Activators/StyleClassActivator.cs b/src/Avalonia.Styling/Styling/Activators/StyleClassActivator.cs
new file mode 100644
index 0000000000..7906a29cb5
--- /dev/null
+++ b/src/Avalonia.Styling/Styling/Activators/StyleClassActivator.cs
@@ -0,0 +1,79 @@
+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
index 8b1d2a8553..85e7aaabde 100644
--- a/src/Avalonia.Styling/Styling/ChildSelector.cs
+++ b/src/Avalonia.Styling/Styling/ChildSelector.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.LogicalTree;
 
diff --git a/src/Avalonia.Styling/Styling/DescendentSelector.cs b/src/Avalonia.Styling/Styling/DescendentSelector.cs
index a81908f23d..dde88b3436 100644
--- a/src/Avalonia.Styling/Styling/DescendentSelector.cs
+++ b/src/Avalonia.Styling/Styling/DescendentSelector.cs
@@ -1,25 +1,19 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Collections.Generic;
 using Avalonia.LogicalTree;
+using Avalonia.Styling.Activators;
+
+#nullable enable
 
 namespace Avalonia.Styling
 {
     internal class DescendantSelector : Selector
     {
         private readonly Selector _parent;
-        private string _selectorString;
+        private string? _selectorString;
 
-        public DescendantSelector(Selector parent)
+        public DescendantSelector(Selector? parent)
         {
-            if (parent == null)
-            {
-                throw new InvalidOperationException("Descendant selector must be preceeded by a selector.");
-            }
-
-            _parent = parent;
+            _parent = parent ?? throw new InvalidOperationException("Descendant selector must be preceeded by a selector.");
         }
 
         /// <inheritdoc/>
@@ -29,7 +23,7 @@ namespace Avalonia.Styling
         public override bool InTemplate => _parent.InTemplate;
 
         /// <inheritdoc/>
-        public override Type TargetType => null;
+        public override Type? TargetType => null;
 
         public override string ToString()
         {
@@ -43,8 +37,8 @@ namespace Avalonia.Styling
 
         protected override SelectorMatch Evaluate(IStyleable control, bool subscribe)
         {
-            ILogical c = (ILogical)control;
-            List<IObservable<bool>> descendantMatches = new List<IObservable<bool>>();
+            var c = (ILogical)control;
+            var descendantMatches = new OrActivatorBuilder();
 
             while (c != null)
             {
@@ -67,7 +61,7 @@ namespace Avalonia.Styling
 
             if (descendantMatches.Count > 0)
             {
-                return new SelectorMatch(StyleActivator.Or(descendantMatches));
+                return new SelectorMatch(descendantMatches.Get());
             }
             else
             {
@@ -75,6 +69,6 @@ namespace Avalonia.Styling
             }
         }
 
-        protected override Selector MovePrevious() => null;
+        protected override Selector? MovePrevious() => null;
     }
 }
diff --git a/src/Avalonia.Styling/Styling/IGlobalStyles.cs b/src/Avalonia.Styling/Styling/IGlobalStyles.cs
index 8bdf6f869b..91a04932de 100644
--- a/src/Avalonia.Styling/Styling/IGlobalStyles.cs
+++ b/src/Avalonia.Styling/Styling/IGlobalStyles.cs
@@ -1,12 +1,23 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
+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 : IStyleRoot
+    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/ISetStyleParent.cs b/src/Avalonia.Styling/Styling/ISetStyleParent.cs
deleted file mode 100644
index bca3d9d714..0000000000
--- a/src/Avalonia.Styling/Styling/ISetStyleParent.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Avalonia.Controls;
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Defines an interface through which a <see cref="Style"/>'s parent can be set.
-    /// </summary>
-    /// <remarks>
-    /// You should not usually need to use this interface - it is for internal use only.
-    /// </remarks>
-    public interface ISetStyleParent : IStyle
-    {
-        /// <summary>
-        /// Sets the style parent.
-        /// </summary>
-        /// <param name="parent">The parent.</param>
-        void SetParent(IResourceNode parent);
-
-        /// <summary>
-        /// Notifies the style 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/Styling/ISetter.cs b/src/Avalonia.Styling/Styling/ISetter.cs
index da97638f07..d588817be8 100644
--- a/src/Avalonia.Styling/Styling/ISetter.cs
+++ b/src/Avalonia.Styling/Styling/ISetter.cs
@@ -1,8 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
+#nullable enable
+
 namespace Avalonia.Styling
 {
     /// <summary>
@@ -11,11 +10,15 @@ namespace Avalonia.Styling
     public interface ISetter
     {
         /// <summary>
-        /// Applies the setter to a control.
+        /// Instances a setter on a control.
         /// </summary>
-        /// <param name="style">The style that is being applied.</param>
-        /// <param name="control">The control.</param>
-        /// <param name="activator">An optional activator.</param>
-        IDisposable Apply(IStyle style, IStyleable control, IObservable<bool> activator);
+        /// <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);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Styling/Styling/ISetterInstance.cs b/src/Avalonia.Styling/Styling/ISetterInstance.cs
new file mode 100644
index 0000000000..a299a87b64
--- /dev/null
+++ b/src/Avalonia.Styling/Styling/ISetterInstance.cs
@@ -0,0 +1,40 @@
+#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
index da2a08f04d..78fbe0f2b5 100644
--- a/src/Avalonia.Styling/Styling/IStyle.cs
+++ b/src/Avalonia.Styling/Styling/IStyle.cs
@@ -1,29 +1,28 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using System.Collections.Generic;
 using Avalonia.Controls;
 
+#nullable enable
+
 namespace Avalonia.Styling
 {
     /// <summary>
     /// Defines the interface for styles.
     /// </summary>
-    public interface IStyle : IResourceNode
+    public interface IStyle
     {
         /// <summary>
-        /// Attaches the style to a control if the style's selector matches.
+        /// 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="control">The control to attach to.</param>
-        /// <param name="container">
-        /// The control that contains this style. May be null.
-        /// </param>
+        /// <param name="target">The control to attach to.</param>
+        /// <param name="host">The element that hosts the style.</param>
         /// <returns>
-        /// True if the style can match a control of type <paramref name="control"/>
-        /// (even if it does not match this control specifically); false if the style
-        /// can never match.
+        /// A <see cref="SelectorMatchResult"/> describing how the style matches the control.
         /// </returns>
-        bool Attach(IStyleable control, IStyleHost container);
-
-        void Detach();
+        SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host);
     }
 }
diff --git a/src/Avalonia.Styling/Styling/IStyleHost.cs b/src/Avalonia.Styling/Styling/IStyleHost.cs
index fa722aeb41..360b40d9a1 100644
--- a/src/Avalonia.Styling/Styling/IStyleHost.cs
+++ b/src/Avalonia.Styling/Styling/IStyleHost.cs
@@ -1,6 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using System.Collections.Generic;
+
+#nullable enable
 
 namespace Avalonia.Styling
 {
@@ -26,6 +27,18 @@ namespace Avalonia.Styling
         /// <summary>
         /// Gets the parent style host element.
         /// </summary>
-        IStyleHost StylingParent { get; }
+        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
new file mode 100644
index 0000000000..cb094badd2
--- /dev/null
+++ b/src/Avalonia.Styling/Styling/IStyleInstance.cs
@@ -0,0 +1,22 @@
+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>
+        /// Instructs the style to start acting upon the control.
+        /// </summary>
+        void Start();
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/IStyleRoot.cs b/src/Avalonia.Styling/Styling/IStyleRoot.cs
deleted file mode 100644
index 56778dcb9f..0000000000
--- a/src/Avalonia.Styling/Styling/IStyleRoot.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Denotes the root <see cref="IStyleHost"/> in a tree.
-    /// </summary>
-    public interface IStyleRoot : IStyleHost
-    {
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/IStyleable.cs b/src/Avalonia.Styling/Styling/IStyleable.cs
index 5ad97d8a61..a3df779057 100644
--- a/src/Avalonia.Styling/Styling/IStyleable.cs
+++ b/src/Avalonia.Styling/Styling/IStyleable.cs
@@ -1,9 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using System.Collections.Generic;
 using Avalonia.Collections;
 
+#nullable enable
+
 namespace Avalonia.Styling
 {
     /// <summary>
@@ -11,11 +11,6 @@ namespace Avalonia.Styling
     /// </summary>
     public interface IStyleable : IAvaloniaObject, INamed
     {
-        /// <summary>
-        /// Signaled when the control's style should be removed.
-        /// </summary>
-        IObservable<IStyleable> StyleDetach { get; }
-
         /// <summary>
         /// Gets the list of classes for the control.
         /// </summary>
@@ -29,6 +24,27 @@ namespace Avalonia.Styling
         /// <summary>
         /// Gets the template parent of this element if the control comes from a template.
         /// </summary>
-        ITemplatedControl TemplatedParent { get; }
+        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/IStyler.cs b/src/Avalonia.Styling/Styling/IStyler.cs
index 97fe1497c8..d6477d169e 100644
--- a/src/Avalonia.Styling/Styling/IStyler.cs
+++ b/src/Avalonia.Styling/Styling/IStyler.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 
 namespace Avalonia.Styling
 {
diff --git a/src/Avalonia.Styling/Styling/ITemplate.cs b/src/Avalonia.Styling/Styling/ITemplate.cs
index 1593326e37..8a130cb3b4 100644
--- a/src/Avalonia.Styling/Styling/ITemplate.cs
+++ b/src/Avalonia.Styling/Styling/ITemplate.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Styling
+namespace Avalonia.Styling
 {
     public interface ITemplate
     {
diff --git a/src/Avalonia.Styling/Styling/ITemplatedControl.cs b/src/Avalonia.Styling/Styling/ITemplatedControl.cs
index 4e1a51e18a..5485babb62 100644
--- a/src/Avalonia.Styling/Styling/ITemplatedControl.cs
+++ b/src/Avalonia.Styling/Styling/ITemplatedControl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 
 namespace Avalonia.Styling
 {
diff --git a/src/Avalonia.Styling/Styling/NotSelector.cs b/src/Avalonia.Styling/Styling/NotSelector.cs
index bcf76620be..ab4e9d5d7f 100644
--- a/src/Avalonia.Styling/Styling/NotSelector.cs
+++ b/src/Avalonia.Styling/Styling/NotSelector.cs
@@ -1,8 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Reactive.Linq;
+using Avalonia.Styling.Activators;
+
+#nullable enable
 
 namespace Avalonia.Styling
 {
@@ -11,16 +10,16 @@ namespace Avalonia.Styling
     /// </summary>
     internal class NotSelector : Selector
     {
-        private readonly Selector _previous;
+        private readonly Selector? _previous;
         private readonly Selector _argument;
-        private string _selectorString;
+        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)
+        public NotSelector(Selector? previous, Selector argument)
         {
             _previous = previous;
             _argument = argument ?? throw new InvalidOperationException("Not selector must have a selector argument.");
@@ -33,14 +32,14 @@ namespace Avalonia.Styling
         public override bool IsCombinator => false;
 
         /// <inheritdoc/>
-        public override Type TargetType => _previous?.TargetType;
+        public override Type? TargetType => _previous?.TargetType;
 
         /// <inheritdoc/>
         public override string ToString()
         {
             if (_selectorString == null)
             {
-                _selectorString = ":not(" + _argument.ToString() + ")";
+                _selectorString = $"{_previous?.ToString()}:not({_argument})";
             }
 
             return _selectorString;
@@ -61,12 +60,12 @@ namespace Avalonia.Styling
                 case SelectorMatchResult.NeverThisType:
                     return SelectorMatch.AlwaysThisType;
                 case SelectorMatchResult.Sometimes:
-                    return new SelectorMatch(innerResult.Activator.Select(x => !x));
+                    return new SelectorMatch(new NotActivator(innerResult.Activator!));
                 default:
                     throw new InvalidOperationException("Invalid SelectorMatchResult.");
             }
         }
 
-        protected override Selector MovePrevious() => _previous;
+        protected override Selector? MovePrevious() => _previous;
     }
 }
diff --git a/src/Avalonia.Styling/Styling/OrSelector.cs b/src/Avalonia.Styling/Styling/OrSelector.cs
index 58c5c778fb..8251915504 100644
--- a/src/Avalonia.Styling/Styling/OrSelector.cs
+++ b/src/Avalonia.Styling/Styling/OrSelector.cs
@@ -1,8 +1,8 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
+using Avalonia.Styling.Activators;
+
+#nullable enable
 
 namespace Avalonia.Styling
 {
@@ -12,8 +12,8 @@ namespace Avalonia.Styling
     internal class OrSelector : Selector
     {
         private readonly IReadOnlyList<Selector> _selectors;
-        private string _selectorString;
-        private Type _targetType;
+        private string? _selectorString;
+        private Type? _targetType;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="OrSelector"/> class.
@@ -21,8 +21,15 @@ namespace Avalonia.Styling
         /// <param name="selectors">The selectors to OR.</param>
         public OrSelector(IReadOnlyList<Selector> selectors)
         {
-            Contract.Requires<ArgumentNullException>(selectors != null);
-            Contract.Requires<ArgumentException>(selectors.Count > 1);
+            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;
         }
@@ -34,7 +41,7 @@ namespace Avalonia.Styling
         public override bool IsCombinator => false;
 
         /// <inheritdoc/>
-        public override Type TargetType
+        public override Type? TargetType
         {
             get
             {
@@ -60,7 +67,7 @@ namespace Avalonia.Styling
 
         protected override SelectorMatch Evaluate(IStyleable control, bool subscribe)
         {
-            var activators = new List<IObservable<bool>>();
+            var activators = new OrActivatorBuilder();
             var neverThisInstance = false;
 
             foreach (var selector in _selectors)
@@ -76,18 +83,14 @@ namespace Avalonia.Styling
                         neverThisInstance = true;
                         break;
                     case SelectorMatchResult.Sometimes:
-                        activators.Add(match.Activator);
+                        activators.Add(match.Activator!);
                         break;
                 }
             }
 
-            if (activators.Count > 1)
-            {
-                return new SelectorMatch(StyleActivator.Or(activators));
-            }
-            else if (activators.Count == 1)
+            if (activators.Count > 0)
             {
-                return new SelectorMatch(activators[0]);
+                return new SelectorMatch(activators.Get());
             }
             else if (neverThisInstance)
             {
@@ -99,11 +102,11 @@ namespace Avalonia.Styling
             }
         }
 
-        protected override Selector MovePrevious() => null;
+        protected override Selector? MovePrevious() => null;
 
-        private Type EvaluateTargetType()
+        private Type? EvaluateTargetType()
         {
-            var result = default(Type);
+            Type? result = null;
 
             foreach (var selector in _selectors)
             {
diff --git a/src/Avalonia.Styling/Styling/PropertyEqualsSelector.cs b/src/Avalonia.Styling/Styling/PropertyEqualsSelector.cs
index cfc0998fe0..cdd985ac80 100644
--- a/src/Avalonia.Styling/Styling/PropertyEqualsSelector.cs
+++ b/src/Avalonia.Styling/Styling/PropertyEqualsSelector.cs
@@ -1,9 +1,8 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Reactive.Linq;
 using System.Text;
+using Avalonia.Styling.Activators;
+
+#nullable enable
 
 namespace Avalonia.Styling
 {
@@ -13,14 +12,14 @@ namespace Avalonia.Styling
     /// </summary>
     internal class PropertyEqualsSelector : Selector
     {
-        private readonly Selector _previous;
+        private readonly Selector? _previous;
         private readonly AvaloniaProperty _property;
-        private readonly object _value;
-        private string _selectorString;
+        private readonly object? _value;
+        private string? _selectorString;
 
-        public PropertyEqualsSelector(Selector previous, AvaloniaProperty property, object value)
+        public PropertyEqualsSelector(Selector? previous, AvaloniaProperty property, object? value)
         {
-            Contract.Requires<ArgumentNullException>(property != null);
+            property = property ?? throw new ArgumentNullException(nameof(property));
 
             _previous = previous;
             _property = property;
@@ -33,13 +32,8 @@ namespace Avalonia.Styling
         /// <inheritdoc/>
         public override bool IsCombinator => false;
 
-        /// <summary>
-        /// Gets the name of the control to match.
-        /// </summary>
-        public string Name { get; private set; }
-
         /// <inheritdoc/>
-        public override Type TargetType => _previous?.TargetType;
+        public override Type? TargetType => _previous?.TargetType;
 
         /// <inheritdoc/>
         public override string ToString()
@@ -77,7 +71,7 @@ namespace Avalonia.Styling
         {
             if (subscribe)
             {
-                return new SelectorMatch(control.GetObservable(_property).Select(v => Equals(v ?? string.Empty, _value)));
+                return new SelectorMatch(new PropertyEqualsActivator(control, _property, _value));
             }
             else
             {
@@ -86,6 +80,6 @@ namespace Avalonia.Styling
             }
         }
 
-        protected override Selector MovePrevious() => _previous;
+        protected override Selector? MovePrevious() => _previous;
     }
 }
diff --git a/src/Avalonia.Styling/Styling/PropertySetterBindingInstance.cs b/src/Avalonia.Styling/Styling/PropertySetterBindingInstance.cs
new file mode 100644
index 0000000000..929f7142bb
--- /dev/null
+++ b/src/Avalonia.Styling/Styling/PropertySetterBindingInstance.cs
@@ -0,0 +1,184 @@
+using System;
+using System.Reactive.Subjects;
+using Avalonia.Data;
+using Avalonia.Reactive;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// A <see cref="Setter"/> which has been instanced on a control and has an
+    /// <see cref="IBinding"/> as its value.
+    /// </summary>
+    /// <typeparam name="T">The target property type.</typeparam>
+    internal class PropertySetterBindingInstance<T> : SingleSubscriberObservableBase<BindingValue<T>>,
+        ISubject<BindingValue<T>>,
+        ISetterInstance
+    {
+        private readonly IStyleable _target;
+        private readonly StyledPropertyBase<T>? _styledProperty;
+        private readonly DirectPropertyBase<T>? _directProperty;
+        private readonly InstancedBinding _binding;
+        private readonly Inner _inner;
+        private BindingValue<T> _value;
+        private IDisposable? _subscription;
+        private IDisposable? _subscriptionTwoWay;
+        private IDisposable? _innerSubscription;
+        private bool _isActive;
+
+        public PropertySetterBindingInstance(
+            IStyleable target,
+            StyledPropertyBase<T> property,
+            IBinding binding)
+        {
+            _target = target;
+            _styledProperty = property;
+            _binding = binding.Initiate(_target, property);
+
+            if (_binding.Mode == BindingMode.OneTime)
+            {
+                // For the moment, we don't support OneTime bindings in setters, because I'm not
+                // sure what the semantics should be in the case of activation/deactivation.
+                throw new NotSupportedException("OneTime bindings are not supported in setters.");
+            }
+
+            _inner = new Inner(this);
+        }
+
+        public PropertySetterBindingInstance(
+            IStyleable target,
+            DirectPropertyBase<T> property,
+            IBinding binding)
+        {
+            _target = target;
+            _directProperty = property;
+            _binding = binding.Initiate(_target, property);
+            _inner = new Inner(this);
+        }
+
+        public void Start(bool hasActivator)
+        {
+            _isActive = !hasActivator;
+
+            if (_styledProperty is object)
+            {
+                if (_binding.Mode != BindingMode.OneWayToSource)
+                {
+                    var priority = hasActivator ? BindingPriority.StyleTrigger : BindingPriority.Style;
+                    _subscription = _target.Bind(_styledProperty, this, priority);
+                }
+
+                if (_binding.Mode == BindingMode.TwoWay)
+                {
+                    _subscriptionTwoWay = _target.GetBindingObservable(_styledProperty).Subscribe(this);
+                }
+            }
+            else
+            {
+                if (_binding.Mode != BindingMode.OneWayToSource)
+                {
+                    _subscription = _target.Bind(_directProperty!, this);
+                }
+
+                if (_binding.Mode == BindingMode.TwoWay)
+                {
+                    _subscriptionTwoWay = _target.GetBindingObservable(_directProperty!).Subscribe(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();
+            }
+
+            if (_subscriptionTwoWay is object)
+            {
+                var sub = _subscriptionTwoWay;
+                _subscriptionTwoWay = null;
+                sub.Dispose();
+            }
+
+            _innerSubscription?.Dispose();
+            _innerSubscription = null;
+
+            base.Dispose();
+        }
+
+        void IObserver<BindingValue<T>>.OnCompleted()
+        {
+            // This is the observable coming from the target control. It should not complete.
+        }
+
+        void IObserver<BindingValue<T>>.OnError(Exception error)
+        {
+            // This is the observable coming from the target control. It should not error.
+        }
+
+        void IObserver<BindingValue<T>>.OnNext(BindingValue<T> value)
+        {
+            if (value.HasValue && _isActive)
+            {
+                _binding.Subject.OnNext(value.Value);
+            }
+        }
+
+        protected override void Subscribed()
+        {
+            _innerSubscription = _binding.Observable.Subscribe(_inner);
+        }
+
+        protected override void Unsubscribed()
+        {
+            _innerSubscription?.Dispose();
+            _innerSubscription = null;
+        }
+
+        private void PublishNext()
+        {
+            PublishNext(_isActive ? _value : default);
+        }
+
+        private void ConvertAndPublishNext(object? value)
+        {
+            _value = BindingValue<T>.FromUntyped(value);
+
+            if (_isActive)
+            {
+                PublishNext();
+            }
+        }
+
+        private class Inner : IObserver<object?>
+        {
+            private readonly PropertySetterBindingInstance<T> _owner;
+            public Inner(PropertySetterBindingInstance<T> owner) => _owner = owner;
+            public void OnCompleted() => _owner.PublishCompleted();
+            public void OnError(Exception error) => _owner.PublishError(error);
+            public void OnNext(object? value) => _owner.ConvertAndPublishNext(value);
+        }
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/PropertySetterInstance.cs b/src/Avalonia.Styling/Styling/PropertySetterInstance.cs
new file mode 100644
index 0000000000..689438dfd7
--- /dev/null
+++ b/src/Avalonia.Styling/Styling/PropertySetterInstance.cs
@@ -0,0 +1,118 @@
+using System;
+using Avalonia.Data;
+using Avalonia.Reactive;
+
+#nullable enable
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// A <see cref="Setter"/> which has been instance 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/Selector.cs b/src/Avalonia.Styling/Styling/Selector.cs
index af209ea970..0740e0f891 100644
--- a/src/Avalonia.Styling/Styling/Selector.cs
+++ b/src/Avalonia.Styling/Styling/Selector.cs
@@ -1,8 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Collections.Generic;
+using Avalonia.Styling.Activators;
+
+#nullable enable
 
 namespace Avalonia.Styling
 {
@@ -28,7 +27,7 @@ namespace Avalonia.Styling
         /// <summary>
         /// Gets the target type of the selector, if available.
         /// </summary>
-        public abstract Type TargetType { get; }
+        public abstract Type? TargetType { get; }
 
         /// <summary>
         /// Tries to match the selector with a control.
@@ -41,47 +40,28 @@ namespace Avalonia.Styling
         /// <returns>A <see cref="SelectorMatch"/>.</returns>
         public SelectorMatch Match(IStyleable control, bool subscribe = true)
         {
-            var inputs = new List<IObservable<bool>>();
-            var selector = this;
-            var alwaysThisType = true;
-            var hitCombinator = false;
-
-            while (selector != null)
+            // 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)
             {
-                hitCombinator |= selector.IsCombinator;
+                match = match.And(combinator.Match(control, subscribe));
 
-                var match = selector.Evaluate(control, subscribe);
-
-                if (!match.IsMatch)
-                {
-                    return hitCombinator ? SelectorMatch.NeverThisInstance : match;
-                }
-                else if (selector.InTemplate && control.TemplatedParent == null)
-                {
-                    return SelectorMatch.NeverThisInstance;
-                }
-                else if (match.Result == SelectorMatchResult.AlwaysThisInstance)
-                {
-                    alwaysThisType = false;
-                }
-                else if (match.Result == SelectorMatchResult.Sometimes)
+                // 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
                 {
-                    inputs.Add(match.Activator);
-                }
-
-                selector = selector.MovePrevious();
+                    SelectorMatchResult.AlwaysThisType => SelectorMatch.AlwaysThisInstance,
+                    SelectorMatchResult.NeverThisType => SelectorMatch.NeverThisInstance,
+                    _ => match
+                };
             }
 
-            if (inputs.Count > 0)
-            {
-                return new SelectorMatch(StyleActivator.And(inputs));
-            }
-            else
-            {
-                return alwaysThisType && !hitCombinator ? 
-                    SelectorMatch.AlwaysThisType :
-                    SelectorMatch.AlwaysThisInstance;
-            }
+            return match;
         }
 
         /// <summary>
@@ -98,6 +78,65 @@ namespace Avalonia.Styling
         /// <summary>
         /// Moves to the previous selector.
         /// </summary>
-        protected abstract Selector MovePrevious();
+        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/SelectorMatch.cs b/src/Avalonia.Styling/Styling/SelectorMatch.cs
index 63b89e9e97..26b525347e 100644
--- a/src/Avalonia.Styling/Styling/SelectorMatch.cs
+++ b/src/Avalonia.Styling/Styling/SelectorMatch.cs
@@ -1,7 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using Avalonia.Styling.Activators;
+
+#nullable enable
 
 namespace Avalonia.Styling
 {
@@ -21,9 +21,9 @@ namespace Avalonia.Styling
         NeverThisInstance,
 
         /// <summary>
-        /// The selector always matches this type.
+        /// The selector matches this instance based on the <see cref="SelectorMatch.Activator"/>.
         /// </summary>
-        AlwaysThisType,
+        Sometimes,
 
         /// <summary>
         /// The selector always matches this instance, but doesn't always match this type.
@@ -31,9 +31,9 @@ namespace Avalonia.Styling
         AlwaysThisInstance,
 
         /// <summary>
-        /// The selector matches this instance based on the <see cref="SelectorMatch.Activator"/>.
+        /// The selector always matches this type.
         /// </summary>
-        Sometimes,
+        AlwaysThisType,
     }
 
     /// <summary>
@@ -43,7 +43,7 @@ namespace Avalonia.Styling
     /// A selector match describes whether and how a <see cref="Selector"/> matches a control, and
     /// in addition whether the selector can ever match a control of the same type.
     /// </remarks>
-    public class SelectorMatch
+    public readonly struct SelectorMatch
     {
         /// <summary>
         /// A selector match with the result of <see cref="SelectorMatchResult.NeverThisType"/>.
@@ -70,20 +70,28 @@ namespace Avalonia.Styling
         /// <see cref="SelectorMatchResult.Sometimes"/> result.
         /// </summary>
         /// <param name="match">The match activator.</param>
-        public SelectorMatch(IObservable<bool> match)
+        public SelectorMatch(IStyleActivator match)
         {
-            Contract.Requires<ArgumentNullException>(match != null);
+            match = match ?? throw new ArgumentNullException(nameof(match));
 
             Result = SelectorMatchResult.Sometimes;
             Activator = match;
         }
 
-        private SelectorMatch(SelectorMatchResult result) => Result = result;
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SelectorMatch"/> class with the specified result.
+        /// </summary>
+        /// <param name="result">The match result.</param>
+        public SelectorMatch(SelectorMatchResult result)
+        {
+            Result = result;
+            Activator = null;
+        }
 
         /// <summary>
         /// Gets a value indicating whether the match was positive.
         /// </summary>
-        public bool IsMatch => Result >= SelectorMatchResult.AlwaysThisType;
+        public bool IsMatch => Result >= SelectorMatchResult.Sometimes;
 
         /// <summary>
         /// Gets the result of the match.
@@ -91,9 +99,34 @@ namespace Avalonia.Styling
         public SelectorMatchResult Result { get; }
 
         /// <summary>
-        /// Gets an observable which tracks the selector match, in the case of selectors that can
+        /// Gets an activator which tracks the selector match, in the case of selectors that can
         /// change over time.
         /// </summary>
-        public IObservable<bool> Activator { get; }
+        public IStyleActivator? Activator { get; }
+
+        /// <summary>
+        /// Logical ANDs this <see cref="SelectorMatch"/> with another.
+        /// </summary>
+        /// <param name="other"></param>
+        /// <returns></returns>
+        public SelectorMatch And(in SelectorMatch other)
+        {
+            var result = (SelectorMatchResult)Math.Min((int)Result, (int)other.Result);
+
+            if (result == SelectorMatchResult.Sometimes)
+            {
+                var activators = new AndActivatorBuilder();
+                activators.Add(Activator);
+                activators.Add(other.Activator);
+                return new SelectorMatch(activators.Get());
+            }
+            else
+            {
+                return new SelectorMatch(result);
+            }
+        }
+
+        /// <inheritdoc/>
+        public override string ToString() => Result.ToString();
     }
 }
diff --git a/src/Avalonia.Styling/Styling/Selectors.cs b/src/Avalonia.Styling/Styling/Selectors.cs
index 323f53b85b..762ed7b58c 100644
--- a/src/Avalonia.Styling/Styling/Selectors.cs
+++ b/src/Avalonia.Styling/Styling/Selectors.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/Avalonia.Styling/Styling/Setter.cs b/src/Avalonia.Styling/Styling/Setter.cs
index 9312d38c51..c6bdeef317 100644
--- a/src/Avalonia.Styling/Styling/Setter.cs
+++ b/src/Avalonia.Styling/Styling/Setter.cs
@@ -1,14 +1,11 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Reactive.Disposables;
-using System.Reflection;
 using Avalonia.Animation;
-using Avalonia.Controls;
 using Avalonia.Data;
+using Avalonia.Data.Core;
 using Avalonia.Metadata;
-using Avalonia.Reactive;
+using Avalonia.Utilities;
+
+#nullable enable
 
 namespace Avalonia.Styling
 {
@@ -19,9 +16,9 @@ namespace Avalonia.Styling
     /// 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
+    public class Setter : ISetter, IAnimationSetter, IAvaloniaPropertyVisitor<Setter.SetterVisitorData>
     {
-        private object _value;
+        private object? _value;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Setter"/> class.
@@ -44,11 +41,7 @@ namespace Avalonia.Styling
         /// <summary>
         /// Gets or sets the property to set.
         /// </summary>
-        public AvaloniaProperty Property
-        {
-            get;
-            set;
-        }
+        public AvaloniaProperty? Property { get; set; }
 
         /// <summary>
         /// Gets or sets the property value.
@@ -56,13 +49,9 @@ namespace Avalonia.Styling
         [Content]
         [AssignBinding]
         [DependsOn(nameof(Property))]
-        public object Value
+        public object? Value
         {
-            get
-            {
-                return _value;
-            }
-
+            get => _value;
             set
             {
                 (value as ISetterValue)?.Initialize(this);
@@ -70,98 +59,78 @@ namespace Avalonia.Styling
             }
         }
 
-        /// <summary>
-        /// Applies the setter to a control.
-        /// </summary>
-        /// <param name="style">The style that is being applied.</param>
-        /// <param name="control">The control.</param>
-        /// <param name="activator">An optional activator.</param>
-        public IDisposable Apply(IStyle style, IStyleable control, IObservable<bool> activator)
+        public ISetterInstance Instance(IStyleable target)
         {
-            Contract.Requires<ArgumentNullException>(control != null);
+            target = target ?? throw new ArgumentNullException(nameof(target));
 
-            var description = style?.ToString();
-
-            if (Property == null)
+            if (Property is null)
             {
                 throw new InvalidOperationException("Setter.Property must be set.");
             }
 
             var value = Value;
-            var binding = value as IBinding;
 
-            if (binding == null)
+            if (value is ITemplate template &&
+                !typeof(ITemplate).IsAssignableFrom(Property.PropertyType))
             {
-                var template = value as ITemplate;
-                bool isPropertyOfTypeITemplate = typeof(ITemplate).GetTypeInfo()
-                    .IsAssignableFrom(Property.PropertyType.GetTypeInfo());
+                value = template.Build();
+            }
 
-                if (template != null && !isPropertyOfTypeITemplate)
-                {
-                    var materialized = template.Build();
-                    value = materialized;
-                }
+            var data = new SetterVisitorData
+            {
+                target = target,
+                value = value,
+            };
 
-                if (activator == null)
-                {
-                    return control.Bind(Property, ObservableEx.SingleValue(value), BindingPriority.Style);
-                }
-                else
-                {
-                    var activated = new ActivatedValue(activator, value, description);
-                    return control.Bind(Property, activated, BindingPriority.StyleTrigger);
-                }
+            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
             {
-                var source = binding.Initiate(control, Property);
-
-                if (source != null)
-                {
-                    var cloned = Clone(source, source.Mode == BindingMode.Default ? Property.GetMetadata(control.GetType()).DefaultBindingMode : source.Mode, style, activator);
-                    return BindingOperations.Apply(control, Property, cloned, null);
-                }
+                data.result = new PropertySetterInstance<T>(
+                    data.target,
+                    property,
+                    (T)data.value);
             }
-
-            return Disposable.Empty;
         }
 
-        private InstancedBinding Clone(InstancedBinding sourceInstance, BindingMode mode, IStyle style, IObservable<bool> activator)
+        void IAvaloniaPropertyVisitor<SetterVisitorData>.Visit<T>(
+            DirectPropertyBase<T> property,
+            ref SetterVisitorData data)
         {
-            if (activator != null)
+            if (data.value is IBinding binding)
             {
-                var description = style?.ToString();
-
-                switch (mode)
-                {
-                    case BindingMode.OneTime:
-                        if (sourceInstance.Observable != null)
-                        {
-                            var activated = new ActivatedObservable(activator, sourceInstance.Observable, description);
-                            return InstancedBinding.OneTime(activated, BindingPriority.StyleTrigger);
-                        }
-                        else
-                        {
-                            var activated = new ActivatedValue(activator, sourceInstance.Value, description);
-                            return InstancedBinding.OneTime(activated, BindingPriority.StyleTrigger);
-                        }
-                    case BindingMode.OneWay:
-                        {
-                            var activated = new ActivatedObservable(activator, sourceInstance.Observable, description);
-                            return InstancedBinding.OneWay(activated, BindingPriority.StyleTrigger);
-                        }
-                    default:
-                        {
-                            var activated = new ActivatedSubject(activator, sourceInstance.Subject, description);
-                            return new InstancedBinding(activated, sourceInstance.Mode, BindingPriority.StyleTrigger);
-                        }
-                }
-
+                data.result = new PropertySetterBindingInstance<T>(
+                    data.target,
+                    property,
+                    binding);
             }
             else
             {
-                return sourceInstance.WithPriority(BindingPriority.Style);
+                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
index 3ce82b4160..00819ef7be 100644
--- a/src/Avalonia.Styling/Styling/Style.cs
+++ b/src/Avalonia.Styling/Styling/Style.cs
@@ -1,30 +1,22 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
 using Avalonia.Animation;
 using Avalonia.Controls;
 using Avalonia.Metadata;
 
+#nullable enable
+
 namespace Avalonia.Styling
 {
     /// <summary>
     /// Defines a style.
     /// </summary>
-    public class Style : AvaloniaObject, IStyle, ISetStyleParent
+    public class Style : AvaloniaObject, IStyle, IResourceProvider
     {
-        private static Dictionary<IStyleable, CompositeDisposable> _applied =
-            new Dictionary<IStyleable, CompositeDisposable>();
-        private IResourceNode _parent;
-
-        private CompositeDisposable _subscriptions;
-
-        private IResourceDictionary _resources;
-
-        private IList<IAnimation> _animations;
+        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.
@@ -37,13 +29,23 @@ namespace Avalonia.Styling
         /// Initializes a new instance of the <see cref="Style"/> class.
         /// </summary>
         /// <param name="selector">The style selector.</param>
-        public Style(Func<Selector, Selector> selector)
+        public Style(Func<Selector?, Selector> selector)
         {
             Selector = selector(null);
         }
 
-        /// <inheritdoc/>
-        public event EventHandler<ResourcesChangedEventArgs> ResourcesChanged;
+        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.
@@ -53,22 +55,20 @@ namespace Avalonia.Styling
             get => _resources ?? (Resources = new ResourceDictionary());
             set
             {
-                Contract.Requires<ArgumentNullException>(value != null);
-
-                var hadResources = false;
+                value = value ?? throw new ArgumentNullException(nameof(value));
 
-                if (_resources != null)
-                {
-                    hadResources = _resources.Count > 0;
-                    _resources.ResourcesChanged -= ResourceDictionaryChanged;
-                }
+                var hadResources = _resources?.HasResources ?? false;
 
                 _resources = value;
-                _resources.ResourcesChanged += ResourceDictionaryChanged;
 
-                if (hadResources || _resources.Count > 0)
+                if (Owner is object)
                 {
-                    ((ISetStyleParent)this).NotifyResourcesChanged(new ResourcesChangedEventArgs());
+                    _resources.AddOwner(Owner);
+
+                    if (hadResources || _resources.HasResources)
+                    {
+                        Owner.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
+                    }
                 }
             }
         }
@@ -76,102 +76,42 @@ namespace Avalonia.Styling
         /// <summary>
         /// Gets or sets the style's selector.
         /// </summary>
-        public Selector Selector { get; set; }
+        public Selector? Selector { get; set; }
 
         /// <summary>
-        /// Gets or sets the style's setters.
+        /// Gets the style's setters.
         /// </summary>
         [Content]
-        public IList<ISetter> Setters { get; set; } = new List<ISetter>();
-
-        public IList<IAnimation> Animations
-        {
-            get
-            {
-                return _animations ?? (_animations = new List<IAnimation>());
-            }
-        }
+        public IList<ISetter> Setters => _setters ??= new List<ISetter>();
 
-        private CompositeDisposable Subscriptions
-        {
-            get
-            {
-                return _subscriptions ?? (_subscriptions = new CompositeDisposable(2));
-            }
-        }
+        /// <summary>
+        /// Gets the style's animations.
+        /// </summary>
+        public IList<IAnimation> Animations => _animations ??= new List<IAnimation>();
 
-        /// <inheritdoc/>
-        IResourceNode IResourceNode.ResourceParent => _parent;
+        bool IResourceNode.HasResources => _resources?.Count > 0;
+        IReadOnlyList<IStyle> IStyle.Children => Array.Empty<IStyle>();
 
-        /// <inheritdoc/>
-        bool IResourceProvider.HasResources => _resources?.Count > 0;
+        public event EventHandler? OwnerChanged;
 
-        /// <inheritdoc/>
-        public bool Attach(IStyleable control, IStyleHost container)
+        public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host)
         {
-            if (Selector != null)
-            {
-                var match = Selector.Match(control);
+            target = target ?? throw new ArgumentNullException(nameof(target));
 
-                if (match.IsMatch)
-                {
-                    var controlSubscriptions = GetSubscriptions(control);
-                    
-                    var subs = new CompositeDisposable(Setters.Count + Animations.Count);
+            var match = Selector is object ? Selector.Match(target) :
+                target == host ? SelectorMatch.AlwaysThisInstance : SelectorMatch.NeverThisInstance;
 
-                    if (control is Animatable animatable)
-                    {
-                        foreach (var animation in Animations)
-                        {
-                            var obsMatch = match.Activator;
-
-                            if (match.Result == SelectorMatchResult.AlwaysThisType ||
-                                match.Result == SelectorMatchResult.AlwaysThisInstance)
-                            {
-                                obsMatch = Observable.Return(true);
-                            }
-
-                            var sub = animation.Apply(animatable, null, obsMatch);
-                            subs.Add(sub);
-                        } 
-                    }
-
-                    foreach (var setter in Setters)
-                    {
-                        var sub = setter.Apply(this, control, match.Activator);
-                        subs.Add(sub);
-                    }
-
-                    controlSubscriptions.Add(subs);
-                    controlSubscriptions.Add(Disposable.Create(() => Subscriptions.Remove(subs)));
-                    Subscriptions.Add(subs);
-                }
-
-                return match.Result != SelectorMatchResult.NeverThisType;
-            }
-            else if (control == container)
+            if (match.IsMatch && (_setters is object || _animations is object))
             {
-                var controlSubscriptions = GetSubscriptions(control);
-
-                var subs = new CompositeDisposable(Setters.Count);
-
-                foreach (var setter in Setters)
-                {
-                    var sub = setter.Apply(this, control, null);
-                    subs.Add(sub);
-                }
-
-                controlSubscriptions.Add(subs);
-                controlSubscriptions.Add(Disposable.Create(() => Subscriptions.Remove(subs)));
-                Subscriptions.Add(subs);
-                return true;
+                var instance = new StyleInstance(this, target, _setters, _animations, match.Activator);
+                target.StyleApplied(instance);
+                instance.Start();
             }
 
-            return false;
+            return match.Result;
         }
 
-        /// <inheritdoc/>
-        public bool TryGetResource(object key, out object result)
+        public bool TryGetResource(object key, out object? result)
         {
             result = null;
             return _resources?.TryGetResource(key, out result) ?? false;
@@ -193,63 +133,28 @@ namespace Avalonia.Styling
             }
         }
 
-        /// <inheritdoc/>
-        void ISetStyleParent.NotifyResourcesChanged(ResourcesChangedEventArgs e)
+        void IResourceProvider.AddOwner(IResourceHost owner)
         {
-            ResourcesChanged?.Invoke(this, e);
-        }
+            owner = owner ?? throw new ArgumentNullException(nameof(owner));
 
-        /// <inheritdoc/>
-        void ISetStyleParent.SetParent(IResourceNode parent)
-        {
-            if (_parent != null && parent != null)
+            if (Owner != null)
             {
                 throw new InvalidOperationException("The Style already has a parent.");
             }
 
-            if (parent == null)
-            {
-                Detach();
-            }
-
-            _parent = parent;
+            Owner = owner;
+            _resources?.AddOwner(owner);
         }
 
-        public void Detach()
+        void IResourceProvider.RemoveOwner(IResourceHost owner)
         {
-            _subscriptions?.Dispose();
-            _subscriptions = null;
-        }
+            owner = owner ?? throw new ArgumentNullException(nameof(owner));
 
-        private static CompositeDisposable GetSubscriptions(IStyleable control)
-        {
-            if (!_applied.TryGetValue(control, out var subscriptions))
+            if (Owner == owner)
             {
-                subscriptions = new CompositeDisposable(3);
-                subscriptions.Add(control.StyleDetach.Subscribe(ControlDetach));
-                _applied.Add(control, subscriptions);
+                Owner = null;
+                _resources?.RemoveOwner(owner);
             }
-
-            return subscriptions;
-        }
-
-        /// <summary>
-        /// Called when a control's <see cref="IStyleable.StyleDetach"/> is signaled to remove
-        /// all applied styles.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        private static void ControlDetach(IStyleable control)
-        {
-            var subscriptions = _applied[control];
-
-            subscriptions.Dispose();
-
-            _applied.Remove(control);
-        }
-
-        private void ResourceDictionaryChanged(object sender, ResourcesChangedEventArgs e)
-        {
-            ResourcesChanged?.Invoke(this, e);
         }
     }
 }
diff --git a/src/Avalonia.Styling/Styling/StyleActivator.cs b/src/Avalonia.Styling/Styling/StyleActivator.cs
deleted file mode 100644
index 63945037d8..0000000000
--- a/src/Avalonia.Styling/Styling/StyleActivator.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Linq;
-
-namespace Avalonia.Styling
-{
-    public enum ActivatorMode
-    {
-        And,
-        Or,
-    }
-
-    public static class StyleActivator
-    {
-        public static IObservable<bool> And(IList<IObservable<bool>> inputs)
-        {
-            if (inputs.Count == 0)
-            {
-                throw new ArgumentException("StyleActivator.And inputs may not be empty.");
-            }
-            else if (inputs.Count == 1)
-            {
-                return inputs[0];
-            }
-            else
-            {
-                return inputs.CombineLatest()
-                    .Select(values => values.All(x => x))
-                    .DistinctUntilChanged();
-            }
-        }
-
-        public static IObservable<bool> Or(IList<IObservable<bool>> inputs)
-        {
-            if (inputs.Count == 0)
-            {
-                throw new ArgumentException("StyleActivator.Or inputs may not be empty.");
-            }
-            else if (inputs.Count == 1)
-            {
-                return inputs[0];
-            }
-            else
-            {
-                return inputs.CombineLatest()
-                    .Select(values => values.Any(x => x))
-                    .DistinctUntilChanged();
-            }
-        }
-    }
-}
diff --git a/src/Avalonia.Styling/Styling/StyleInstance.cs b/src/Avalonia.Styling/Styling/StyleInstance.cs
new file mode 100644
index 0000000000..8ca31d654f
--- /dev/null
+++ b/src/Avalonia.Styling/Styling/StyleInstance.cs
@@ -0,0 +1,135 @@
+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;
+        private bool _active;
+
+        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;
+
+            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 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 (_active != value)
+            {
+                _active = value;
+
+                _animationTrigger?.OnNext(value);
+
+                if (_setters is object)
+                {
+                    if (_active)
+                    {
+                        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
index 7ac5c89005..74cf77ea40 100644
--- a/src/Avalonia.Styling/Styling/Styler.cs
+++ b/src/Avalonia.Styling/Styling/Styler.cs
@@ -1,37 +1,33 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
+#nullable enable
+
 namespace Avalonia.Styling
 {
     public class Styler : IStyler
     {
-        public void ApplyStyles(IStyleable control)
+        public void ApplyStyles(IStyleable target)
         {
-            var styleHost = control as IStyleHost;
+            target = target ?? throw new ArgumentNullException(nameof(target));
 
-            if (styleHost != null)
+            if (target is IStyleHost styleHost)
             {
-                ApplyStyles(control, styleHost);
+                ApplyStyles(target, styleHost);
             }
         }
 
-        private void ApplyStyles(IStyleable control, IStyleHost styleHost)
+        private void ApplyStyles(IStyleable target, IStyleHost host)
         {
-            Contract.Requires<ArgumentNullException>(control != null);
-            Contract.Requires<ArgumentNullException>(styleHost != null);
-
-            var parentContainer = styleHost.StylingParent;
+            var parent = host.StylingParent;
 
-            if (parentContainer != null)
+            if (parent != null)
             {
-                ApplyStyles(control, parentContainer);
+                ApplyStyles(target, parent);
             }
 
-            if (styleHost.IsStylesInitialized)
+            if (host.IsStylesInitialized)
             {
-                styleHost.Styles.Attach(control, styleHost);
+                host.Styles.TryAttach(target, host);
             }
         }
     }
diff --git a/src/Avalonia.Styling/Styling/Styles.cs b/src/Avalonia.Styling/Styling/Styles.cs
index a4563110a9..c752bdfeb8 100644
--- a/src/Avalonia.Styling/Styling/Styles.cs
+++ b/src/Avalonia.Styling/Styling/Styles.cs
@@ -1,79 +1,56 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
 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, ISetStyleParent
+    public class Styles : AvaloniaObject,
+        IAvaloniaList<IStyle>,
+        IStyle,
+        IResourceProvider
     {
-        private IResourceNode _parent;
-        private IResourceDictionary _resources;
-        private AvaloniaList<IStyle> _styles = new AvaloniaList<IStyle>();
-        private Dictionary<Type, List<IStyle>> _cache;
+        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.ForEachItem(
-                x =>
-                {
-                    if (x.ResourceParent == null && x is ISetStyleParent setParent)
-                    {
-                        setParent.SetParent(this);
-                        setParent.NotifyResourcesChanged(new ResourcesChangedEventArgs());
-                    }
-
-                    if (x.HasResources)
-                    {
-                        ResourcesChanged?.Invoke(this, new ResourcesChangedEventArgs());
-                    }
-
-                    x.ResourcesChanged += SubResourceChanged;
-                    _cache = null;
-                },
-                x =>
-                {
-                    if (x.ResourceParent == this && x is ISetStyleParent setParent)
-                    {
-                        setParent.SetParent(null);
-                        setParent.NotifyResourcesChanged(new ResourcesChangedEventArgs());
-                    }
-
-                    if (x.HasResources)
-                    {
-                        ResourcesChanged?.Invoke(this, new ResourcesChangedEventArgs());
-                    }
-
-                    x.ResourcesChanged -= SubResourceChanged;
-                    _cache = null;
-                },
-                () => { });
+            _styles.CollectionChanged += OnCollectionChanged;
         }
 
-        public event NotifyCollectionChangedEventHandler CollectionChanged
+        public Styles(IResourceHost owner)
+            : this()
         {
-            add => _styles.CollectionChanged += value;
-            remove => _styles.CollectionChanged -= value;
+            Owner = owner;
         }
 
-        /// <inheritdoc/>
-        public event EventHandler<ResourcesChangedEventArgs> ResourcesChanged;
+        public event NotifyCollectionChangedEventHandler? CollectionChanged;
+        public event EventHandler? OwnerChanged;
 
-        /// <inheritdoc/>
         public int Count => _styles.Count;
 
-        /// <inheritdoc/>
-        public bool HasResources => _resources?.Count > 0 || this.Any(x => x.HasResources);
+        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.
@@ -83,102 +60,98 @@ namespace Avalonia.Styling
             get => _resources ?? (Resources = new ResourceDictionary());
             set
             {
-                Contract.Requires<ArgumentNullException>(value != null);
+                value = value ?? throw new ArgumentNullException(nameof(Resources));
 
-                var hadResources = false;
-
-                if (_resources != null)
+                if (Owner is object)
                 {
-                    hadResources = _resources.Count > 0;
-                    _resources.ResourcesChanged -= ResourceDictionaryChanged;
+                    _resources?.RemoveOwner(Owner);
                 }
 
                 _resources = value;
-                _resources.ResourcesChanged += ResourceDictionaryChanged;
 
-                if (hadResources || _resources.Count > 0)
+                if (Owner is object)
                 {
-                    ((ISetStyleParent)this).NotifyResourcesChanged(new ResourcesChangedEventArgs());
+                    _resources.AddOwner(Owner);
                 }
             }
         }
 
-        /// <inheritdoc/>
-        IResourceNode IResourceNode.ResourceParent => _parent;
-
-        /// <inheritdoc/>
         bool ICollection<IStyle>.IsReadOnly => false;
 
-        /// <inheritdoc/>
+        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];
 
-        /// <inheritdoc/>
+        IReadOnlyList<IStyle> IStyle.Children => this;
+
         public IStyle this[int index]
         {
             get => _styles[index];
             set => _styles[index] = value;
         }
 
-        /// <summary>
-        /// Attaches the style to a control if the style's selector matches.
-        /// </summary>
-        /// <param name="control">The control to attach to.</param>
-        /// <param name="container">
-        /// The control that contains this style. May be null.
-        /// </param>
-        public bool Attach(IStyleable control, IStyleHost container)
+        public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host)
         {
-            if (_cache == null)
-            {
-                _cache = new Dictionary<Type, List<IStyle>>();
-            }
+            _cache ??= new Dictionary<Type, List<IStyle>?>();
 
-            if (_cache.TryGetValue(control.StyleKey, out var cached))
+            if (_cache.TryGetValue(target.StyleKey, out var cached))
             {
-                if (cached != null)
+                if (cached is object)
                 {
                     foreach (var style in cached)
                     {
-                        style.Attach(control, container);
+                        style.TryAttach(target, host);
                     }
 
-                    return true;
+                    return SelectorMatchResult.AlwaysThisType;
+                }
+                else
+                {
+                    return SelectorMatchResult.NeverThisType;
                 }
-
-                return false;
             }
             else
             {
-                List<IStyle> result = null;
+                List<IStyle>? matches = null;
 
-                foreach (var style in this)
+                foreach (var child in this)
                 {
-                    if (style.Attach(control, container))
+                    if (child.TryAttach(target, host) != SelectorMatchResult.NeverThisType)
                     {
-                        if (result == null)
-                        {
-                            result = new List<IStyle>();
-                        }
-
-                        result.Add(style);
+                        matches ??= new List<IStyle>();
+                        matches.Add(child);
                     }
                 }
 
-                _cache.Add(control.StyleKey, result);
-                return result != null;
-            }
-        }
-
-        public void Detach()
-        {
-            foreach (IStyle style in this)
-            {
-                style.Detach();
+                _cache.Add(target.StyleKey, matches);
+                
+                return matches is null ?
+                    SelectorMatchResult.NeverThisType :
+                    SelectorMatchResult.AlwaysThisType;
             }
         }
 
         /// <inheritdoc/>
-        public bool TryGetResource(object key, out object value)
+        public bool TryGetResource(object key, out object? value)
         {
             if (_resources != null && _resources.TryGetResource(key, out value))
             {
@@ -187,7 +160,7 @@ namespace Avalonia.Styling
 
             for (var i = Count - 1; i >= 0; --i)
             {
-                if (this[i].TryGetResource(key, out value))
+                if (this[i] is IResourceProvider p && p.TryGetResource(key, out value))
                 {
                     return true;
                 }
@@ -239,54 +212,123 @@ namespace Avalonia.Styling
         /// <inheritdoc/>
         public bool Remove(IStyle item) => _styles.Remove(item);
 
+        public AvaloniaList<IStyle>.Enumerator GetEnumerator() => _styles.GetEnumerator();
+
         /// <inheritdoc/>
-        public IEnumerator<IStyle> GetEnumerator() => _styles.GetEnumerator();
+        IEnumerator<IStyle> IEnumerable<IStyle>.GetEnumerator() => _styles.GetEnumerator();
 
         /// <inheritdoc/>
         IEnumerator IEnumerable.GetEnumerator() => _styles.GetEnumerator();
 
         /// <inheritdoc/>
-        void ISetStyleParent.SetParent(IResourceNode parent)
+        void IResourceProvider.AddOwner(IResourceHost owner)
         {
-            if (_parent != null && parent != null)
+            owner = owner ?? throw new ArgumentNullException(nameof(owner));
+
+            if (Owner != null)
             {
-                throw new InvalidOperationException("The Style already has a parent.");
+                throw new InvalidOperationException("The Styles already has a owner.");
             }
 
-            _parent = parent;
+            Owner = owner;
+            _resources?.AddOwner(owner);
+
+            foreach (var child in this)
+            {
+                if (child is IResourceProvider r)
+                {
+                    r.AddOwner(owner);
+                }
+            }
         }
 
         /// <inheritdoc/>
-        void ISetStyleParent.NotifyResourcesChanged(ResourcesChangedEventArgs e)
+        void IResourceProvider.RemoveOwner(IResourceHost owner)
         {
-            ResourcesChanged?.Invoke(this, e);
+            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 ResourceDictionaryChanged(object sender, ResourcesChangedEventArgs e)
+        private void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            foreach (var child in this)
+            static IReadOnlyList<T> ToReadOnlyList<T>(IList list)
             {
-                (child as ISetStyleParent)?.NotifyResourcesChanged(e);
+                if (list is IReadOnlyList<T>)
+                {
+                    return (IReadOnlyList<T>)list;
+                }
+                else
+                {
+                    var result = new T[list.Count];
+                    list.CopyTo(result, 0);
+                    return result;
+                }
             }
 
-            ResourcesChanged?.Invoke(this, e);
-        }
+            void Add(IList items)
+            {
+                for (var i = 0; i < items.Count; ++i)
+                {
+                    var style = (IStyle)items[i];
 
-        private void SubResourceChanged(object sender, ResourcesChangedEventArgs e)
-        {
-            var foundSource = false;
+                    if (Owner is object && style is IResourceProvider resourceProvider)
+                    {
+                        resourceProvider.AddOwner(Owner);
+                    }
 
-            foreach (var child in this)
+                    _cache = null;
+                }
+
+                (Owner as IStyleHost)?.StylesAdded(ToReadOnlyList<IStyle>(items));
+            }
+
+            void Remove(IList items)
             {
-                if (foundSource)
+                for (var i = 0; i < items.Count; ++i)
                 {
-                    (child as ISetStyleParent)?.NotifyResourcesChanged(e);
+                    var style = (IStyle)items[i];
+
+                    if (Owner is object && style is IResourceProvider resourceProvider)
+                    {
+                        resourceProvider.RemoveOwner(Owner);
+                    }
+
+                    _cache = null;
                 }
 
-                foundSource |= child == sender;
+                (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.");
             }
 
-            ResourcesChanged?.Invoke(this, e);
+            CollectionChanged?.Invoke(this, e);
         }
     }
 }
diff --git a/src/Avalonia.Styling/Styling/TemplateSelector.cs b/src/Avalonia.Styling/Styling/TemplateSelector.cs
index 7530339883..5ea8defeda 100644
--- a/src/Avalonia.Styling/Styling/TemplateSelector.cs
+++ b/src/Avalonia.Styling/Styling/TemplateSelector.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Styling
@@ -41,12 +38,11 @@ namespace Avalonia.Styling
 
         protected override SelectorMatch Evaluate(IStyleable control, bool subscribe)
         {
-            IStyleable templatedParent = control.TemplatedParent as IStyleable;
+            var templatedParent = control.TemplatedParent as IStyleable;
 
             if (templatedParent == null)
             {
-                throw new InvalidOperationException(
-                    "Cannot call Template selector on control with null TemplatedParent.");
+                return SelectorMatch.NeverThisInstance;
             }
 
             return _parent.Match(templatedParent, subscribe);
diff --git a/src/Avalonia.Styling/Styling/TypeNameAndClassSelector.cs b/src/Avalonia.Styling/Styling/TypeNameAndClassSelector.cs
index f1fd2f6c7f..ef48c4a8cd 100644
--- a/src/Avalonia.Styling/Styling/TypeNameAndClassSelector.cs
+++ b/src/Avalonia.Styling/Styling/TypeNameAndClassSelector.cs
@@ -1,13 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Reflection;
 using System.Text;
-using Avalonia.Collections;
-using Avalonia.Reactive;
+using Avalonia.Styling.Activators;
+
+#nullable enable
 
 namespace Avalonia.Styling
 {
@@ -17,13 +13,12 @@ namespace Avalonia.Styling
     /// </summary>
     internal class TypeNameAndClassSelector : Selector
     {
-        private readonly Selector _previous;
+        private readonly Selector? _previous;
         private readonly Lazy<List<string>> _classes = new Lazy<List<string>>(() => new List<string>());
-        private Type _targetType;
-        
-        private string _selectorString;
+        private Type? _targetType;
+        private string? _selectorString;
 
-        public static TypeNameAndClassSelector OfType(Selector previous, Type targetType)
+        public static TypeNameAndClassSelector OfType(Selector? previous, Type targetType)
         {
             var result = new TypeNameAndClassSelector(previous);
             result._targetType = targetType;
@@ -32,7 +27,7 @@ namespace Avalonia.Styling
             return result;
         }
 
-        public static TypeNameAndClassSelector Is(Selector previous, Type targetType)
+        public static TypeNameAndClassSelector Is(Selector? previous, Type targetType)
         {
             var result = new TypeNameAndClassSelector(previous);
             result._targetType = targetType;
@@ -41,7 +36,7 @@ namespace Avalonia.Styling
             return result;
         }
 
-        public static TypeNameAndClassSelector ForName(Selector previous, string name)
+        public static TypeNameAndClassSelector ForName(Selector? previous, string name)
         {
             var result = new TypeNameAndClassSelector(previous);
             result.Name = name;
@@ -49,7 +44,7 @@ namespace Avalonia.Styling
             return result;
         }
 
-        public static TypeNameAndClassSelector ForClass(Selector previous, string className)
+        public static TypeNameAndClassSelector ForClass(Selector? previous, string className)
         {
             var result = new TypeNameAndClassSelector(previous);
             result.Classes.Add(className);
@@ -57,7 +52,7 @@ namespace Avalonia.Styling
             return result;
         }
 
-        protected TypeNameAndClassSelector(Selector previous)
+        protected TypeNameAndClassSelector(Selector? previous)
         {
             _previous = previous;
         }
@@ -68,10 +63,10 @@ namespace Avalonia.Styling
         /// <summary>
         /// Gets the name of the control to match.
         /// </summary>
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         /// <inheritdoc/>
-        public override Type TargetType => _targetType ?? _previous?.TargetType;
+        public override Type? TargetType => _targetType ?? _previous?.TargetType;
 
         /// <inheritdoc/>
         public override bool IsCombinator => false;
@@ -114,7 +109,7 @@ namespace Avalonia.Styling
                 }
                 else
                 {
-                    if (!TargetType.GetTypeInfo().IsAssignableFrom(controlType.GetTypeInfo()))
+                    if (!TargetType.IsAssignableFrom(controlType))
                     {
                         return SelectorMatch.NeverThisType;
                     }
@@ -130,12 +125,12 @@ namespace Avalonia.Styling
             {
                 if (subscribe)
                 {
-                    var observable = new ClassObserver(control.Classes, _classes.Value);
+                    var observable = new StyleClassActivator(control.Classes, _classes.Value);
 
                     return new SelectorMatch(observable);
                 }
 
-                if (!AreClassesMatching(control.Classes, Classes))
+                if (!StyleClassActivator.AreClassesMatching(control.Classes, Classes))
                 {
                     return SelectorMatch.NeverThisInstance;
                 }
@@ -144,7 +139,7 @@ namespace Avalonia.Styling
             return Name == null ? SelectorMatch.AlwaysThisType : SelectorMatch.AlwaysThisInstance;
         }
 
-        protected override Selector MovePrevious() => _previous;
+        protected override Selector? MovePrevious() => _previous;
 
         private string BuildSelectorString()
         {
@@ -190,80 +185,5 @@ namespace Avalonia.Styling
 
             return builder.ToString();
         }
-
-        private 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;
-        }
-
-        private sealed class ClassObserver : LightweightObservableBase<bool>
-        {
-            private readonly IList<string> _match;
-            private readonly IAvaloniaReadOnlyList<string> _classes;
-            private bool _hasMatch;
-
-            public ClassObserver(IAvaloniaReadOnlyList<string> classes, IList<string> match)
-            {
-                _classes = classes;
-                _match = match;
-            }
-
-            protected override void Deinitialize() => _classes.CollectionChanged -= ClassesChanged;
-
-            protected override void Initialize()
-            {
-                _hasMatch = IsMatching();
-                _classes.CollectionChanged += ClassesChanged;
-            }
-
-            protected override void Subscribed(IObserver<bool> observer, bool first)
-            {
-                observer.OnNext(_hasMatch);
-            }
-
-            private void ClassesChanged(object sender, NotifyCollectionChangedEventArgs e)
-            {
-                if (e.Action != NotifyCollectionChangedAction.Move)
-                {
-                    var hasMatch = IsMatching();
-
-                    if (hasMatch != _hasMatch)
-                    {
-                        PublishNext(hasMatch);
-                        _hasMatch = hasMatch;
-                    }
-                }
-            }
-
-            private bool IsMatching()
-            {
-                return AreClassesMatching(_classes, _match);
-            }
-        }
     }
 }
diff --git a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml b/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
index ffe3e92202..5f18bac44a 100644
--- a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
+++ b/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
@@ -58,6 +58,11 @@
         <SolidColorBrush x:Key="NotificationCardWarningBackgroundBrush" Color="#FDB328" Opacity="0.75"/>
         <SolidColorBrush x:Key="NotificationCardErrorBackgroundBrush" Color="#BD202C" Opacity="0.75"/>
 
+        <SolidColorBrush x:Key="DatePickerFlyoutPresenterHighlightFill" Color="{DynamicResource ThemeAccentColor}" Opacity="0.4" />
+        <SolidColorBrush x:Key="TimePickerFlyoutPresenterHighlightFill" Color="{DynamicResource ThemeAccentColor}" Opacity="0.4" />
+
+        <SolidColorBrush x:Key="ThemeControlTransparentBrush" Color="Transparent" />
+      
         <Thickness x:Key="ThemeBorderThickness">1,1,1,1</Thickness>
         <sys:Double x:Key="ThemeDisabledOpacity">0.5</sys:Double>
 
@@ -67,5 +72,8 @@
 
         <sys:Double x:Key="ScrollBarThickness">18</sys:Double>
         <sys:Double x:Key="ScrollBarThumbThickness">8</sys:Double>
+
+        <sys:Double x:Key="IconElementThemeHeight">20</sys:Double>
+        <sys:Double x:Key="IconElementThemeWidth">20</sys:Double>
     </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
index c0e5f47eed..30c6d39856 100644
--- a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
+++ b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
@@ -61,6 +61,11 @@
         <SolidColorBrush x:Key="NotificationCardWarningBackgroundBrush" Color="#FDB328" Opacity="0.75"/>
         <SolidColorBrush x:Key="NotificationCardErrorBackgroundBrush" Color="#BD202C" Opacity="0.75"/>
 
+        <SolidColorBrush x:Key="DatePickerFlyoutPresenterHighlightFill" Color="{DynamicResource ThemeAccentColor}" Opacity="0.4" />
+        <SolidColorBrush x:Key="TimePickerFlyoutPresenterHighlightFill" Color="{DynamicResource ThemeAccentColor}" Opacity="0.4" />
+      
+        <SolidColorBrush x:Key="ThemeControlTransparentBrush" Color="Transparent" />
+
         <Thickness x:Key="ThemeBorderThickness">1</Thickness>
         <sys:Double x:Key="ThemeDisabledOpacity">0.5</sys:Double>
 
@@ -70,5 +75,8 @@
 
         <sys:Double x:Key="ScrollBarThickness">18</sys:Double>
         <sys:Double x:Key="ScrollBarThumbThickness">8</sys:Double>
+
+        <sys:Double x:Key="IconElementThemeHeight">20</sys:Double>
+        <sys:Double x:Key="IconElementThemeWidth">20</sys:Double>
     </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Default/AutoCompleteBox.xaml b/src/Avalonia.Themes.Default/AutoCompleteBox.xaml
index 788b60892b..66d0f17ede 100644
--- a/src/Avalonia.Themes.Default/AutoCompleteBox.xaml
+++ b/src/Avalonia.Themes.Default/AutoCompleteBox.xaml
@@ -19,7 +19,7 @@
                  MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
                  MaxHeight="{TemplateBinding MaxDropDownHeight}"
                  PlacementTarget="{TemplateBinding}"
-                 StaysOpen="False">
+                 IsLightDismissEnabled="True">
             <Border BorderBrush="{DynamicResource ThemeBorderMidBrush}"
                     BorderThickness="1">
               <ListBox Name="PART_SelectingItemsControl"
diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
index c44cc358e8..153e21761e 100644
--- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
+++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
@@ -19,4 +19,5 @@
   </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />
   <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>
diff --git a/src/Avalonia.Themes.Default/CalendarDatePicker.xaml b/src/Avalonia.Themes.Default/CalendarDatePicker.xaml
new file mode 100644
index 0000000000..bc1aba1a03
--- /dev/null
+++ b/src/Avalonia.Themes.Default/CalendarDatePicker.xaml
@@ -0,0 +1,126 @@
+<!--
+// (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}" 
+                   Padding="{TemplateBinding Padding}"
+                   Watermark="{TemplateBinding Watermark}"
+                   UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
+                   DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
+                   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}"/>
+          </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/CaptionButtons.xaml b/src/Avalonia.Themes.Default/CaptionButtons.xaml
new file mode 100644
index 0000000000..95967547c6
--- /dev/null
+++ b/src/Avalonia.Themes.Default/CaptionButtons.xaml
@@ -0,0 +1,73 @@
+<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 Path">
+    <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/ComboBox.xaml b/src/Avalonia.Themes.Default/ComboBox.xaml
index 675234c16a..67151731a8 100644
--- a/src/Avalonia.Themes.Default/ComboBox.xaml
+++ b/src/Avalonia.Themes.Default/ComboBox.xaml
@@ -1,9 +1,32 @@
-<Styles xmlns="https://github.com/avaloniaui">
+<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="Padding" Value="4"/>
+    <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"
@@ -11,11 +34,19 @@
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}">
           <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}"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"/>
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
             <ToggleButton Name="toggle"
                           BorderThickness="0"
                           Background="Transparent"
@@ -29,25 +60,24 @@
                     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"/>
+                    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}"
-                   ObeyScreenEdges="True"
-                   StaysOpen="False">
+                   IsLightDismissEnabled="True">
               <Border BorderBrush="{DynamicResource ThemeBorderMidBrush}"
                       BorderThickness="1">
-                  <ScrollViewer>
-                      <ItemsPresenter Name="PART_ItemsPresenter"
-                                      Items="{TemplateBinding Items}"
-                                      ItemsPanel="{TemplateBinding ItemsPanel}"
-                                      ItemTemplate="{TemplateBinding ItemTemplate}"
-                                      VirtualizationMode="{TemplateBinding VirtualizationMode}"
-                              />
-                  </ScrollViewer>
+                <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>
@@ -56,6 +86,9 @@
     </Setter>
   </Style>
   <Style Selector="ComboBox:pointerover /template/ Border#border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}"/>
+    <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/ContextMenu.xaml b/src/Avalonia.Themes.Default/ContextMenu.xaml
index 75f8f7c23d..9b84253c8a 100644
--- a/src/Avalonia.Themes.Default/ContextMenu.xaml
+++ b/src/Avalonia.Themes.Default/ContextMenu.xaml
@@ -10,7 +10,7 @@
               BorderBrush="{TemplateBinding BorderBrush}"
               BorderThickness="{TemplateBinding BorderThickness}"
               Padding="{TemplateBinding Padding}">
-          <ScrollViewer>
+          <ScrollViewer Classes="menuscroller">
               <ItemsPresenter Name="PART_ItemsPresenter"
                               Items="{TemplateBinding Items}"
                               ItemsPanel="{TemplateBinding ItemsPanel}"
diff --git a/src/Avalonia.Themes.Default/DatePicker.xaml b/src/Avalonia.Themes.Default/DatePicker.xaml
index 7adb1c2d5f..da878c88e2 100644
--- a/src/Avalonia.Themes.Default/DatePicker.xaml
+++ b/src/Avalonia.Themes.Default/DatePicker.xaml
@@ -8,119 +8,327 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:sys="clr-namespace:System;assembly=netstandard">
-  <Style Selector="DatePicker">
+  <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 ThemeBorderMidBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="Padding" Value="4"/>
-    
+    <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 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}" 
-                   Padding="{TemplateBinding Padding}"
-                   Watermark="{TemplateBinding Watermark}"
-                   UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
-                   DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
-                   Grid.Column="0"/>
-
-          <Button Name="PART_Button"
-                  Grid.Column="1"
-                  Width="20"
-                  Classes="CalendarDropDown"
+        <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="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}"/>
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  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}"
+                                  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}"
+                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="DatePicker:focus /template/ TextBox#PART_TextBox">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}"/>
+  <Style Selector="DatePickerPresenter /template/ Panel:pointerover RepeatButton">
+    <Setter Property="IsVisible" Value="True" />
   </Style>
   
 </Styles>
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
index 67279fca99..107fc07875 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml
@@ -9,9 +9,11 @@
   <StyleInclude Source="resm:Avalonia.Themes.Default.Button.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.Carousel.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.CheckBox.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.CaptionButtons.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.ComboBox.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.ComboBoxItem.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.ContentControl.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.Label.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.GridSplitter.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.ItemsControl.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.ListBox.xaml?assembly=Avalonia.Themes.Default"/>
@@ -20,6 +22,7 @@
   <StyleInclude Source="resm:Avalonia.Themes.Default.ContextMenu.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.MenuItem.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.OverlayPopupHost.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.PathIcon.xaml?assembly=Avalonia.Themes.Default" />
   <StyleInclude Source="resm:Avalonia.Themes.Default.PopupRoot.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.ProgressBar.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.RadioButton.xaml?assembly=Avalonia.Themes.Default"/>
@@ -36,6 +39,7 @@
   <StyleInclude Source="resm:Avalonia.Themes.Default.TextBox.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.ToggleButton.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.Expander.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.TitleBar.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.TreeView.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.TreeViewItem.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.UserControl.xaml?assembly=Avalonia.Themes.Default"/>
@@ -45,11 +49,15 @@
   <StyleInclude Source="resm:Avalonia.Themes.Default.CalendarDayButton.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.CalendarItem.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.Calendar.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.DatePicker.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.CalendarDatePicker.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.ButtonSpinner.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.NumericUpDown.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.AutoCompleteBox.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.WindowNotificationManager.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.NotificationCard.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.NativeMenuBar.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.ToggleSwitch.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.SplitView.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.DatePicker.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.TimePicker.xaml?assembly=Avalonia.Themes.Default"/>
 </Styles>
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml.cs b/src/Avalonia.Themes.Default/DefaultTheme.xaml.cs
index 86647439ce..effdb88537 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml.cs
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
 
diff --git a/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml b/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml
index 1fd168c009..9ffe51fae8 100644
--- a/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml
+++ b/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml
@@ -3,14 +3,17 @@
   <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
   <Setter Property="Template">
     <ControlTemplate>
-      <Border Background="{TemplateBinding Background}">
-        <VisualLayerManager>
-          <ContentPresenter Name="PART_ContentPresenter" 
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}" 
-                            Margin="{TemplateBinding Padding}"/>
-        </VisualLayerManager>
-      </Border>
+      <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/Expander.xaml b/src/Avalonia.Themes.Default/Expander.xaml
index d63f785e77..08d8b4c995 100644
--- a/src/Avalonia.Themes.Default/Expander.xaml
+++ b/src/Avalonia.Themes.Default/Expander.xaml
@@ -86,7 +86,7 @@
   <Style Selector="Expander /template/ ToggleButton#PART_toggle">
     <Setter Property="Template">
       <ControlTemplate>
-        <Border BorderThickness="1">
+        <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}"
diff --git a/src/Avalonia.Themes.Default/GridSplitter.xaml b/src/Avalonia.Themes.Default/GridSplitter.xaml
index dc5cd002dc..6d9cb4f31f 100644
--- a/src/Avalonia.Themes.Default/GridSplitter.xaml
+++ b/src/Avalonia.Themes.Default/GridSplitter.xaml
@@ -2,8 +2,8 @@
 
   <Style Selector="GridSplitter">
     <Setter Property="Focusable" Value="True" />
-    <Setter Property="MinWidth" Value="6" />
-    <Setter Property="MinHeight" Value="6" />
+    <Setter Property="MinWidth" Value="1" />
+    <Setter Property="MinHeight" Value="1" />
     <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
     <Setter Property="PreviewContent">
       <Template>
diff --git a/src/Avalonia.Themes.Default/ItemsControl.xaml b/src/Avalonia.Themes.Default/ItemsControl.xaml
index f3def542fc..8bb0fc297c 100644
--- a/src/Avalonia.Themes.Default/ItemsControl.xaml
+++ b/src/Avalonia.Themes.Default/ItemsControl.xaml
@@ -1,10 +1,15 @@
 <Style xmlns="https://github.com/avaloniaui" Selector="ItemsControl">
   <Setter Property="Template">
     <ControlTemplate>
-      <ItemsPresenter Name="PART_ItemsPresenter"
-                      Items="{TemplateBinding Items}"
-                      ItemsPanel="{TemplateBinding ItemsPanel}"
-                      ItemTemplate="{TemplateBinding ItemTemplate}"/>
+      <Border Background="{TemplateBinding Background}"
+              BorderBrush="{TemplateBinding BorderBrush}"
+              BorderThickness="{TemplateBinding BorderThickness}"
+              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/Label.xaml b/src/Avalonia.Themes.Default/Label.xaml
new file mode 100644
index 0000000000..d93381aa69
--- /dev/null
+++ b/src/Avalonia.Themes.Default/Label.xaml
@@ -0,0 +1,17 @@
+<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}"
+                        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/ListBox.xaml b/src/Avalonia.Themes.Default/ListBox.xaml
index 59c596bcaa..e91d8a6772 100644
--- a/src/Avalonia.Themes.Default/ListBox.xaml
+++ b/src/Avalonia.Themes.Default/ListBox.xaml
@@ -1,4 +1,5 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="ListBox">
+<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}"/>
@@ -7,7 +8,7 @@
   <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
   <Setter Property="Template">
     <ControlTemplate>
-      <Border BorderBrush="{TemplateBinding BorderBrush}"
+      <Border Name="border" BorderBrush="{TemplateBinding BorderBrush}"
               BorderThickness="{TemplateBinding BorderThickness}">
         <ScrollViewer Name="PART_ScrollViewer"
                       Background="{TemplateBinding Background}"
@@ -23,4 +24,8 @@
       </Border>
     </ControlTemplate>
   </Setter>
-</Style>
+    </Style>
+    <Style Selector="ListBox:disabled /template/ Border#border">
+        <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+</Styles>
diff --git a/src/Avalonia.Themes.Default/MenuItem.xaml b/src/Avalonia.Themes.Default/MenuItem.xaml
index 93989d3782..741cf1b79c 100644
--- a/src/Avalonia.Themes.Default/MenuItem.xaml
+++ b/src/Avalonia.Themes.Default/MenuItem.xaml
@@ -1,6 +1,10 @@
 <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"/>
@@ -11,7 +15,14 @@
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}">
-          <Grid ColumnDefinitions="20,5,*,20">
+          <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"
@@ -36,26 +47,29 @@
                 </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="3"/>
+                  Grid.Column="4"/>
             <Popup Name="PART_Popup"
                    PlacementMode="Right"
-                   StaysOpen="True"
-                   IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}"
-                   ObeyScreenEdges="True">
+                   IsLightDismissEnabled="True"
+                   IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
               <Border Background="{TemplateBinding Background}"
                       BorderBrush="{DynamicResource ThemeBorderMidBrush}"
                       BorderThickness="{TemplateBinding BorderThickness}">
-                <ScrollViewer>                  
+                <ScrollViewer Classes="menuscroller">                  
                     <ItemsPresenter Name="PART_ItemsPresenter"
                                     Items="{TemplateBinding Items}"
                                     ItemsPanel="{TemplateBinding ItemsPanel}"
                                     ItemTemplate="{TemplateBinding ItemTemplate}"
-                                    Margin="4 2"/>                                      
+                                    Grid.IsSharedSizeScope="True"/>
                 </ScrollViewer>
               </Border>
             </Popup>
@@ -94,18 +108,18 @@
               </ContentPresenter.DataTemplates>
             </ContentPresenter>
             <Popup Name="PART_Popup"
-                   IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}"
-                   StaysOpen="True" 
-                   ObeyScreenEdges="True">
+                   IsLightDismissEnabled="True"
+                   OverlayInputPassThroughElement="{Binding $parent[Menu]}"
+                   IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
               <Border Background="{TemplateBinding Background}"
                       BorderBrush="{DynamicResource ThemeBorderMidBrush}"
                       BorderThickness="{TemplateBinding BorderThickness}">
-                <ScrollViewer>
+                <ScrollViewer Classes="menuscroller">
                   <ItemsPresenter Name="PART_ItemsPresenter"
-                                    Items="{TemplateBinding Items}"
-                                    ItemsPanel="{TemplateBinding ItemsPanel}"
-                                    ItemTemplate="{TemplateBinding ItemTemplate}"
-                                    Margin="2"/>
+                                  Items="{TemplateBinding Items}"
+                                  ItemsPanel="{TemplateBinding ItemsPanel}"
+                                  ItemTemplate="{TemplateBinding ItemTemplate}"
+                                  Grid.IsSharedSizeScope="True"/>
                 </ScrollViewer>
               </Border>
             </Popup>
@@ -115,6 +129,10 @@
     </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}"/>
diff --git a/src/Avalonia.Themes.Default/NativeMenuBar.xaml b/src/Avalonia.Themes.Default/NativeMenuBar.xaml
index 2832bab226..c5d7ad55d7 100644
--- a/src/Avalonia.Themes.Default/NativeMenuBar.xaml
+++ b/src/Avalonia.Themes.Default/NativeMenuBar.xaml
@@ -13,6 +13,7 @@
         <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}"/>
diff --git a/src/Avalonia.Themes.Default/OverlayPopupHost.xaml b/src/Avalonia.Themes.Default/OverlayPopupHost.xaml
index 56b3699c07..36dbc1b761 100644
--- a/src/Avalonia.Themes.Default/OverlayPopupHost.xaml
+++ b/src/Avalonia.Themes.Default/OverlayPopupHost.xaml
@@ -2,13 +2,16 @@
   <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
   <Setter Property="Template">
     <ControlTemplate>
-      <VisualLayerManager IsPopup="True">
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Background="{TemplateBinding Background}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding Content}" 
-                          Padding="{TemplateBinding Padding}"/>
-      </VisualLayerManager>
+      <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/PathIcon.xaml b/src/Avalonia.Themes.Default/PathIcon.xaml
new file mode 100644
index 0000000000..039f0ef10c
--- /dev/null
+++ b/src/Avalonia.Themes.Default/PathIcon.xaml
@@ -0,0 +1,21 @@
+<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/PopupRoot.xaml b/src/Avalonia.Themes.Default/PopupRoot.xaml
index cf063f5390..9af4f5a910 100644
--- a/src/Avalonia.Themes.Default/PopupRoot.xaml
+++ b/src/Avalonia.Themes.Default/PopupRoot.xaml
@@ -2,13 +2,16 @@
   <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
   <Setter Property="Template">
     <ControlTemplate>
-      <VisualLayerManager IsPopup="True">
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Background="{TemplateBinding Background}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding Content}" 
-                          Padding="{TemplateBinding Padding}"/>
-      </VisualLayerManager>
+      <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/ProgressBar.xaml b/src/Avalonia.Themes.Default/ProgressBar.xaml
index 72271e785a..d9c407245b 100644
--- a/src/Avalonia.Themes.Default/ProgressBar.xaml
+++ b/src/Avalonia.Themes.Default/ProgressBar.xaml
@@ -1,14 +1,28 @@
 <Styles xmlns="https://github.com/avaloniaui">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel>
+        <ProgressBar VerticalAlignment="Center" IsIndeterminate="True" />
+        <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="Foreground" Value="{DynamicResource ThemeAccentBrush}"/>
     <Setter Property="Template">
       <ControlTemplate>
-        <Border Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}">
-          <Border Name="PART_Indicator" Background="{TemplateBinding Foreground}"/>
-        </Border>
+        <Grid>
+          <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+            <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>
@@ -22,42 +36,44 @@
   </Style>
   <Style Selector="ProgressBar:horizontal">
     <Setter Property="MinWidth" Value="200"/>
-    <Setter Property="MinHeight" Value="14"/>
+    <Setter Property="MinHeight" Value="16"/>
   </Style>
   <Style Selector="ProgressBar:vertical">
-    <Setter Property="MinWidth" Value="14"/>
+    <Setter Property="MinWidth" Value="16"/>
     <Setter Property="MinHeight" Value="200"/>
   </Style>
-  <Style Selector="ProgressBar:horizontal:indeterminate /template/ Border#PART_Indicator">
-      <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>
+  <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>
-  </Style>
-  <Style Selector="ProgressBar:vertical:indeterminate /template/ Border#PART_Indicator">
-      <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>
+    </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>
+    </Style.Animations>
+    <Setter Property="Height" Value="{Binding TemplateProperties.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
   </Style>
 </Styles>
diff --git a/src/Avalonia.Themes.Default/RadioButton.xaml b/src/Avalonia.Themes.Default/RadioButton.xaml
index e7cbed8ec5..4cdb116cdd 100644
--- a/src/Avalonia.Themes.Default/RadioButton.xaml
+++ b/src/Avalonia.Themes.Default/RadioButton.xaml
@@ -13,7 +13,6 @@
                    Height="18"
                    VerticalAlignment="Center"/>
           <Ellipse Name="checkMark"
-                   Fill="{DynamicResource HighlightBrush}"
                    Width="10"
                    Height="10"
                    Stretch="Uniform"
@@ -38,10 +37,12 @@
       </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">
@@ -56,4 +57,4 @@
   <Style Selector="RadioButton:disabled /template/ Ellipse#border">
     <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
   </Style>
-</Styles>
\ No newline at end of file
+</Styles>
diff --git a/src/Avalonia.Themes.Default/ScrollBar.xaml b/src/Avalonia.Themes.Default/ScrollBar.xaml
index 64a4399d16..0f8fa4986d 100644
--- a/src/Avalonia.Themes.Default/ScrollBar.xaml
+++ b/src/Avalonia.Themes.Default/ScrollBar.xaml
@@ -3,7 +3,8 @@
     <Setter Property="Cursor" Value="Arrow" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Border Background="{DynamicResource ThemeControlMidBrush}">
+        <Border Background="{DynamicResource ThemeControlMidBrush}"
+                UseLayoutRounding="False">
           <Grid RowDefinitions="Auto,*,Auto">
             <RepeatButton Name="PART_LineUpButton" HorizontalAlignment="Center"
                           Classes="repeat"
@@ -49,7 +50,8 @@
     <Setter Property="Height" Value="{DynamicResource ScrollBarThickness}" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Border Background="{DynamicResource ThemeControlMidBrush}">
+        <Border Background="{DynamicResource ThemeControlMidBrush}"
+                UseLayoutRounding="False">
           <Grid ColumnDefinitions="Auto,*,Auto">
             <RepeatButton Name="PART_LineUpButton" VerticalAlignment="Center"
                           Classes="repeat"
diff --git a/src/Avalonia.Themes.Default/ScrollViewer.xaml b/src/Avalonia.Themes.Default/ScrollViewer.xaml
index 38f4eef964..2a1aead8ed 100644
--- a/src/Avalonia.Themes.Default/ScrollViewer.xaml
+++ b/src/Avalonia.Themes.Default/ScrollViewer.xaml
@@ -1,43 +1,105 @@
-<Style xmlns="https://github.com/avaloniaui" 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}">
-          <ScrollContentPresenter.GestureRecognizers>
-            <ScrollGestureRecognizer 
-              CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
-              CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
+<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}">
+            <ScrollContentPresenter.GestureRecognizers>
+              <ScrollGestureRecognizer
+                CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
+                CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
             />
-          </ScrollContentPresenter.GestureRecognizers>  
-        </ScrollContentPresenter>
-        <ScrollBar Name="horizontalScrollBar"
-                   Orientation="Horizontal"
-                   Maximum="{TemplateBinding HorizontalScrollBarMaximum}"
-                   Value="{TemplateBinding HorizontalScrollBarValue, Mode=TwoWay}"
-                   ViewportSize="{TemplateBinding HorizontalScrollBarViewportSize}"
-                   Visibility="{TemplateBinding HorizontalScrollBarVisibility}"
-                   Grid.Row="1"
-                   Focusable="False"/>
-        <ScrollBar Name="verticalScrollBar"
-                   Orientation="Vertical"
-                   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>
+            </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/Slider.xaml b/src/Avalonia.Themes.Default/Slider.xaml
index eb46fdffa2..ba4b1ee998 100644
--- a/src/Avalonia.Themes.Default/Slider.xaml
+++ b/src/Avalonia.Themes.Default/Slider.xaml
@@ -4,7 +4,7 @@
     <Setter Property="MinHeight" Value="20"/>
     <Setter Property="Template">
       <ControlTemplate>
-        <Grid>
+        <Grid Name="grid">
           <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto" MinHeight="20"/>
@@ -20,7 +20,7 @@
                <RepeatButton Name="PART_IncreaseButton"
                              Classes="repeattrack" />
             </Track.IncreaseButton>
-            <Thumb MinWidth="20" MinHeight="20">
+            <Thumb Name="thumb" MinWidth="20" MinHeight="20">
               <Thumb.Template>
                 <ControlTemplate>
                   <Grid>
@@ -46,7 +46,7 @@
             <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" Orientation="Vertical" IsDirectionReversed="True">
+          <Track Name="PART_Track" Grid.Column="1" Orientation="Vertical">
             <Track.DecreaseButton>
                <RepeatButton Name="PART_DecreaseButton"
                              Classes="repeattrack" />
@@ -55,7 +55,7 @@
                <RepeatButton Name="PART_IncreaseButton"
                              Classes="repeattrack" />
             </Track.IncreaseButton>
-            <Thumb MinWidth="20" MinHeight="20">
+            <Thumb Name="thumb" MinWidth="20" MinHeight="20">
               <Thumb.Template>
                 <ControlTemplate>
                   <Grid>
@@ -87,4 +87,10 @@
         </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/SplitView.xaml b/src/Avalonia.Themes.Default/SplitView.xaml
new file mode 100644
index 0000000000..18da3edb46
--- /dev/null
+++ b/src/Avalonia.Themes.Default/SplitView.xaml
@@ -0,0 +1,219 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+  <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"/>
+    <!-- Not used here (directly) since they're strings, but preserving for reference
+        <x:String x:Key="SplitViewPaneAnimationOpenDuration">00:00:00.2</x:String>
+        <x:String x:Key="SplitViewPaneAnimationOpenPreDuration">00:00:00.19999</x:String>
+        <x:String x:Key="SplitViewPaneAnimationCloseDuration">00:00:00.1</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="00:00:00.2" Easing="0.1,0.9,0.2,1.0" />
+      </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="00:00:00.2" Easing="0.1,0.9,0.2,1.0" />
+      </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="00:00:00.1" Easing="0.1,0.9,0.2,1.0" />
+      </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="00:00:00.2" Easing="0.1,0.9,0.2,1.0" />
+      </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/TabControl.xaml b/src/Avalonia.Themes.Default/TabControl.xaml
index dc3597e9d9..ed2e67df28 100644
--- a/src/Avalonia.Themes.Default/TabControl.xaml
+++ b/src/Avalonia.Themes.Default/TabControl.xaml
@@ -57,6 +57,6 @@
         <Setter Property="Orientation" Value="Vertical"/>
     </Style>
     <Style Selector="TabControl[TabStripPlacement=Right]">
-        <Setter Property="Padding" Value="0 0 0 4"/>
+        <Setter Property="Padding" Value="0 0 4 0"/>
     </Style>
 </Styles>
diff --git a/src/Avalonia.Themes.Default/TabItem.xaml b/src/Avalonia.Themes.Default/TabItem.xaml
index 92482a564c..6e344ce58e 100644
--- a/src/Avalonia.Themes.Default/TabItem.xaml
+++ b/src/Avalonia.Themes.Default/TabItem.xaml
@@ -2,7 +2,7 @@
     <Style Selector="TabItem">
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}"/>
-        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}"/>
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
         <Setter Property="Padding" Value="8"/>
         <Setter Property="Template">
diff --git a/src/Avalonia.Themes.Default/TextBox.xaml b/src/Avalonia.Themes.Default/TextBox.xaml
index ec1f6e9e7d..9085cfc2c6 100644
--- a/src/Avalonia.Themes.Default/TextBox.xaml
+++ b/src/Avalonia.Themes.Default/TextBox.xaml
@@ -1,18 +1,32 @@
 <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>
+    <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="ContextMenu" Value="{StaticResource DefaultTextBoxContextMenu}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border Name="border"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}">
-          <DockPanel Margin="{TemplateBinding Padding}">
+          <DockPanel Margin="{TemplateBinding Padding}"
+                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
 
             <TextBlock Name="floatingWatermark"
                        Foreground="{DynamicResource ThemeAccentBrush}"
@@ -31,27 +45,35 @@
             </TextBlock>
 
             <DataValidationErrors>
-              <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
-                            VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
 
-                <Panel>
-                  <TextBlock Name="watermark"
-                             Opacity="0.5"
-                             Text="{TemplateBinding Watermark}"
-                             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}"
-                                 SelectionBrush="{TemplateBinding SelectionBrush}"
-                                 SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
-                                 CaretBrush="{TemplateBinding CaretBrush}"/>
-                </Panel>
-              </ScrollViewer>
+              <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)}">
+                  <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>
@@ -67,7 +89,102 @@
   <Style Selector="TextBox:error /template/ Border#border">
     <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}"/>
   </Style>
-  <Style Selector="TextBox">
+  <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="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Button">
+          <Border x:Name="PART_ButtonLayoutBorder"
+                  BorderThickness="{TemplateBinding BorderThickness}" 
+                  Background="Transparent" 
+                  Cursor="Arrow">
+            <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" Cursor="Arrow" IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}" />
+        </Panel>
+      </Template>
+    </Setter>
+  </Style>
+  
+  <Style Selector="ToggleButton.passwordBoxRevealButton">
+    <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/TimePicker.xaml b/src/Avalonia.Themes.Default/TimePicker.xaml
new file mode 100644
index 0000000000..c76f900cfe
--- /dev/null
+++ b/src/Avalonia.Themes.Default/TimePicker.xaml
@@ -0,0 +1,283 @@
+<!--
+// (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}"
+                  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}"
+                                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}"
+                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/TitleBar.xaml b/src/Avalonia.Themes.Default/TitleBar.xaml
new file mode 100644
index 0000000000..7f8ed24076
--- /dev/null
+++ b/src/Avalonia.Themes.Default/TitleBar.xaml
@@ -0,0 +1,53 @@
+<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/ToggleSwitch.xaml b/src/Avalonia.Themes.Default/ToggleSwitch.xaml
new file mode 100644
index 0000000000..f11f77df5a
--- /dev/null
+++ b/src/Avalonia.Themes.Default/ToggleSwitch.xaml
@@ -0,0 +1,321 @@
+<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}"
+            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/TreeViewItem.xaml b/src/Avalonia.Themes.Default/TreeViewItem.xaml
index 0d826806d0..a3f8d8b7f7 100644
--- a/src/Avalonia.Themes.Default/TreeViewItem.xaml
+++ b/src/Avalonia.Themes.Default/TreeViewItem.xaml
@@ -17,8 +17,7 @@
                             BorderThickness="{TemplateBinding BorderThickness}"
                             TemplatedControl.IsTemplateFocusTarget="True">
                         <Grid Name="PART_Header"
-                              ColumnDefinitions="16, Auto"
-                              HorizontalAlignment="Left"
+                              ColumnDefinitions="16, *"
                               Margin="{TemplateBinding Level, Mode=OneWay, Converter={StaticResource LeftMarginConverter}}" >
                             <ToggleButton Name="expander"
                                           Focusable="False"
diff --git a/src/Avalonia.Themes.Default/Window.xaml b/src/Avalonia.Themes.Default/Window.xaml
index 2a8b5d0fca..9c515ebe30 100644
--- a/src/Avalonia.Themes.Default/Window.xaml
+++ b/src/Avalonia.Themes.Default/Window.xaml
@@ -1,19 +1,26 @@
 <Style xmlns="https://github.com/avaloniaui" Selector="Window">
-  <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
+  <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="FontSize" Value="{DynamicResource FontSizeNormal}"/>  
   <Setter Property="Template">
     <ControlTemplate>
-      <Border Background="{TemplateBinding Background}">
+      <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}"/>           
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
         </VisualLayerManager>
-      </Border>
+      </Panel>
     </ControlTemplate>
   </Setter>
 </Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/Base.xaml b/src/Avalonia.Themes.Fluent/Accents/Base.xaml
new file mode 100644
index 0000000000..0e34eb3f3b
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Accents/Base.xaml
@@ -0,0 +1,26 @@
+<Style xmlns="https://github.com/avaloniaui"
+       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+       xmlns:sys="clr-namespace:System;assembly=netstandard">
+  <Style.Resources>
+    <!-- https://docs.microsoft.com/en-us/previous-versions/windows/apps/dn518235(v=win.10)?redirectedfrom=MSDN -->
+    <!-- SystemColor Color Resources (Reflect OS High Contrast Settings) -->
+    <Color x:Key="SystemColorButtonFaceColor">#FFF0F0F0</Color>
+    <Color x:Key="SystemColorButtonTextColor">#FF000000</Color>
+    <Color x:Key="SystemColorGrayTextColor">#FF6D6D6D</Color>
+    <Color x:Key="SystemColorHighlightColor">#FF3399FF</Color>
+    <Color x:Key="SystemColorHighlightTextColor">#FFFFFFFF</Color>
+    <Color x:Key="SystemColorHotlightColor">#FF0066CC</Color>
+    <Color x:Key="SystemColorWindowColor">#FFFFFFFF</Color>
+    <Color x:Key="SystemColorWindowTextColor">#FF000000</Color>
+    <FontFamily x:Key="ContentControlThemeFontFamily">avares://Avalonia.Themes.Fluent/Assets#Inter</FontFamily>
+    <sys:Double x:Key="ControlContentThemeFontSize">14</sys:Double>
+
+    <SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />
+    <x:Boolean x:Key="UseSystemFocusVisuals">True</x:Boolean>
+    <Thickness x:Key="TextControlBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
+    <Thickness x:Key="TextControlThemePadding">10,6,6,5</Thickness>
+    <sys:Double x:Key="IconElementThemeHeight">20</sys:Double>
+    <sys:Double x:Key="IconElementThemeWidth">20</sys:Double>
+  </Style.Resources>
+</Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml b/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml
new file mode 100644
index 0000000000..fb08b97b47
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml
@@ -0,0 +1,346 @@
+<Style xmlns="https://github.com/avaloniaui"
+       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+       xmlns:sys="clr-namespace:System;assembly=netstandard">
+  <Style.Resources>
+    <!-- Accent Colours -->
+    <!-- TODO pull accents from system... algorithm to generate shades -->
+    <Color x:Key="SystemAccentColor">#FF0078D7</Color>
+    <Color x:Key="SystemAccentColorDark1">#FF005A9E</Color>
+    <Color x:Key="SystemAccentColorDark2">#FF004275</Color>
+    <Color x:Key="SystemAccentColorDark3">#FF002642</Color>
+    <Color x:Key="SystemAccentColorLight1">#FF429CE3</Color>
+    <Color x:Key="SystemAccentColorLight2">#FF76B9ED</Color>
+    <Color x:Key="SystemAccentColorLight3">#FFA6D8FF</Color>
+
+    <!-- System Control Colors -->
+    <Color x:Key="SystemAltHighColor">#FF000000</Color>
+    <Color x:Key="SystemAltLowColor">#33000000</Color>
+    <Color x:Key="SystemAltMediumColor">#99000000</Color>
+    <Color x:Key="SystemAltMediumHighColor">#CC000000</Color>
+    <Color x:Key="SystemAltMediumLowColor">#66000000</Color>
+    <Color x:Key="SystemBaseHighColor">#FFFFFFFF</Color>
+    <Color x:Key="SystemBaseLowColor">#33FFFFFF</Color>
+    <Color x:Key="SystemBaseMediumColor">#99FFFFFF</Color>
+    <Color x:Key="SystemBaseMediumHighColor">#CCFFFFFF</Color>
+    <Color x:Key="SystemBaseMediumLowColor">#66FFFFFF</Color>
+    <Color x:Key="SystemChromeAltLowColor">#FFF2F2F2</Color>
+    <Color x:Key="SystemChromeBlackHighColor">#FF000000</Color>
+    <Color x:Key="SystemChromeBlackLowColor">#33000000</Color>
+    <Color x:Key="SystemChromeBlackMediumLowColor">#66000000</Color>
+    <Color x:Key="SystemChromeBlackMediumColor">#CC000000</Color>
+    <Color x:Key="SystemChromeDisabledHighColor">#FF333333</Color>
+    <Color x:Key="SystemChromeDisabledLowColor">#FF858585</Color>
+    <Color x:Key="SystemChromeHighColor">#FF767676</Color>
+    <Color x:Key="SystemChromeLowColor">#FF171717</Color>
+    <Color x:Key="SystemChromeMediumColor">#FF1F1F1F</Color>
+    <Color x:Key="SystemChromeMediumLowColor">#FF2B2B2B</Color>
+    <Color x:Key="SystemChromeWhiteColor">#FFFFFFFF</Color>
+    <Color x:Key="SystemChromeGrayColor">#FF767676</Color>
+    <Color x:Key="SystemListLowColor">#19FFFFFF</Color>
+    <Color x:Key="SystemListMediumColor">#33FFFFFF</Color>
+    <Color x:Key="SystemErrorTextColor">#FFF000</Color>
+
+    <SolidColorBrush x:Key="SystemControlBackgroundAccentBrush" Color="{DynamicResource SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundAltHighBrush" Color="{StaticResource SystemAltHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundAltMediumHighBrush" Color="{StaticResource SystemAltMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundAltMediumBrush" Color="{StaticResource SystemAltMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundAltMediumLowBrush" Color="{StaticResource SystemAltMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseHighBrush" Color="{StaticResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseLowBrush" Color="{StaticResource SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumBrush" Color="{StaticResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumHighBrush" Color="{StaticResource SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumLowBrush" Color="{StaticResource SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeBlackHighBrush" Color="{StaticResource SystemChromeBlackHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeBlackMediumBrush" Color="{StaticResource SystemChromeBlackMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeBlackLowBrush" Color="{StaticResource SystemChromeBlackLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeBlackMediumLowBrush" Color="{StaticResource SystemChromeBlackMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeMediumBrush" Color="{StaticResource SystemChromeMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeMediumLowBrush" Color="{StaticResource SystemChromeMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeWhiteBrush" Color="{StaticResource SystemChromeWhiteColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundListLowBrush" Color="{StaticResource SystemListLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundListMediumBrush" Color="{StaticResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledAccentBrush" Color="{DynamicResource SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledBaseHighBrush" Color="{StaticResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledBaseLowBrush" Color="{StaticResource SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledBaseMediumLowBrush" Color="{StaticResource SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledChromeDisabledHighBrush" Color="{StaticResource SystemChromeDisabledHighColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledChromeDisabledLowBrush" Color="{StaticResource SystemChromeDisabledLowColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledChromeHighBrush" Color="{StaticResource SystemChromeHighColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledChromeMediumLowBrush" Color="{StaticResource SystemChromeMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledListMediumBrush" Color="{StaticResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlFocusVisualPrimaryBrush" Color="{DynamicResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlFocusVisualSecondaryBrush" Color="{DynamicResource SystemAltMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlRevealFocusVisualBrush" Color="{DynamicResource SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundAccentBrush" Color="{DynamicResource SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundAltHighBrush" Color="{StaticResource SystemAltHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundAltMediumHighBrush" Color="{StaticResource SystemAltMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundBaseHighBrush" Color="{StaticResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundBaseLowBrush" Color="{StaticResource SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundBaseMediumBrush" Color="{StaticResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundBaseMediumHighBrush" Color="{StaticResource SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundBaseMediumLowBrush" Color="{StaticResource SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeBlackHighBrush" Color="{StaticResource SystemChromeBlackHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeHighBrush" Color="{StaticResource SystemChromeHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeMediumBrush" Color="{StaticResource SystemChromeMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeWhiteBrush" Color="{StaticResource SystemChromeWhiteColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeDisabledLowBrush" Color="{StaticResource SystemChromeDisabledLowColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeGrayBrush" Color="{StaticResource SystemChromeGrayColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundListLowBrush" Color="{StaticResource SystemListLowColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundListMediumBrush" Color="{StaticResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeBlackMediumBrush" Color="{StaticResource SystemChromeBlackMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeBlackMediumLowBrush" Color="{StaticResource SystemChromeBlackMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAccentBrush" Color="{DynamicResource SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="{DynamicResource SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltAltHighBrush" Color="{StaticResource SystemAltHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltBaseHighBrush" Color="{StaticResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltBaseLowBrush" Color="{StaticResource SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltBaseMediumBrush" Color="{StaticResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltBaseMediumHighBrush" Color="{StaticResource SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltAltMediumHighBrush" Color="{StaticResource SystemAltMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltBaseMediumLowBrush" Color="{StaticResource SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltListAccentHighBrush" Color="{DynamicResource SystemAccentColor}" Opacity="0.9" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltListAccentLowBrush" Color="{DynamicResource SystemAccentColor}" Opacity="0.6" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltListAccentMediumBrush" Color="{DynamicResource SystemAccentColor}" Opacity="0.8" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltChromeWhiteBrush" Color="{StaticResource SystemChromeWhiteColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseHighBrush" Color="{StaticResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseLowBrush" Color="{StaticResource SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseMediumBrush" Color="{StaticResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseMediumHighBrush" Color="{StaticResource SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseMediumLowBrush" Color="{StaticResource SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightChromeAltLowBrush" Color="{StaticResource SystemChromeAltLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightChromeHighBrush" Color="{StaticResource SystemChromeHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightListAccentHighBrush" Color="{DynamicResource SystemAccentColor}" Opacity="0.9" />
+    <SolidColorBrush x:Key="SystemControlHighlightListAccentLowBrush" Color="{DynamicResource SystemAccentColor}" Opacity="0.6" />
+    <SolidColorBrush x:Key="SystemControlHighlightListAccentMediumBrush" Color="{DynamicResource SystemAccentColor}" Opacity="0.8" />
+    <SolidColorBrush x:Key="SystemControlHighlightListMediumBrush" Color="{StaticResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightListLowBrush" Color="{StaticResource SystemListLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightChromeWhiteBrush" Color="{StaticResource SystemChromeWhiteColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlHyperlinkTextBrush" Color="{DynamicResource SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHyperlinkBaseHighBrush" Color="{StaticResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHyperlinkBaseMediumBrush" Color="{StaticResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHyperlinkBaseMediumHighBrush" Color="{StaticResource SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundAltMediumBrush" Color="{StaticResource SystemAltMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundAltHighBrush" Color="{StaticResource SystemAltHighColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundMediumAltMediumBrush" Color="{StaticResource SystemAltMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundBaseLowBrush" Color="{StaticResource SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundBaseMediumBrush" Color="{StaticResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundListLowBrush" Color="{StaticResource SystemListLowColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundChromeLowBrush" Color="{StaticResource SystemChromeLowColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundChromeMediumLowBrush" Color="{StaticResource SystemChromeMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlPageTextBaseHighBrush" Color="{StaticResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlPageTextBaseMediumBrush" Color="{StaticResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlPageTextChromeBlackMediumLowBrush" Color="{StaticResource SystemChromeBlackMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlErrorTextForegroundBrush" Color="{StaticResource SystemErrorTextColor}" />
+    <SolidColorBrush x:Key="SystemControlTransientBorderBrush" Color="#000000" Opacity="0.36" />
+    <SolidColorBrush x:Key="SystemControlHighlightListLowRevealBackgroundBrush" Color="{StaticResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightListMediumRevealBackgroundBrush" Color="{StaticResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAccentRevealBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAccent3RevealBackgroundBrush" Color="{DynamicResource SystemAccentColor}" Opacity="0.6" />
+    <SolidColorBrush x:Key="SystemControlHighlightAccent2RevealBackgroundBrush" Color="{DynamicResource SystemAccentColor}" Opacity="0.8" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeWhiteRevealBorderBrush" Color="{StaticResource SystemChromeWhiteColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltTransparentRevealBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlBackgroundTransparentRevealBorderBrush" Color="Transparent" />
+    <!-- TODO implement AcrylicBrush -->
+    <!--<AcrylicBrush x:Key="SystemControlTransientBackgroundBrush" BackgroundSource="HostBackdrop" TintColor="{StaticResource SystemChromeAltHighColor}" TintOpacity="0.8" FallbackColor="{StaticResource SystemChromeMediumLowColor}" />-->
+    <SolidColorBrush x:Key="SystemControlTransientBackgroundBrush" Color="{StaticResource SystemChromeMediumLowColor}" />
+    <StaticResource x:Key="SystemControlDescriptionTextForegroundBrush" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <x:Boolean x:Key="IsApplicationFocusVisualKindReveal">False</x:Boolean>
+
+
+    <!-- Default Control Settings -->
+    <FontFamily x:Key="ContentControlThemeFontFamily">XamlAutoFontFamily</FontFamily>
+    <FontFamily x:Key="MTCMediaFontFamily">XamlAutoFontFamily</FontFamily>
+    <FontFamily x:Key="PhoneFontFamilyNormal">Segoe WP</FontFamily>
+    <FontFamily x:Key="PhoneFontFamilySemiLight">Segoe WP SemiLight</FontFamily>
+    <FontFamily x:Key="SettingsFlyoutHeaderThemeFontFamily">XamlAutoFontFamily</FontFamily>
+    <FontFamily x:Key="SymbolThemeFontFamily">Segoe MDL2 Assets</FontFamily>
+    <FontFamily x:Key="KeyTipFontFamily">XamlAutoFontFamily</FontFamily>
+    <x:Double x:Key="AppBarExpandButtonThemeHeight">24</x:Double>
+    <x:Double x:Key="AppBarExpandButtonThemeWidth">48</x:Double>
+    <x:Double x:Key="AppBarThemeMinHeight">56</x:Double>
+    <x:Double x:Key="AppBarThemeMinimalHeight">24</x:Double>
+    <x:Double x:Key="AppBarThemeCompactHeight">40</x:Double>
+    <x:Double x:Key="AppBarExpandButtonCircleDiameter">3</x:Double>
+    <x:Double x:Key="AutoCompleteListMaxHeight">374</x:Double>
+    <x:Double x:Key="AutoCompleteListBorderOpacity">0</x:Double>
+    <Thickness x:Key="CheckBoxBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="CheckBoxCheckedStrokeThickness">0</Thickness>
+    <x:Double x:Key="ComboBoxArrowThemeFontSize">21</x:Double>
+    <x:Double x:Key="ComboBoxThemeMinWidth">64</x:Double>
+    <x:Double x:Key="ComboBoxPopupThemeMinWidth">80</x:Double>
+    <x:Double x:Key="ComboBoxPopupThemeTouchMinWidth">240</x:Double>
+    <x:Double x:Key="ControlContentThemeFontSize">14</x:Double>
+    <x:Double x:Key="ContentControlFontSize">14</x:Double>
+    <x:Double x:Key="ContentDialogMinWidth">320</x:Double>
+    <x:Double x:Key="ContentDialogMaxWidth">548</x:Double>
+    <x:Double x:Key="ContentDialogMinHeight">184</x:Double>
+    <x:Double x:Key="ContentDialogMaxHeight">756</x:Double>
+    <x:Double x:Key="ContentDialogButtonMinWidth">130</x:Double>
+    <x:Double x:Key="ContentDialogButtonMaxWidth">202</x:Double>
+    <x:Double x:Key="ContentDialogButtonMinHeight">32</x:Double>
+    <x:Double x:Key="ContentDialogButtonHeight">32</x:Double>
+    <x:Double x:Key="ContentDialogTitleMaxHeight">56</x:Double>
+    <x:Double x:Key="DatePickerSelectorThemeMinWidth">80</x:Double>
+    <x:Double x:Key="DatePickerSpacingThemeWidth">20</x:Double>
+    <x:Double x:Key="DatePickerSpacingThemeHeight">20</x:Double>
+    <x:Double x:Key="FlyoutThemeMaxHeight">758</x:Double>
+    <x:Double x:Key="FlyoutThemeMaxWidth">456</x:Double>
+    <x:Double x:Key="FlyoutThemeMinHeight">40</x:Double>
+    <x:Double x:Key="FlyoutThemeMinWidth">96</x:Double>
+    <x:Double x:Key="FlyoutThemeTouchMinWidth">240</x:Double>
+    <x:Double x:Key="GridViewItemSelectedBorderThemeThickness">4</x:Double>
+    <x:Double x:Key="HubHeaderThemeFontSize">34</x:Double>
+    <x:Double x:Key="HubSectionHeaderThemeFontSize">20</x:Double>
+    <x:Double x:Key="HubSectionHeaderSeeMoreThemeFontSize">14</x:Double>
+    <x:Double x:Key="ListPickerFlyoutFooterThemeHeight">80</x:Double>
+    <x:Double x:Key="GridViewItemReorderHintThemeOffset">16.0</x:Double>
+    <x:Double x:Key="MTCControlPanelHeight">42</x:Double>
+    <x:Double x:Key="MTCHorizontalVolumeSliderWidth">180</x:Double>
+    <x:Double x:Key="MTCMediaFontSize">12</x:Double>
+    <x:Double x:Key="MTCMediaButtonHeight">48</x:Double>
+    <x:Double x:Key="MTCMediaButtonWidth">48</x:Double>
+    <x:Double x:Key="MTCPositionSliderMinimumWidth">96</x:Double>
+    <x:Double x:Key="MTCSideMargins">16</x:Double>
+    <x:Double x:Key="MTCTimeButtonHeight">21</x:Double>
+    <x:Double x:Key="MTCTimeButtonWidth">62</x:Double>
+    <x:Double x:Key="MTCVerticalVolumeHostVerticalOffset">-112</x:Double>
+    <x:Double x:Key="MTCVerticalVolumeHostWidth">42</x:Double>
+    <x:Double x:Key="MTCVerticalVolumeSliderMaxHeight">289</x:Double>
+    <x:Double x:Key="MTCVerticalVolumeSliderMinHeight">96</x:Double>
+    <x:Double x:Key="MTCVerticalVolumeSliderTopGap">8</x:Double>
+    <x:Double x:Key="MTCVerticalVolumeSliderTopPadding">16</x:Double>
+    <x:Double x:Key="ProgressBarIndicatorPauseOpacity">0.6</x:Double>
+    <x:Double x:Key="ProgressBarThemeMinHeight">4</x:Double>
+    <x:Double x:Key="RadioButtonBorderThemeThickness">2</x:Double>
+    <x:Double x:Key="ScrollBarTrackBorderThemeThickness">0</x:Double>
+    <x:Double x:Key="SearchBoxContentThemeFontSize">14</x:Double>
+    <x:Double x:Key="SearchBoxResultSuggestionImageThemeWidth">32</x:Double>
+    <x:Double x:Key="SearchBoxResultSuggestionImageThemeHeight">32</x:Double>
+    <x:Double x:Key="SearchBoxSuggestionPopupThemeMinWidth">270</x:Double>
+    <x:Double x:Key="SearchBoxSuggestionPopupThemeMaxHeight">300</x:Double>
+    <x:Double x:Key="SearchBoxTextBoxThemeMinHeight">28</x:Double>
+    <x:Double x:Key="SemanticZoomButtonFontSize">4</x:Double>
+    <x:Double x:Key="SettingsFlyoutHeaderThemeFontSize">26.667</x:Double>
+
+    <x:Double x:Key="SliderOutsideTickBarThemeHeight">4</x:Double>
+    <x:Double x:Key="SliderTrackThemeHeight">2</x:Double>
+    <x:Double x:Key="SplitViewOpenPaneThemeLength">320</x:Double>
+    <x:Double x:Key="SplitViewCompactPaneThemeLength">48</x:Double>
+    <x:Double x:Key="TextControlBackgroundThemeOpacity">0.8</x:Double>
+    <x:Double x:Key="TextControlBorderThemeOpacity">0.8</x:Double>
+    <x:Double x:Key="TextControlBorderThemeBrushOpacity">1</x:Double>
+    <x:Double x:Key="TextControlPointerOverBackgroundThemeOpacity">0.87</x:Double>
+    <x:Double x:Key="TextControlPointerOverBorderThemeOpacity">0.87</x:Double>
+    <x:Double x:Key="TextControlPointerOverBorderThemeBrushOpacity">1</x:Double>
+    <x:Double x:Key="TextControlBackgroundRestOpacity">0.4</x:Double>
+    <x:Double x:Key="TextControlBackgroundHoverOpacity">0.6</x:Double>
+    <x:Double x:Key="TextControlBackgroundFocusedOpacity">1</x:Double>
+    <x:Double x:Key="TextControlThemeMinHeight">32</x:Double>
+    <x:Double x:Key="TextControlThemeMinWidth">64</x:Double>
+    <x:Double x:Key="TextStyleLargeFontSize">18.14</x:Double>
+    <x:Double x:Key="TextStyleExtraLargeFontSize">25.5</x:Double>
+
+    <x:Double x:Key="TimePickerSelectorThemeMinWidth">80</x:Double>
+    <x:Double x:Key="ToolTipContentThemeFontSize">12</x:Double>
+    <x:Double x:Key="ListViewHeaderItemMinHeight">44</x:Double>
+    <x:Double x:Key="GridViewHeaderItemMinHeight">44</x:Double>
+    <x:Double x:Key="ListViewHeaderItemThemeFontSize">20</x:Double>
+    <x:Double x:Key="GridViewHeaderItemThemeFontSize">20</x:Double>
+
+    <x:Double x:Key="ToggleSwitchOnStrokeThickness">0</x:Double>
+    <x:Double x:Key="GridViewItemMinWidth">44</x:Double>
+    <x:Double x:Key="GridViewItemMinHeight">44</x:Double>
+    <x:Double x:Key="KeyTipContentThemeFontSize">12</x:Double>
+    <Thickness x:Key="AppBarBottomBorderThemeThickness">0,0,0,0</Thickness>
+    <Thickness x:Key="AppBarBottomThemePadding">0,0,0,0</Thickness>
+    <Thickness x:Key="AppBarTopBorderThemeThickness">0,0,0,0</Thickness>
+    <Thickness x:Key="AppBarTopThemePadding">0,0,0,0</Thickness>
+    <Thickness x:Key="AppBarExpandButtonCircleInnerPadding">3,0,3,0</Thickness>
+    <Thickness x:Key="AutoCompleteListBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="AutoCompleteListMargin">0,2,0,2</Thickness>
+    <Thickness x:Key="AutoCompleteListPadding">-1,0,-1,0</Thickness>
+    <Thickness x:Key="AutoCompleteListViewItemMargin">12,11,0,13</Thickness>
+    <Thickness x:Key="ButtonBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="CalendarDatePickerBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="ComboBoxBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="ComboBoxDropdownBorderThickness">1</Thickness>
+    <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
+    <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
+    <Thickness x:Key="ComboBoxHeaderThemeMargin">0,0,0,4</Thickness>
+    <Thickness x:Key="ComboBoxPopupBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="ComboBoxItemThemePadding">11,5,11,7</Thickness>
+    <Thickness x:Key="ComboBoxItemThemeTouchPadding">11,11,11,13</Thickness>
+    <Thickness x:Key="ComboBoxItemThemeGameControllerPadding">11,11,11,13</Thickness>
+    <Thickness x:Key="ContentDialogBorderWidth">1</Thickness>
+    <Thickness x:Key="ContentDialogButton1HostMargin">0,0,4,0</Thickness>
+    <Thickness x:Key="ContentDialogButton2HostMargin">0,0,0,0</Thickness>
+    <Thickness x:Key="ContentDialogContentMargin">0,0,0,0</Thickness>
+    <Thickness x:Key="ContentDialogContentScrollViewerMargin">0,0,0,0</Thickness>
+    <Thickness x:Key="ContentDialogCommandSpaceMargin">0,24,0,0</Thickness>
+    <Thickness x:Key="ContentDialogTitleMargin">0,0,0,12</Thickness>
+    <Thickness x:Key="ContentDialogPadding">24,18,24,24</Thickness>
+    <Thickness x:Key="DatePickerHeaderThemeMargin">0,0,0,4</Thickness>
+    <Thickness x:Key="DateTimeFlyoutBorderThickness">1</Thickness>
+    <Thickness x:Key="DateTimeFlyoutBorderPadding">0</Thickness>
+    <Thickness x:Key="DateTimeFlyoutButtonBorderThickness">0</Thickness>
+    <Thickness x:Key="DateTimeFlyoutContentPanelPortraitThemeMargin">0,37,0,0</Thickness>
+    <Thickness x:Key="DateTimeFlyoutContentPanelLandscapeThemeMargin">0,19,0,0</Thickness>
+    <Thickness x:Key="DateTimeFlyoutTitleThemeMargin">19,0,19,17.5</Thickness>
+    <Thickness x:Key="FlipViewButtonBorderThemeThickness">0</Thickness>
+    <Thickness x:Key="FlyoutContentThemeMargin">0,0,0,0</Thickness>
+    <Thickness x:Key="FlyoutContentThemePadding">12,11,12,12</Thickness>
+    <Thickness x:Key="GridViewItemCompactSelectedBorderThemeThickness">4</Thickness>
+    <Thickness x:Key="GridViewItemMultiselectBorderThickness">2.5</Thickness>
+    <Thickness x:Key="HandwritingViewExpandedButtonMargin">5,6,5,6</Thickness>
+    <Thickness x:Key="HubSectionHeaderThemeMargin">0,0,0,9</Thickness>
+    <Thickness x:Key="HubSectionHeaderSeeMoreThemeMargin">24,0,0,11</Thickness>
+    <Thickness x:Key="HyperlinkButtonBorderThemeThickness">0</Thickness>
+    <Thickness x:Key="ListPickerFlyoutPresenterMultiselectCheckBoxMargin">0,9.5,0,0</Thickness>
+    <Thickness x:Key="ListPickerFlyoutPresenterItemMargin">0,0,0,19</Thickness>
+    <Thickness x:Key="PickerFlyoutContentPanelLandscapeThemeMargin">19,19,19,0</Thickness>
+    <Thickness x:Key="PickerFlyoutContentPanelPortraitThemeMargin">19,37,19,0</Thickness>
+    <Thickness x:Key="PickerFlyoutTitleThemeMargin">0,0,0,32.5</Thickness>
+    <Thickness x:Key="ProgressBarBorderThemeThickness">0</Thickness>
+    <Thickness x:Key="RepeatButtonBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="ScrollBarPanningBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="SearchBoxQuerySuggestionThemeMargin">12,11,8,13</Thickness>
+    <Thickness x:Key="SearchBoxResultSuggestionThemeMargin">12,11,8,13</Thickness>
+    <Thickness x:Key="SearchBoxSeparatorSuggestionThemeMargin">12,11,8,13</Thickness>
+    <Thickness x:Key="SearchBoxSuggestionSubcomponentThemeMargin">0,0,12,0</Thickness>
+    <Thickness x:Key="SearchBoxThemePadding">12,4,8,4</Thickness>
+    <Thickness x:Key="SearchBoxIMECandidateListSeparatorThemeThickness">0,2,0,0</Thickness>
+    <Thickness x:Key="SearchBoxBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="SliderBorderThemeThickness">0</Thickness>
+    <Thickness x:Key="SliderHeaderThemeMargin">0,0,0,4</Thickness>
+    <Thickness x:Key="SplitViewLeftBorderThemeThickness">0,0,1,0</Thickness>
+    <Thickness x:Key="SplitViewRightBorderThemeThickness">1,0,0,0</Thickness>
+    <Thickness x:Key="TextControlBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="TextControlMarginThemeThickness">0,9.5,0,9.5</Thickness>
+    <Thickness x:Key="TextControlThemePadding">10,3,6,6</Thickness>
+    <Thickness x:Key="HelperButtonThemePadding">0,0,-2,0</Thickness>
+    <Thickness x:Key="TextControlPlaceholderThemePadding">12,5,10,5</Thickness>
+    <Thickness x:Key="TimePickerHeaderThemeMargin">0,0,0,4</Thickness>
+    <Thickness x:Key="TimePickerFirstHostThemeMargin">0,0,20,0</Thickness>
+    <Thickness x:Key="TimePickerThirdHostThemeMargin">20,0,0,0</Thickness>
+    <Thickness x:Key="ToggleButtonBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="KeyTipBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="KeyTipThemePadding">4</Thickness>
+    <FontWeight x:Key="ComboBoxHeaderThemeFontWeight">Normal</FontWeight>
+    <FontWeight x:Key="ComboBoxPlaceholderTextThemeFontWeight">SemiLight</FontWeight>
+    <FontWeight x:Key="DatePickerHeaderThemeFontWeight">Normal</FontWeight>
+    <FontWeight x:Key="SearchBoxButtonThemeFontWeight">Normal</FontWeight>
+    <FontWeight x:Key="SearchBoxContentThemeFontWeight">Normal</FontWeight>
+    <FontWeight x:Key="TimePickerHeaderThemeFontWeight">Normal</FontWeight>
+    <FontWeight x:Key="SliderHeaderThemeFontWeight">Normal</FontWeight>
+    <FontWeight x:Key="HubHeaderThemeFontWeight">Light</FontWeight>
+    <FontWeight x:Key="HubSectionHeaderThemeFontWeight">Normal</FontWeight>
+    <GridLength x:Key="AppBarExpandButtonThemeWidthGridLength">48</GridLength>
+    <Thickness x:Key="MediaTransportControlsTitleSafeBounds">48,0,48,27</Thickness>
+  </Style.Resources>
+</Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml b/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml
new file mode 100644
index 0000000000..6c8d16ddfa
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml
@@ -0,0 +1,345 @@
+<Style xmlns="https://github.com/avaloniaui"
+       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+       xmlns:sys="clr-namespace:System;assembly=netstandard">
+  <Style.Resources>
+    <!-- Accent Colours -->
+    <!-- TODO pull accents from system... algorithm to generate shades -->
+    <Color x:Key="SystemAccentColor">#FF0078D7</Color>
+    <Color x:Key="SystemAccentColorDark1">#FF005A9E</Color>
+    <Color x:Key="SystemAccentColorDark2">#FF004275</Color>
+    <Color x:Key="SystemAccentColorDark3">#FF002642</Color>
+    <Color x:Key="SystemAccentColorLight1">#FF429CE3</Color>
+    <Color x:Key="SystemAccentColorLight2">#FF76B9ED</Color>
+    <Color x:Key="SystemAccentColorLight3">#FFA6D8FF</Color>
+
+    <!-- System Control Colors -->
+    <Color x:Key="SystemAltHighColor">#FFFFFFFF</Color>
+    <Color x:Key="SystemAltLowColor">#33FFFFFF</Color>
+    <Color x:Key="SystemAltMediumColor">#99FFFFFF</Color>
+    <Color x:Key="SystemAltMediumHighColor">#CCFFFFFF</Color>
+    <Color x:Key="SystemAltMediumLowColor">#66FFFFFF</Color>
+    <Color x:Key="SystemBaseHighColor">#FF000000</Color>
+    <Color x:Key="SystemBaseLowColor">#33000000</Color>
+    <Color x:Key="SystemBaseMediumColor">#99000000</Color>
+    <Color x:Key="SystemBaseMediumHighColor">#CC000000</Color>
+    <Color x:Key="SystemBaseMediumLowColor">#66000000</Color>
+    <Color x:Key="SystemChromeAltLowColor">#FF171717</Color>
+    <Color x:Key="SystemChromeBlackHighColor">#FF000000</Color>
+    <Color x:Key="SystemChromeBlackLowColor">#33000000</Color>
+    <Color x:Key="SystemChromeBlackMediumLowColor">#66000000</Color>
+    <Color x:Key="SystemChromeBlackMediumColor">#CC000000</Color>
+    <Color x:Key="SystemChromeDisabledHighColor">#FFCCCCCC</Color>
+    <Color x:Key="SystemChromeDisabledLowColor">#FF7A7A7A</Color>
+    <Color x:Key="SystemChromeHighColor">#FFCCCCCC</Color>
+    <Color x:Key="SystemChromeLowColor">#FFF2F2F2</Color>
+    <Color x:Key="SystemChromeMediumColor">#FFE6E6E6</Color>
+    <Color x:Key="SystemChromeMediumLowColor">#FFF2F2F2</Color>
+    <Color x:Key="SystemChromeWhiteColor">#FFFFFFFF</Color>
+    <Color x:Key="SystemChromeGrayColor">#FF767676</Color>
+    <Color x:Key="SystemListLowColor">#19000000</Color>
+    <Color x:Key="SystemListMediumColor">#33000000</Color>
+    <Color x:Key="SystemErrorTextColor">#C50500</Color>
+
+    <SolidColorBrush x:Key="SystemControlBackgroundAccentBrush" Color="{DynamicResource SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundAltHighBrush" Color="{StaticResource SystemAltHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundAltMediumHighBrush" Color="{StaticResource SystemAltMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundAltMediumBrush" Color="{StaticResource SystemAltMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundAltMediumLowBrush" Color="{StaticResource SystemAltMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseHighBrush" Color="{StaticResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseLowBrush" Color="{StaticResource SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumBrush" Color="{StaticResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumHighBrush" Color="{StaticResource SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumLowBrush" Color="{StaticResource SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeBlackHighBrush" Color="{StaticResource SystemChromeBlackHighColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeBlackMediumBrush" Color="{StaticResource SystemChromeBlackMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeBlackLowBrush" Color="{StaticResource SystemChromeBlackLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeBlackMediumLowBrush" Color="{StaticResource SystemChromeBlackMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeMediumBrush" Color="{StaticResource SystemChromeMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeMediumLowBrush" Color="{StaticResource SystemChromeMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeWhiteBrush" Color="{StaticResource SystemChromeWhiteColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundListLowBrush" Color="{StaticResource SystemListLowColor}" />
+    <SolidColorBrush x:Key="SystemControlBackgroundListMediumBrush" Color="{StaticResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledAccentBrush" Color="{DynamicResource SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledBaseHighBrush" Color="{StaticResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledBaseLowBrush" Color="{StaticResource SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledBaseMediumLowBrush" Color="{StaticResource SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledChromeDisabledHighBrush" Color="{StaticResource SystemChromeDisabledHighColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledChromeDisabledLowBrush" Color="{StaticResource SystemChromeDisabledLowColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledChromeHighBrush" Color="{StaticResource SystemChromeHighColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledChromeMediumLowBrush" Color="{StaticResource SystemChromeMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledListMediumBrush" Color="{StaticResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlDisabledTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlFocusVisualPrimaryBrush" Color="{DynamicResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlFocusVisualSecondaryBrush" Color="{DynamicResource SystemAltMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlRevealFocusVisualBrush" Color="{DynamicResource SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundAccentBrush" Color="{DynamicResource SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundAltHighBrush" Color="{StaticResource SystemAltHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundAltMediumHighBrush" Color="{StaticResource SystemAltMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundBaseHighBrush" Color="{StaticResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundBaseLowBrush" Color="{StaticResource SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundBaseMediumBrush" Color="{StaticResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundBaseMediumHighBrush" Color="{StaticResource SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundBaseMediumLowBrush" Color="{StaticResource SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeBlackHighBrush" Color="{StaticResource SystemChromeBlackHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeHighBrush" Color="{StaticResource SystemChromeHighColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeMediumBrush" Color="{StaticResource SystemChromeMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeDisabledLowBrush" Color="{StaticResource SystemChromeDisabledLowColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeWhiteBrush" Color="{StaticResource SystemChromeWhiteColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeBlackMediumBrush" Color="{StaticResource SystemChromeBlackMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeBlackMediumLowBrush" Color="{StaticResource SystemChromeBlackMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundChromeGrayBrush" Color="{StaticResource SystemChromeGrayColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundListLowBrush" Color="{StaticResource SystemListLowColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundListMediumBrush" Color="{StaticResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlForegroundTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlHighlightAccentBrush" Color="{DynamicResource SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="{DynamicResource SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltAltHighBrush" Color="{StaticResource SystemAltHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltBaseHighBrush" Color="{StaticResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltBaseLowBrush" Color="{StaticResource SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltBaseMediumBrush" Color="{StaticResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltBaseMediumHighBrush" Color="{StaticResource SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltAltMediumHighBrush" Color="{StaticResource SystemAltMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltBaseMediumLowBrush" Color="{StaticResource SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltListAccentHighBrush" Color="{DynamicResource SystemAccentColor}" Opacity="0.7" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltListAccentLowBrush" Color="{DynamicResource SystemAccentColor}" Opacity="0.4" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltListAccentMediumBrush" Color="{DynamicResource SystemAccentColor}" Opacity="0.6" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltChromeWhiteBrush" Color="{StaticResource SystemChromeWhiteColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseHighBrush" Color="{StaticResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseLowBrush" Color="{StaticResource SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseMediumBrush" Color="{StaticResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseMediumHighBrush" Color="{StaticResource SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightBaseMediumLowBrush" Color="{StaticResource SystemBaseMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightChromeAltLowBrush" Color="{StaticResource SystemChromeAltLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightChromeHighBrush" Color="{StaticResource SystemChromeHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightListAccentHighBrush" Color="{DynamicResource SystemAccentColor}" Opacity="0.7" />
+    <SolidColorBrush x:Key="SystemControlHighlightListAccentLowBrush" Color="{DynamicResource SystemAccentColor}" Opacity="0.4" />
+    <SolidColorBrush x:Key="SystemControlHighlightListAccentMediumBrush" Color="{DynamicResource SystemAccentColor}" Opacity="0.6" />
+    <SolidColorBrush x:Key="SystemControlHighlightListMediumBrush" Color="{StaticResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightListLowBrush" Color="{StaticResource SystemListLowColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightChromeWhiteBrush" Color="{StaticResource SystemChromeWhiteColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlHyperlinkTextBrush" Color="{DynamicResource SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHyperlinkBaseHighBrush" Color="{StaticResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlHyperlinkBaseMediumBrush" Color="{StaticResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHyperlinkBaseMediumHighBrush" Color="{StaticResource SystemBaseMediumHighColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundAltMediumBrush" Color="{StaticResource SystemAltMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundAltHighBrush" Color="{StaticResource SystemAltHighColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundMediumAltMediumBrush" Color="{StaticResource SystemAltMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundBaseLowBrush" Color="{StaticResource SystemBaseLowColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundBaseMediumBrush" Color="{StaticResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundListLowBrush" Color="{StaticResource SystemListLowColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundChromeLowBrush" Color="{StaticResource SystemChromeLowColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundChromeMediumLowBrush" Color="{StaticResource SystemChromeMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlPageBackgroundTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlPageTextBaseHighBrush" Color="{StaticResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="SystemControlPageTextBaseMediumBrush" Color="{StaticResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlPageTextChromeBlackMediumLowBrush" Color="{StaticResource SystemChromeBlackMediumLowColor}" />
+    <SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlErrorTextForegroundBrush" Color="{StaticResource SystemErrorTextColor}" />
+    <SolidColorBrush x:Key="SystemControlTransientBorderBrush" Color="#000000" Opacity="0.14" />
+    <SolidColorBrush x:Key="SystemControlHighlightListLowRevealBackgroundBrush" Color="{StaticResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightListMediumRevealBackgroundBrush" Color="{StaticResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAccentRevealBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAccent3RevealBackgroundBrush" Color="{DynamicResource SystemAccentColor}" Opacity="0.6" />
+    <SolidColorBrush x:Key="SystemControlHighlightAccent2RevealBackgroundBrush" Color="{DynamicResource SystemAccentColor}" Opacity="0.8" />
+    <SolidColorBrush x:Key="SystemControlBackgroundChromeWhiteRevealBorderBrush" Color="{StaticResource SystemChromeWhiteColor}" />
+    <SolidColorBrush x:Key="SystemControlHighlightAltTransparentRevealBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SystemControlBackgroundTransparentRevealBorderBrush" Color="Transparent" />
+    <!-- TODO implement AcrylicBrush -->
+    <!--<AcrylicBrush x:Key="SystemControlTransientBackgroundBrush" BackgroundSource="HostBackdrop" TintColor="{StaticResource SystemChromeAltHighColor}" TintOpacity="0.8" FallbackColor="{StaticResource SystemChromeMediumLowColor}" />-->
+    <SolidColorBrush x:Key="SystemControlTransientBackgroundBrush" Color="{StaticResource SystemChromeMediumLowColor}" />
+    <StaticResource x:Key="SystemControlDescriptionTextForegroundBrush" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <x:Boolean x:Key="IsApplicationFocusVisualKindReveal">False</x:Boolean>
+
+    <!-- Default Control Settings -->
+    <FontFamily x:Key="ContentControlThemeFontFamily">XamlAutoFontFamily</FontFamily>
+    <FontFamily x:Key="MTCMediaFontFamily">XamlAutoFontFamily</FontFamily>
+    <FontFamily x:Key="PhoneFontFamilyNormal">Segoe WP</FontFamily>
+    <FontFamily x:Key="PhoneFontFamilySemiLight">Segoe WP SemiLight</FontFamily>
+    <FontFamily x:Key="SettingsFlyoutHeaderThemeFontFamily">XamlAutoFontFamily</FontFamily>
+    <FontFamily x:Key="SymbolThemeFontFamily">Segoe MDL2 Assets</FontFamily>
+    <FontFamily x:Key="KeyTipFontFamily">XamlAutoFontFamily</FontFamily>
+    <x:Double x:Key="AppBarExpandButtonThemeHeight">24</x:Double>
+    <x:Double x:Key="AppBarExpandButtonThemeWidth">48</x:Double>
+    <x:Double x:Key="AppBarThemeMinHeight">56</x:Double>
+    <x:Double x:Key="AppBarThemeMinimalHeight">24</x:Double>
+    <x:Double x:Key="AppBarThemeCompactHeight">40</x:Double>
+    <x:Double x:Key="AppBarExpandButtonCircleDiameter">3</x:Double>
+    <x:Double x:Key="AutoCompleteListMaxHeight">374</x:Double>
+    <x:Double x:Key="AutoCompleteListBorderOpacity">0</x:Double>
+    <Thickness x:Key="CheckBoxBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="CheckBoxCheckedStrokeThickness">0</Thickness>
+    <x:Double x:Key="ComboBoxArrowThemeFontSize">21</x:Double>
+    <x:Double x:Key="ComboBoxThemeMinWidth">64</x:Double>
+    <x:Double x:Key="ComboBoxPopupThemeMinWidth">80</x:Double>
+    <x:Double x:Key="ComboBoxPopupThemeTouchMinWidth">240</x:Double>
+    <x:Double x:Key="ControlContentThemeFontSize">14</x:Double>
+    <x:Double x:Key="ContentControlFontSize">14</x:Double>
+    <x:Double x:Key="ContentDialogMinWidth">320</x:Double>
+    <x:Double x:Key="ContentDialogMaxWidth">548</x:Double>
+    <x:Double x:Key="ContentDialogMinHeight">184</x:Double>
+    <x:Double x:Key="ContentDialogMaxHeight">756</x:Double>
+    <x:Double x:Key="ContentDialogButtonMinWidth">130</x:Double>
+    <x:Double x:Key="ContentDialogButtonMaxWidth">202</x:Double>
+    <x:Double x:Key="ContentDialogButtonMinHeight">32</x:Double>
+    <x:Double x:Key="ContentDialogButtonHeight">32</x:Double>
+    <x:Double x:Key="ContentDialogTitleMaxHeight">56</x:Double>
+    <x:Double x:Key="DatePickerSelectorThemeMinWidth">80</x:Double>
+    <x:Double x:Key="DatePickerSpacingThemeWidth">20</x:Double>
+    <x:Double x:Key="DatePickerSpacingThemeHeight">20</x:Double>
+    <x:Double x:Key="FlyoutThemeMaxHeight">758</x:Double>
+    <x:Double x:Key="FlyoutThemeMaxWidth">456</x:Double>
+    <x:Double x:Key="FlyoutThemeMinHeight">40</x:Double>
+    <x:Double x:Key="FlyoutThemeMinWidth">96</x:Double>
+    <x:Double x:Key="FlyoutThemeTouchMinWidth">240</x:Double>
+    <x:Double x:Key="GridViewItemSelectedBorderThemeThickness">4</x:Double>
+    <x:Double x:Key="HubHeaderThemeFontSize">34</x:Double>
+    <x:Double x:Key="HubSectionHeaderThemeFontSize">20</x:Double>
+    <x:Double x:Key="HubSectionHeaderSeeMoreThemeFontSize">14</x:Double>
+    <x:Double x:Key="ListPickerFlyoutFooterThemeHeight">80</x:Double>
+    <x:Double x:Key="GridViewItemReorderHintThemeOffset">16.0</x:Double>
+    <x:Double x:Key="MTCControlPanelHeight">42</x:Double>
+    <x:Double x:Key="MTCHorizontalVolumeSliderWidth">180</x:Double>
+    <x:Double x:Key="MTCMediaFontSize">12</x:Double>
+    <x:Double x:Key="MTCMediaButtonHeight">48</x:Double>
+    <x:Double x:Key="MTCMediaButtonWidth">48</x:Double>
+    <x:Double x:Key="MTCPositionSliderMinimumWidth">96</x:Double>
+    <x:Double x:Key="MTCSideMargins">16</x:Double>
+    <x:Double x:Key="MTCTimeButtonHeight">21</x:Double>
+    <x:Double x:Key="MTCTimeButtonWidth">62</x:Double>
+    <x:Double x:Key="MTCVerticalVolumeHostVerticalOffset">-112</x:Double>
+    <x:Double x:Key="MTCVerticalVolumeHostWidth">42</x:Double>
+    <x:Double x:Key="MTCVerticalVolumeSliderMaxHeight">289</x:Double>
+    <x:Double x:Key="MTCVerticalVolumeSliderMinHeight">96</x:Double>
+    <x:Double x:Key="MTCVerticalVolumeSliderTopGap">8</x:Double>
+    <x:Double x:Key="MTCVerticalVolumeSliderTopPadding">16</x:Double>
+    <x:Double x:Key="ProgressBarIndicatorPauseOpacity">0.6</x:Double>
+    <x:Double x:Key="ProgressBarThemeMinHeight">4</x:Double>
+    <x:Double x:Key="RadioButtonBorderThemeThickness">2</x:Double>
+    <x:Double x:Key="ScrollBarTrackBorderThemeThickness">0</x:Double>
+    <x:Double x:Key="SearchBoxContentThemeFontSize">14</x:Double>
+    <x:Double x:Key="SearchBoxResultSuggestionImageThemeWidth">32</x:Double>
+    <x:Double x:Key="SearchBoxResultSuggestionImageThemeHeight">32</x:Double>
+    <x:Double x:Key="SearchBoxSuggestionPopupThemeMinWidth">270</x:Double>
+    <x:Double x:Key="SearchBoxSuggestionPopupThemeMaxHeight">300</x:Double>
+    <x:Double x:Key="SearchBoxTextBoxThemeMinHeight">28</x:Double>
+    <x:Double x:Key="SemanticZoomButtonFontSize">4</x:Double>
+    <x:Double x:Key="SettingsFlyoutHeaderThemeFontSize">26.667</x:Double>
+
+    <x:Double x:Key="SliderOutsideTickBarThemeHeight">4</x:Double>
+    <x:Double x:Key="SliderTrackThemeHeight">2</x:Double>
+    <x:Double x:Key="SplitViewOpenPaneThemeLength">320</x:Double>
+    <x:Double x:Key="SplitViewCompactPaneThemeLength">48</x:Double>
+    <x:Double x:Key="TextControlBackgroundThemeOpacity">0.8</x:Double>
+    <x:Double x:Key="TextControlBorderThemeOpacity">0.45</x:Double>
+    <x:Double x:Key="TextControlBorderThemeBrushOpacity">0.5625</x:Double>
+    <x:Double x:Key="TextControlPointerOverBackgroundThemeOpacity">0.87</x:Double>
+    <x:Double x:Key="TextControlPointerOverBorderThemeOpacity">0.73</x:Double>
+    <x:Double x:Key="TextControlPointerOverBorderThemeBrushOpacity">0.839</x:Double>
+    <x:Double x:Key="TextControlBackgroundRestOpacity">0.4</x:Double>
+    <x:Double x:Key="TextControlBackgroundHoverOpacity">0.6</x:Double>
+    <x:Double x:Key="TextControlBackgroundFocusedOpacity">1</x:Double>
+    <x:Double x:Key="TextControlThemeMinHeight">32</x:Double>
+    <x:Double x:Key="TextControlThemeMinWidth">64</x:Double>
+    <x:Double x:Key="TextStyleLargeFontSize">18.14</x:Double>
+    <x:Double x:Key="TextStyleExtraLargeFontSize">25.5</x:Double>
+
+    <x:Double x:Key="TimePickerSelectorThemeMinWidth">80</x:Double>
+    <x:Double x:Key="ToolTipContentThemeFontSize">12</x:Double>
+    <x:Double x:Key="ListViewHeaderItemMinHeight">44</x:Double>
+    <x:Double x:Key="GridViewHeaderItemMinHeight">44</x:Double>
+    <x:Double x:Key="ListViewHeaderItemThemeFontSize">20</x:Double>
+    <x:Double x:Key="GridViewHeaderItemThemeFontSize">20</x:Double>
+
+    <x:Double x:Key="ToggleSwitchOnStrokeThickness">0</x:Double>
+    <x:Double x:Key="GridViewItemMinWidth">44</x:Double>
+    <x:Double x:Key="GridViewItemMinHeight">44</x:Double>
+    <x:Double x:Key="KeyTipContentThemeFontSize">12</x:Double>
+    <Thickness x:Key="AppBarBottomBorderThemeThickness">0,0,0,0</Thickness>
+    <Thickness x:Key="AppBarBottomThemePadding">0,0,0,0</Thickness>
+    <Thickness x:Key="AppBarTopBorderThemeThickness">0,0,0,0</Thickness>
+    <Thickness x:Key="AppBarTopThemePadding">0,0,0,0</Thickness>
+    <Thickness x:Key="AppBarExpandButtonCircleInnerPadding">3,0,3,0</Thickness>
+    <Thickness x:Key="AutoCompleteListBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="AutoCompleteListMargin">0,2,0,2</Thickness>
+    <Thickness x:Key="AutoCompleteListPadding">-1,0,-1,0</Thickness>
+    <Thickness x:Key="AutoCompleteListViewItemMargin">12,11,0,13</Thickness>
+    <Thickness x:Key="ButtonBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="CalendarDatePickerBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="ComboBoxBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="ComboBoxDropdownBorderThickness">1</Thickness>
+    <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
+    <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
+    <Thickness x:Key="ComboBoxHeaderThemeMargin">0,0,0,4</Thickness>
+    <Thickness x:Key="ComboBoxPopupBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="ComboBoxItemThemePadding">11,5,11,7</Thickness>
+    <Thickness x:Key="ComboBoxItemThemeTouchPadding">11,11,11,13</Thickness>
+    <Thickness x:Key="ComboBoxItemThemeGameControllerPadding">11,11,11,13</Thickness>
+    <Thickness x:Key="ContentDialogBorderWidth">1</Thickness>
+    <Thickness x:Key="ContentDialogButton1HostMargin">0,0,4,0</Thickness>
+    <Thickness x:Key="ContentDialogButton2HostMargin">0,0,0,0</Thickness>
+    <Thickness x:Key="ContentDialogContentMargin">0,0,0,0</Thickness>
+    <Thickness x:Key="ContentDialogContentScrollViewerMargin">0,0,0,0</Thickness>
+    <Thickness x:Key="ContentDialogCommandSpaceMargin">0,24,0,0</Thickness>
+    <Thickness x:Key="ContentDialogTitleMargin">0,0,0,12</Thickness>
+    <Thickness x:Key="ContentDialogPadding">24,18,24,24</Thickness>
+    <Thickness x:Key="DatePickerHeaderThemeMargin">0,0,0,4</Thickness>
+    <Thickness x:Key="DateTimeFlyoutBorderThickness">1</Thickness>
+    <Thickness x:Key="DateTimeFlyoutBorderPadding">0</Thickness>
+    <Thickness x:Key="DateTimeFlyoutButtonBorderThickness">0</Thickness>
+    <Thickness x:Key="DateTimeFlyoutContentPanelPortraitThemeMargin">0,37,0,0</Thickness>
+    <Thickness x:Key="DateTimeFlyoutContentPanelLandscapeThemeMargin">0,19,0,0</Thickness>
+    <Thickness x:Key="DateTimeFlyoutTitleThemeMargin">19,0,19,17.5</Thickness>
+    <Thickness x:Key="FlipViewButtonBorderThemeThickness">0</Thickness>
+    <Thickness x:Key="FlyoutContentThemeMargin">0,0,0,0</Thickness>
+    <Thickness x:Key="FlyoutContentThemePadding">12,11,12,12</Thickness>
+    <Thickness x:Key="GridViewItemCompactSelectedBorderThemeThickness">4</Thickness>
+    <Thickness x:Key="GridViewItemMultiselectBorderThickness">2.5</Thickness>
+    <Thickness x:Key="HandwritingViewExpandedButtonMargin">5,6,5,6</Thickness>
+    <Thickness x:Key="HubSectionHeaderThemeMargin">0,0,0,9</Thickness>
+    <Thickness x:Key="HubSectionHeaderSeeMoreThemeMargin">24,0,0,11</Thickness>
+    <Thickness x:Key="HyperlinkButtonBorderThemeThickness">0</Thickness>
+    <Thickness x:Key="ListPickerFlyoutPresenterMultiselectCheckBoxMargin">0,9.5,0,0</Thickness>
+    <Thickness x:Key="ListPickerFlyoutPresenterItemMargin">0,0,0,19</Thickness>
+    <Thickness x:Key="PickerFlyoutContentPanelLandscapeThemeMargin">19,19,19,0</Thickness>
+    <Thickness x:Key="PickerFlyoutContentPanelPortraitThemeMargin">19,37,19,0</Thickness>
+    <Thickness x:Key="PickerFlyoutTitleThemeMargin">0,0,0,32.5</Thickness>
+    <Thickness x:Key="ProgressBarBorderThemeThickness">0</Thickness>
+    <Thickness x:Key="RepeatButtonBorderThemeThickness">0</Thickness>
+    <Thickness x:Key="ScrollBarPanningBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="SearchBoxQuerySuggestionThemeMargin">12,11,8,13</Thickness>
+    <Thickness x:Key="SearchBoxResultSuggestionThemeMargin">12,11,8,13</Thickness>
+    <Thickness x:Key="SearchBoxSeparatorSuggestionThemeMargin">12,11,8,13</Thickness>
+    <Thickness x:Key="SearchBoxSuggestionSubcomponentThemeMargin">0,0,12,0</Thickness>
+    <Thickness x:Key="SearchBoxThemePadding">12,4,8,4</Thickness>
+    <Thickness x:Key="SearchBoxIMECandidateListSeparatorThemeThickness">0,2,0,0</Thickness>
+    <Thickness x:Key="SearchBoxBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="SliderBorderThemeThickness">0</Thickness>
+    <Thickness x:Key="SliderHeaderThemeMargin">0,0,0,4</Thickness>
+    <Thickness x:Key="SplitViewLeftBorderThemeThickness">0,0,1,0</Thickness>
+    <Thickness x:Key="SplitViewRightBorderThemeThickness">1,0,0,0</Thickness>
+    <Thickness x:Key="TextControlBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="TextControlMarginThemeThickness">0,9.5,0,9.5</Thickness>
+    <Thickness x:Key="TextControlThemePadding">10,3,6,6</Thickness>
+    <Thickness x:Key="HelperButtonThemePadding">0,0,-2,0</Thickness>
+    <Thickness x:Key="TextControlPlaceholderThemePadding">12,5,10,5</Thickness>
+    <Thickness x:Key="TimePickerHeaderThemeMargin">0,0,0,4</Thickness>
+    <Thickness x:Key="TimePickerFirstHostThemeMargin">0,0,20,0</Thickness>
+    <Thickness x:Key="TimePickerThirdHostThemeMargin">20,0,0,0</Thickness>
+    <Thickness x:Key="ToggleButtonBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="KeyTipBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="KeyTipThemePadding">4</Thickness>
+    <FontWeight x:Key="ComboBoxHeaderThemeFontWeight">Normal</FontWeight>
+    <FontWeight x:Key="ComboBoxPlaceholderTextThemeFontWeight">SemiLight</FontWeight>
+    <FontWeight x:Key="DatePickerHeaderThemeFontWeight">Normal</FontWeight>
+    <FontWeight x:Key="SearchBoxButtonThemeFontWeight">Normal</FontWeight>
+    <FontWeight x:Key="SearchBoxContentThemeFontWeight">Normal</FontWeight>
+    <FontWeight x:Key="TimePickerHeaderThemeFontWeight">Normal</FontWeight>
+    <FontWeight x:Key="SliderHeaderThemeFontWeight">Normal</FontWeight>
+    <FontWeight x:Key="HubHeaderThemeFontWeight">Light</FontWeight>
+    <FontWeight x:Key="HubSectionHeaderThemeFontWeight">Normal</FontWeight>
+    <GridLength x:Key="AppBarExpandButtonThemeWidthGridLength">48</GridLength>
+    <Thickness x:Key="MediaTransportControlsTitleSafeBounds">48,0,48,27</Thickness>
+  </Style.Resources>
+</Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
new file mode 100644
index 0000000000..1c65911593
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
@@ -0,0 +1,455 @@
+<Style xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+  xmlns:sys="clr-namespace:System;assembly=netstandard">
+  <Style.Resources>
+    <Color x:Key="SystemRevealListLowColor">#18FFFFFF</Color>
+    <Color x:Key="SystemRevealListMediumColor">#30FFFFFF</Color>
+    <!--<AcrylicBrush x:Key="SystemControlAcrylicWindowBrush" BackgroundSource="HostBackdrop" TintColor="{ThemeResource SystemChromeAltHighColor}" TintOpacity="0.8" FallbackColor="{ThemeResource SystemChromeMediumColor}" />-->
+    <!--<RevealBackgroundBrush x:Key="SystemControlTransparentRevealBackgroundBrush" TargetTheme="Dark" Color="Transparent" FallbackColor="Transparent" />-->
+    <SolidColorBrush x:Key="SystemControlTransparentRevealBackgroundBrush" Color="Transparent" />
+    <!--<RevealBorderBrush x:Key="SystemControlTransparentRevealBorderBrush" TargetTheme="Dark" Color="Transparent" FallbackColor="Transparent" />-->
+    <SolidColorBrush x:Key="SystemControlTransparentRevealBorderBrush" Color="Transparent" />
+    
+    <!-- Override system shape defaults -->
+    <CornerRadius x:Key="ControlCornerRadius">3</CornerRadius>
+    <CornerRadius x:Key="OverlayCornerRadius">5</CornerRadius>
+    
+    <!-- Override system borders -->
+    <Thickness x:Key="MenuBarItemBorderThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="GridViewItemMultiselectBorderThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="CheckBoxBorderThemeThickness">1</Thickness>
+    <x:Double x:Key="GridViewItemSelectedBorderThemeThickness">1</x:Double>
+    <x:Double x:Key="RadioButtonBorderThemeThickness">1</x:Double>
+    <Thickness x:Key="ButtonBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="CalendarDatePickerBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="TimePickerBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="DatePickerBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="ToggleSwitchOuterBorderStrokeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="RepeatButtonBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="SearchBoxBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="ToggleButtonBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="TextControlBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="ButtonRevealBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="RepeatButtonRevealBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="ToggleButtonRevealBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="AppBarEllipsisButtonRevealBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="AppBarButtonRevealBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="AppBarToggleButtonRevealBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="ListViewItemRevealBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="GridViewItemRevealBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="ComboBoxItemRevealBorderThemeThickness">1,1,1,1</Thickness>
+    <x:Double x:Key="PersonPictureEllipseBadgeStrokeThickness">1</x:Double>
+    
+    <Color x:Key="RegionColor">#FF000000</Color>
+    <SolidColorBrush x:Key="RegionBrush" Color="{StaticResource RegionColor}" />
+    
+    <!-- BaseResources for Button.xaml -->
+    <StaticResource x:Key="ButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="ButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+
+    <!-- Resources for RepeatButton.xaml -->
+    <StaticResource x:Key="RepeatButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="RepeatButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="RepeatButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="RepeatButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="RepeatButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RepeatButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="RepeatButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="RepeatButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RepeatButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="RepeatButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <!-- Resources for Windows.UI.Xaml.Controls.Primitives.ToggleButton -->
+    <StaticResource x:Key="ToggleButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundChecked" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundCheckedPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundCheckedPressed" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundCheckedDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundIndeterminate" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundIndeterminatePointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundIndeterminatePressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundIndeterminateDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundChecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundIndeterminate" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundIndeterminatePointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundIndeterminatePressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushChecked" ResourceKey="SystemControlHighlightAltTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushCheckedPointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushCheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushCheckedDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushIndeterminate" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushIndeterminatePointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushIndeterminatePressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushIndeterminateDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+
+    <!-- BaseResources for ComboBox.xaml -->
+    <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="ComboBoxItemForegroundSelectedUnfocused" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxItemForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxItemForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxItemForegroundSelectedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <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="ComboBoxItemBackgroundSelectedUnfocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightListAccentHighBrush" />
+    <StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightListAccentMediumBrush" />
+    <StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ComboBoxItemBorderBrush" 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="ComboBoxItemBorderBrushSelectedUnfocused" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
+
+    <StaticResource x:Key="ComboBoxBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundBorderBrushFocused" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundBorderBrushUnfocused" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxForegroundFocused" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxPlaceHolderForeground" ResourceKey="SystemControlPageTextBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxPlaceHolderForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="ComboBoxBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="ComboBoxDropDownBackgroundPointerOver" ResourceKey="SystemControlBackgroundListLowBrush" />
+    <StaticResource x:Key="ComboBoxDropDownBackgroundPointerPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
+    <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerOver" ResourceKey="SystemControlBackgroundChromeBlackLowBrush" />
+    <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerPressed" ResourceKey="SystemControlBackgroundChromeBlackMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxDropDownGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="ComboBoxEditableDropDownGlyphForeground" ResourceKey="SystemControlForegroundAltMediumHighBrush" />
+    <StaticResource x:Key="ComboBoxDropDownGlyphForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocused" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlTransientBackgroundBrush" />
+    <StaticResource x:Key="ComboBoxDropDownForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+
+    <!-- BaseResources for ListBox.xaml -->
+    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
+    <SolidColorBrush x:Key="ListBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ListBoxDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxFocusBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
+    <SolidColorBrush x:Key="ListBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackgroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledForegroundThemeBrush" Color="#99000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
+    <!-- BaseResources for ProgressBar.xaml -->
+    <SolidColorBrush x:Key="ProgressBarBackgroundThemeBrush" Color="#30000000" />
+    <SolidColorBrush x:Key="ProgressBarBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ProgressBarForegroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="ProgressBarIndeterminateForegroundThemeBrush" Color="#FF4617B4" />
+
+    <!-- BaseResources for TextBox.xaml -->
+    <StaticResource x:Key="TextControlForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundChromeBlackHighBrush" />
+    <StaticResource x:Key="TextControlForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
+    <StaticResource x:Key="TextControlBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <StaticResource x:Key="TextControlBackgroundPointerOver" ResourceKey="SystemControlBackgroundAltMediumBrush" />
+    <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundChromeWhiteBrush" />
+    <StaticResource x:Key="TextControlBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="TextControlBorderBrushFocused" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForeground" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundPointerOver" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlPageTextChromeBlackMediumLowBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
+    <StaticResource x:Key="TextControlHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="TextControlSelectionHighlightColor" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBackgroundPressed" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundChromeBlackMediumBrush" />
+    <StaticResource x:Key="TextControlButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ContentLinkForegroundColor" ResourceKey="SystemControlHyperlinkTextBrush" />
+    <StaticResource x:Key="ContentLinkBackgroundColor" ResourceKey="SystemControlPageBackgroundChromeLowBrush" />
+
+    <!-- Resources for AutoCompleteBox.xaml -->
+    <StaticResource x:Key="AutoCompleteBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+    <StaticResource x:Key="AutoCompleteBoxSuggestionsListBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <StaticResource x:Key="AutoCompleteBoxSuggestionsListBorderBrush" ResourceKey="SystemControlForegroundChromeHighBrush" />
+    <x:Double x:Key="AutoCompleteBoxIconFontSize">12</x:Double>
+
+    <!-- BaseResources for CheckBox.xaml -->
+    <StaticResource x:Key="CheckBoxForegroundUnchecked" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundUncheckedPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundUncheckedPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundUncheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxForegroundChecked" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundCheckedPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundCheckedPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxForegroundIndeterminate" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundIndeterminatePointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundIndeterminatePressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundUnchecked" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundChecked" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundCheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundCheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundIndeterminate" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundIndeterminatePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundIndeterminatePressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushUnchecked" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushChecked" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushCheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushCheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushIndeterminate" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushIndeterminatePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushIndeterminatePressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeUnchecked" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeChecked" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminate" ResourceKey="SystemControlForegroundAccentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminatePointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminatePressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillUnchecked" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPressed" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillChecked" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedPointerOver" ResourceKey="SystemControlBackgroundAccentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminate" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminatePointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminatePressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundUnchecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedPointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedDisabled" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundChecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedPointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedPressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminate" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePressed" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    
+    <!-- BaseResources for RadioButton.xaml -->
+    <StaticResource x:Key="RadioButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStroke" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokePointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokePressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFill" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStroke" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFill" ResourceKey="SystemControlHighlightAltTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFill" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillPressed" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStroke" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokePressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokeDisabled" ResourceKey="SystemControlTransparentBrush" />
+    
+    <!-- BaseResources for Slider.xaml -->
+    <StaticResource x:Key="SliderContainerBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderThumbBackground" ResourceKey="SystemControlForegroundAccentBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundPointerOver" ResourceKey="SystemControlHighlightChromeAltLowBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundPressed" ResourceKey="SystemControlHighlightChromeHighBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillPointerOver" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="SliderTrackFillPressed" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackValueFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <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" />
+
+    <!-- Resources for ToolTip.xaml -->
+    <x:Double x:Key="ToolTipContentThemeFontSize">12</x:Double>
+    <Thickness x:Key="ToolTipBorderThemeThickness">1</Thickness>
+    <StaticResource x:Key="ToolTipForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ToolTipBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <StaticResource x:Key="ToolTipBorderBrush" ResourceKey="SystemControlForegroundChromeHighBrush" />
+    <SolidColorBrush x:Key="ToolTipBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToolTipBorderThemeBrush" Color="#FF808080" />
+    <SolidColorBrush x:Key="ToolTipForegroundThemeBrush" Color="#FF666666" />
+
+    <!-- Resources for TabItem.xaml -->
+    <FontFamily x:Key="TabItemHeaderFontFamily">XamlAutoFontFamily</FontFamily>
+    <x:Double x:Key="TabItemHeaderFontSize">24</x:Double>
+    <x:Double x:Key="TabItemHeaderLockedTranslation">40</x:Double>
+    <x:Int32 x:Key="TabItemHeaderCharacterSpacing">-25</x:Int32>
+    <Thickness x:Key="TabItemHeaderMargin">12,0,12,0</Thickness>
+    <Thickness x:Key="TabItemMargin">12,0,12,0</Thickness>
+    <FontWeight x:Key="TabItemHeaderThemeFontWeight">SemiLight</FontWeight>
+    <StaticResource x:Key="TabControlBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackground" ResourceKey="SystemControlTransparentBrush" />
+    <!-- Resources for TabItem -->
+    <StaticResource x:Key="TabItemHeaderBackgroundUnselected" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundUnselectedPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundUnselectedPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundSelected" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundSelectedPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundUnselected" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundUnselectedPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundUnselectedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="TabItemHeaderFocusPipeFill" ResourceKey="SystemControlHighlightAltAccentBrush" />
+    <StaticResource x:Key="TabItemHeaderSelectedPipeFill" ResourceKey="SystemControlHighlightAltAccentBrush" />
+
+    <!-- BaseResources for ScrollBar.xaml -->
+    <StaticResource x:Key="ScrollBarBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarForeground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundListLowBrush" />
+    <StaticResource x:Key="ScrollBarButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+    <StaticResource x:Key="ScrollBarButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonArrowForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ScrollBarButtonArrowForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ScrollBarButtonArrowForegroundPressed" ResourceKey="SystemControlForegroundAltHighBrush" />
+    <StaticResource x:Key="ScrollBarButtonArrowForegroundDisabled" ResourceKey="SystemControlForegroundBaseLowBrush" />
+    <StaticResource x:Key="ScrollBarThumbFill" ResourceKey="SystemControlForegroundChromeDisabledLowBrush" />
+    <StaticResource x:Key="ScrollBarThumbFillPointerOver" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="ScrollBarThumbFillPressed" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+    <StaticResource x:Key="ScrollBarThumbFillDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <SolidColorBrush x:Key="ScrollBarTrackFill" Color="{StaticResource SystemChromeMediumColor}" Opacity="0.9" />
+    <SolidColorBrush x:Key="ScrollBarTrackFillPointerOver" Color="{StaticResource SystemChromeMediumColor}" Opacity="0.9" />
+    <StaticResource x:Key="ScrollBarTrackFillDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <StaticResource x:Key="ScrollBarTrackStroke" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ScrollBarTrackStrokePointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ScrollBarTrackStrokeDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <StaticResource x:Key="ScrollBarPanningThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeHighBrush" />
+    <StaticResource x:Key="ScrollBarThumbBackgroundColor" ResourceKey="SystemBaseLowColor" />
+    <StaticResource x:Key="ScrollBarPanningThumbBackgroundColor" ResourceKey="SystemChromeDisabledLowColor" />
+    <SolidColorBrush x:Key="ScrollBarThumbBackground" Color="{StaticResource ScrollBarThumbBackgroundColor}" />
+    <SolidColorBrush x:Key="ScrollBarPanningThumbBackground" Color="{StaticResource ScrollBarPanningThumbBackgroundColor}" />
+    <x:TimeSpan x:Key="ScrollBarExpandDuration">00:00:00.1</x:TimeSpan>
+    <x:String x:Key="ScrollBarExpandBeginTime">00:00:00.40</x:String>
+    <x:String x:Key="ScrollBarContractBeginTime">00:00:02.00</x:String>
+    <x:String x:Key="ScrollBarContractDelay">00:00:02</x:String>
+    <x:String x:Key="ScrollBarContractDuration">00:00:00.1</x:String>
+    <x:String x:Key="ScrollBarContractFinalKeyframe">00:00:02.1</x:String>
+    <x:Double x:Key="ScrollBarSize">16</x:Double>
+    <x:Double x:Key="SmallScrollThumbScale">0.125</x:Double>
+    <x:Double x:Key="SmallScrollThumbOffset">-2</x:Double>
+    <TransformOperations x:Key="VerticalSmallScrollThumbScaleTransform">scaleX(0.125) translateX(-2px)</TransformOperations>
+    <TransformOperations x:Key="HorizontalSmallScrollThumbScaleTransform">scaleY(0.125) translateY(-2px)</TransformOperations>
+    <x:Double x:Key="ScrollBarButtonArrowIconFontSize">8</x:Double>
+
+    <!-- BaseResources for ScrollViewer.xaml -->
+    <SolidColorBrush x:Key="ScrollViewerScrollBarsSeparatorBackground" Color="{StaticResource SystemChromeMediumColor}" Opacity="0.9" />
+  </Style.Resources>
+</Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
new file mode 100644
index 0000000000..ad23955776
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
@@ -0,0 +1,458 @@
+<Style xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+  xmlns:sys="clr-namespace:System;assembly=netstandard">
+  <Style.Resources>
+    <Color x:Key="SystemRevealListLowColor">#17000000</Color>
+    <Color x:Key="SystemRevealListMediumColor">#2E000000</Color>
+    <!--<AcrylicBrush x:Key="SystemControlAcrylicWindowBrush" BackgroundSource="HostBackdrop" TintColor="{ThemeResource SystemChromeAltHighColor}" TintOpacity="0.8" FallbackColor="{ThemeResource SystemChromeMediumColor}" />-->
+    <!--<RevealBackgroundBrush x:Key="SystemControlTransparentRevealBackgroundBrush" TargetTheme="Dark" Color="Transparent" FallbackColor="Transparent" />-->
+    <SolidColorBrush x:Key="SystemControlTransparentRevealBackgroundBrush" Color="Transparent" />
+    <!--<RevealBorderBrush x:Key="SystemControlTransparentRevealBorderBrush" TargetTheme="Dark" Color="Transparent" FallbackColor="Transparent" />-->
+    <SolidColorBrush x:Key="SystemControlTransparentRevealBorderBrush" Color="Transparent" />
+    
+    <!-- Override system shape defaults -->
+    <CornerRadius x:Key="ControlCornerRadius">3</CornerRadius>
+    <CornerRadius x:Key="OverlayCornerRadius">5</CornerRadius>
+    
+    <!-- Override system borders -->
+    <Thickness x:Key="MenuBarItemBorderThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="GridViewItemMultiselectBorderThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="CheckBoxBorderThemeThickness">1</Thickness>
+    <x:Double x:Key="GridViewItemSelectedBorderThemeThickness">1</x:Double>
+    <x:Double x:Key="RadioButtonBorderThemeThickness">1</x:Double>
+    <Thickness x:Key="ButtonBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="CalendarDatePickerBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="TimePickerBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="DatePickerBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="ToggleSwitchOuterBorderStrokeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="RepeatButtonBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="SearchBoxBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="ToggleButtonBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="TextControlBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="ButtonRevealBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="RepeatButtonRevealBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="ToggleButtonRevealBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="AppBarEllipsisButtonRevealBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="AppBarButtonRevealBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="AppBarToggleButtonRevealBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="ListViewItemRevealBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="GridViewItemRevealBorderThemeThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="ComboBoxItemRevealBorderThemeThickness">1,1,1,1</Thickness>
+    <x:Double x:Key="PersonPictureEllipseBadgeStrokeThickness">1</x:Double>
+    
+    <!--<RevealBackgroundBrush x:Key="SystemControlHighlightListLowRevealBackgroundBrush" TargetTheme="Light" Color="{ThemeResource SystemRevealListMediumColor}" FallbackColor="{ StaticResource SystemListMediumColor}" />-->
+    <Color x:Key="RegionColor">#FFFFFFFF</Color>
+    <SolidColorBrush x:Key="RegionBrush" Color="{StaticResource RegionColor}" />
+    
+    <!-- BaseResources for Button.xaml -->
+    <StaticResource x:Key="ButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="ButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+
+    <!-- Resources for RepeatButton.xaml -->
+    <StaticResource x:Key="RepeatButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="RepeatButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="RepeatButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="RepeatButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="RepeatButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RepeatButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="RepeatButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="RepeatButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RepeatButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="RepeatButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+
+    <!-- Resources for ToggleButton.xaml -->
+    <StaticResource x:Key="ToggleButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundChecked" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundCheckedPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundCheckedPressed" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundCheckedDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundIndeterminate" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundIndeterminatePointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundIndeterminatePressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundIndeterminateDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundChecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundIndeterminate" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundIndeterminatePointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundIndeterminatePressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushChecked" ResourceKey="SystemControlHighlightAltTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushCheckedPointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushCheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushCheckedDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushIndeterminate" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushIndeterminatePointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushIndeterminatePressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushIndeterminateDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    
+    <!-- BaseResources for ComboBox.xaml -->
+    <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="ComboBoxItemForegroundSelectedUnfocused" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxItemForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxItemForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxItemForegroundSelectedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <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="ComboBoxItemBackgroundSelectedUnfocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightListAccentHighBrush" />
+    <StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightListAccentMediumBrush" />
+    <StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ComboBoxItemBorderBrush" 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="ComboBoxItemBorderBrushSelectedUnfocused" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />    
+
+    <StaticResource x:Key="ComboBoxBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundBorderBrushFocused" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundBorderBrushUnfocused" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxForegroundFocused" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxPlaceHolderForeground" ResourceKey="SystemControlPageTextBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxPlaceHolderForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="ComboBoxBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="ComboBoxDropDownBackgroundPointerOver" ResourceKey="SystemControlBackgroundListLowBrush" />
+    <StaticResource x:Key="ComboBoxDropDownBackgroundPointerPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
+    <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerOver" ResourceKey="SystemControlBackgroundChromeBlackLowBrush" />
+    <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerPressed" ResourceKey="SystemControlBackgroundChromeBlackMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxDropDownGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="ComboBoxEditableDropDownGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="ComboBoxDropDownGlyphForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocused" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlTransientBackgroundBrush" />
+    <StaticResource x:Key="ComboBoxDropDownForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    
+    <!-- BaseResources for Listbox.xaml -->
+    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
+    <SolidColorBrush x:Key="ListBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxBorderThemeBrush" Color="#45000000" />
+    <SolidColorBrush x:Key="ListBoxDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ListBoxFocusBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
+    <SolidColorBrush x:Key="ListBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackgroundThemeBrush" Color="#8C000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledForegroundThemeBrush" Color="#99FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
+    
+    <!-- BaseResources for ProgressBar.xaml -->
+    <SolidColorBrush x:Key="ProgressBarBackgroundThemeBrush" Color="#59FFFFFF" />
+    <SolidColorBrush x:Key="ProgressBarBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ProgressBarForegroundThemeBrush" Color="#FF5B2EC5" />
+    <SolidColorBrush x:Key="ProgressBarIndeterminateForegroundThemeBrush" Color="#FF8A57FF" />
+
+    <!-- BaseResources for TextBox.xaml -->
+    <StaticResource x:Key="TextControlForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundChromeBlackHighBrush" />
+    <StaticResource x:Key="TextControlForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
+    <StaticResource x:Key="TextControlBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <StaticResource x:Key="TextControlBackgroundPointerOver" ResourceKey="SystemControlBackgroundAltMediumBrush" />
+    <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundChromeWhiteBrush" />
+    <StaticResource x:Key="TextControlBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="TextControlBorderBrushFocused" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForeground" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundPointerOver" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlPageTextChromeBlackMediumLowBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
+    <StaticResource x:Key="TextControlHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="TextControlSelectionHighlightColor" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBackgroundPressed" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundChromeBlackMediumBrush" />
+    <StaticResource x:Key="TextControlButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ContentLinkForegroundColor" ResourceKey="SystemControlHyperlinkTextBrush" />
+    <StaticResource x:Key="ContentLinkBackgroundColor" ResourceKey="SystemControlPageBackgroundChromeLowBrush" />
+
+    <!-- Resources for AutoCompleteBox.xaml -->
+    <StaticResource x:Key="AutoCompleteBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+    <StaticResource x:Key="AutoCompleteBoxSuggestionsListBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <StaticResource x:Key="AutoCompleteBoxSuggestionsListBorderBrush" ResourceKey="SystemControlForegroundChromeHighBrush" />
+    <x:Double x:Key="AutoCompleteBoxIconFontSize">12</x:Double>
+
+    <!-- BaseResources for CheckBox.xaml -->
+    <StaticResource x:Key="CheckBoxForegroundUnchecked" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundUncheckedPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundUncheckedPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundUncheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxForegroundChecked" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundCheckedPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundCheckedPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxForegroundIndeterminate" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundIndeterminatePointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundIndeterminatePressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundUnchecked" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundChecked" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundCheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundCheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundIndeterminate" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundIndeterminatePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundIndeterminatePressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushUnchecked" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushChecked" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushCheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushCheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushIndeterminate" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushIndeterminatePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushIndeterminatePressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeUnchecked" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeChecked" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminate" ResourceKey="SystemControlForegroundAccentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminatePointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminatePressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillUnchecked" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPressed" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillChecked" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedPointerOver" ResourceKey="SystemControlBackgroundAccentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminate" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminatePointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminatePressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundUnchecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedPointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedDisabled" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundChecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedPointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedPressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminate" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePressed" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    
+    <!-- BaseResources for RadioButton.xaml -->
+    <StaticResource x:Key="RadioButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStroke" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokePointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokePressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFill" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStroke" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFill" ResourceKey="SystemControlHighlightAltTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFill" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillPressed" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStroke" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokePressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokeDisabled" ResourceKey="SystemControlTransparentBrush" />
+    
+    <!-- BaseResources for Slider.xaml -->
+    <StaticResource x:Key="SliderContainerBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderThumbBackground" ResourceKey="SystemControlForegroundAccentBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundPointerOver" ResourceKey="SystemControlHighlightChromeAltLowBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundPressed" ResourceKey="SystemControlHighlightChromeHighBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillPointerOver" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="SliderTrackFillPressed" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackValueFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <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" />
+
+    <!-- Resources for ToolTip.xaml -->
+    <x:Double x:Key="ToolTipContentThemeFontSize">12</x:Double>
+    <Thickness x:Key="ToolTipBorderThemeThickness">1</Thickness>
+    <StaticResource x:Key="ToolTipForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ToolTipBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <StaticResource x:Key="ToolTipBorderBrush" ResourceKey="SystemControlForegroundChromeHighBrush" />
+    <SolidColorBrush x:Key="ToolTipBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToolTipBorderThemeBrush" Color="#FF808080" />
+    <SolidColorBrush x:Key="ToolTipForegroundThemeBrush" Color="#FF666666" />
+
+    <!-- Resources for TabItem.xaml -->
+    <FontFamily x:Key="TabItemHeaderFontFamily">XamlAutoFontFamily</FontFamily>
+    <x:Double x:Key="TabItemHeaderFontSize">24</x:Double>
+    <x:Double x:Key="TabItemHeaderLockedTranslation">40</x:Double>
+    <x:Int32 x:Key="TabItemHeaderCharacterSpacing">-25</x:Int32>
+    <Thickness x:Key="TabItemHeaderMargin">12,0,12,0</Thickness>
+    <Thickness x:Key="TabItemMargin">12,0,12,0</Thickness>
+    <FontWeight x:Key="TabItemHeaderThemeFontWeight">SemiLight</FontWeight>
+    <StaticResource x:Key="TabControlBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackground" ResourceKey="SystemControlTransparentBrush" />
+    <!-- Resources for TabItem -->
+    <StaticResource x:Key="TabItemHeaderBackgroundUnselected" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundUnselectedPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundUnselectedPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundSelected" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundSelectedPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundUnselected" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundUnselectedPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundUnselectedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="TabItemHeaderFocusPipeFill" ResourceKey="SystemControlHighlightAltAccentBrush" />
+    <StaticResource x:Key="TabItemHeaderSelectedPipeFill" ResourceKey="SystemControlHighlightAltAccentBrush" />
+
+    <!-- BaseResources for ScrollBar.xaml -->
+    <StaticResource x:Key="ScrollBarBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarForeground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundListLowBrush" />
+    <StaticResource x:Key="ScrollBarButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+    <StaticResource x:Key="ScrollBarButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonArrowForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ScrollBarButtonArrowForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ScrollBarButtonArrowForegroundPressed" ResourceKey="SystemControlForegroundAltHighBrush" />
+    <StaticResource x:Key="ScrollBarButtonArrowForegroundDisabled" ResourceKey="SystemControlForegroundBaseLowBrush" />
+    <StaticResource x:Key="ScrollBarThumbFill" ResourceKey="SystemControlForegroundChromeDisabledLowBrush" />
+    <StaticResource x:Key="ScrollBarThumbFillPointerOver" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="ScrollBarThumbFillPressed" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+    <StaticResource x:Key="ScrollBarThumbFillDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <SolidColorBrush x:Key="ScrollBarTrackFill" Color="{StaticResource SystemChromeMediumColor}" Opacity="0.9" />
+    <SolidColorBrush x:Key="ScrollBarTrackFillPointerOver" Color="{StaticResource SystemChromeMediumColor}" Opacity="0.9" />
+    <StaticResource x:Key="ScrollBarTrackFillDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <StaticResource x:Key="ScrollBarTrackStroke" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ScrollBarTrackStrokePointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ScrollBarTrackStrokeDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <StaticResource x:Key="ScrollBarPanningThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeHighBrush" />
+    <StaticResource x:Key="ScrollBarThumbBackgroundColor" ResourceKey="SystemBaseLowColor" />
+    <StaticResource x:Key="ScrollBarPanningThumbBackgroundColor" ResourceKey="SystemChromeDisabledLowColor" />
+    <SolidColorBrush x:Key="ScrollBarThumbBackground" Color="{StaticResource ScrollBarThumbBackgroundColor}" />
+    <SolidColorBrush x:Key="ScrollBarPanningThumbBackground" Color="{StaticResource ScrollBarPanningThumbBackgroundColor}" />
+    <x:String x:Key="ScrollBarExpandDuration">00:00:00.1</x:String>
+    <x:String x:Key="ScrollBarExpandBeginTime">00:00:00.40</x:String>
+    <x:String x:Key="ScrollBarContractBeginTime">00:00:02.00</x:String>
+    <x:String x:Key="ScrollBarContractDelay">00:00:02</x:String>
+    <x:String x:Key="ScrollBarContractDuration">00:00:00.1</x:String>
+    <x:String x:Key="ScrollBarContractFinalKeyframe">00:00:02.1</x:String>
+    <x:Double x:Key="ScrollBarSize">16</x:Double>
+    <x:Double x:Key="SmallScrollThumbScale">0.125</x:Double>
+    <x:Double x:Key="SmallScrollThumbOffset">-2</x:Double>
+    <TransformOperations x:Key="VerticalSmallScrollThumbScaleTransform">scaleX(0.125) translateX(-2px)</TransformOperations>
+    <TransformOperations x:Key="HorizontalSmallScrollThumbScaleTransform">scaleY(0.125) translateY(-2px)</TransformOperations>
+    <x:Double x:Key="ScrollBarButtonArrowIconFontSize">8</x:Double>
+
+    <!-- BaseResources for ScrollViewer.xaml -->
+    <SolidColorBrush x:Key="ScrollViewerScrollBarsSeparatorBackground" Color="{StaticResource SystemChromeMediumColor}" Opacity="0.9" />
+  </Style.Resources>
+</Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
new file mode 100644
index 0000000000..abc02a6371
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
@@ -0,0 +1,813 @@
+<Style xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:sys="clr-namespace:System;assembly=netstandard">
+  <Style.Resources>
+    <!-- Resources for Button.xaml -->
+    <StaticResource x:Key="AccentButtonBackground" ResourceKey="SystemControlBackgroundAccentBrush" />
+    <StaticResource x:Key="AccentButtonBackgroundPointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="AccentButtonBackgroundPressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="AccentButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="AccentButtonForeground" ResourceKey="SystemControlBackgroundChromeWhiteBrush" />
+    <StaticResource x:Key="AccentButtonForegroundPointerOver" ResourceKey="SystemControlBackgroundChromeWhiteBrush" />
+    <StaticResource x:Key="AccentButtonForegroundPressed" ResourceKey="SystemControlBackgroundChromeWhiteBrush" />
+    <StaticResource x:Key="AccentButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="AccentButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="AccentButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="AccentButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="AccentButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <Thickness x:Key="ButtonBorderThemeThickness">1</Thickness>
+    <StaticResource x:Key="ButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{StaticResource SystemBaseHighColor}" Opacity="0.1" />
+    <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="ButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <SolidColorBrush x:Key="ButtonBackgroundThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ButtonBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ButtonDisabledBackgroundThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ButtonDisabledBorderThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ButtonDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ButtonForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ButtonPointerOverBackgroundThemeBrush" Color="#21FFFFFF" />
+    <SolidColorBrush x:Key="ButtonPointerOverForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ButtonPressedBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ButtonPressedForegroundThemeBrush" Color="#FF000000" />
+
+    <!-- Resources for RepeatButton.xaml -->
+    <Thickness x:Key="RepeatButtonBorderThemeThickness">1</Thickness>
+    <StaticResource x:Key="RepeatButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <SolidColorBrush x:Key="RepeatButtonBackgroundPointerOver" Color="{StaticResource SystemBaseHighColor}" Opacity="0.1" />
+    <StaticResource x:Key="RepeatButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="RepeatButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="RepeatButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RepeatButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="RepeatButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="RepeatButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RepeatButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="RepeatButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <SolidColorBrush x:Key="RepeatButtonBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="RepeatButtonDisabledBackgroundThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="RepeatButtonDisabledBorderThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="RepeatButtonDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="RepeatButtonForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="RepeatButtonPointerOverBackgroundThemeBrush" Color="#21FFFFFF" />
+    <SolidColorBrush x:Key="RepeatButtonPointerOverForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="RepeatButtonPressedBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="RepeatButtonPressedForegroundThemeBrush" Color="#FF000000" />
+
+    <!-- Resources for ToggleButton.xaml -->
+    <Thickness x:Key="ToggleButtonBorderThemeThickness">1</Thickness>
+    <StaticResource x:Key="ToggleButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <SolidColorBrush x:Key="ToggleButtonBackgroundPointerOver" Color="{StaticResource SystemBaseHighColor}" Opacity="0.1" />
+    <StaticResource x:Key="ToggleButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundChecked" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundCheckedPointerOver" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="ToggleButtonBackgroundCheckedPressed" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundCheckedDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundIndeterminate" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundIndeterminatePointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundIndeterminatePressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundIndeterminateDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundChecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundIndeterminate" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundIndeterminatePointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundIndeterminatePressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushChecked" ResourceKey="SystemControlHighlightAltTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushCheckedPointerOver" ResourceKey="SystemControlHighlightAltTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushCheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushCheckedDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushIndeterminate" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushIndeterminatePointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushIndeterminatePressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushIndeterminateDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <SolidColorBrush x:Key="ToggleButtonBackgroundThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ToggleButtonBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedDisabledBackgroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedDisabledForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedPointerOverBackgroundThemeBrush" Color="#99FFFFFF" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedPointerOverBorderThemeBrush" Color="#99FFFFFF" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedPressedBackgroundThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedPressedBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedPressedForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToggleButtonDisabledBorderThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ToggleButtonDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ToggleButtonForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToggleButtonPointerOverBackgroundThemeBrush" Color="#21FFFFFF" />
+    <SolidColorBrush x:Key="ToggleButtonPressedBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToggleButtonPressedForegroundThemeBrush" Color="#FF000000" />
+
+    <!-- Resources for ComboBox.xaml -->
+    <x:Double x:Key="ComboBoxArrowThemeFontSize">21</x:Double>
+    <x:Double x:Key="ComboBoxThemeMinWidth">64</x:Double>
+    <x:Double x:Key="ComboBoxPopupThemeMinWidth">80</x:Double>
+    <x:Double x:Key="ComboBoxPopupThemeTouchMinWidth">240</x:Double>
+    <Thickness x:Key="ComboBoxBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="ComboBoxDropdownBorderThickness">1</Thickness>
+    <Thickness x:Key="ComboBoxHeaderThemeMargin">0,0,0,4</Thickness>
+    <Thickness x:Key="ComboBoxPopupBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="ComboBoxItemThemePadding">11,5,11,7</Thickness>
+    <Thickness x:Key="ComboBoxItemThemeTouchPadding">11,11,11,13</Thickness>
+    <Thickness x:Key="ComboBoxItemThemeGameControllerPadding">11,11,11,13</Thickness>
+    <FontWeight x:Key="ComboBoxHeaderThemeFontWeight">Normal</FontWeight>
+    <FontWeight x:Key="ComboBoxPlaceholderTextThemeFontWeight">SemiLight</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="ComboBoxItemForegroundSelectedUnfocused" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxItemForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxItemForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxItemForegroundSelectedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <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="ComboBoxItemBackgroundSelectedUnfocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightListAccentHighBrush" />
+    <StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightListAccentMediumBrush" />
+    <StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ComboBoxItemBorderBrush" 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="ComboBoxItemBorderBrushSelectedUnfocused" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
+
+    <StaticResource x:Key="ComboBoxBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundBorderBrushFocused" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundBorderBrushUnfocused" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxForegroundFocused" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxPlaceHolderForeground" ResourceKey="SystemControlPageTextBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxPlaceHolderForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="ComboBoxBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="ComboBoxBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="ComboBoxDropDownGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="ComboBoxDropDownGlyphForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocused" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="ComboBoxDropDownForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlTransientBackgroundBrush" />
+    <StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+
+    <StaticResource x:Key="ComboBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+    <SolidColorBrush x:Key="ComboBoxArrowDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ComboBoxArrowForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ComboBoxArrowPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ComboBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="ComboBoxBorderThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="ComboBoxDisabledBackgroundThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ComboBoxDisabledBorderThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ComboBoxDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ComboBoxFocusedBackgroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="ComboBoxFocusedBorderThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="ComboBoxFocusedForegroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="ComboBoxForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ComboBoxHeaderForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ComboBoxItemDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ComboBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
+    <SolidColorBrush x:Key="ComboBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ComboBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
+    <SolidColorBrush x:Key="ComboBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedDisabledBackgroundThemeBrush" Color="#8C000000" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedDisabledForegroundThemeBrush" Color="#99FFFFFF" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedForegroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
+    <SolidColorBrush x:Key="ComboBoxPlaceholderTextForegroundThemeBrush" Color="#88000000" />
+    <SolidColorBrush x:Key="ComboBoxPointerOverBackgroundThemeBrush" Color="#DEFFFFFF" />
+    <SolidColorBrush x:Key="ComboBoxPointerOverBorderThemeBrush" Color="#DEFFFFFF" />
+    <SolidColorBrush x:Key="ComboBoxPopupBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ComboBoxPopupBorderThemeBrush" Color="#FF212121" />
+    <SolidColorBrush x:Key="ComboBoxPopupForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ComboBoxPressedBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ComboBoxPressedBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ComboBoxPressedHighlightThemeBrush" Color="#FFD3D3D3" />
+    <SolidColorBrush x:Key="ComboBoxPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ComboBoxSelectedBackgroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="ComboBoxSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
+
+    <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
+    <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
+    <StaticResource x:Key="ComboBoxDropDownBackgroundPointerOver" ResourceKey="SystemControlBackgroundListLowBrush" />
+    <StaticResource x:Key="ComboBoxDropDownBackgroundPointerPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
+    <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxEditableDropDownGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+
+    <!-- Resources for ListBox.xaml -->
+    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
+    <SolidColorBrush x:Key="ListBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ListBoxDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxFocusBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
+    <SolidColorBrush x:Key="ListBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackgroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledForegroundThemeBrush" Color="#99000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
+
+    <!-- Resources for MenuFlyout.xaml (Menu, ContextMenu, etc) -->
+    <x:Double x:Key="MenuFlyoutSeparatorThemeHeight">1</x:Double>
+    <x:Double x:Key="MenuFlyoutThemeMinHeight">32</x:Double>
+    <Thickness x:Key="MenuFlyoutPresenterThemePadding">0,0</Thickness>
+    <Thickness x:Key="MenuFlyoutItemChevronMargin">12,0,0,0</Thickness>
+    <Thickness x:Key="MenuFlyoutSeparatorThemePadding">12,4,12,4</Thickness>
+    <StaticResource x:Key="MenuFlyoutItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="MenuFlyoutItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <StaticResource x:Key="MenuFlyoutItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <StaticResource x:Key="MenuFlyoutItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="MenuFlyoutItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="MenuFlyoutItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="MenuFlyoutItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="MenuFlyoutItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="MenuFlyoutSubItemChevron" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="MenuFlyoutSubItemChevronPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="MenuFlyoutSubItemChevronPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="MenuFlyoutSubItemChevronSubMenuOpened" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="MenuFlyoutSubItemChevronDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="MenuFlyoutLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+    <StaticResource x:Key="MenuFlyoutItemKeyboardAcceleratorTextForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="MenuFlyoutItemKeyboardAcceleratorTextForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <StaticResource x:Key="MenuFlyoutItemKeyboardAcceleratorTextForegroundPressed" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <StaticResource x:Key="MenuFlyoutItemKeyboardAcceleratorTextForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <Thickness x:Key="MenuFlyoutItemThemePadding">11,9,11,10</Thickness>
+    <Thickness x:Key="MenuFlyoutItemThemePaddingNarrow">11,4,11,7</Thickness>
+    <StaticResource x:Key="MenuFlyoutPresenterBackground" ResourceKey="SystemControlTransientBackgroundBrush" />
+    <StaticResource x:Key="MenuFlyoutPresenterBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <Thickness x:Key="MenuFlyoutPresenterBorderThemeThickness">1</Thickness>
+
+    <!-- Resources for ProgressBar.xaml -->
+    <x:Double x:Key="ProgressBarIndicatorPauseOpacity">0.6</x:Double>
+    <x:Double x:Key="ProgressBarThemeMinHeight">4</x:Double>
+    <Thickness x:Key="ProgressBarBorderThemeThickness">0</Thickness>
+    <SolidColorBrush x:Key="ProgressBarBackgroundThemeBrush" Color="#59FFFFFF" />
+    <SolidColorBrush x:Key="ProgressBarBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ProgressBarForegroundThemeBrush" Color="#FF5B2EC5" />
+    <SolidColorBrush x:Key="ProgressBarIndeterminateForegroundThemeBrush" Color="#FF8A57FF" />
+
+    <!-- Resources for TextBox.xaml -->
+    <SolidColorBrush x:Key="TextBoxForegroundHeaderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush" Color="#AB000000" />
+    <SolidColorBrush x:Key="TextBoxBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="TextBoxBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="TextBoxButtonBackgroundThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonForegroundThemeBrush" Color="#99FFFFFF" />
+    <SolidColorBrush x:Key="TextBoxButtonPointerOverBackgroundThemeBrush" Color="#FFDEDEDE" />
+    <SolidColorBrush x:Key="TextBoxButtonPointerOverBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="TextBoxButtonPressedBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="TextBoxButtonPressedBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonPressedForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="TextBoxDisabledBackgroundThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxDisabledBorderThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="TextBoxDisabledForegroundThemeBrush" Color="#FF666666" />
+    <SolidColorBrush x:Key="TextBoxForegroundThemeBrush" Color="#FF000000" />
+    <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+
+    <!-- Resources for AutoCompleteBox.xaml -->
+    <StaticResource x:Key="AutoCompleteBoxSuggestionsListBackground" ResourceKey="SystemControlTransientBackgroundBrush" />
+    <StaticResource x:Key="AutoCompleteBoxSuggestionsListBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <StaticResource x:Key="AutoCompleteBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+    <x:Double x:Key="AutoCompleteBoxIconFontSize">12</x:Double>
+
+    <!-- Resources for Checkbox.xaml -->
+    <Thickness x:Key="CheckBoxBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="CheckBoxCheckedStrokeThickness">0</Thickness>
+    <StaticResource x:Key="CheckBoxForegroundUnchecked" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundUncheckedPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundUncheckedPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundUncheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxForegroundChecked" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundCheckedPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundCheckedPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxForegroundIndeterminate" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundIndeterminatePointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundIndeterminatePressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundUnchecked" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundChecked" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundCheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundCheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundIndeterminate" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundIndeterminatePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundIndeterminatePressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushUnchecked" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushChecked" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushCheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushCheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushIndeterminate" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushIndeterminatePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushIndeterminatePressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeUnchecked" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeChecked" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedPointerOver" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedPressed" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminate" ResourceKey="SystemControlForegroundAccentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminatePointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminatePressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillUnchecked" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillChecked" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedPointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedPressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedDisabled" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminate" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminatePointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminatePressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminateDisabled" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundUnchecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedPointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedDisabled" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundChecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedDisabled" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminate" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminateDisabled" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <SolidColorBrush x:Key="CheckBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="CheckBoxBorderThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="CheckBoxContentDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="CheckBoxContentForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="CheckBoxDisabledBackgroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="CheckBoxDisabledBorderThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="CheckBoxDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="CheckBoxForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="CheckBoxPointerOverBackgroundThemeBrush" Color="#DEFFFFFF" />
+    <SolidColorBrush x:Key="CheckBoxPointerOverBorderThemeBrush" Color="#DEFFFFFF" />
+    <SolidColorBrush x:Key="CheckBoxPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="CheckBoxPressedBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="CheckBoxPressedBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="CheckBoxPressedForegroundThemeBrush" Color="#FF000000" />
+
+    <!-- Resources for Calendar.xaml, CalendarButton.xaml, CalendarDayButton.xaml, CalendarItem.xaml -->
+    <StaticResource x:Key="CalendarViewFocusBorderBrush" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CalendarViewSelectedHoverBorderBrush" ResourceKey="SystemControlHighlightListAccentMediumBrush" />
+    <StaticResource x:Key="CalendarViewSelectedPressedBorderBrush" ResourceKey="SystemControlHighlightListAccentHighBrush" />
+    <StaticResource x:Key="CalendarViewSelectedBorderBrush" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="CalendarViewHoverBorderBrush" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarViewPressedBorderBrush" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="CalendarViewTodayForeground" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CalendarViewBlackoutForeground" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarViewSelectedForeground" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="CalendarViewPressedForeground" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="CalendarViewOutOfScopeForeground" ResourceKey="SystemControlHyperlinkBaseHighBrush" />
+    <StaticResource x:Key="CalendarViewCalendarItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CalendarViewOutOfScopeBackground" ResourceKey="SystemControlDisabledChromeMediumLowBrush" />
+    <StaticResource x:Key="CalendarViewCalendarItemBackground" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <StaticResource x:Key="CalendarViewForeground" ResourceKey="SystemControlHyperlinkBaseMediumHighBrush" />
+    <StaticResource x:Key="CalendarViewBackground" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <StaticResource x:Key="CalendarViewBorderBrush" ResourceKey="SystemControlForegroundChromeMediumBrush" />
+    <StaticResource x:Key="CalendarViewWeekDayForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarViewNavigationButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CalendarViewNavigationButtonForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CalendarViewNavigationButtonForegroundPressed" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="CalendarViewNavigationButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarViewCalendarItemRevealBackground" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <StaticResource x:Key="CalendarViewCalendarItemRevealBorderBrush" ResourceKey="SystemControlTransparentRevealBorderBrush" />
+    <StaticResource x:Key="CalendarViewNavigationButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="CalendarViewNavigationButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    
+    <!--Resources for NotificationCard.xaml -->
+    <SolidColorBrush x:Key="NotificationCardBackgroundBrush" Color="#444444" />
+    <SolidColorBrush x:Key="NotificationCardProgressBackgroundBrush" Color="#9A9A9A" />
+    <SolidColorBrush x:Key="NotificationCardInformationBackgroundBrush" Color="#007ACC" Opacity="0.75"/>
+    <SolidColorBrush x:Key="NotificationCardSuccessBackgroundBrush" Color="#1F9E45" Opacity="0.75"/>
+    <SolidColorBrush x:Key="NotificationCardWarningBackgroundBrush" Color="#FDB328" Opacity="0.75"/>
+    <SolidColorBrush x:Key="NotificationCardErrorBackgroundBrush" Color="#BD202C" Opacity="0.75"/>
+    
+    <!-- Resources for RadioButton.xaml -->
+    <x:Double x:Key="RadioButtonBorderThemeThickness">1</x:Double>
+    <StaticResource x:Key="RadioButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStroke" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokePointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokePressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFill" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStroke" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillDisabled" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFill" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillPointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillPressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillDisabled" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStroke" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokePressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokeDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <SolidColorBrush x:Key="RadioButtonBackgroundThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonBorderThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonContentDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonContentForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonDisabledBackgroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonDisabledBorderThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="RadioButtonForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="RadioButtonPointerOverBackgroundThemeBrush" Color="#DEFFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonPointerOverBorderThemeBrush" Color="#DEFFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="RadioButtonPressedBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonPressedBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="RadioButtonContentPointerOverForegroundThemeBrush" Color="{DynamicResource SystemColorHighlightTextColor}" />
+
+    <!-- Resources for Slider.xaml -->
+    <x:Double x:Key="SliderOutsideTickBarThemeHeight">4</x:Double>
+    <x:Double x:Key="SliderTrackThemeHeight">2</x:Double>
+    <Thickness x:Key="SliderBorderThemeThickness">0</Thickness>
+    <Thickness x:Key="SliderHeaderThemeMargin">0,0,0,4</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" />
+    <StaticResource x:Key="SliderContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderThumbBackground" ResourceKey="SystemControlForegroundAccentBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundPointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="SliderThumbBackgroundPressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="SliderThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillPointerOver" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="SliderTrackFillPressed" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackValueFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <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" />
+    <SolidColorBrush x:Key="SliderBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SliderDisabledBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SliderThumbBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="SliderThumbBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="SliderThumbDisabledBackgroundThemeBrush" Color="#FF7E7E7E" />
+    <SolidColorBrush x:Key="SliderThumbPointerOverBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="SliderThumbPointerOverBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="SliderThumbPressedBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="SliderThumbPressedBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="SliderTickMarkInlineBackgroundThemeBrush" Color="Black" />
+    <SolidColorBrush x:Key="SliderTickMarkInlineDisabledForegroundThemeBrush" Color="Black" />
+    <SolidColorBrush x:Key="SliderTickmarkOutsideBackgroundThemeBrush" Color="#80FFFFFF" />
+    <SolidColorBrush x:Key="SliderTickMarkOutsideDisabledForegroundThemeBrush" Color="#80FFFFFF" />
+    <SolidColorBrush x:Key="SliderTrackBackgroundThemeBrush" Color="#29FFFFFF" />
+    <SolidColorBrush x:Key="SliderTrackDecreaseBackgroundThemeBrush" Color="#FF5B2EC5" />
+    <SolidColorBrush x:Key="SliderTrackDecreaseDisabledBackgroundThemeBrush" Color="#1FFFFFFF" />
+    <SolidColorBrush x:Key="SliderTrackDecreasePointerOverBackgroundThemeBrush" Color="#FF724BCD" />
+    <SolidColorBrush x:Key="SliderTrackDecreasePressedBackgroundThemeBrush" Color="#FF8152EF" />
+    <SolidColorBrush x:Key="SliderTrackDisabledBackgroundThemeBrush" Color="#29FFFFFF" />
+    <SolidColorBrush x:Key="SliderTrackPointerOverBackgroundThemeBrush" Color="#46FFFFFF" />
+    <SolidColorBrush x:Key="SliderTrackPressedBackgroundThemeBrush" Color="#59FFFFFF" />
+    <SolidColorBrush x:Key="SliderHeaderForegroundThemeBrush" Color="#FFFFFFFF" />
+
+    <!--ToggleSwitch-->
+    <Thickness x:Key="ToggleSwitchOnStrokeThickness">0</Thickness>
+    <Thickness x:Key="ToggleSwitchOuterBorderStrokeThickness">1</Thickness>
+    <StaticResource x:Key="ToggleSwitchContentForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ToggleSwitchContentForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleSwitchHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ToggleSwitchHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleSwitchContainerBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ToggleSwitchContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ToggleSwitchContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ToggleSwitchContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ToggleSwitchFillOff" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ToggleSwitchFillOffPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ToggleSwitchFillOffPressed" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleSwitchFillOffDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ToggleSwitchStrokeOff" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="ToggleSwitchStrokeOffPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="ToggleSwitchStrokeOffPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ToggleSwitchStrokeOffDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleSwitchFillOn" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="ToggleSwitchFillOnPointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="ToggleSwitchFillOnPressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="ToggleSwitchFillOnDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="ToggleSwitchStrokeOn" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleSwitchStrokeOnPointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="ToggleSwitchStrokeOnPressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="ToggleSwitchStrokeOnDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleSwitchKnobFillOff" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleSwitchKnobFillOffPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleSwitchKnobFillOffPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleSwitchKnobFillOffDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleSwitchKnobFillOn" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ToggleSwitchKnobFillOnPointerOver" ResourceKey="SystemControlHighlightChromeWhiteBrush" />
+    <StaticResource x:Key="ToggleSwitchKnobFillOnPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ToggleSwitchKnobFillOnDisabled" ResourceKey="SystemControlPageBackgroundBaseLowBrush" />
+    <SolidColorBrush x:Key="ToggleSwitchCurtainBackgroundThemeBrush" Color="#FF5729C1" />
+    <SolidColorBrush x:Key="ToggleSwitchCurtainDisabledBackgroundThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ToggleSwitchCurtainPointerOverBackgroundThemeBrush" Color="#FF6E46CA" />
+    <SolidColorBrush x:Key="ToggleSwitchCurtainPressedBackgroundThemeBrush" Color="#FF7E4FEC" />
+    <SolidColorBrush x:Key="ToggleSwitchDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ToggleSwitchForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToggleSwitchHeaderDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ToggleSwitchHeaderForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToggleSwitchOuterBorderBorderThemeBrush" Color="#59FFFFFF" />
+    <SolidColorBrush x:Key="ToggleSwitchOuterBorderDisabledBorderThemeBrush" Color="#33FFFFFF" />
+    <SolidColorBrush x:Key="ToggleSwitchThumbBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToggleSwitchThumbBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToggleSwitchThumbDisabledBackgroundThemeBrush" Color="#FF7E7E7E" />
+    <SolidColorBrush x:Key="ToggleSwitchThumbDisabledBorderThemeBrush" Color="#FF7E7E7E" />
+    <SolidColorBrush x:Key="ToggleSwitchThumbPointerOverBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToggleSwitchThumbPointerOverBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToggleSwitchThumbPressedBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToggleSwitchThumbPressedForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToggleSwitchTrackBackgroundThemeBrush" Color="#42FFFFFF" />
+    <SolidColorBrush x:Key="ToggleSwitchTrackBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ToggleSwitchTrackDisabledBackgroundThemeBrush" Color="#1FFFFFFF" />
+    <SolidColorBrush x:Key="ToggleSwitchTrackPointerOverBackgroundThemeBrush" Color="#4AFFFFFF" />
+    <SolidColorBrush x:Key="ToggleSwitchTrackPressedBackgroundThemeBrush" Color="#59FFFFFF" />
+
+    <!-- Resources for ToolTip.xaml -->
+    <x:Double x:Key="ToolTipContentThemeFontSize">12</x:Double>
+    <Thickness x:Key="ToolTipBorderThemeThickness">1</Thickness>
+    <StaticResource x:Key="ToolTipForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ToolTipBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <StaticResource x:Key="ToolTipBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <SolidColorBrush x:Key="ToolTipBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToolTipBorderThemeBrush" Color="#FF808080" />
+    <SolidColorBrush x:Key="ToolTipForegroundThemeBrush" Color="#FF666666" />
+    <Thickness x:Key="ToolTipBorderThemePadding">8,5,8,7</Thickness>
+
+    <!-- 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="DatePickerHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="DatePickerButtonBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="DatePickerButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="DatePickerButtonBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="DatePickerButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="DatePickerButtonBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <StaticResource x:Key="DatePickerButtonBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
+    <StaticResource x:Key="DatePickerButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="DatePickerButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="DatePickerButtonBackgroundFocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <StaticResource x:Key="DatePickerButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="DatePickerButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="DatePickerButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="DatePickerButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="DatePickerButtonForegroundFocused" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="DatePickerFlyoutPresenterBackground" ResourceKey="SystemControlTransientBackgroundBrush" />
+    <StaticResource x:Key="DatePickerFlyoutPresenterBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <StaticResource x:Key="DatePickerFlyoutPresenterSpacerFill" ResourceKey="SystemControlForegroundBaseLowBrush" />
+    <StaticResource x:Key="DatePickerFlyoutPresenterHighlightFill" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <StaticResource x:Key="DatePickerLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+
+    <StaticResource x:Key="DateTimePickerFlyoutButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+
+    <!-- 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" />
+    <StaticResource x:Key="TimePickerButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="TimePickerButtonBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <StaticResource x:Key="TimePickerButtonBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
+    <StaticResource x:Key="TimePickerButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="TimePickerButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="TimePickerButtonBackgroundFocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <StaticResource x:Key="TimePickerButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TimePickerButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="TimePickerButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="TimePickerButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="TimePickerButtonForegroundFocused" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="TimePickerFlyoutPresenterBackground" ResourceKey="SystemControlTransientBackgroundBrush" />
+    <StaticResource x:Key="TimePickerFlyoutPresenterBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <StaticResource x:Key="TimePickerFlyoutPresenterSpacerFill" ResourceKey="SystemControlForegroundBaseLowBrush" />
+    <StaticResource x:Key="TimePickerFlyoutPresenterHighlightFill" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <StaticResource x:Key="TimePickerLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+    <SolidColorBrush x:Key="TimePickerHeaderForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="TimePickerForegroundThemeBrush" Color="#FF000000" />
+
+    <!-- Resources for TabItem.xaml -->
+    <FontFamily x:Key="TabItemHeaderFontFamily">XamlAutoFontFamily</FontFamily>
+    <x:Double x:Key="TabItemHeaderFontSize">24</x:Double>
+    <x:Double x:Key="TabItemHeaderLockedTranslation">40</x:Double>
+    <x:Int32 x:Key="TabItemHeaderCharacterSpacing">-25</x:Int32>
+    <Thickness x:Key="TabItemHeaderMargin">12,0,12,0</Thickness>
+    <Thickness x:Key="TabItemMargin">12,0,12,0</Thickness>
+    <FontWeight x:Key="TabItemHeaderThemeFontWeight">SemiLight</FontWeight>
+    <StaticResource x:Key="TabControlBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackground" ResourceKey="SystemControlTransparentBrush" />
+    <!-- Resources for TabItem -->
+    <StaticResource x:Key="TabItemHeaderBackgroundUnselected" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundUnselectedPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundUnselectedPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundSelected" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundSelectedPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundUnselected" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundUnselectedPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundUnselectedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="TabItemHeaderFocusPipeFill" ResourceKey="SystemControlHighlightAltAccentBrush" />
+    <StaticResource x:Key="TabItemHeaderSelectedPipeFill" ResourceKey="SystemControlHighlightAltAccentBrush" />
+
+    <!-- Resources for ScrollBar.xaml -->
+    <x:Double x:Key="ScrollBarTrackBorderThemeThickness">0</x:Double>
+    <Thickness x:Key="ScrollBarPanningBorderThemeThickness">1</Thickness>
+    <StaticResource x:Key="ScrollBarBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarForeground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundListLowBrush" />
+    <StaticResource x:Key="ScrollBarButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+    <StaticResource x:Key="ScrollBarButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonArrowForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ScrollBarButtonArrowForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ScrollBarButtonArrowForegroundPressed" ResourceKey="SystemControlForegroundAltHighBrush" />
+    <StaticResource x:Key="ScrollBarButtonArrowForegroundDisabled" ResourceKey="SystemControlForegroundBaseLowBrush" />
+    <StaticResource x:Key="ScrollBarThumbFill" ResourceKey="SystemControlForegroundChromeDisabledLowBrush" />
+    <StaticResource x:Key="ScrollBarThumbFillPointerOver" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="ScrollBarThumbFillPressed" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+    <StaticResource x:Key="ScrollBarThumbFillDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <SolidColorBrush x:Key="ScrollBarTrackFill" Color="{StaticResource SystemChromeMediumColor}" Opacity="0.9" />
+    <SolidColorBrush x:Key="ScrollBarTrackFillPointerOver" Color="{StaticResource SystemChromeMediumColor}" Opacity="0.9" />
+    <StaticResource x:Key="ScrollBarTrackFillDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <StaticResource x:Key="ScrollBarTrackStroke" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ScrollBarTrackStrokePointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ScrollBarTrackStrokeDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <StaticResource x:Key="ScrollBarThumbBackgroundColor" ResourceKey="SystemBaseLowColor" />
+    <StaticResource x:Key="ScrollBarPanningThumbBackgroundColor" ResourceKey="SystemChromeDisabledLowColor" />
+    <SolidColorBrush x:Key="ScrollBarThumbBackground" Color="{StaticResource ScrollBarThumbBackgroundColor}" />
+    <SolidColorBrush x:Key="ScrollBarPanningThumbBackground" Color="{StaticResource ScrollBarPanningThumbBackgroundColor}" />
+    <StaticResource x:Key="ScrollBarPanningThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeHighBrush" />
+    <SolidColorBrush x:Key="ScrollBarButtonForegroundThemeBrush" Color="#99000000" />
+    <SolidColorBrush x:Key="ScrollBarButtonPointerOverBackgroundThemeBrush" Color="#FFDADADA" />
+    <SolidColorBrush x:Key="ScrollBarButtonPointerOverBorderThemeBrush" Color="#FFDADADA" />
+    <SolidColorBrush x:Key="ScrollBarButtonPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ScrollBarButtonPressedBackgroundThemeBrush" Color="#99000000" />
+    <SolidColorBrush x:Key="ScrollBarButtonPressedBorderThemeBrush" Color="#99000000" />
+    <SolidColorBrush x:Key="ScrollBarButtonPressedForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ScrollBarPanningBackgroundThemeBrush" Color="#FFCDCDCD" />
+    <SolidColorBrush x:Key="ScrollBarPanningBorderThemeBrush" Color="#7D9A9A9A" />
+    <SolidColorBrush x:Key="ScrollBarThumbBackgroundThemeBrush" Color="#FFCDCDCD" />
+    <SolidColorBrush x:Key="ScrollBarThumbBorderThemeBrush" Color="#3B555555" />
+    <SolidColorBrush x:Key="ScrollBarThumbPointerOverBackgroundThemeBrush" Color="#FFDADADA" />
+    <SolidColorBrush x:Key="ScrollBarThumbPointerOverBorderThemeBrush" Color="#6BB7B7B7" />
+    <SolidColorBrush x:Key="ScrollBarThumbPressedBackgroundThemeBrush" Color="#99000000" />
+    <SolidColorBrush x:Key="ScrollBarThumbPressedBorderThemeBrush" Color="#ED555555" />
+    <SolidColorBrush x:Key="ScrollBarTrackBackgroundThemeBrush" Color="#59D5D5D5" />
+    <SolidColorBrush x:Key="ScrollBarTrackBorderThemeBrush" Color="#59D5D5D5" />
+    <x:String x:Key="ScrollBarExpandDuration">00:00:00.1</x:String>
+    <x:String x:Key="ScrollBarContractDelay">00:00:02</x:String>
+    <x:String x:Key="ScrollBarContractDuration">00:00:00.1</x:String>
+    <x:String x:Key="ScrollBarContractFinalKeyframe">00:00:02.1</x:String>
+    <x:Double x:Key="ScrollBarSize">16</x:Double>
+    <x:Double x:Key="ScrollBarButtonArrowIconFontSize">8</x:Double>
+    <x:String x:Key="ScrollBarExpandBeginTime">00:00:00.40</x:String>
+    <x:String x:Key="ScrollBarContractBeginTime">00:00:02.00</x:String>
+    <!-- Resources for TreeViewItem.xaml -->
+    <StaticResource x:Key="TreeViewItemBackground" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <StaticResource x:Key="TreeViewItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
+    <StaticResource x:Key="TreeViewItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
+    <StaticResource x:Key="TreeViewItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TreeViewItemBackgroundSelected" ResourceKey="SystemControlHighlightAccent3RevealBackgroundBrush" />
+    <StaticResource x:Key="TreeViewItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightAccent2RevealBackgroundBrush" />
+    <StaticResource x:Key="TreeViewItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
+    <StaticResource x:Key="TreeViewItemBackgroundSelectedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="TreeViewItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TreeViewItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="TreeViewItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="TreeViewItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="TreeViewItemForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="TreeViewItemForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="TreeViewItemForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="TreeViewItemForegroundSelectedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="TreeViewItemBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TreeViewItemBorderBrushPointerOver" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
+    <StaticResource x:Key="TreeViewItemBorderBrushPressed" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
+    <StaticResource x:Key="TreeViewItemBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TreeViewItemBorderBrushSelected" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TreeViewItemBorderBrushSelectedPointerOver" ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
+    <StaticResource x:Key="TreeViewItemBorderBrushSelectedPressed" ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
+    <StaticResource x:Key="TreeViewItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TreeViewItemCheckBoxBackgroundSelected" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TreeViewItemCheckBoxBorderSelected" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="TreeViewItemCheckGlyphSelected" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <Thickness x:Key="TreeViewItemBorderThemeThickness">1</Thickness>
+    <x:Double x:Key="TreeViewItemMinHeight">32</x:Double>
+    <!-- Resources for SplitView.xaml -->
+    <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="CalendarDatePickerBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <Thickness x:Key="CalendarDatePickerBorderThemeThickness">1</Thickness>
+  </Style.Resources>
+</Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
new file mode 100644
index 0000000000..6a2a04f732
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
@@ -0,0 +1,811 @@
+<Style xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:sys="clr-namespace:System;assembly=netstandard">
+  <Style.Resources>
+    <!-- Resources for Button.xaml -->
+    <StaticResource x:Key="AccentButtonBackground" ResourceKey="SystemControlBackgroundAccentBrush" />
+    <StaticResource x:Key="AccentButtonBackgroundPointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="AccentButtonBackgroundPressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="AccentButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="AccentButtonForeground" ResourceKey="SystemControlBackgroundChromeWhiteBrush" />
+    <StaticResource x:Key="AccentButtonForegroundPointerOver" ResourceKey="SystemControlBackgroundChromeWhiteBrush" />
+    <StaticResource x:Key="AccentButtonForegroundPressed" ResourceKey="SystemControlBackgroundChromeWhiteBrush" />
+    <StaticResource x:Key="AccentButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="AccentButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="AccentButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="AccentButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="AccentButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <Thickness x:Key="ButtonBorderThemeThickness">1</Thickness>
+    <StaticResource x:Key="ButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{StaticResource SystemBaseHighColor}" Opacity="0.1" />
+    <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="ButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <SolidColorBrush x:Key="ButtonBackgroundThemeBrush" Color="#B3B6B6B6" />
+    <SolidColorBrush x:Key="ButtonBorderThemeBrush" Color="#33000000" />
+    <SolidColorBrush x:Key="ButtonDisabledBackgroundThemeBrush" Color="#66CACACA" />
+    <SolidColorBrush x:Key="ButtonDisabledBorderThemeBrush" Color="#1A000000" />
+    <SolidColorBrush x:Key="ButtonDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ButtonForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ButtonPointerOverBackgroundThemeBrush" Color="#D1CDCDCD" />
+    <SolidColorBrush x:Key="ButtonPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ButtonPressedBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ButtonPressedForegroundThemeBrush" Color="#FFFFFFFF" />
+
+    <!-- Resources for RepeatButton.xaml -->
+    <Thickness x:Key="RepeatButtonBorderThemeThickness">1</Thickness>
+    <StaticResource x:Key="RepeatButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <SolidColorBrush x:Key="RepeatButtonBackgroundPointerOver" Color="{StaticResource SystemBaseHighColor}" Opacity="0.1" />
+    <StaticResource x:Key="RepeatButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="RepeatButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="RepeatButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RepeatButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="RepeatButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="RepeatButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RepeatButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="RepeatButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <SolidColorBrush x:Key="RepeatButtonBorderThemeBrush" Color="#33000000" />
+    <SolidColorBrush x:Key="RepeatButtonDisabledBackgroundThemeBrush" Color="#66CACACA" />
+    <SolidColorBrush x:Key="RepeatButtonDisabledBorderThemeBrush" Color="#1A000000" />
+    <SolidColorBrush x:Key="RepeatButtonDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="RepeatButtonForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="RepeatButtonPointerOverBackgroundThemeBrush" Color="#D1CDCDCD" />
+    <SolidColorBrush x:Key="RepeatButtonPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="RepeatButtonPressedBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="RepeatButtonPressedForegroundThemeBrush" Color="#FFFFFFFF" />
+    <!-- Resources for ToggleButton.xaml -->
+    <Thickness x:Key="ToggleButtonBorderThemeThickness">1</Thickness>
+    <StaticResource x:Key="ToggleButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <SolidColorBrush x:Key="ToggleButtonBackgroundPointerOver" Color="{StaticResource SystemBaseHighColor}" Opacity="0.1" />
+    <StaticResource x:Key="ToggleButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundChecked" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundCheckedPointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="ToggleButtonBackgroundCheckedPressed" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundCheckedDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundIndeterminate" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundIndeterminatePointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundIndeterminatePressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBackgroundIndeterminateDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ToggleButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundChecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundCheckedPointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundCheckedPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundIndeterminate" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundIndeterminatePointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundIndeterminatePressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleButtonForegroundIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushChecked" ResourceKey="SystemControlHighlightAltTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushCheckedPointerOver" ResourceKey="SystemControlHighlightAltTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushCheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushCheckedDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushIndeterminate" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushIndeterminatePointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushIndeterminatePressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="ToggleButtonBorderBrushIndeterminateDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <SolidColorBrush x:Key="ToggleButtonBackgroundThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ToggleButtonBorderThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedBorderThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedDisabledBackgroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedDisabledForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedPointerOverBackgroundThemeBrush" Color="#99000000" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedPointerOverBorderThemeBrush" Color="#99000000" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedPressedBackgroundThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedPressedBorderThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ToggleButtonDisabledBorderThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ToggleButtonDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ToggleButtonForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ToggleButtonPointerOverBackgroundThemeBrush" Color="#21000000" />
+    <SolidColorBrush x:Key="ToggleButtonPressedBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ToggleButtonPressedForegroundThemeBrush" Color="#FFFFFFFF" />
+
+    <!-- Resources for ComboBox.xaml -->
+    <x:Double x:Key="ComboBoxArrowThemeFontSize">21</x:Double>
+    <x:Double x:Key="ComboBoxThemeMinWidth">64</x:Double>
+    <x:Double x:Key="ComboBoxPopupThemeMinWidth">80</x:Double>
+    <x:Double x:Key="ComboBoxPopupThemeTouchMinWidth">240</x:Double>
+    <Thickness x:Key="ComboBoxBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="ComboBoxDropdownBorderThickness">1</Thickness>
+    <Thickness x:Key="ComboBoxHeaderThemeMargin">0,0,0,4</Thickness>
+    <Thickness x:Key="ComboBoxPopupBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="ComboBoxItemThemePadding">11,5,11,7</Thickness>
+    <Thickness x:Key="ComboBoxItemThemeTouchPadding">11,11,11,13</Thickness>
+    <Thickness x:Key="ComboBoxItemThemeGameControllerPadding">11,11,11,13</Thickness>
+    <FontWeight x:Key="ComboBoxHeaderThemeFontWeight">Normal</FontWeight>
+    <FontWeight x:Key="ComboBoxPlaceholderTextThemeFontWeight">SemiLight</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="ComboBoxItemForegroundSelectedUnfocused" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxItemForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxItemForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxItemForegroundSelectedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <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="ComboBoxItemBackgroundSelectedUnfocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightListAccentHighBrush" />
+    <StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightListAccentMediumBrush" />
+    <StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ComboBoxItemBorderBrush" 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="ComboBoxItemBorderBrushSelectedUnfocused" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
+
+    <StaticResource x:Key="ComboBoxBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundBorderBrushFocused" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="ComboBoxBackgroundBorderBrushUnfocused" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxForegroundFocused" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxPlaceHolderForeground" ResourceKey="SystemControlPageTextBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxPlaceHolderForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="ComboBoxBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="ComboBoxBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="ComboBoxDropDownGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="ComboBoxDropDownGlyphForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocused" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="ComboBoxDropDownForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlTransientBackgroundBrush" />
+    <StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+
+    <StaticResource x:Key="ComboBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+    <SolidColorBrush x:Key="ComboBoxArrowDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ComboBoxArrowForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ComboBoxArrowPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ComboBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="ComboBoxBorderThemeBrush" Color="#45000000" />
+    <SolidColorBrush x:Key="ComboBoxDisabledBackgroundThemeBrush" Color="#66CACACA" />
+    <SolidColorBrush x:Key="ComboBoxDisabledBorderThemeBrush" Color="#26000000" />
+    <SolidColorBrush x:Key="ComboBoxDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ComboBoxFocusedBackgroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="ComboBoxFocusedBorderThemeBrush" Color="#70000000" />
+    <SolidColorBrush x:Key="ComboBoxFocusedForegroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="ComboBoxForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ComboBoxHeaderForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ComboBoxItemDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ComboBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
+    <SolidColorBrush x:Key="ComboBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ComboBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
+    <SolidColorBrush x:Key="ComboBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedForegroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedDisabledBackgroundThemeBrush" Color="#8C000000" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedDisabledForegroundThemeBrush" Color="#99FFFFFF" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
+    <SolidColorBrush x:Key="ComboBoxPlaceholderTextForegroundThemeBrush" Color="#88000000" />
+    <SolidColorBrush x:Key="ComboBoxPointerOverBackgroundThemeBrush" Color="#DEFFFFFF" />
+    <SolidColorBrush x:Key="ComboBoxPointerOverBorderThemeBrush" Color="#70000000" />
+    <SolidColorBrush x:Key="ComboBoxPopupBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ComboBoxPopupBorderThemeBrush" Color="#FF212121" />
+    <SolidColorBrush x:Key="ComboBoxPopupForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ComboBoxPressedBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ComboBoxPressedBorderThemeBrush" Color="#A3000000" />
+    <SolidColorBrush x:Key="ComboBoxPressedHighlightThemeBrush" Color="#FFD3D3D3" />
+    <SolidColorBrush x:Key="ComboBoxPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ComboBoxSelectedBackgroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="ComboBoxSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
+
+    <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
+    <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
+    <StaticResource x:Key="ComboBoxDropDownBackgroundPointerOver" ResourceKey="SystemControlBackgroundListLowBrush" />
+    <StaticResource x:Key="ComboBoxDropDownBackgroundPointerPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
+    <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="ComboBoxEditableDropDownGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+
+    <!-- Resources for ListBox.xaml -->
+    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
+    <SolidColorBrush x:Key="ListBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxBorderThemeBrush" Color="#45000000" />
+    <SolidColorBrush x:Key="ListBoxDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ListBoxFocusBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
+    <SolidColorBrush x:Key="ListBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackgroundThemeBrush" Color="#8C000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledForegroundThemeBrush" Color="#99FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
+    <!-- Resources for ProgressBar.xaml -->
+    <x:Double x:Key="ProgressBarIndicatorPauseOpacity">0.6</x:Double>
+    <x:Double x:Key="ProgressBarThemeMinHeight">4</x:Double>
+    <Thickness x:Key="ProgressBarBorderThemeThickness">0</Thickness>
+    <SolidColorBrush x:Key="ProgressBarBackgroundThemeBrush" Color="#30000000" />
+    <SolidColorBrush x:Key="ProgressBarBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ProgressBarForegroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="ProgressBarIndeterminateForegroundThemeBrush" Color="#FF4617B4" />
+
+    <!-- Resources for MenuFlyout.xaml (Menu, ContextMenu, etc) -->
+    <x:Double x:Key="MenuFlyoutSeparatorThemeHeight">1</x:Double>
+    <x:Double x:Key="MenuFlyoutThemeMinHeight">32</x:Double>
+    <Thickness x:Key="MenuFlyoutPresenterThemePadding">0,0</Thickness>
+    <Thickness x:Key="MenuFlyoutItemChevronMargin">12,0,0,0</Thickness>
+    <Thickness x:Key="MenuFlyoutSeparatorThemePadding">12,4,12,4</Thickness>
+    <StaticResource x:Key="MenuFlyoutItemBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="MenuFlyoutItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <StaticResource x:Key="MenuFlyoutItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <StaticResource x:Key="MenuFlyoutItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="MenuFlyoutItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="MenuFlyoutItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="MenuFlyoutItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="MenuFlyoutItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="MenuFlyoutSubItemChevron" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="MenuFlyoutSubItemChevronPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="MenuFlyoutSubItemChevronPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="MenuFlyoutSubItemChevronSubMenuOpened" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="MenuFlyoutSubItemChevronDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="MenuFlyoutLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+    <StaticResource x:Key="MenuFlyoutItemKeyboardAcceleratorTextForeground" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="MenuFlyoutItemKeyboardAcceleratorTextForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <StaticResource x:Key="MenuFlyoutItemKeyboardAcceleratorTextForegroundPressed" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <StaticResource x:Key="MenuFlyoutItemKeyboardAcceleratorTextForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <Thickness x:Key="MenuFlyoutItemThemePadding">11,9,11,10</Thickness>
+    <Thickness x:Key="MenuFlyoutItemThemePaddingNarrow">11,4,11,7</Thickness>
+    <StaticResource x:Key="MenuFlyoutPresenterBackground" ResourceKey="SystemControlTransientBackgroundBrush" />
+    <StaticResource x:Key="MenuFlyoutPresenterBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <Thickness x:Key="MenuFlyoutPresenterBorderThemeThickness">1</Thickness>
+
+    <!-- Resources for TextBox.xaml -->
+    <SolidColorBrush x:Key="TextBoxForegroundHeaderThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush" Color="#AB000000" />
+    <SolidColorBrush x:Key="TextBoxBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="TextBoxBorderThemeBrush" Color="#A3000000" />
+    <SolidColorBrush x:Key="TextBoxButtonBackgroundThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonForegroundThemeBrush" Color="#99000000" />
+    <SolidColorBrush x:Key="TextBoxButtonPointerOverBackgroundThemeBrush" Color="#FFDEDEDE" />
+    <SolidColorBrush x:Key="TextBoxButtonPointerOverBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonPointerOverForegroundThemeBrush" Color="Black" />
+    <SolidColorBrush x:Key="TextBoxButtonPressedBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="TextBoxButtonPressedBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonPressedForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="TextBoxDisabledBackgroundThemeBrush" Color="#66CACACA" />
+    <SolidColorBrush x:Key="TextBoxDisabledBorderThemeBrush" Color="#26000000" />
+    <SolidColorBrush x:Key="TextBoxDisabledForegroundThemeBrush" Color="#FF666666" />
+    <SolidColorBrush x:Key="TextBoxForegroundThemeBrush" Color="#FF000000" />
+    <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+
+    <!-- Resources for AutoCompleteBox.xaml -->
+    <StaticResource x:Key="AutoCompleteBoxSuggestionsListBackground" ResourceKey="SystemControlTransientBackgroundBrush" />
+    <StaticResource x:Key="AutoCompleteBoxSuggestionsListBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <StaticResource x:Key="AutoCompleteBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+    <x:Double x:Key="AutoCompleteBoxIconFontSize">12</x:Double>
+
+    <!-- Resources for CheckBox.xaml -->
+    <Thickness x:Key="CheckBoxBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="CheckBoxCheckedStrokeThickness">0</Thickness>
+    <StaticResource x:Key="CheckBoxForegroundUnchecked" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundUncheckedPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundUncheckedPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundUncheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxForegroundChecked" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundCheckedPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundCheckedPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundCheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxForegroundIndeterminate" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundIndeterminatePointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundIndeterminatePressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxForegroundIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundUnchecked" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundChecked" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundCheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundCheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundIndeterminate" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundIndeterminatePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundIndeterminatePressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBackgroundIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushUnchecked" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushChecked" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushCheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushCheckedPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushIndeterminate" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushIndeterminatePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushIndeterminatePressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxBorderBrushIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeUnchecked" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeChecked" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedPointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminate" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminatePointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminatePressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeIndeterminateDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillUnchecked" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillChecked" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedPointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedPressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminate" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminatePointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminatePressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillIndeterminateDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundUnchecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedPointerOver" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundUncheckedDisabled" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundChecked" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedPointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedPressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundCheckedDisabled" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminate" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminateDisabled" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <SolidColorBrush x:Key="CheckBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="CheckBoxBorderThemeBrush" Color="#45000000" />
+    <SolidColorBrush x:Key="CheckBoxContentDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="CheckBoxContentForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="CheckBoxDisabledBackgroundThemeBrush" Color="#66CACACA" />
+    <SolidColorBrush x:Key="CheckBoxDisabledBorderThemeBrush" Color="#26000000" />
+    <SolidColorBrush x:Key="CheckBoxDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="CheckBoxForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="CheckBoxPointerOverBackgroundThemeBrush" Color="#DEFFFFFF" />
+    <SolidColorBrush x:Key="CheckBoxPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="CheckBoxPointerOverBorderThemeBrush" Color="#70000000" />
+    <SolidColorBrush x:Key="CheckBoxPressedBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="CheckBoxPressedBorderThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="CheckBoxPressedForegroundThemeBrush" Color="#FFFFFFFF" />
+
+    <!-- Resources for Calendar.xaml, CalendarButton.xaml, CalendarDayButton.xaml, CalendarItem.xaml -->
+    <StaticResource x:Key="CalendarViewFocusBorderBrush" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CalendarViewSelectedHoverBorderBrush" ResourceKey="SystemControlHighlightListAccentMediumBrush" />
+    <StaticResource x:Key="CalendarViewSelectedPressedBorderBrush" ResourceKey="SystemControlHighlightListAccentHighBrush" />
+    <StaticResource x:Key="CalendarViewSelectedBorderBrush" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="CalendarViewHoverBorderBrush" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarViewPressedBorderBrush" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="CalendarViewTodayForeground" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="CalendarViewBlackoutForeground" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarViewSelectedForeground" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="CalendarViewPressedForeground" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="CalendarViewOutOfScopeForeground" ResourceKey="SystemControlHyperlinkBaseHighBrush" />
+    <StaticResource x:Key="CalendarViewCalendarItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CalendarViewOutOfScopeBackground" ResourceKey="SystemControlDisabledChromeMediumLowBrush" />
+    <StaticResource x:Key="CalendarViewCalendarItemBackground" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <StaticResource x:Key="CalendarViewForeground" ResourceKey="SystemControlHyperlinkBaseMediumHighBrush" />
+    <StaticResource x:Key="CalendarViewBackground" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <StaticResource x:Key="CalendarViewBorderBrush" ResourceKey="SystemControlForegroundChromeMediumBrush" />
+    <StaticResource x:Key="CalendarViewWeekDayForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarViewNavigationButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="CalendarViewNavigationButtonForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="CalendarViewNavigationButtonForegroundPressed" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="CalendarViewNavigationButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="CalendarViewCalendarItemRevealBackground" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <StaticResource x:Key="CalendarViewCalendarItemRevealBorderBrush" ResourceKey="SystemControlTransparentRevealBorderBrush" />
+    <StaticResource x:Key="CalendarViewNavigationButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="CalendarViewNavigationButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+
+    <!--Resources for NotificationCard.xaml -->
+    <SolidColorBrush x:Key="NotificationCardBackgroundBrush" Color="White" />
+    <SolidColorBrush x:Key="NotificationCardProgressBackgroundBrush" Color="#9A9A9A" />
+    <SolidColorBrush x:Key="NotificationCardInformationBackgroundBrush" Color="#0078D4" />
+    <SolidColorBrush x:Key="NotificationCardSuccessBackgroundBrush" Color="#128B44" />
+    <SolidColorBrush x:Key="NotificationCardWarningBackgroundBrush" Color="#FFC316" />
+    <SolidColorBrush x:Key="NotificationCardErrorBackgroundBrush" Color="#F03916" />
+    
+    <!-- Resources for RadioButton.xaml -->
+    <x:Double x:Key="RadioButtonBorderThemeThickness">1</x:Double>
+    <StaticResource x:Key="RadioButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStroke" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokePointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokePressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFill" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStroke" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillDisabled" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFill" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillPointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillPressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillDisabled" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStroke" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokePressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokeDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <SolidColorBrush x:Key="RadioButtonBackgroundThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonBorderThemeBrush" Color="#45000000" />
+    <SolidColorBrush x:Key="RadioButtonContentDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="RadioButtonContentForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="RadioButtonDisabledBackgroundThemeBrush" Color="#66CACACA" />
+    <SolidColorBrush x:Key="RadioButtonDisabledBorderThemeBrush" Color="#26000000" />
+    <SolidColorBrush x:Key="RadioButtonDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="RadioButtonForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="RadioButtonPointerOverBackgroundThemeBrush" Color="#DEFFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonPointerOverBorderThemeBrush" Color="#70000000" />
+    <SolidColorBrush x:Key="RadioButtonPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="RadioButtonPressedBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="RadioButtonPressedBorderThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="RadioButtonPressedForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonContentPointerOverForegroundThemeBrush" Color="{DynamicResource SystemColorHighlightTextColor}" />
+
+    <!-- Resources for Slider.xaml -->
+    <x:Double x:Key="SliderOutsideTickBarThemeHeight">4</x:Double>
+    <x:Double x:Key="SliderTrackThemeHeight">2</x:Double>
+    <Thickness x:Key="SliderBorderThemeThickness">0</Thickness>
+    <Thickness x:Key="SliderHeaderThemeMargin">0,0,0,4</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" />
+    <StaticResource x:Key="SliderContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderThumbBackground" ResourceKey="SystemControlForegroundAccentBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundPointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="SliderThumbBackgroundPressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="SliderThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillPointerOver" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="SliderTrackFillPressed" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackValueFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <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" />
+    <SolidColorBrush x:Key="SliderBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SliderDisabledBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SliderThumbBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="SliderThumbBorderThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="SliderThumbDisabledBackgroundThemeBrush" Color="#FF929292" />
+    <SolidColorBrush x:Key="SliderThumbPointerOverBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="SliderThumbPointerOverBorderThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="SliderThumbPressedBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="SliderThumbPressedBorderThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="SliderTickMarkInlineBackgroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="SliderTickMarkInlineDisabledForegroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="SliderTickmarkOutsideBackgroundThemeBrush" Color="#80000000" />
+    <SolidColorBrush x:Key="SliderTickMarkOutsideDisabledForegroundThemeBrush" Color="#80000000" />
+    <SolidColorBrush x:Key="SliderTrackBackgroundThemeBrush" Color="#1A000000" />
+    <SolidColorBrush x:Key="SliderTrackDecreaseBackgroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="SliderTrackDecreaseDisabledBackgroundThemeBrush" Color="#1C000000" />
+    <SolidColorBrush x:Key="SliderTrackDecreasePointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
+    <SolidColorBrush x:Key="SliderTrackDecreasePressedBackgroundThemeBrush" Color="#FF7241E4" />
+    <SolidColorBrush x:Key="SliderTrackDisabledBackgroundThemeBrush" Color="#1A000000" />
+    <SolidColorBrush x:Key="SliderTrackPointerOverBackgroundThemeBrush" Color="#26000000" />
+    <SolidColorBrush x:Key="SliderTrackPressedBackgroundThemeBrush" Color="#33000000" />
+    <SolidColorBrush x:Key="SliderHeaderForegroundThemeBrush" Color="#FF000000" />
+
+    <!--Recources ToggleSwitch-->
+    <Thickness x:Key="ToggleSwitchOnStrokeThickness">0</Thickness>
+    <Thickness x:Key="ToggleSwitchOuterBorderStrokeThickness">1</Thickness>
+    <StaticResource x:Key="ToggleSwitchContentForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ToggleSwitchContentForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleSwitchHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ToggleSwitchHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleSwitchContainerBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ToggleSwitchContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ToggleSwitchContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ToggleSwitchContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ToggleSwitchFillOff" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ToggleSwitchFillOffPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ToggleSwitchFillOffPressed" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleSwitchFillOffDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ToggleSwitchStrokeOff" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="ToggleSwitchStrokeOffPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="ToggleSwitchStrokeOffPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ToggleSwitchStrokeOffDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleSwitchFillOn" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="ToggleSwitchFillOnPointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="ToggleSwitchFillOnPressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="ToggleSwitchFillOnDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="ToggleSwitchStrokeOn" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleSwitchStrokeOnPointerOver" ResourceKey="SystemControlHighlightListAccentHighBrush" />
+    <StaticResource x:Key="ToggleSwitchStrokeOnPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="ToggleSwitchStrokeOnDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleSwitchKnobFillOff" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ToggleSwitchKnobFillOffPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleSwitchKnobFillOffPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="ToggleSwitchKnobFillOffDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="ToggleSwitchKnobFillOn" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ToggleSwitchKnobFillOnPointerOver" ResourceKey="SystemControlHighlightChromeWhiteBrush" />
+    <StaticResource x:Key="ToggleSwitchKnobFillOnPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ToggleSwitchKnobFillOnDisabled" ResourceKey="SystemControlPageBackgroundBaseLowBrush" />
+    <SolidColorBrush x:Key="ToggleSwitchCurtainBackgroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="ToggleSwitchCurtainDisabledBackgroundThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ToggleSwitchCurtainPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
+    <SolidColorBrush x:Key="ToggleSwitchCurtainPressedBackgroundThemeBrush" Color="#FF7241E4" />
+    <SolidColorBrush x:Key="ToggleSwitchDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ToggleSwitchForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ToggleSwitchHeaderDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ToggleSwitchHeaderForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ToggleSwitchOuterBorderBorderThemeBrush" Color="#59000000" />
+    <SolidColorBrush x:Key="ToggleSwitchOuterBorderDisabledBorderThemeBrush" Color="#33000000" />
+    <SolidColorBrush x:Key="ToggleSwitchThumbBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ToggleSwitchThumbBorderThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ToggleSwitchThumbDisabledBackgroundThemeBrush" Color="#FF929292" />
+    <SolidColorBrush x:Key="ToggleSwitchThumbDisabledBorderThemeBrush" Color="#FF929292" />
+    <SolidColorBrush x:Key="ToggleSwitchThumbPointerOverBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ToggleSwitchThumbPointerOverBorderThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ToggleSwitchThumbPressedBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ToggleSwitchThumbPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ToggleSwitchTrackBackgroundThemeBrush" Color="#59000000" />
+    <SolidColorBrush x:Key="ToggleSwitchTrackBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ToggleSwitchTrackDisabledBackgroundThemeBrush" Color="#1F000000" />
+    <SolidColorBrush x:Key="ToggleSwitchTrackPointerOverBackgroundThemeBrush" Color="#4A000000" />
+    <SolidColorBrush x:Key="ToggleSwitchTrackPressedBackgroundThemeBrush" Color="#42000000" />
+
+    <!-- Resources for ToolTip.xaml -->
+    <x:Double x:Key="ToolTipContentThemeFontSize">12</x:Double>
+    <Thickness x:Key="ToolTipBorderThemeThickness">1</Thickness>
+    <StaticResource x:Key="ToolTipForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ToolTipBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <StaticResource x:Key="ToolTipBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <SolidColorBrush x:Key="ToolTipBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ToolTipBorderThemeBrush" Color="#FF808080" />
+    <SolidColorBrush x:Key="ToolTipForegroundThemeBrush" Color="#FF666666" />
+    <Thickness x:Key="ToolTipBorderThemePadding">8,5,8,7</Thickness>
+
+    <!-- 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="DatePickerHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="DatePickerButtonBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="DatePickerButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="DatePickerButtonBorderBrushPressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="DatePickerButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="DatePickerButtonBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <StaticResource x:Key="DatePickerButtonBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
+    <StaticResource x:Key="DatePickerButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="DatePickerButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="DatePickerButtonBackgroundFocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <StaticResource x:Key="DatePickerButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="DatePickerButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="DatePickerButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="DatePickerButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="DatePickerButtonForegroundFocused" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="DatePickerFlyoutPresenterBackground" ResourceKey="SystemControlTransientBackgroundBrush" />
+    <StaticResource x:Key="DatePickerFlyoutPresenterBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <StaticResource x:Key="DatePickerFlyoutPresenterSpacerFill" ResourceKey="SystemControlForegroundBaseLowBrush" />
+    <StaticResource x:Key="DatePickerFlyoutPresenterHighlightFill" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <StaticResource x:Key="DatePickerLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+
+    <StaticResource x:Key="DateTimePickerFlyoutButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    
+    <!-- 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" />
+    <StaticResource x:Key="TimePickerButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="TimePickerButtonBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <StaticResource x:Key="TimePickerButtonBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
+    <StaticResource x:Key="TimePickerButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="TimePickerButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="TimePickerButtonBackgroundFocused" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <StaticResource x:Key="TimePickerButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TimePickerButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="TimePickerButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="TimePickerButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="TimePickerButtonForegroundFocused" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="TimePickerFlyoutPresenterBackground" ResourceKey="SystemControlTransientBackgroundBrush" />
+    <StaticResource x:Key="TimePickerFlyoutPresenterBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <StaticResource x:Key="TimePickerFlyoutPresenterSpacerFill" ResourceKey="SystemControlForegroundBaseLowBrush" />
+    <StaticResource x:Key="TimePickerFlyoutPresenterHighlightFill" ResourceKey="SystemControlHighlightListAccentLowBrush" />
+    <StaticResource x:Key="TimePickerLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+    <SolidColorBrush x:Key="TimePickerForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="TimePickerHeaderForegroundThemeBrush" Color="#FF000000" />
+    
+    <!-- Resources for TabItem.xaml -->
+    <FontFamily x:Key="TabItemHeaderFontFamily">XamlAutoFontFamily</FontFamily>
+    <x:Double x:Key="TabItemHeaderFontSize">24</x:Double>
+    <x:Double x:Key="TabItemHeaderLockedTranslation">40</x:Double>
+    <x:Int32 x:Key="TabItemHeaderCharacterSpacing">-25</x:Int32>
+    <Thickness x:Key="TabItemHeaderMargin">12,0,12,0</Thickness>
+    <Thickness x:Key="TabItemMargin">12,0,12,0</Thickness>
+    <FontWeight x:Key="TabItemHeaderThemeFontWeight">SemiLight</FontWeight>
+    <StaticResource x:Key="TabControlBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackground" ResourceKey="SystemControlTransparentBrush" />
+    <!-- Resources for TabItem -->
+    <StaticResource x:Key="TabItemHeaderBackgroundUnselected" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundUnselectedPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundUnselectedPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundSelected" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundSelectedPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundUnselected" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundUnselectedPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundUnselectedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+    <StaticResource x:Key="TabItemHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="TabItemHeaderFocusPipeFill" ResourceKey="SystemControlHighlightAltAccentBrush" />
+    <StaticResource x:Key="TabItemHeaderSelectedPipeFill" ResourceKey="SystemControlHighlightAltAccentBrush" />
+
+    <!-- Resources for ScrollBar.xaml -->
+    <x:Double x:Key="ScrollBarTrackBorderThemeThickness">0</x:Double>
+    <Thickness x:Key="ScrollBarPanningBorderThemeThickness">1</Thickness>
+    <StaticResource x:Key="ScrollBarBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarForeground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundListLowBrush" />
+    <StaticResource x:Key="ScrollBarButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+    <StaticResource x:Key="ScrollBarButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="ScrollBarButtonArrowForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ScrollBarButtonArrowForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="ScrollBarButtonArrowForegroundPressed" ResourceKey="SystemControlForegroundAltHighBrush" />
+    <StaticResource x:Key="ScrollBarButtonArrowForegroundDisabled" ResourceKey="SystemControlForegroundBaseLowBrush" />
+    <StaticResource x:Key="ScrollBarThumbFill" ResourceKey="SystemControlForegroundChromeDisabledLowBrush" />
+    <StaticResource x:Key="ScrollBarThumbFillPointerOver" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="ScrollBarThumbFillPressed" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+    <StaticResource x:Key="ScrollBarThumbFillDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <SolidColorBrush x:Key="ScrollBarTrackFill" Color="{StaticResource SystemChromeMediumColor}" Opacity="0.9" />
+    <SolidColorBrush x:Key="ScrollBarTrackFillPointerOver" Color="{StaticResource SystemChromeMediumColor}" Opacity="0.9" />
+    <StaticResource x:Key="ScrollBarTrackFillDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <StaticResource x:Key="ScrollBarTrackStroke" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ScrollBarTrackStrokePointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <StaticResource x:Key="ScrollBarTrackStrokeDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <SolidColorBrush x:Key="ScrollBarThumbBackground" Color="{StaticResource ScrollBarThumbBackgroundColor}" />
+    <SolidColorBrush x:Key="ScrollBarPanningThumbBackground" Color="{StaticResource ScrollBarPanningThumbBackgroundColor}" />
+    <StaticResource x:Key="ScrollBarPanningThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeHighBrush" />
+    <SolidColorBrush x:Key="ScrollBarButtonForegroundThemeBrush" Color="#99000000" />
+    <SolidColorBrush x:Key="ScrollBarButtonPointerOverBackgroundThemeBrush" Color="#FFDADADA" />
+    <SolidColorBrush x:Key="ScrollBarButtonPointerOverBorderThemeBrush" Color="#FFDADADA" />
+    <SolidColorBrush x:Key="ScrollBarButtonPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ScrollBarButtonPressedBackgroundThemeBrush" Color="#99000000" />
+    <SolidColorBrush x:Key="ScrollBarButtonPressedBorderThemeBrush" Color="#99000000" />
+    <SolidColorBrush x:Key="ScrollBarButtonPressedForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ScrollBarPanningBackgroundThemeBrush" Color="#FFCDCDCD" />
+    <SolidColorBrush x:Key="ScrollBarPanningBorderThemeBrush" Color="#7D9A9A9A" />
+    <SolidColorBrush x:Key="ScrollBarThumbBackgroundThemeBrush" Color="#FFCDCDCD" />
+    <SolidColorBrush x:Key="ScrollBarThumbBorderThemeBrush" Color="#3B555555" />
+    <SolidColorBrush x:Key="ScrollBarThumbPointerOverBackgroundThemeBrush" Color="#FFDADADA" />
+    <SolidColorBrush x:Key="ScrollBarThumbPointerOverBorderThemeBrush" Color="#6BB7B7B7" />
+    <SolidColorBrush x:Key="ScrollBarThumbPressedBackgroundThemeBrush" Color="#99000000" />
+    <SolidColorBrush x:Key="ScrollBarThumbPressedBorderThemeBrush" Color="#ED555555" />
+    <SolidColorBrush x:Key="ScrollBarTrackBackgroundThemeBrush" Color="#59D5D5D5" />
+    <SolidColorBrush x:Key="ScrollBarTrackBorderThemeBrush" Color="#59D5D5D5" />
+    <StaticResource x:Key="ScrollBarThumbBackgroundColor" ResourceKey="SystemBaseLowColor" />
+    <StaticResource x:Key="ScrollBarPanningThumbBackgroundColor" ResourceKey="SystemChromeDisabledLowColor" />
+    <x:String x:Key="ScrollBarExpandDuration">00:00:00.1</x:String>
+    <x:String x:Key="ScrollBarContractDelay">00:00:02</x:String>
+    <x:String x:Key="ScrollBarContractDuration">00:00:00.1</x:String>
+    <x:String x:Key="ScrollBarContractFinalKeyframe">00:00:02.1</x:String>
+    <x:Double x:Key="ScrollBarSize">16</x:Double>
+    <x:Double x:Key="ScrollBarButtonArrowIconFontSize">8</x:Double>
+    <x:String x:Key="ScrollBarExpandBeginTime">00:00:00.40</x:String>
+    <x:String x:Key="ScrollBarContractBeginTime">00:00:02.00</x:String>
+    <!-- Resources for TreeViewItem.xaml -->
+    <StaticResource x:Key="TreeViewItemBackground" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
+    <StaticResource x:Key="TreeViewItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
+    <StaticResource x:Key="TreeViewItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
+    <StaticResource x:Key="TreeViewItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TreeViewItemBackgroundSelected" ResourceKey="SystemControlHighlightAccent3RevealBackgroundBrush" />
+    <StaticResource x:Key="TreeViewItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightAccent2RevealBackgroundBrush" />
+    <StaticResource x:Key="TreeViewItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
+    <StaticResource x:Key="TreeViewItemBackgroundSelectedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="TreeViewItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TreeViewItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="TreeViewItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="TreeViewItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="TreeViewItemForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="TreeViewItemForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="TreeViewItemForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="TreeViewItemForegroundSelectedDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="TreeViewItemBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TreeViewItemBorderBrushPointerOver" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
+    <StaticResource x:Key="TreeViewItemBorderBrushPressed" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
+    <StaticResource x:Key="TreeViewItemBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TreeViewItemBorderBrushSelected" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TreeViewItemBorderBrushSelectedPointerOver" ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
+    <StaticResource x:Key="TreeViewItemBorderBrushSelectedPressed" ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
+    <StaticResource x:Key="TreeViewItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TreeViewItemCheckBoxBackgroundSelected" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TreeViewItemCheckBoxBorderSelected" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="TreeViewItemCheckGlyphSelected" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <Thickness x:Key="TreeViewItemBorderThemeThickness">1</Thickness>
+    <x:Double x:Key="TreeViewItemMinHeight">32</x:Double>
+    <!-- Resources for SplitView.xaml -->
+    <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="CalendarDatePickerBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <Thickness x:Key="CalendarDatePickerBorderThemeThickness">1</Thickness>
+  </Style.Resources>
+</Style>
diff --git a/src/Avalonia.Themes.Fluent/Assets/Inter-Bold.ttf b/src/Avalonia.Themes.Fluent/Assets/Inter-Bold.ttf
new file mode 100644
index 0000000000..847ffd191b
Binary files /dev/null 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
new file mode 100644
index 0000000000..33267cd799
Binary files /dev/null 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
new file mode 100644
index 0000000000..c22eafe9fb
Binary files /dev/null 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
new file mode 100644
index 0000000000..f782894eea
Binary files /dev/null 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
new file mode 100644
index 0000000000..3b7e686e54
Binary files /dev/null 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
new file mode 100644
index 0000000000..556e972f48
Binary files /dev/null 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
new file mode 100644
index 0000000000..e49058e33d
Binary files /dev/null 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
new file mode 100644
index 0000000000..72f1fbf973
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </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" />    
+    <AvaloniaResource Include="**/*.xaml" />
+    <AvaloniaResource Include="Assets\*" />  
+  </ItemGroup>
+  <Import Project="..\..\build\BuildTargets.targets" />
+  <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\ApiDiff.props" />
+</Project>
diff --git a/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml b/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
new file mode 100644
index 0000000000..532826c500
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
@@ -0,0 +1,69 @@
+<Styles xmlns="https://github.com/avaloniaui" 
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <AutoCompleteBox Width="200">
+        <AutoCompleteBox.Items>
+          Alabama
+          Alaska
+          Arizona
+          Arkansas
+          California
+          Colorado
+          Connecticut
+          Delaware
+        </AutoCompleteBox.Items>
+      </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="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}"
+                   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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Button.xaml b/src/Avalonia.Themes.Fluent/Controls/Button.xaml
new file mode 100644
index 0000000000..573b9f337f
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/Button.xaml
@@ -0,0 +1,101 @@
+<Styles 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>      
+    </Border>
+  </Design.PreviewWith>
+  <Styles.Resources>
+    <Thickness x:Key="ButtonPadding">8,5,8,6</Thickness>
+  </Styles.Resources>
+  <Style Selector="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="Padding" Value="8,5,8,5" />
+    <Setter Property="Padding" Value="{StaticResource 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="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>
+
+  <!-- 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="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="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="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="Button, RepeatButton, ToggleButton">
+    <Setter Property="RenderTransform" Value="none" />
+    <Setter Property="Transitions">
+      <Transitions>
+        <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.075" />
+      </Transitions>
+    </Setter>
+  </Style>
+
+  <Style Selector="Button:pressed, RepeatButton:pressed, ToggleButton:pressed">
+    <Setter Property="RenderTransform" Value="scale(0.98)" />    
+  </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>
+  
+  <Style Selector="Button /template/ ContentPresenter#PART_ContentPresenter">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
new file mode 100644
index 0000000000..12b4845522
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
@@ -0,0 +1,146 @@
+<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">
+  <Design.PreviewWith>
+    <Border Padding="20"
+            Background="Black">
+      <StackPanel Spacing="20">
+        <ButtonSpinner ButtonSpinnerLocation="Right"
+                       Content="Right disabled inline spinner"
+                       AllowSpin="False">
+          <DataValidationErrors.Error>
+            <sys:Exception />
+          </DataValidationErrors.Error>
+        </ButtonSpinner>
+        <ButtonSpinner ButtonSpinnerLocation="Left"
+                       Content="Left spinner" />
+        <ButtonSpinner ShowButtonSpinner="False"
+                       Content="Hide spinner" />
+      </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>
+
+  <!--  RepeatButton.ButtonSpinnerRepeatButton  -->
+  <Style Selector="RepeatButton.ButtonSpinnerRepeatButton">
+    <Setter Property="MinWidth" Value="34" />
+    <Setter Property="VerticalAlignment" Value="Stretch" />
+  </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>
+
+  <!--  ButtonSpinner  -->
+  <Style Selector="ButtonSpinner">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
+    <Setter Property="Padding" Value="10, 0" />
+    <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
+    <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
+    <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />    
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DataValidationErrors>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{DynamicResource ControlCornerRadius}"
+                  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}" />
+
+              <StackPanel Name="PART_SpinnerPanel"
+                          Orientation="Horizontal"
+                          IsVisible="{TemplateBinding ShowButtonSpinner}">
+                <RepeatButton Name="PART_IncreaseButton"
+                              Classes="ButtonSpinnerRepeatButton"
+                              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}" />
+                </RepeatButton>
+
+                <RepeatButton Name="PART_DecreaseButton"
+                              Classes="ButtonSpinnerRepeatButton"
+                              Foreground="{TemplateBinding Foreground}"
+                              BorderBrush="{TemplateBinding BorderBrush}"
+                              Background="{TemplateBinding Background}"
+                              VerticalContentAlignment="Center"
+                              FontSize="{TemplateBinding FontSize}">
+                  <Path Fill="{TemplateBinding Foreground}"
+                        Width="16"
+                        Height="8"
+                        Stretch="Uniform"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Data="{StaticResource ButtonSpinnerDecreaseButtonIcon}" />
+                </RepeatButton>
+              </StackPanel>
+            </Grid>
+          </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>
+
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml b/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml
new file mode 100644
index 0000000000..6ae334dbae
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/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.
+-->
+
+<Styles xmlns="https://github.com/avaloniaui">  
+  <Style Selector="Calendar">
+    <Setter Property="Foreground" Value="{DynamicResource CalendarViewForeground}" />
+    <Setter Property="Background" Value="{DynamicResource CalendarViewBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewBorderBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <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}"/>
+
+        </StackPanel>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
new file mode 100644
index 0000000000..ca538e4b0a
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
@@ -0,0 +1,121 @@
+<!--
+// (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="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,4"/>
+    <!--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="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}"/>
+
+          </Border>
+
+          <!-- 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}"/>-->
+        </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>
+
+  <!-- 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="CalendarButton:selected /template/ ContentControl#Content">
+    <Setter Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}"/>
+    <Setter Property="FontWeight" Value="SemiBold"/>
+  </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="CalendarButton:blackout /template/ ContentControl#Content">
+    <Setter Property="Foreground" Value="{DynamicResource CalendarViewBlackoutForeground}"/>
+  </Style>
+
+  <!--<Style Selector="CalendarButton: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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
new file mode 100644
index 0000000000..75343ebb4a
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
@@ -0,0 +1,133 @@
+<!--
+// (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">
+  <Design.PreviewWith>
+    <Border Margin="20">
+      <CalendarDatePicker/>
+    </Border>
+  </Design.PreviewWith>
+
+  <Styles.Resources>
+    <sys:Double x:Key="CalendarDatePickerCurrentDayFontSize">12</sys:Double>
+  </Styles.Resources>
+  
+  <Style Selector="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="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="Padding" Value="4"/>
+    
+    <Setter Property="Template">
+      <ControlTemplate>
+        <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">
+
+                    <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="{StaticResource CalendarDatePickerCurrentDayFontSize}"
+                               Text="{Binding Source={x:Static sys:DateTime.Today}, Path=Day}"/>
+
+                    <Ellipse HorizontalAlignment="Center" VerticalAlignment="Center" Fill="{DynamicResource SystemControlBackgroundChromeBlackHighBrush}" 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 SystemAccentColorDark2}"/>
+            </Style>
+            
+          </Grid.Styles>
+          
+          <TextBox Name="PART_TextBox"
+                   Background="{TemplateBinding Background}" 
+                   BorderBrush="{TemplateBinding BorderBrush}" 
+                   BorderThickness="{TemplateBinding BorderThickness}" 
+                   Padding="{TemplateBinding Padding}"
+                   Watermark="{TemplateBinding Watermark}"
+                   UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
+                   DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
+                   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}"
+                 IsLightDismissEnabled="True">
+            <Calendar Name="PART_Calendar"
+                      FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
+                      IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"/>
+          </Popup>
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+  
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
new file mode 100644
index 0000000000..ff72044c93
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
@@ -0,0 +1,116 @@
+<!--
+// (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="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,4"/>
+    <!--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="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}"/>
+
+          </Border>
+
+          <!-- 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"/>-->
+        </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="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>
+
+  <!-- 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>
+
+  <Style Selector="CalendarDayButton: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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
new file mode 100644
index 0000000000..df17da84dc
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
@@ -0,0 +1,134 @@
+<!--
+// (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="DayTitleTemplate">
+      <Template>
+        <TextBlock Text="{Binding}"
+                   HorizontalAlignment="Center"
+                   VerticalAlignment="Center"
+                   FontSize="12"/>
+      </Template>
+    </Setter>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border BorderThickness="{TemplateBinding BorderThickness}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                CornerRadius="{DynamicResource ControlCornerRadius}">
+          <Border.Styles>
+            <Style Selector="Button.CalendarHeader">
+              <Setter Property="HorizontalAlignment" Value="Stretch" />
+              <Setter Property="VerticalAlignment" Value="Stretch" />
+              <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)
+                -->
+          <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">
+                <!--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"/>
+              </Button>
+              <Button Name="NextButton" Grid.Column="2" Classes="CalendarHeader CalendarNavigation" 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"/>
+              </Button>
+            </Grid>
+            <Border Name="BackgroundLayer" Background="{TemplateBinding BorderBrush}" Grid.Row="1" />
+            <Grid Name="MonthView" Grid.Row="1" IsVisible="False" MinHeight="290" >
+              <Grid.RowDefinitions>
+                <!--This should always be the week day names??-->
+                <RowDefinition Height="38" />
+                <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" MinHeight="290"
+                    Grid.Row="1" IsVisible="False">
+              <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+              </Grid.RowDefinitions>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+                <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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml b/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
new file mode 100644
index 0000000000..1f8887c283
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
@@ -0,0 +1,72 @@
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Style Selector="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}" />
+            </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 Path">
+    <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.Fluent/Controls/Carousel.xaml b/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml
new file mode 100644
index 0000000000..955a49a974
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml
@@ -0,0 +1,16 @@
+<Style xmlns="https://github.com/avaloniaui" Selector="Carousel">
+  <Setter Property="Template">
+    <ControlTemplate>
+      <Border Background="{TemplateBinding Background}"
+              BorderBrush="{TemplateBinding BorderBrush}"
+              BorderThickness="{TemplateBinding BorderThickness}">
+        <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.Fluent/Controls/CheckBox.xaml b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
new file mode 100644
index 0000000000..83d2779872
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
@@ -0,0 +1,298 @@
+<Styles 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" />
+    </Border>
+  </Design.PreviewWith>
+  <Style Selector="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="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="MinWidth" Value="120" />
+    <Setter Property="MinHeight" Value="32" />
+    <!--<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+    <Setter Property="FocusVisualMargin" Value="-7,-3,-7,-3" />-->
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid x:Name="RootGrid" ColumnDefinitions="20,*">
+          <Border x:Name="PART_Border"
+                  Grid.ColumnSpan="2"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}" />
+
+          <Grid VerticalAlignment="Top" Height="32">
+            <Border x:Name="NormalRectangle"
+                BorderThickness="{DynamicResource CheckBoxBorderThemeThickness}"
+                UseLayoutRounding="False"
+                Height="20"
+                Width="20" />
+
+            <Viewbox UseLayoutRounding="False">
+              <Panel>
+                <Panel Height="16" Width="16" />
+                <Path x:Name="CheckGlyph" Stretch="Uniform" VerticalAlignment="Center" />
+              </Panel>
+            </Viewbox>
+          </Grid>
+          <ContentPresenter x:Name="ContentPresenter"
+                         ContentTemplate="{TemplateBinding ContentTemplate}"
+                         Content="{TemplateBinding Content}"
+                         Margin="{TemplateBinding Padding}"
+                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                         Grid.Column="1" />
+          <!-- TODO: TextWrapping="Wrap" on contentpresenter -->
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+  
+  <Style Selector="CheckBox /template/ Border#PART_Border">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
+
+  <Style Selector="CheckBox /template/ Border#NormalRectangle">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
new file mode 100644
index 0000000000..2eee656dc6
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
@@ -0,0 +1,242 @@
+<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>
+  <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">
+    <Setter Property="Padding" Value="{DynamicResource ComboBoxPadding}" />
+    <Setter Property="FocusAdorner" Value="{x:Null}" />
+    <Setter Property="MaxDropDownHeight" Value="504" />
+    <Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
+    <Setter Property="Background" Value="{DynamicResource ComboBoxBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ComboBoxBorderThemeThickness}" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <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" />
+            <Border x:Name="Background"
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    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}" />
+            <TextBlock x:Name="PlaceholderTextBlock"
+                       Grid.Row="1"
+                       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 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"
+                    Width="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"
+                      Stretch="Uniform"
+                      VerticalAlignment="Center"
+                      Data="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
+              </Panel>
+            </Viewbox>
+            <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">
+              <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}">
+                <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                              VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                  <ItemsPresenter Name="PART_ItemsPresenter"
+                                  Items="{TemplateBinding Items}"
+                                  Margin="{DynamicResource ComboBoxDropdownContentMargin}"
+                                  ItemsPanel="{TemplateBinding ItemsPanel}"
+                                  ItemTemplate="{TemplateBinding ItemTemplate}"
+                                  VirtualizationMode="{TemplateBinding VirtualizationMode}" />
+                </ScrollViewer>
+              </Border>
+            </Popup>
+          </Grid>
+        </DataValidationErrors>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <!--  NormalState  -->
+  <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}" />
+  </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>
+  
+  <Style Selector="ComboBox /template/ Border#Background">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
+  
+  <Style Selector="ComboBox /template/ Border#HighlightBackground">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
+  
+  <!-- Error State -->
+  <Style Selector="ComboBox:error /template/ Border#Background">
+    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
+  </Style>
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml
new file mode 100644
index 0000000000..66ccea99b5
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml
@@ -0,0 +1,89 @@
+<Styles xmlns="https://github.com/avaloniaui">
+  <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}">
+        <StackPanel HorizontalAlignment="Stretch">
+          <ComboBoxItem>Item 1</ComboBoxItem>
+          <ComboBoxItem>Item 2 long</ComboBoxItem>
+          <ComboBoxItem IsSelected="True">Item 3</ComboBoxItem>
+          <ComboBoxItem IsEnabled="False">Item 4</ComboBoxItem>
+        </StackPanel>
+      </Border>
+    </Border>
+  </Design.PreviewWith>
+
+  <Style Selector="ComboBoxItem">
+    <Setter Property="TextBlock.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}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          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>
+
+  <!--  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>
+
+  <!--  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>
+
+  <!--  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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Common.xaml b/src/Avalonia.Themes.Fluent/Controls/Common.xaml
new file mode 100644
index 0000000000..e09e39d7cb
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/Common.xaml
@@ -0,0 +1,6 @@
+<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
new file mode 100644
index 0000000000..d76eecee84
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/ContentControl.xaml
@@ -0,0 +1,15 @@
+<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}"
+                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                        Content="{TemplateBinding Content}"
+                        Padding="{TemplateBinding Padding}"
+                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+    </ControlTemplate>
+  </Setter>
+</Style>
\ No newline at end of file
diff --git a/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml b/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
new file mode 100644
index 0000000000..a4e716c7f6
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
@@ -0,0 +1,65 @@
+<Style xmlns="https://github.com/avaloniaui"
+       Selector="ContextMenu">
+  <Design.PreviewWith>
+    <Border Background="{DynamicResource SystemAccentColor}"
+            Margin="16"
+            Padding="48"
+            Width="400"
+            Height="200">
+      <Border.ContextMenu>
+        <ContextMenu>
+          <MenuItem Header="Standard _Menu Item" />
+          <MenuItem Header="Disabled"
+                    IsEnabled="False" />
+          <Separator />
+          <MenuItem Header="Menu with _Submenu">
+            <MenuItem Header="Submenu _1" />
+            <MenuItem Header="Submenu _2" />
+          </MenuItem>
+          <MenuItem Header="Menu Item with _Icon" />
+          <MenuItem Header="Menu Item with _Checkbox">
+            <MenuItem.Icon>
+              <CheckBox BorderThickness="0"
+                        IsHitTestVisible="False"
+                        IsChecked="True" />
+            </MenuItem.Icon>
+          </MenuItem>
+        </ContextMenu>
+      </Border.ContextMenu>
+      <TextBlock Text="Defined in XAML" />
+    </Border>
+  </Design.PreviewWith>
+
+  <Setter Property="Background" Value="{DynamicResource MenuFlyoutPresenterBackground}" />
+  <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
+  <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
+  <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 ContentControlFontSize}" />
+  <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="{DynamicResource OverlayCornerRadius}">
+        <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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
new file mode 100644
index 0000000000..ed31f7b573
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
@@ -0,0 +1,44 @@
+<Style xmlns="https://github.com/avaloniaui" 
+       Selector="DataValidationErrors"
+       xmlns:sys="clr-namespace:System;assembly=netstandard">
+  <Design.PreviewWith>
+    <Border Padding="20"> 
+      <TextBox Text="Sample">
+        <DataValidationErrors.Error>
+          <sys:Exception/> 
+        </DataValidationErrors.Error>
+      </TextBox>
+    </Border>
+  </Design.PreviewWith>
+    
+  <Setter Property="Template">
+    <ControlTemplate>
+      <DockPanel LastChildFill="True">
+        <ContentControl Margin="0 4 0 0"
+          DockPanel.Dock="Bottom"
+          ContentTemplate="{TemplateBinding ErrorTemplate}"
+          DataContext="{TemplateBinding Owner}"
+          Content="{Binding (DataValidationErrors.Errors)}"
+          IsVisible="{Binding (DataValidationErrors.HasErrors)}" />
+        <ContentPresenter
+          Name="PART_ContentPresenter"
+          Background="{TemplateBinding Background}"
+          BorderThickness="{TemplateBinding BorderThickness}"
+          ContentTemplate="{TemplateBinding ContentTemplate}"
+          Content="{TemplateBinding Content}"
+          Padding="{TemplateBinding Padding}" />
+      </DockPanel>
+    </ControlTemplate>
+  </Setter>
+  <Setter Property="ErrorTemplate">
+    <DataTemplate>
+      <ItemsControl Items="{Binding}">
+        <ItemsControl.ItemTemplate>
+          <DataTemplate>
+            <TextBlock Text="{Binding Message}" Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}" TextWrapping="Wrap" />
+          </DataTemplate>
+        </ItemsControl.ItemTemplate>
+      </ItemsControl>
+    </DataTemplate>
+  </Setter>
+</Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
new file mode 100644
index 0000000000..b6e36861e0
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
@@ -0,0 +1,343 @@
+<!--
+// (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 SystemControlForegroundBaseHighBrush}"/>
+  </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 DateTimePickerFlyoutButtonBackground}" />
+    <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}"
+                  TextBlock.Foreground="{DynamicResource SystemControlHighlightAltBaseHighBrush}"
+                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                  Padding="{TemplateBinding Padding}"
+                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                  CornerRadius="{DynamicResource ControlCornerRadius}"/>
+        </Border>
+      </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="DatePicker">    
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForeground}" />
+    <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackground}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrush}"/>
+    <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}" 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}"
+                    IsEnabled="{TemplateBinding IsEnabled}"
+                    MinWidth="{StaticResource DatePickerThemeMinWidth}"
+                    MaxWidth="{StaticResource 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="{DynamicResource ControlCornerRadius}"/>
+                </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 DatePickerSpacerFill}"
+                      HorizontalAlignment="Center"
+                      Width="1"
+                      Grid.Column="1" />
+                <Rectangle x:Name="SecondSpacer"
+                      Fill="{DynamicResource DatePickerSpacerFill}"
+                      HorizontalAlignment="Center"
+                      Width="1"
+                      Grid.Column="3" />
+              </Grid>
+            </Button>
+
+            <Popup Name="Popup" WindowManagerAddShadowHint="False"
+                   IsLightDismissEnabled="True" PlacementTarget="{TemplateBinding}"
+                   PlacementMode="Bottom">
+              <DatePickerPresenter Name="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="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>
+
+  <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>
+  
+
+  <!--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 ControlContentThemeFontSize}" />
+    <Setter Property="Background" Value="{DynamicResource DatePickerFlyoutPresenterBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource DatePickerFlyoutPresenterBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource DateTimeFlyoutBorderThickness}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="Background" Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
+                MaxHeight="398" CornerRadius="{DynamicResource OverlayCornerRadius}">
+          <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 DatePickerFlyoutPresenterSpacerFill}"
+                         HorizontalAlignment="Center"
+                         Width="{DynamicResource DatePickerSpacerThemeWidth}"
+                         Grid.Column="1" />
+              <Rectangle Name="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"
+                         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>
+              <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.Fluent/Controls/EmbeddableControlRoot.xaml b/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
new file mode 100644
index 0000000000..3ff47111eb
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
@@ -0,0 +1,19 @@
+<Style xmlns="https://github.com/avaloniaui" Selector="EmbeddableControlRoot">
+  <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
+  <Setter Property="FontSize" Value="{DynamicResource ContentControlFontSize}"/>
+  <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.Fluent/Controls/Expander.xaml b/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
new file mode 100644
index 0000000000..97ca62c493
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
@@ -0,0 +1,138 @@
+<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}">
+          <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}">
+          <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}">
+          <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}">
+          <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 SystemControlForegroundBaseHighBrush}"
+                      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}" 
+                              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 SystemControlTransientBorderBrush}" />
+  </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.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
new file mode 100644
index 0000000000..0acb8f4f6e
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -0,0 +1,62 @@
+<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/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/SplitView.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/DatePicker.xaml"/>  
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TimePicker.xaml"/>  
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml.cs b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml.cs
new file mode 100644
index 0000000000..37822f5c8c
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml.cs
@@ -0,0 +1,12 @@
+using Avalonia.Markup.Xaml;
+using Avalonia.Styling;
+
+namespace Avalonia.Themes.Fluent.Controls
+{
+    /// <summary>
+    /// The default Avalonia theme.
+    /// </summary>
+    public class FluentControls : Styles
+    {
+    }
+}
diff --git a/src/Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml b/src/Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml
new file mode 100644
index 0000000000..f20dc2e650
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml
@@ -0,0 +1,34 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Styles.Resources>
+    <Thickness x:Key="SystemControlFocusVisualMargin">0</Thickness>
+    <Thickness x:Key="SystemControlFocusVisualPrimaryThickness">2</Thickness>
+    <Thickness x:Key="SystemControlFocusVisualSecondaryThickness">1</Thickness>
+  </Styles.Resources>
+
+  <!--  HighVisibility FocusAdorner  -->
+  <Style Selector=":is(Control)">
+    <Setter Property="FocusAdorner">
+      <FocusAdornerTemplate>
+        <Border BorderThickness="{StaticResource SystemControlFocusVisualPrimaryThickness}"
+                BorderBrush="{DynamicResource SystemControlFocusVisualPrimaryBrush}"
+                Margin="{StaticResource SystemControlFocusVisualMargin}">
+          <Border BorderThickness="{StaticResource SystemControlFocusVisualSecondaryThickness}"
+                  BorderBrush="{DynamicResource SystemControlFocusVisualSecondaryBrush}" />
+        </Border>
+      </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
new file mode 100644
index 0000000000..d68d74d884
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/GridSplitter.xaml
@@ -0,0 +1,23 @@
+<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}"
+          Background="{TemplateBinding Background}"/>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml b/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml
new file mode 100644
index 0000000000..8bb0fc297c
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml
@@ -0,0 +1,15 @@
+<Style xmlns="https://github.com/avaloniaui" Selector="ItemsControl">
+  <Setter Property="Template">
+    <ControlTemplate>
+      <Border Background="{TemplateBinding Background}"
+              BorderBrush="{TemplateBinding BorderBrush}"
+              BorderThickness="{TemplateBinding BorderThickness}"
+              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.Fluent/Controls/Label.xaml b/src/Avalonia.Themes.Fluent/Controls/Label.xaml
new file mode 100644
index 0000000000..d93381aa69
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/Label.xaml
@@ -0,0 +1,17 @@
+<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}"
+                        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.Fluent/Controls/ListBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
new file mode 100644
index 0000000000..ae4fdca490
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
@@ -0,0 +1,39 @@
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <ListBox>
+        <ListBoxItem>Test</ListBoxItem>
+        <ListBoxItem>Test</ListBoxItem>
+        <ListBoxItem>Test</ListBoxItem>
+        <ListBoxItem>Test</ListBoxItem>
+      </ListBox>
+    </Border>
+  </Design.PreviewWith>
+  <Style Selector="ListBox">
+    <Setter Property="TextBlock.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="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />    
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="border" BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}">
+          <ScrollViewer Name="PART_ScrollViewer"
+                        Background="{TemplateBinding Background}"
+                        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>
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml b/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
new file mode 100644
index 0000000000..7715ddf1f1
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
@@ -0,0 +1,94 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="0">
+      <ListBox>
+        <ListBoxItem IsEnabled="False">Disabled</ListBoxItem>
+        <ListBoxItem Background="#66000000"
+                     Padding="20">
+          Test
+        </ListBoxItem>
+        <ListBoxItem>Test</ListBoxItem>
+      </ListBox>
+    </Border>
+  </Design.PreviewWith>
+  <Styles.Resources>
+    <Thickness x:Key="ListBoxItemPadding">12,9,12,12</Thickness>
+  </Styles.Resources>
+  <Style Selector="ListBoxItem">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Padding" Value="{StaticResource ListBoxItemPadding}" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
+                          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>
+
+  <!--  Disabled State  -->
+  <Style Selector="ListBoxItem:disabled /template/ ContentPresenter#PART_ContentPresenter">
+    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlDisabledBaseMediumLowBrush}" />
+  </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="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="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>
+
+  <!--  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 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 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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Menu.xaml b/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
new file mode 100644
index 0000000000..e62b76d293
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
@@ -0,0 +1,36 @@
+<Style xmlns="https://github.com/avaloniaui"
+       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+       Selector="Menu">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <Menu>
+        <MenuItem Header="New" />
+        <MenuItem Header="Open" />
+      </Menu>
+    </Border>
+  </Design.PreviewWith>
+
+  <Style.Resources>
+    <x:Double x:Key="MenuBarHeight">32</x:Double>
+    <Thickness x:Key="MenuBarItemPadding">12,0,12,0</Thickness>
+  </Style.Resources>
+
+  <Setter Property="Background" Value="Transparent" />
+  <Setter Property="Height" Value="{StaticResource MenuBarHeight}" />
+  <Setter Property="Template">
+    <ControlTemplate>
+      <Border Background="{TemplateBinding Background}"
+              BorderBrush="{TemplateBinding BorderBrush}"
+              BorderThickness="{TemplateBinding BorderThickness}"
+              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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
new file mode 100644
index 0000000000..fff7baf3bd
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
@@ -0,0 +1,276 @@
+<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">
+  <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" />
+        </MenuItem>
+        <MenuItem Header="Edit">
+          <MenuItem Header="Go To">
+            <MenuItem Header="Go To Line" />
+          </MenuItem>
+        </MenuItem>
+        <MenuItem Header="View">
+          <MenuItem Header="Designer"
+                    InputGesture="Shift+F7" />
+        </MenuItem>
+        <MenuItem Header="Project">
+          <MenuItem Header="Add class" />
+        </MenuItem>
+      </Menu>
+    </Border>
+  </Design.PreviewWith>
+
+  <Styles.Resources>
+    <conv:PlatformKeyGestureConverter x:Key="KeyGestureConverter" />
+    <x:Double x:Key="MenuFlyoutSubItemPopupHorizontalOffset">-4</x:Double>
+    <Thickness x:Key="MenuFlyoutScrollerMargin">0,4,0,4</Thickness>
+    <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>
+
+  <Style Selector="MenuItem">
+    <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackground}" />
+    <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForeground}" />
+    <Setter Property="Padding" Value="{DynamicResource MenuFlyoutItemThemePadding}" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+          <Border Name="PART_LayoutRoot"
+                  Padding="{TemplateBinding Padding}"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <Grid>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"
+                                  SharedSizeGroup="MenuItemIcon" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto"
+                                  SharedSizeGroup="MenuItemIGT" />
+                <ColumnDefinition Width="Auto"
+                                  SharedSizeGroup="MenuItemChevron" />
+              </Grid.ColumnDefinitions>
+              <ContentPresenter Name="PART_IconPresenter"
+                                Content="{TemplateBinding Icon}"
+                                Width="16"
+                                Height="16"
+                                Margin="{DynamicResource MenuIconPresenterMargin}"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center" />
+
+              <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>
+              <TextBlock x:Name="PART_InputGestureText"
+                         Grid.Column="2"
+                         Classes="CaptionTextBlockStyle"
+                         Margin="{DynamicResource MenuInputGestureTextMargin}"
+                         Text="{TemplateBinding InputGesture, Converter={StaticResource KeyGestureConverter}}"
+                         HorizontalAlignment="Right"
+                         VerticalAlignment="Center" />
+              <Path Name="PART_ChevronPath"
+                    Stretch="Uniform"
+                    Width="8"
+                    Height="16"
+                    Data="{StaticResource MenuItemChevronPathData}"
+                    Margin="{DynamicResource MenuFlyoutItemChevronMargin}"
+                    VerticalAlignment="Center"
+                    Grid.Column="3" />
+            </Grid>
+          </Border>
+          <Popup Name="PART_Popup"
+                 WindowManagerAddShadowHint="False"
+                 PlacementMode="Right"
+                 HorizontalOffset="{StaticResource MenuFlyoutSubItemPopupHorizontalOffset}"
+                 IsLightDismissEnabled="True"
+                 IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
+            <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>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="Menu > MenuItem">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="PART_LayoutRoot"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}">
+          <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="{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 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="{StaticResource MenuFlyoutItemThemePaddingNarrow}" />
+  </Style>
+
+  <Style Selector="Menu > MenuItem">
+    <!--  Custom padding for Menu > MenuItem  -->
+    <Setter Property="Padding" Value="{StaticResource MenuBarItemPadding}" />
+  </Style>
+
+  <Style Selector="MenuItem /template/ ContentPresenter#PART_IconPresenter">
+    <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>
+
+  <!--  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="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>
+
+  <Style Selector="MenuItem:open /template/ Path#PART_ChevronPath">
+    <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronSubMenuOpened}" />
+  </Style>
+
+  <Style Selector="MenuItem:empty /template/ Path#PART_ChevronPath">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+
+  <Style Selector="MenuItem:separator">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Separator />
+      </ControlTemplate>
+    </Setter>
+  </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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml b/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
new file mode 100644
index 0000000000..799fe6ffe4
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
@@ -0,0 +1,26 @@
+<Style xmlns="https://github.com/avaloniaui"
+       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+       xmlns:local="clr-namespace:Avalonia.Themes.Fluent"
+       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.Fluent/Controls/NotificationCard.xaml b/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml
new file mode 100644
index 0000000000..5a0fa32657
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml
@@ -0,0 +1,104 @@
+<Styles 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">
+    <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="BorderThickness" Value="0" />
+    <Setter Property="Background" Value="{DynamicResource NotificationCardBackgroundBrush}" />    
+    <Setter Property="Template">
+      <ControlTemplate>
+        <LayoutTransformControl Name="PART_LayoutTransformControl" UseRenderTransform="True">
+          <Border CornerRadius="{DynamicResource ControlCornerRadius}" BoxShadow="0 6 8 0 #4F000000" Margin="5 5 5 10">
+            <Border Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{DynamicResource ControlCornerRadius}" ClipToBounds="True">
+              <DockPanel>
+                <Panel x:Name="PART_HeaderBar" Height="4" DockPanel.Dock="Top" />
+                <ContentControl Name="PART_Content" Content="{TemplateBinding Content}" />
+              </DockPanel>
+            </Border>
+          </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="64" />
+  </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 /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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
new file mode 100644
index 0000000000..1da48ebd8a
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
@@ -0,0 +1,59 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20"
+            Background="Black">
+      <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"
+                       ButtonSpinnerLocation="Left"
+                       Watermark="Enter text" />
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <Style Selector="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="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ButtonSpinner Name="PART_Spinner"
+                       Background="{TemplateBinding Background}"
+                       BorderThickness="{TemplateBinding BorderThickness}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       Padding="0"
+                       HorizontalContentAlignment="Stretch"
+                       VerticalContentAlignment="Stretch"
+                       AllowSpin="{TemplateBinding AllowSpin}"
+                       ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
+                       DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
+                       ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}">
+          <TextBox Name="PART_TextBox"
+                   Background="Transparent"
+                   BorderBrush="Transparent"
+                   Margin="-1"
+                   Padding="{TemplateBinding Padding}"
+                   Watermark="{TemplateBinding Watermark}"
+                   IsReadOnly="{TemplateBinding IsReadOnly}"
+                   Text="{TemplateBinding Text}"
+                   AcceptsReturn="False"
+                   TextWrapping="NoWrap" />
+        </ButtonSpinner>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
new file mode 100644
index 0000000000..3809e11251
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
@@ -0,0 +1,17 @@
+<Style xmlns="https://github.com/avaloniaui" Selector="OverlayPopupHost">
+  <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
+  <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.Fluent/Controls/PathIcon.xaml b/src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml
new file mode 100644
index 0000000000..d4952b3571
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml
@@ -0,0 +1,29 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <StackPanel>
+      <StackPanel.Resources>
+        <StreamGeometry x:Key="settings_regular">M14 9.50006C11.5147 9.50006 9.5 11.5148 9.5 14.0001C9.5 16.4853 11.5147 18.5001 14 18.5001C15.3488 18.5001 16.559 17.9066 17.3838 16.9666C18.0787 16.1746 18.5 15.1365 18.5 14.0001C18.5 13.5401 18.431 13.0963 18.3028 12.6784C17.7382 10.8381 16.0253 9.50006 14 9.50006ZM11 14.0001C11 12.3432 12.3431 11.0001 14 11.0001C15.6569 11.0001 17 12.3432 17 14.0001C17 15.6569 15.6569 17.0001 14 17.0001C12.3431 17.0001 11 15.6569 11 14.0001Z  M21.7093 22.3948L19.9818 21.6364C19.4876 21.4197 18.9071 21.4515 18.44 21.7219C17.9729 21.9924 17.675 22.4693 17.6157 23.0066L17.408 24.8855C17.3651 25.273 17.084 25.5917 16.7055 25.682C14.9263 26.1061 13.0725 26.1061 11.2933 25.682C10.9148 25.5917 10.6336 25.273 10.5908 24.8855L10.3834 23.0093C10.3225 22.4731 10.0112 21.9976 9.54452 21.7281C9.07783 21.4586 8.51117 21.4269 8.01859 21.6424L6.29071 22.4009C5.93281 22.558 5.51493 22.4718 5.24806 22.1859C4.00474 20.8536 3.07924 19.2561 2.54122 17.5137C2.42533 17.1384 2.55922 16.7307 2.8749 16.4977L4.40219 15.3703C4.83721 15.0501 5.09414 14.5415 5.09414 14.0007C5.09414 13.4598 4.83721 12.9512 4.40162 12.6306L2.87529 11.5051C2.55914 11.272 2.42513 10.8638 2.54142 10.4882C3.08038 8.74734 4.00637 7.15163 5.24971 5.82114C5.51684 5.53528 5.93492 5.44941 6.29276 5.60691L8.01296 6.36404C8.50793 6.58168 9.07696 6.54881 9.54617 6.27415C10.0133 6.00264 10.3244 5.52527 10.3844 4.98794L10.5933 3.11017C10.637 2.71803 10.9245 2.39704 11.3089 2.31138C12.19 2.11504 13.0891 2.01071 14.0131 2.00006C14.9147 2.01047 15.8128 2.11485 16.6928 2.31149C17.077 2.39734 17.3643 2.71823 17.4079 3.11017L17.617 4.98937C17.7116 5.85221 18.4387 6.50572 19.3055 6.50663C19.5385 6.507 19.769 6.45838 19.9843 6.36294L21.7048 5.60568C22.0626 5.44818 22.4807 5.53405 22.7478 5.81991C23.9912 7.1504 24.9172 8.74611 25.4561 10.487C25.5723 10.8623 25.4386 11.2703 25.1228 11.5035L23.5978 12.6297C23.1628 12.95 22.9 13.4586 22.9 13.9994C22.9 14.5403 23.1628 15.0489 23.5988 15.3698L25.1251 16.4965C25.441 16.7296 25.5748 17.1376 25.4586 17.5131C24.9198 19.2536 23.9944 20.8492 22.7517 22.1799C22.4849 22.4657 22.0671 22.5518 21.7093 22.3948ZM16.263 22.1966C16.4982 21.4685 16.9889 20.8288 17.6884 20.4238C18.5702 19.9132 19.6536 19.8547 20.5841 20.2627L21.9281 20.8526C22.791 19.8538 23.4593 18.7013 23.8981 17.4552L22.7095 16.5778L22.7086 16.5771C21.898 15.98 21.4 15.0277 21.4 13.9994C21.4 12.9719 21.8974 12.0195 22.7073 11.4227L22.7085 11.4218L23.8957 10.545C23.4567 9.2988 22.7881 8.14636 21.9248 7.1477L20.5922 7.73425L20.5899 7.73527C20.1844 7.91463 19.7472 8.00722 19.3039 8.00663C17.6715 8.00453 16.3046 6.77431 16.1261 5.15465L16.1259 5.15291L15.9635 3.69304C15.3202 3.57328 14.6677 3.50872 14.013 3.50017C13.3389 3.50891 12.6821 3.57367 12.0377 3.69328L11.8751 5.15452C11.7625 6.16272 11.1793 7.05909 10.3019 7.56986C9.41937 8.0856 8.34453 8.14844 7.40869 7.73694L6.07273 7.14893C5.20949 8.14751 4.54092 9.29983 4.10196 10.5459L5.29181 11.4233C6.11115 12.0269 6.59414 12.9837 6.59414 14.0007C6.59414 15.0173 6.11142 15.9742 5.29237 16.5776L4.10161 17.4566C4.54002 18.7044 5.2085 19.8585 6.07205 20.8587L7.41742 20.2682C8.34745 19.8613 9.41573 19.9215 10.2947 20.4292C11.174 20.937 11.7593 21.832 11.8738 22.84L11.8744 22.8445L12.0362 24.3088C13.3326 24.5638 14.6662 24.5638 15.9626 24.3088L16.1247 22.8418C16.1491 22.6217 16.1955 22.4055 16.263 22.1966Z</StreamGeometry>
+      </StackPanel.Resources>
+      <PathIcon Data="{StaticResource settings_regular}" />
+    </StackPanel>
+  </Design.PreviewWith>
+  <Style Selector="PathIcon">
+    <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
+    <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.Fluent/Controls/PopupRoot.xaml b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
new file mode 100644
index 0000000000..25c71e3493
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
@@ -0,0 +1,21 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Style Selector="PopupRoot">
+    <Setter Property="TransparencyLevelHint" Value="Transparent" />
+    <Setter Property="Background" Value="{x:Null}" />
+    <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>
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml b/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
new file mode 100644
index 0000000000..036595b61c
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
@@ -0,0 +1,156 @@
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel>
+        <ProgressBar VerticalAlignment="Center" IsIndeterminate="True" />
+        <ProgressBar HorizontalAlignment="Left" IsIndeterminate="True" Orientation="Vertical" />
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+  <Style Selector="ProgressBar">
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAccentBrush}" />
+    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ProgressBarBorderThemeThickness}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlHighlightTransparentBrush}" />
+    <Setter Property="Maximum" Value="100" />
+    <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="{DynamicResource ControlCornerRadius}">          
+            <Panel>
+              <Panel x:Name="DeterminateRoot">
+                <Border CornerRadius="{DynamicResource ControlCornerRadius}" x:Name="PART_Indicator" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Foreground}" />
+              </Panel>
+              <Panel x:Name="IndeterminateRoot">
+                <Border x:Name="IndeterminateProgressBarIndicator" CornerRadius="{DynamicResource ControlCornerRadius}" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Foreground}" />
+                <Border x:Name="IndeterminateProgressBarIndicator2" CornerRadius="{DynamicResource ControlCornerRadius}" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Foreground}" />
+              </Panel>
+            </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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml b/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
new file mode 100644
index 0000000000..2847d1fa5a
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
@@ -0,0 +1,175 @@
+<Styles xmlns="https://github.com/avaloniaui">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="10">
+        <RadioButton Content="Option 1" />
+        <RadioButton Content="Option 2" />
+        <RadioButton IsEnabled="False" Content="Option 3" />
+        <RadioButton Content="Option 2" />
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+  <Style Selector="RadioButton">
+    <Setter Property="Background" Value="{DynamicResource RadioButtonBackground}" />
+    <Setter Property="Foreground" Value="{DynamicResource RadioButtonForeground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrush}" />
+    <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="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="MinWidth" Value="120" />
+    <Setter Property="Template">
+      <ControlTemplate TargetType="RadioButton">
+        <Border Name="RootBorder"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}">
+          <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>
+
+            <ContentPresenter Name="PART_ContentPresenter"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              TextBlock.Foreground="{TemplateBinding Foreground}"
+                              Margin="{TemplateBinding Padding}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Grid.Column="1" />
+          </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>
+  
+  <Style Selector="RadioButton /template/ Border#RootBorder">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml b/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
new file mode 100644
index 0000000000..70a6b8a2ee
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
@@ -0,0 +1,61 @@
+<Styles 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!" />
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+  <Styles.Resources>
+    <Thickness x:Key="ButtonPadding">8,5,8,6</Thickness>
+  </Styles.Resources>
+  <Style Selector="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="Padding" Value="{StaticResource 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="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>
+
+  <Style Selector="RepeatButton /template/ ContentPresenter#PART_ContentPresenter">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </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="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="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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ScrollBar.xaml b/src/Avalonia.Themes.Fluent/Controls/ScrollBar.xaml
new file mode 100644
index 0000000000..4727ff72b9
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/ScrollBar.xaml
@@ -0,0 +1,302 @@
+<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}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Border x:Name="ThumbVisual" Background="{TemplateBinding Background}" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Transitions">
+      <Transitions>
+        <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>
+    </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>
+
+  <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">
+    <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>
+      </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="ScrollBar /template/ RepeatButton.line:pressed /template/ Border#Root" >
+    <Setter Property="Background" Value="{DynamicResource ScrollBarButtonBackgroundPressed}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarButtonBorderBrushPressed}" />
+  </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="ScrollBar /template/ RepeatButton.line /template/ Path#Arrow" >
+    <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForeground}" />
+  </Style>
+
+  <Style Selector="ScrollBar /template/ RepeatButton.line:pointerover /template/ Path#Arrow" >
+    <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForegroundPointerOver}" />
+  </Style>
+
+  <Style Selector="ScrollBar /template/ RepeatButton.line:pressed /template/ Path#Arrow" >
+    <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForegroundPressed}" />
+  </Style>
+
+  <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>
+
+  <Style Selector="ScrollBar[IsExpanded=true] /template/ RepeatButton.largeIncrease">
+    <Setter Property="Opacity" Value="1" />
+  </Style>
+
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
new file mode 100644
index 0000000000..640b8de89f
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
@@ -0,0 +1,159 @@
+<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">
+
+  <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>
+  </Design.PreviewWith>
+  
+  <Style Selector="ScrollViewer">
+    <Setter Property="Background"
+            Value="Transparent" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,Auto">
+          <ScrollContentPresenter Name="PART_ContentPresenter"
+                                  Grid.Row="0"
+                                  Grid.Column="0"
+                                  Grid.RowSpan="2"
+                                  Grid.ColumnSpan="2"
+                                  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}">
+            <ScrollContentPresenter.GestureRecognizers>
+              <ScrollGestureRecognizer
+                CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
+                CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}" />
+            </ScrollContentPresenter.GestureRecognizers>
+          </ScrollContentPresenter>
+          <ScrollBar Name="PART_HorizontalScrollBar"
+                     AllowAutoHide="{TemplateBinding AllowAutoHide}"
+                     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="PART_VerticalScrollBar"
+                     AllowAutoHide="{TemplateBinding AllowAutoHide}"
+                     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 x:Name="PART_ScrollBarsSeparator" Grid.Row="1" Grid.Column="1" Background="{DynamicResource ScrollViewerScrollBarsSeparatorBackground}" />
+        </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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Separator.xaml b/src/Avalonia.Themes.Fluent/Controls/Separator.xaml
new file mode 100644
index 0000000000..dc968fe86c
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/Separator.xaml
@@ -0,0 +1,18 @@
+<Styles xmlns="https://github.com/avaloniaui">
+
+  <Style Selector="Separator">
+    <Setter Property="Focusable" Value="False"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Padding="{TemplateBinding Margin}"
+                Height="{TemplateBinding Height}"
+                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                Background="{TemplateBinding Background}"/>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
new file mode 100644
index 0000000000..d70eb1abe3
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
@@ -0,0 +1,275 @@
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Margin="20" Width="200" Height="200">
+      <DockPanel LastChildFill="True">
+        <StackPanel Spacing="10" DockPanel.Dock="Top">
+          <Slider Value="50" />
+          <Slider IsEnabled="False" Value="50" />
+        </StackPanel>
+        <StackPanel Spacing="10" Orientation="Horizontal">
+          <Slider Value="50" Orientation="Vertical" />
+          <Slider IsEnabled="False" Orientation="Vertical" Value="50" />
+        </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" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
+        </ControlTemplate>
+      </Setter.Value>
+    </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}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DataValidationErrors>
+          <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{DynamicResource ControlCornerRadius}">
+            <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" Orientation="Horizontal">
+                    <Track.DecreaseButton>
+                      <RepeatButton Name="PART_DecreaseButton" Background="{TemplateBinding Foreground}" 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}" 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>
+      </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}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DataValidationErrors>
+          <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{DynamicResource ControlCornerRadius}">
+            <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" Orientation="Vertical">
+                    <Track.DecreaseButton>
+                      <RepeatButton Name="PART_DecreaseButton" Background="{TemplateBinding Foreground}" 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}" 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>
+      </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>
+
+  <Style Selector="Slider /template/ Grid#SliderContainer">
+    <Setter Property="Background" Value="{DynamicResource SliderContainerBackground}" />
+  </Style>
+
+  <Style Selector="Slider /template/ TickBar">
+    <Setter Property="IsVisible" Value="False" />
+    <Setter Property="Ticks" Value="{TemplateBinding Ticks}" />
+  </Style>
+
+  <!-- TickBar Placement States -->
+
+  <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="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>
+
+  <!-- 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>
+
+  <!-- Pressed State -->
+  <Style Selector="Slider:pressed /template/ RepeatButton#PART_IncreaseButton">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
+  </Style>
+
+  <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">
+      <Setter Property="Foreground" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
+  </Style>
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/SplitView.xaml b/src/Avalonia.Themes.Fluent/Controls/SplitView.xaml
new file mode 100644
index 0000000000..7d6f7a9b9a
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/SplitView.xaml
@@ -0,0 +1,219 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+  <Styles.Resources>
+    <x:Double x:Key="SplitViewOpenPaneThemeLength">320</x:Double>
+    <x:Double x:Key="SplitViewCompactPaneThemeLength">48</x:Double>
+
+    <!-- Not used here (directly) since they're strings, but preserving for reference
+        <x:String x:Key="SplitViewPaneAnimationOpenDuration">00:00:00.2</x:String>
+        <x:String x:Key="SplitViewPaneAnimationOpenPreDuration">00:00:00.19999</x:String>
+        <x:String x:Key="SplitViewPaneAnimationCloseDuration">00:00:00.1</x:String>-->
+  </Styles.Resources>
+
+  <Style Selector="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="00:00:00.2" Easing="0.1,0.9,0.2,1.0" />
+      </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="00:00:00.2" Easing="0.1,0.9,0.2,1.0" />
+      </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="00:00:00.1" Easing="0.1,0.9,0.2,1.0" />
+      </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="00:00:00.2" Easing="0.1,0.9,0.2,1.0" />
+      </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.Fluent/Controls/TabControl.xaml b/src/Avalonia.Themes.Fluent/Controls/TabControl.xaml
new file mode 100644
index 0000000000..c38ecb0452
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/TabControl.xaml
@@ -0,0 +1,65 @@
+<Styles 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">
+            <TextBlock Text="Content" Foreground="Black" FontSize="20"/>
+          </Border>
+        </TabItem>
+        <TabItem Header="Leaf">
+          <Border Background="Green"
+                  Height="100" />
+        </TabItem>
+        <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">
+    <Setter Property="Margin" Value="0" />
+    <Setter Property="Padding" Value="{DynamicResource TabItemMargin}" />
+    <Setter Property="Background" Value="{DynamicResource TabControlBackground}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Margin="{TemplateBinding Margin}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                Background="{TemplateBinding Background}"
+                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                VerticalAlignment="{TemplateBinding VerticalAlignment}">
+          <DockPanel>
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
+                            DockPanel.Dock="{TemplateBinding TabStripPlacement}"/>
+            <ContentPresenter Name="PART_SelectedContentHost"
+                              Margin="{TemplateBinding Padding}"
+                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Content="{TemplateBinding SelectedContent}"
+                              ContentTemplate="{TemplateBinding SelectedContentTemplate}" />
+          </DockPanel>
+        </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="{StaticResource TabControlTopPlacementItemMargin}" />
+  </Style>
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
new file mode 100644
index 0000000000..1c9574f169
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
@@ -0,0 +1,130 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <TabItem Header="Leaf" />
+        <TabItem Header="Arch" IsSelected="True" />
+      </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">
+    <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="{DynamicResource TabItemHeaderMargin}" />
+    <Setter Property="Margin" Value="0" />
+    <Setter Property="MinHeight" Value="{DynamicResource TabItemMinHeight}" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="PART_LayoutRoot"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                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}" />
+            <Border Name="PART_SelectedPipe"
+                    Background="{DynamicResource TabItemHeaderSelectedPipeFill}" />
+          </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>
+
+  <!-- PointerOver state -->
+  <Style Selector="TabItem:pointerover /template/ Border#PART_LayoutRoot">
+    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPointerOver}" />
+    <Setter Property="TextBlock.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>
+
+  <!-- Pressed state -->
+  <Style Selector="TabItem:pressed /template/ Border#PART_LayoutRoot">
+    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPressed}" />
+    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
+  </Style>
+
+  <!-- Selected Pressed state -->
+  <Style Selector="TabItem:pressed /template/ Border#PART_LayoutRoot">
+    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPressed}" />
+    <Setter Property="TextBlock.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>
+
+  <!-- TabStripPlacement States Group -->
+  <Style Selector="TabItem[TabStripPlacement=Left] /template/ Border#PART_SelectedPipe">
+    <Setter Property="Width" Value="{StaticResource TabItemPipeThickness}" />
+    <Setter Property="Height" Value="{StaticResource 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>
+
+  <Style Selector="TabItem[TabStripPlacement=Top] /template/ Border#PART_SelectedPipe, TabItem[TabStripPlacement=Bottom] /template/ Border#PART_SelectedPipe">
+    <Setter Property="Height" Value="{StaticResource 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="{StaticResource TabItemPipeThickness}" />
+    <Setter Property="Height" Value="{StaticResource 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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml b/src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml
new file mode 100644
index 0000000000..8b3c0a8310
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml
@@ -0,0 +1,26 @@
+<Styles xmlns="https://github.com/avaloniaui">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <TabStrip>
+        <TabStripItem>Item 1</TabStripItem>
+        <TabStripItem>Item 2</TabStripItem>
+        <TabStripItem IsEnabled="False">Disabled</TabStripItem>
+      </TabStrip>
+    </Border>
+  </Design.PreviewWith>
+  <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>
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
new file mode 100644
index 0000000000..78ef102705
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
@@ -0,0 +1,105 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <TabStripItem>Leaf</TabStripItem>
+        <TabStripItem IsSelected="True">Arch</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">
+    <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="{DynamicResource TabItemHeaderMargin}" />
+    <Setter Property="Margin" Value="0" />
+    <Setter Property="MinHeight" Value="{DynamicResource TabStripItemMinHeight}" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="PART_LayoutRoot"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                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}" />
+            <Border Name="PART_SelectedPipe"
+                    Background="{DynamicResource TabItemHeaderSelectedPipeFill}" />
+          </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="{StaticResource 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>
+
+  <!--  PointerOver state  -->
+  <Style Selector="TabStripItem:pointerover /template/ Border#PART_LayoutRoot">
+    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPointerOver}" />
+    <Setter Property="TextBlock.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>
+
+  <!--  Pressed state  -->
+  <Style Selector="TabStripItem:pressed /template/ Border#PART_LayoutRoot">
+    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPressed}" />
+    <Setter Property="TextBlock.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
+  </Style>
+
+  <!--  Selected Pressed state  -->
+  <Style Selector="TabStripItem:pressed /template/ Border#PART_LayoutRoot">
+    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPressed}" />
+    <Setter Property="TextBlock.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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
new file mode 100644
index 0000000000..139a61abdf
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
@@ -0,0 +1,284 @@
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <TextBox Text="Sample"
+               FontSize="20"
+               Width="100"
+               Classes="clearButton"
+               TextAlignment="Center"/>
+    </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>
+    <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="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="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
+    <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
+    <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
+    <Setter Property="FocusAdorner" Value="{x:Null}" />
+    <Setter Property="ContextMenu" Value="{StaticResource DefaultTextBoxContextMenu}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DataValidationErrors>
+          <Panel>
+            <Border
+              Name="PART_BorderElement"
+              Background="{TemplateBinding Background}"
+              BorderBrush="{TemplateBinding BorderBrush}"
+              BorderThickness="{TemplateBinding BorderThickness}"
+              MinWidth="{TemplateBinding MinWidth}"
+              MinHeight="{TemplateBinding MinHeight}">
+            </Border>
+
+            <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}">
+                  <TextBlock Name="PART_FloatingWatermark"
+                             Foreground="{DynamicResource SystemAccentColor}"
+                             FontSize="{TemplateBinding FontSize}"
+                             Text="{TemplateBinding Watermark}"
+                             DockPanel.Dock="Top" />
+                  <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                                VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+                      <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}"/>
+                        <!-- TODO eliminate this margin... text layout issue? -->
+                        <TextPresenter Name="PART_TextPresenter"
+                                      Margin="0 1 0 0"
+                                      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>
+                </DockPanel>
+                <ContentPresenter Grid.Column="2" Grid.ColumnSpan="1" Content="{TemplateBinding InnerRightContent}"/>
+              </Grid>
+            </Border>
+          </Panel>
+        </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>
+
+  <Style Selector="TextBox:disabled /template/ TextBlock#PART_Watermark, TextBox:disabled /template/ TextBlock#PART_FloatingWatermark">
+    <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundDisabled}" />
+  </Style>
+
+  <!-- PointerOver State-->
+  <Style Selector="TextBox:disabled">
+    <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundPointerOver}" />
+  </Style>
+
+  <Style Selector="TextBox:pointerover /template/ Border#PART_BorderElement">
+    <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushPointerOver}"/>
+    <Setter Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" />
+  </Style>
+
+  <Style Selector="TextBox:pointerover /template/ TextBlock#PART_Watermark, TextBox:pointerover /template/ TextBlock#PART_FloatingWatermark">
+    <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundPointerOver}" />
+  </Style>
+
+  <!-- Focused State -->
+  <Style Selector="TextBox:focus">
+    <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundFocused}" />
+  </Style>
+
+  <Style Selector="TextBox:focus /template/ TextBlock#PART_Watermark, TextBox:focus /template/ TextBlock#PART_FloatingWatermark">
+    <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundFocused}" />
+  </Style>
+
+  <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="TextBox:error /template/ Border#PART_BorderElement">
+    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
+  </Style>
+
+  <Style Selector="TextBox /template/ Border#PART_BorderElement">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </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="TextBox.revealPasswordButton[AcceptsReturn=False][IsReadOnly=False]:not(TextBox:empty)">
+    <Setter Property="InnerRightContent">
+      <Template>
+        <ToggleButton Classes="passwordBoxRevealButton"
+                      IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}" />
+      </Template>
+    </Setter>
+  </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}">
+            <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" />
+            </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>
+
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
new file mode 100644
index 0000000000..91969d8733
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
@@ -0,0 +1,288 @@
+<!--
+// (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 ControlContentThemeFontSize}" />
+    <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForeground}" />
+    <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackground}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrush}"/>
+    <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}" 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"
+                    Foreground="{TemplateBinding Foreground}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    IsEnabled="{TemplateBinding IsEnabled}"
+                    MinWidth="{StaticResource TimePickerThemeMinWidth}"
+                    MaxWidth="{StaticResource TimePickerThemeMaxWidth}"
+                    HorizontalAlignment="Stretch"
+                    HorizontalContentAlignment="Stretch"
+                    VerticalAlignment="Top"
+                    VerticalContentAlignment="Stretch">
+              <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="{DynamicResource ControlCornerRadius}" />
+                </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 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>
+
+                <Rectangle Name="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>
+              </Grid>
+            </Button>
+
+            <Popup Name="Popup" WindowManagerAddShadowHint="False"
+                   IsLightDismissEnabled="True" PlacementTarget="{TemplateBinding}"
+                   PlacementMode="Bottom">
+              <TimePickerPresenter Name="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="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="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="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">
+    <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 TimePickerFlyoutPresenterBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource TimePickerFlyoutPresenterBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource DateTimeFlyoutBorderThickness}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="Background"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{DynamicResource OverlayCornerRadius}"
+                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 TimePickerFlyoutPresenterSpacerFill}"
+                  HorizontalAlignment="Center"
+                  Width="{DynamicResource TimePickerSpacerThemeWidth}"
+                  Grid.Column="1" />
+
+              <Rectangle Name="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" />
+              </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.Fluent/Controls/TitleBar.xaml b/src/Avalonia.Themes.Fluent/Controls/TitleBar.xaml
new file mode 100644
index 0000000000..4dba5b4ba4
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/TitleBar.xaml
@@ -0,0 +1,53 @@
+<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>
+
+  <Style Selector="TitleBar:fullscreen">
+    <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
+  </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.Fluent/Controls/ToggleButton.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
new file mode 100644
index 0000000000..dd8e51e4e5
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
@@ -0,0 +1,110 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <ToggleButton Content="Click Me!" />
+        <ToggleButton Content="Disabled" IsEnabled="False" />
+        <ToggleButton Content="Three state" IsThreeState="True" />
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <Styles.Resources>
+    <Thickness x:Key="ButtonPadding">8,5,8,6</Thickness>
+  </Styles.Resources>
+  <Style Selector="ToggleButton">
+    <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="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="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>
+  
+  <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="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="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="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="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="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="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="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="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="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="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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
new file mode 100644
index 0000000000..45537e41ad
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
@@ -0,0 +1,287 @@
+<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>
+  <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
+          Background="Green"
+          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}"
+            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: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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml b/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml
new file mode 100644
index 0000000000..f7a1ebbc6b
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml
@@ -0,0 +1,85 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"       
+        xmlns:sys="clr-namespace:System;assembly=netstandard">
+
+  <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>
+          <StackPanel>
+            <TextBlock Classes="h1">ToolTip</TextBlock>
+            <TextBlock Classes="h2">A control which pops up a hint when a control is hovered</TextBlock>
+          </StackPanel>
+        </ToolTip.Tip>
+        <TextBlock>ToolTip bottom placement</TextBlock>
+      </Border>
+    </Grid>
+  </Design.PreviewWith>
+
+  <Styles.Resources>
+    <sys:Double x:Key="ToolTipContentMaxWidth">320</sys:Double>
+  </Styles.Resources>
+
+  <Style Selector="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="FontSize" Value="{DynamicResource ToolTipContentThemeFontSize}" />
+    <Setter Property="Padding" Value="{DynamicResource ToolTipBorderThemePadding}" />
+    <Setter Property="MaxWidth" Value="{DynamicResource ToolTipContentMaxWidth}" />
+    <Setter Property="Transitions">
+      <Transitions>
+        <DoubleTransition Property="Opacity" Duration="0:0:0.15" />
+      </Transitions>
+    </Setter>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="PART_LayoutRoot"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                Padding="{TemplateBinding Padding}"
+                CornerRadius="{DynamicResource OverlayCornerRadius}">
+          <ContentPresenter Name="PART_ContentPresenter"
+                            MaxWidth="{TemplateBinding MaxWidth}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}" />
+        </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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TreeView.xaml b/src/Avalonia.Themes.Fluent/Controls/TreeView.xaml
new file mode 100644
index 0000000000..292317eb34
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/TreeView.xaml
@@ -0,0 +1,24 @@
+<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="Template">
+    <ControlTemplate>
+      <Border BorderBrush="{TemplateBinding BorderBrush}"
+              BorderThickness="{TemplateBinding BorderThickness}">
+        <ScrollViewer Background="{TemplateBinding Background}"
+                      HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                      VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+          <ItemsPresenter Name="PART_ItemsPresenter"
+                          Items="{TemplateBinding Items}"
+                          ItemsPanel="{TemplateBinding ItemsPanel}"
+                          Margin="{TemplateBinding Padding}" />
+        </ScrollViewer>
+      </Border>
+    </ControlTemplate>
+  </Setter>
+</Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
new file mode 100644
index 0000000000..a938394b56
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
@@ -0,0 +1,180 @@
+<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">
+
+  <Design.PreviewWith>
+    <Border Padding="20"
+            MinWidth="300">
+      <TreeView>
+        <TreeViewItem Header="Level 1">
+          <TreeViewItem Header="Level 2.1">
+            <TreeViewItem Header="Level 3.1" />
+            <TreeViewItem Header="Level 3.2">
+              <TreeViewItem Header="Level 4" />
+            </TreeViewItem>
+          </TreeViewItem>
+          <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>
+
+  <Style Selector="ToggleButton.ExpandCollapseChevron">
+    <Setter Property="Margin" Value="0" />
+    <Setter Property="Width" Value="{StaticResource TreeViewItemExpandCollapseChevronSize}" />
+    <Setter Property="Height" Value="{StaticResource TreeViewItemExpandCollapseChevronSize}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="Transparent"
+                Width="{TemplateBinding Width}"
+                Height="{TemplateBinding Height}"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center">
+          <Path x:Name="ChevronPath"
+                Fill="{DynamicResource TreeViewItemForeground}"
+                Stretch="Uniform"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center" />
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="TreeViewItem">
+    <Style.Resources />
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="Background" Value="{DynamicResource TreeViewItemBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource TreeViewItemBorderThemeThickness}" />
+    <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForeground}" />
+    <Setter Property="MinHeight" Value="{DynamicResource TreeViewItemMinHeight}" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <StackPanel>
+          <Border Name="PART_LayoutRoot"
+                  Classes="TreeViewItemLayoutRoot"
+                  Focusable="True"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  MinHeight="{TemplateBinding MinHeight}"
+                  TemplatedControl.IsTemplateFocusTarget="True">
+            <Grid Name="PART_Header"
+                  ColumnDefinitions="Auto, *"
+                  Margin="{TemplateBinding Level, Mode=OneWay, Converter={StaticResource TreeViewItemLeftMarginConverter}}">
+              <Panel Name="PART_ExpandCollapseChevronContainer"
+                     Margin="{StaticResource TreeViewItemExpandCollapseChevronMargin}">
+                <ToggleButton Name="PART_ExpandCollapseChevron"
+                              Classes="ExpandCollapseChevron"
+                              Focusable="False"
+                              IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
+              </Panel>
+              <ContentPresenter Name="PART_HeaderPresenter"
+                                Grid.Column="1"
+                                Focusable="False"
+                                Content="{TemplateBinding Header}"
+                                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                                Margin="{TemplateBinding Padding}" />
+            </Grid>
+          </Border>
+          <ItemsPresenter Name="PART_ItemsPresenter"
+                          IsVisible="{TemplateBinding IsExpanded}"
+                          Items="{TemplateBinding Items}"
+                          ItemsPanel="{TemplateBinding ItemsPanel}" />
+        </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>
+
+  <!--  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>
+
+  <!--  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>
+
+  <!--  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 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>
+
+  <!--  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>
+
+  <!--  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>
+
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/UserControl.xaml b/src/Avalonia.Themes.Fluent/Controls/UserControl.xaml
new file mode 100644
index 0000000000..f4d0c21367
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/UserControl.xaml
@@ -0,0 +1,15 @@
+<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}"
+                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                        Content="{TemplateBinding Content}"
+                        Padding="{TemplateBinding Padding}"
+                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+    </ControlTemplate>
+  </Setter>
+</Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Window.xaml b/src/Avalonia.Themes.Fluent/Controls/Window.xaml
new file mode 100644
index 0000000000..fc71798d97
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/Window.xaml
@@ -0,0 +1,27 @@
+<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 ContentControlFontSize}"/>  
+  <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>
diff --git a/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml b/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml
new file mode 100644
index 0000000000..46324ea537
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml
@@ -0,0 +1,45 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Style Selector="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>
+            </DataTemplate>
+            <DataTemplate DataType="x:String">
+              <TextBlock Text="{Binding }" Margin="12" Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+            </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.Fluent/DensityStyles/Compact.xaml b/src/Avalonia.Themes.Fluent/DensityStyles/Compact.xaml
new file mode 100644
index 0000000000..f0f3e5ea16
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/DensityStyles/Compact.xaml
@@ -0,0 +1,23 @@
+<Styles xmlns="https://github.com/avaloniaui" 
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style Selector="TextBlock" >
+        <Setter Property="FontSize" Value="14" />
+    </Style>
+    <Style>
+        <Style.Resources>
+            <x:Double x:Key="ControlContentThemeFontSize">14</x:Double>
+            <x:Double x:Key="ContentControlFontSize">14</x:Double>
+            <x:Double x:Key="TextControlThemeMinHeight">24</x:Double>
+            <Thickness x:Key="TextControlThemePadding">2,2,6,1</Thickness>
+            <x:Double x:Key="ListViewItemMinHeight">32</x:Double>
+            <x:Double x:Key="TreeViewItemMinHeight">24</x:Double>
+            <Thickness x:Key="TimePickerHostPadding">0,1,0,2</Thickness>
+            <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>
+            <Thickness x:Key="ComboBoxPadding">12,1,0,3</Thickness>
+            <x:Double x:Key="NavigationViewItemOnLeftMinHeight">32</x:Double>
+        </Style.Resources>
+    </Style>
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/FluentDark.xaml b/src/Avalonia.Themes.Fluent/FluentDark.xaml
new file mode 100644
index 0000000000..74b583a240
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/FluentDark.xaml
@@ -0,0 +1,9 @@
+<Styles xmlns="https://github.com/avaloniaui"
+       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+       xmlns:sys="clr-namespace:System;assembly=netstandard">  
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/BaseDark.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/Base.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FluentControls.xaml" />
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/FluentLight.xaml b/src/Avalonia.Themes.Fluent/FluentLight.xaml
new file mode 100644
index 0000000000..1bc51f655e
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/FluentLight.xaml
@@ -0,0 +1,9 @@
+<Styles xmlns="https://github.com/avaloniaui"
+       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+       xmlns:sys="clr-namespace:System;assembly=netstandard">
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/BaseLight.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/Base.xaml" />  
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FluentControls.xaml" />
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/FluentTheme.cs b/src/Avalonia.Themes.Fluent/FluentTheme.cs
new file mode 100644
index 0000000000..43b71567fa
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/FluentTheme.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Styling;
+
+#nullable enable
+
+namespace Avalonia.Themes.Fluent
+{
+    public enum FluentThemeMode
+    {
+        Light,
+        Dark,
+    }
+
+    /// <summary>
+    /// Includes the fluent theme in an application.
+    /// </summary>
+    public class FluentTheme : IStyle, IResourceProvider
+    {
+        private readonly Uri _baseUri;
+        private IStyle[]? _loaded;
+        private bool _isLoading;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FluentTheme"/> class.
+        /// </summary>
+        /// <param name="baseUri">The base URL for the XAML context.</param>
+        public FluentTheme(Uri baseUri)
+        {
+            _baseUri = baseUri;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FluentTheme"/> class.
+        /// </summary>
+        /// <param name="serviceProvider">The XAML service provider.</param>
+        public FluentTheme(IServiceProvider serviceProvider)
+        {
+            _baseUri = ((IUriContext)serviceProvider.GetService(typeof(IUriContext))).BaseUri;
+        }
+
+        /// <summary>
+        /// Gets or sets the mode of the fluent theme (light, dark).
+        /// </summary>
+        public FluentThemeMode Mode { get; set; }
+
+        public IResourceHost? Owner => (Loaded as IResourceProvider)?.Owner;
+
+        /// <summary>
+        /// Gets the loaded style.
+        /// </summary>
+        public IStyle Loaded
+        {
+            get
+            {
+                if (_loaded == null)
+                {
+                    _isLoading = true;
+                    var loaded = (IStyle)AvaloniaXamlLoader.Load(GetUri(), _baseUri);
+                    _loaded = new[] { loaded };
+                    _isLoading = false;
+                }
+
+                return _loaded?[0]!;
+            }
+        }
+
+        bool IResourceNode.HasResources => (Loaded as IResourceProvider)?.HasResources ?? false;
+
+        IReadOnlyList<IStyle> IStyle.Children => _loaded ?? Array.Empty<IStyle>();
+
+        public event EventHandler OwnerChanged
+        {
+            add
+            {
+                if (Loaded is IResourceProvider rp)
+                {
+                    rp.OwnerChanged += value;
+                }
+            }
+            remove
+            {
+                if (Loaded is IResourceProvider rp)
+                {
+                    rp.OwnerChanged -= value;
+                }
+            }
+        }
+
+        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;
+        }
+
+        void IResourceProvider.AddOwner(IResourceHost owner) => (Loaded as IResourceProvider)?.AddOwner(owner);
+        void IResourceProvider.RemoveOwner(IResourceHost owner) => (Loaded as IResourceProvider)?.RemoveOwner(owner);
+
+        private Uri GetUri() => Mode switch
+        {
+            FluentThemeMode.Dark => new Uri("avares://Avalonia.Themes.Fluent/FluentDark.xaml", UriKind.Absolute),
+            _ => new Uri("avares://Avalonia.Themes.Fluent/FluentLight.xaml", UriKind.Absolute),
+        };
+    }
+}
diff --git a/src/Avalonia.Themes.Fluent/InverseBooleanValueConverter.cs b/src/Avalonia.Themes.Fluent/InverseBooleanValueConverter.cs
new file mode 100644
index 0000000000..20bade2a67
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/InverseBooleanValueConverter.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+
+namespace Avalonia.Themes.Fluent
+{
+    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.Fluent/Properties/AssemblyInfo.cs b/src/Avalonia.Themes.Fluent/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..0bad226ba7
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Properties/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using Avalonia.Metadata;
+
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Themes.Fluent")]
diff --git a/src/Avalonia.Visuals/Animation/Animators/BoxShadowAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/BoxShadowAnimator.cs
new file mode 100644
index 0000000000..ff76902425
--- /dev/null
+++ b/src/Avalonia.Visuals/Animation/Animators/BoxShadowAnimator.cs
@@ -0,0 +1,23 @@
+using Avalonia.Media;
+
+namespace Avalonia.Animation.Animators
+{
+    public class BoxShadowAnimator : Animator<BoxShadow>
+    {
+        static ColorAnimator s_colorAnimator = new ColorAnimator();
+        static DoubleAnimator s_doubleAnimator = new DoubleAnimator();
+        static BoolAnimator s_boolAnimator = new BoolAnimator();
+        public override BoxShadow Interpolate(double progress, BoxShadow oldValue, BoxShadow newValue)
+        {
+            return new BoxShadow
+            {
+                OffsetX = s_doubleAnimator.Interpolate(progress, oldValue.OffsetX, newValue.OffsetX),
+                OffsetY = s_doubleAnimator.Interpolate(progress, oldValue.OffsetY, newValue.OffsetY),
+                Blur = s_doubleAnimator.Interpolate(progress, oldValue.Blur, newValue.Blur),
+                Spread = s_doubleAnimator.Interpolate(progress, oldValue.Spread, newValue.Spread),
+                Color = s_colorAnimator.Interpolate(progress, oldValue.Color, newValue.Color),
+                IsInset = s_boolAnimator.Interpolate(progress, oldValue.IsInset, newValue.IsInset)
+            };
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Animation/Animators/BoxShadowsAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/BoxShadowsAnimator.cs
new file mode 100644
index 0000000000..c6f96a2d0e
--- /dev/null
+++ b/src/Avalonia.Visuals/Animation/Animators/BoxShadowsAnimator.cs
@@ -0,0 +1,40 @@
+using Avalonia.Media;
+
+namespace Avalonia.Animation.Animators
+{
+    public class BoxShadowsAnimator :  Animator<BoxShadows>
+    {
+        private static readonly BoxShadowAnimator s_boxShadowAnimator = new BoxShadowAnimator();
+        public override BoxShadows Interpolate(double progress, BoxShadows oldValue, BoxShadows newValue)
+        {
+            int cnt = progress >= 1d ? newValue.Count : oldValue.Count;
+            if (cnt == 0)
+                return new BoxShadows();
+
+            BoxShadow first;
+            if (oldValue.Count > 0 && newValue.Count > 0)
+                first = s_boxShadowAnimator.Interpolate(progress, oldValue[0], newValue[0]);
+            else if (oldValue.Count > 0)
+                first = oldValue[0];
+            else
+                first = newValue[0];
+
+            if (cnt == 1)
+                return new BoxShadows(first);
+
+            var rest = new BoxShadow[cnt - 1];
+            for (var c = 0; c < rest.Length; c++)
+            {
+                var idx = c + 1;
+                if (oldValue.Count > idx && newValue.Count > idx)
+                    rest[c] = s_boxShadowAnimator.Interpolate(progress, oldValue[idx], newValue[idx]);
+                else if (oldValue.Count > idx)
+                    rest[c] = oldValue[idx];
+                else
+                    rest[c] = newValue[idx];
+            }
+
+            return new BoxShadows(first, rest);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs
index 8776d3a7b7..a8e618af27 100644
--- a/src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs
+++ b/src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Reactive.Disposables;
-using Avalonia.Logging;
 using Avalonia.Media;
 using Avalonia.Media.Immutable;
 
@@ -11,9 +10,9 @@ namespace Avalonia.Animation.Animators
     /// </summary>
     public class SolidColorBrushAnimator : Animator<SolidColorBrush>
     {
-        ColorAnimator _colorAnimator;
+        private ColorAnimator _colorAnimator;
 
-        void InitializeColorAnimator()
+        private void InitializeColorAnimator()
         {
             _colorAnimator = new ColorAnimator();
 
@@ -27,46 +26,44 @@ namespace Avalonia.Animation.Animators
 
         public override IDisposable Apply(Animation animation, Animatable control, IClock clock, IObservable<bool> match, Action onComplete)
         {
+            // Preprocess keyframe values to Color if the xaml parser converts them to ISCB.
             foreach (var keyframe in this)
             {
-                if (keyframe.Value as ISolidColorBrush == null)
-                    return Disposable.Empty;
-
-                // Preprocess keyframe values to Color if the xaml parser converts them to ISCB.
-                if (keyframe.Value.GetType() == typeof(ImmutableSolidColorBrush))
+                if (keyframe.Value is ISolidColorBrush colorBrush)
                 {
-                    keyframe.Value = ((ImmutableSolidColorBrush)keyframe.Value).Color;
+                    keyframe.Value = colorBrush.Color;
+                }
+                else
+                {
+                    return Disposable.Empty;
                 }
             }
 
-            // Add SCB if the target prop is empty.
-            if (control.GetValue(Property) == null)
-                control.SetValue(Property, new SolidColorBrush(Colors.Transparent));
-
+            SolidColorBrush finalTarget;
             var targetVal = control.GetValue(Property);
-
-            // Continue if target prop is not empty & is a SolidColorBrush derivative. 
-            if (typeof(ISolidColorBrush).IsAssignableFrom(targetVal.GetType()))
+            if (targetVal is null)
+            {
+                finalTarget = new SolidColorBrush(Colors.Transparent);
+                control.SetValue(Property, finalTarget);
+            }
+            else if (targetVal is ImmutableSolidColorBrush immutableSolidColorBrush)
+            {
+                finalTarget = new SolidColorBrush(immutableSolidColorBrush.Color);
+                control.SetValue(Property, finalTarget);
+            }
+            else if (targetVal is ISolidColorBrush)
             {
-                if (_colorAnimator == null)
-                    InitializeColorAnimator();
-
-                SolidColorBrush finalTarget;
-
-                // If it's ISCB, change it back to SCB.
-                if (targetVal.GetType() == typeof(ImmutableSolidColorBrush))
-                {
-                    var col = (ImmutableSolidColorBrush)targetVal;
-                    targetVal = new SolidColorBrush(col.Color);
-                    control.SetValue(Property, targetVal);
-                }
-
                 finalTarget = targetVal as SolidColorBrush;
-
-                return _colorAnimator.Apply(animation, finalTarget, clock ?? control.Clock, match, onComplete);
             }
+            else
+            {
+                return Disposable.Empty;
+            }
+
+            if (_colorAnimator == null)
+                InitializeColorAnimator();
 
-            return Disposable.Empty;
+            return _colorAnimator.Apply(animation, finalTarget, clock ?? control.Clock, match, onComplete);
         }
 
         public override SolidColorBrush Interpolate(double p, SolidColorBrush o, SolidColorBrush n) => null;
diff --git a/src/Avalonia.Visuals/Animation/Animators/TransformAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/TransformAnimator.cs
index 1f1590bdcd..1b2142f6c9 100644
--- a/src/Avalonia.Visuals/Animation/Animators/TransformAnimator.cs
+++ b/src/Avalonia.Visuals/Animation/Animators/TransformAnimator.cs
@@ -1,6 +1,8 @@
 using System;
+using System.Reactive.Disposables;
 using Avalonia.Logging;
 using Avalonia.Media;
+using Avalonia.Media.Transformation;
 
 namespace Avalonia.Animation.Animators
 {
@@ -19,6 +21,12 @@ namespace Avalonia.Animation.Animators
             // 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();
@@ -51,7 +59,7 @@ namespace Avalonia.Animation.Animators
                 // It's a transform object so let's target that.
                 if (renderTransformType == Property.OwnerType)
                 {
-                    return _doubleAnimator.Apply(animation, ctrl.RenderTransform, clock ?? control.Clock, obsMatch, onComplete);
+                    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))
@@ -65,15 +73,13 @@ namespace Avalonia.Animation.Animators
                     }
                 }
 
-                Logger.TryGet(LogEventLevel.Warning)?.Log(
-                    LogArea.Animations,
+                Logger.TryGet(LogEventLevel.Warning, LogArea.Animations)?.Log(
                     control,
                     $"Cannot find the appropriate transform: \"{Property.OwnerType}\" in {control}.");
             }
             else
             {
-                Logger.TryGet(LogEventLevel.Error)?.Log(
-                    LogArea.Animations,
+                Logger.TryGet(LogEventLevel.Error, LogArea.Animations)?.Log(
                     control,
                     $"Cannot apply animation: Target property owner {Property.OwnerType} is not a Transform object.");
             }
diff --git a/src/Avalonia.Visuals/Animation/Animators/TransformOperationsAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/TransformOperationsAnimator.cs
new file mode 100644
index 0000000000..8e9d20eb8f
--- /dev/null
+++ b/src/Avalonia.Visuals/Animation/Animators/TransformOperationsAnimator.cs
@@ -0,0 +1,35 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Media.Transformation;
+
+namespace Avalonia.Animation.Animators
+{
+    public class TransformOperationsAnimator : Animator<TransformOperations>
+    {
+        public TransformOperationsAnimator()
+        {
+            Validate = ValidateTransform;
+        }
+
+        public override TransformOperations Interpolate(double progress, TransformOperations oldValue, TransformOperations newValue)
+        {
+            var oldTransform = EnsureOperations(oldValue);
+            var newTransform = EnsureOperations(newValue);
+
+            return TransformOperations.Interpolate(oldTransform, newTransform, progress);
+        }
+
+        internal static TransformOperations EnsureOperations(ITransform value)
+        {
+            return value as TransformOperations ?? TransformOperations.Identity;
+        }
+
+        private void ValidateTransform(AnimatorKeyFrame kf)
+        {
+            if (!(kf.Value is TransformOperations))
+            {
+                throw new InvalidOperationException($"All keyframes must be of type {typeof(TransformOperations)}.");
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Animation/CompositePageTransition.cs b/src/Avalonia.Visuals/Animation/CompositePageTransition.cs
new file mode 100644
index 0000000000..9489914c97
--- /dev/null
+++ b/src/Avalonia.Visuals/Animation/CompositePageTransition.cs
@@ -0,0 +1,61 @@
+using System.Collections.Generic;
+using System.Linq;
+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>();
+
+        /// <summary>
+        /// Starts the animation.
+        /// </summary>
+        /// <param name="from">
+        /// The control that is being transitioned away from. May be null.
+        /// </param>
+        /// <param name="to">
+        /// The control that is being transitioned to. May be null.
+        /// </param>
+        /// <param name="forward">
+        /// Defines the direction of the transition.
+        /// </param>
+        /// <returns>
+        /// A <see cref="Task"/> that tracks the progress of the animation.
+        /// </returns>
+        public Task Start(Visual from, Visual to, bool forward)
+        {
+            var transitionTasks = PageTransitions
+                .Select(transition => transition.Start(from, to, forward))
+                .ToList();
+            return Task.WhenAll(transitionTasks);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Animation/CrossFade.cs b/src/Avalonia.Visuals/Animation/CrossFade.cs
index 614d828259..0615b854da 100644
--- a/src/Avalonia.Visuals/Animation/CrossFade.cs
+++ b/src/Avalonia.Visuals/Animation/CrossFade.cs
@@ -1,9 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Avalonia.Animation.Easings;
 using Avalonia.Styling;
 using Avalonia.VisualTree;
 
@@ -77,14 +75,26 @@ namespace Avalonia.Animation
         /// </summary>
         public TimeSpan Duration
         {
-            get
-            {
-                return _fadeOutAnimation.Duration;
-            }
-            set
-            {
-                _fadeOutAnimation.Duration = _fadeInAnimation.Duration = value;
-            }
+            get => _fadeOutAnimation.Duration;
+            set => _fadeOutAnimation.Duration = _fadeInAnimation.Duration = value;
+        }
+
+        /// <summary>
+        /// Gets or sets element entrance easing.
+        /// </summary>
+        public Easing FadeInEasing
+        {
+            get => _fadeInAnimation.Easing;
+            set => _fadeInAnimation.Easing = value;
+        }
+
+        /// <summary>
+        /// Gets or sets element exit easing.
+        /// </summary>
+        public Easing FadeOutEasing
+        {
+            get => _fadeOutAnimation.Easing;
+            set => _fadeOutAnimation.Easing = value;
         }
 
         /// <summary>
diff --git a/src/Avalonia.Visuals/Animation/IPageTransition.cs b/src/Avalonia.Visuals/Animation/IPageTransition.cs
index 4f598fa08e..659bc12424 100644
--- a/src/Avalonia.Visuals/Animation/IPageTransition.cs
+++ b/src/Avalonia.Visuals/Animation/IPageTransition.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Threading.Tasks;
 
 namespace Avalonia.Animation
diff --git a/src/Avalonia.Visuals/Animation/PageSlide.cs b/src/Avalonia.Visuals/Animation/PageSlide.cs
index 0aa85035ae..dd5d598e12 100644
--- a/src/Avalonia.Visuals/Animation/PageSlide.cs
+++ b/src/Avalonia.Visuals/Animation/PageSlide.cs
@@ -1,9 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Avalonia.Animation.Easings;
 using Avalonia.Media;
 using Avalonia.Styling;
 using Avalonia.VisualTree;
@@ -51,6 +49,16 @@ namespace Avalonia.Animation
         /// 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();
 
         /// <summary>
         /// Starts the animation.
@@ -78,18 +86,12 @@ namespace Avalonia.Animation
             {
                 var animation = new Animation
                 {
-                    Children = 
+                    Easing = SlideOutEasing,
+                    Children =
                     {
                         new KeyFrame
                         {
-                            Setters =
-                            {
-                                new Setter
-                                {
-                                    Property = translateProperty,
-                                Value = 0d
-                                }
-                            },
+                            Setters = { new Setter { Property = translateProperty, Value = 0d } },
                             Cue = new Cue(0d)
                         },
                         new KeyFrame
@@ -103,10 +105,10 @@ namespace Avalonia.Animation
                                 }
                             },
                             Cue = new Cue(1d)
-                        }                       
-                    }
+                        }
+                    },
+                    Duration = Duration
                 };
-                animation.Duration = Duration;
                 tasks.Add(animation.RunAsync(from));
             }
 
@@ -115,9 +117,9 @@ namespace Avalonia.Animation
                 to.IsVisible = true;
                 var animation = new Animation
                 {
+                    Easing = SlideInEasing,
                     Children =
                     {
-
                         new KeyFrame
                         {
                             Setters =
@@ -132,19 +134,12 @@ namespace Avalonia.Animation
                         },
                         new KeyFrame
                         {
-                            Setters =
-                            {
-                                new Setter
-                                {
-                                    Property = translateProperty,
-                                    Value = 0d
-                                }
-                            },
+                            Setters = { new Setter { Property = translateProperty, Value = 0d } },
                             Cue = new Cue(1d)
                         }
-                    }
+                    },
+                    Duration = Duration
                 };
-                animation.Duration = Duration;
                 tasks.Add(animation.RunAsync(to));
             }
 
diff --git a/src/Avalonia.Visuals/Animation/Transitions/CornerRadiusTransition.cs b/src/Avalonia.Visuals/Animation/Transitions/CornerRadiusTransition.cs
index 4b6703133d..0b0f04ca94 100644
--- a/src/Avalonia.Visuals/Animation/Transitions/CornerRadiusTransition.cs
+++ b/src/Avalonia.Visuals/Animation/Transitions/CornerRadiusTransition.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
 
diff --git a/src/Avalonia.Visuals/Animation/Transitions/PointTransition.cs b/src/Avalonia.Visuals/Animation/Transitions/PointTransition.cs
index ea0000f960..29db5fc868 100644
--- a/src/Avalonia.Visuals/Animation/Transitions/PointTransition.cs
+++ b/src/Avalonia.Visuals/Animation/Transitions/PointTransition.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
 
diff --git a/src/Avalonia.Visuals/Animation/Transitions/SizeTransition.cs b/src/Avalonia.Visuals/Animation/Transitions/SizeTransition.cs
index 5de59edc53..b40e789915 100644
--- a/src/Avalonia.Visuals/Animation/Transitions/SizeTransition.cs
+++ b/src/Avalonia.Visuals/Animation/Transitions/SizeTransition.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
 
diff --git a/src/Avalonia.Visuals/Animation/Transitions/ThicknessTransition.cs b/src/Avalonia.Visuals/Animation/Transitions/ThicknessTransition.cs
index e6b5e8904b..28d4ea067f 100644
--- a/src/Avalonia.Visuals/Animation/Transitions/ThicknessTransition.cs
+++ b/src/Avalonia.Visuals/Animation/Transitions/ThicknessTransition.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
 
diff --git a/src/Avalonia.Visuals/Animation/Transitions/TransformOperationsTransition.cs b/src/Avalonia.Visuals/Animation/Transitions/TransformOperationsTransition.cs
new file mode 100644
index 0000000000..104acb71ad
--- /dev/null
+++ b/src/Avalonia.Visuals/Animation/Transitions/TransformOperationsTransition.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Reactive.Linq;
+using Avalonia.Animation.Animators;
+using Avalonia.Media;
+
+namespace Avalonia.Animation
+{
+    public class TransformOperationsTransition : Transition<ITransform>
+    {
+        private static readonly TransformOperationsAnimator _operationsAnimator =  new TransformOperationsAnimator();
+
+        public override IObservable<ITransform> DoTransition(IObservable<double> progress,
+            ITransform oldValue,
+            ITransform newValue)
+        {
+            var oldTransform = TransformOperationsAnimator.EnsureOperations(oldValue);
+            var newTransform = TransformOperationsAnimator.EnsureOperations(newValue);
+
+            return progress
+                .Select(p =>
+                {
+                    var f = Easing.Ease(p);
+
+                    return _operationsAnimator.Interpolate(f, oldTransform, newTransform);
+                });
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Animation/Transitions/VectorTransition.cs b/src/Avalonia.Visuals/Animation/Transitions/VectorTransition.cs
index 5271c1378b..c073e8e192 100644
--- a/src/Avalonia.Visuals/Animation/Transitions/VectorTransition.cs
+++ b/src/Avalonia.Visuals/Animation/Transitions/VectorTransition.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
 
diff --git a/src/Avalonia.Visuals/Assets/GraphemeBreak.trie b/src/Avalonia.Visuals/Assets/GraphemeBreak.trie
new file mode 100644
index 0000000000..482bf9b44d
Binary files /dev/null and b/src/Avalonia.Visuals/Assets/GraphemeBreak.trie differ
diff --git a/src/Avalonia.Visuals/Assets/UnicodeData.trie b/src/Avalonia.Visuals/Assets/UnicodeData.trie
new file mode 100644
index 0000000000..f96106a5fa
Binary files /dev/null and b/src/Avalonia.Visuals/Assets/UnicodeData.trie differ
diff --git a/src/Avalonia.Visuals/Avalonia.Visuals.csproj b/src/Avalonia.Visuals/Avalonia.Visuals.csproj
index 2cc7741bbb..802a120e03 100644
--- a/src/Avalonia.Visuals/Avalonia.Visuals.csproj
+++ b/src/Avalonia.Visuals/Avalonia.Visuals.csproj
@@ -2,7 +2,11 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <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" />
@@ -10,4 +14,5 @@
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\System.Memory.props" />
+  <Import Project="..\..\build\ApiDiff.props" />
 </Project>
diff --git a/src/Avalonia.Visuals/AvaloniaPropertyExtensions.cs b/src/Avalonia.Visuals/AvaloniaPropertyExtensions.cs
new file mode 100644
index 0000000000..6aaa224b00
--- /dev/null
+++ b/src/Avalonia.Visuals/AvaloniaPropertyExtensions.cs
@@ -0,0 +1,27 @@
+using Avalonia.Media;
+
+#nullable enable
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Extensions for <see cref="AvaloniaProperty"/>.
+    /// </summary>
+    public static class AvaloniaPropertyExtensions
+    {
+        /// <summary>
+        /// Checks if values of given property can affect rendering (via <see cref="IAffectsRender"/>).
+        /// </summary>
+        /// <param name="property">Property to check.</param>
+        public static bool CanValueAffectRender(this AvaloniaProperty property)
+        {
+            var propertyType = property.PropertyType;
+
+            // Only case that we are sure that property value CAN'T affect render are sealed types that don't implement
+            // the interface.
+            var cannotAffectRender = propertyType.IsSealed && !typeof(IAffectsRender).IsAssignableFrom(propertyType);
+
+            return !cannotAffectRender;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/CornerRadius.cs b/src/Avalonia.Visuals/CornerRadius.cs
index ecb9e75d82..037bb16e31 100644
--- a/src/Avalonia.Visuals/CornerRadius.cs
+++ b/src/Avalonia.Visuals/CornerRadius.cs
@@ -1,9 +1,8 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
+#if !BUILDTASK
 using Avalonia.Animation.Animators;
+#endif
 using Avalonia.Utilities;
 
 namespace Avalonia
@@ -11,11 +10,16 @@ namespace Avalonia
     /// <summary>
     /// Represents the radii of a rectangle's corners.
     /// </summary>
-    public readonly struct CornerRadius : IEquatable<CornerRadius>
+#if !BUILDTASK
+    public
+#endif
+    readonly struct CornerRadius : IEquatable<CornerRadius>
     {
         static CornerRadius()
         {
+#if !BUILDTASK
             Animation.Animation.RegisterAnimator<CornerRadiusAnimator>(prop => typeof(CornerRadius).IsAssignableFrom(prop.PropertyType));
+#endif
         }
 
         public CornerRadius(double uniformRadius)
diff --git a/src/Avalonia.Visuals/Matrix.cs b/src/Avalonia.Visuals/Matrix.cs
index 92b7dae904..8136f843df 100644
--- a/src/Avalonia.Visuals/Matrix.cs
+++ b/src/Avalonia.Visuals/Matrix.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
 using Avalonia.Utilities;
@@ -10,7 +7,10 @@ namespace Avalonia
     /// <summary>
     /// A 2x3 matrix.
     /// </summary>
-    public readonly struct Matrix : IEquatable<Matrix>
+#if !BUILDTASK
+    public
+#endif
+    readonly struct Matrix : IEquatable<Matrix>
     {
         private readonly double _m11;
         private readonly double _m12;
@@ -57,7 +57,7 @@ namespace Avalonia
         /// <summary>
         /// HasInverse Property - returns true if this matrix is invertible, false otherwise.
         /// </summary>
-        public bool HasInverse => GetDeterminant() != 0;
+        public bool HasInverse => !MathUtilities.IsZero(GetDeterminant());
 
         /// <summary>
         /// The first element of the first row
@@ -282,31 +282,50 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Inverts the Matrix.
+        /// Attempts to invert the Matrix.
         /// </summary>
-        /// <returns>The inverted matrix.</returns>
-        public Matrix Invert()
+        /// <returns>The inverted matrix or <see langword="null"/> when matrix is not invertible.</returns>
+        public bool TryInvert(out Matrix inverted)
         {
             double d = GetDeterminant();
 
-            if (d == 0)
+            if (MathUtilities.IsZero(d))
             {
-                throw new InvalidOperationException("Transform is not invertible.");
+                inverted = default;
+                
+                return false;
             }
 
-            return new Matrix(
+            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">The string.</param>
+        /// <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)
         {
@@ -322,5 +341,76 @@ namespace Avalonia
                 );
             }
         }
+
+        /// <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/AcrylicBackgroundSource.cs b/src/Avalonia.Visuals/Media/AcrylicBackgroundSource.cs
new file mode 100644
index 0000000000..34cede4018
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/AcrylicBackgroundSource.cs
@@ -0,0 +1,20 @@
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Background Sources for Acrylic.
+    /// </summary>
+    public enum AcrylicBackgroundSource
+    {
+        /// <summary>
+        /// The acrylic has no background.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Cuts through all render layers to reveal the window background.
+        /// This means if your window is transparent or blurred it 
+        /// will be blended with the material.
+        /// </summary>
+        Digger
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/AlignmentX.cs b/src/Avalonia.Visuals/Media/AlignmentX.cs
index 89bc1f6258..b2f913c90a 100644
--- a/src/Avalonia.Visuals/Media/AlignmentX.cs
+++ b/src/Avalonia.Visuals/Media/AlignmentX.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Media
 {
     /// <summary>
diff --git a/src/Avalonia.Visuals/Media/AlignmentY.cs b/src/Avalonia.Visuals/Media/AlignmentY.cs
index b05500e039..0c5829569e 100644
--- a/src/Avalonia.Visuals/Media/AlignmentY.cs
+++ b/src/Avalonia.Visuals/Media/AlignmentY.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Media
 {
     /// <summary>
diff --git a/src/Avalonia.Visuals/Media/ArcSegment.cs b/src/Avalonia.Visuals/Media/ArcSegment.cs
index 0e9c4548a4..888cb896bb 100644
--- a/src/Avalonia.Visuals/Media/ArcSegment.cs
+++ b/src/Avalonia.Visuals/Media/ArcSegment.cs
@@ -1,5 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
+using System.Globalization;
 
 namespace Avalonia.Media
 {
@@ -99,5 +98,8 @@ namespace Avalonia.Media
         {
             ctx.ArcTo(Point, Size, RotationAngle, IsLargeArc, SweepDirection);
         }
+
+        public override string ToString()
+            => $"A {Size} {RotationAngle.ToString(CultureInfo.InvariantCulture)} {(IsLargeArc ? 1 : 0)} {(int)SweepDirection} {Point}";
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Media/BezierSegment .cs b/src/Avalonia.Visuals/Media/BezierSegment .cs
index 8bea03bc23..d4330830d9 100644
--- a/src/Avalonia.Visuals/Media/BezierSegment .cs	
+++ b/src/Avalonia.Visuals/Media/BezierSegment .cs	
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Media
 {
     public sealed class BezierSegment : PathSegment
@@ -61,5 +58,8 @@ namespace Avalonia.Media
         {
             ctx.CubicBezierTo(Point1, Point2, Point3);
         }
+
+        public override string ToString()
+            => $"C {Point1} {Point2} {Point3}";
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Media/BoxShadow.cs b/src/Avalonia.Visuals/Media/BoxShadow.cs
new file mode 100644
index 0000000000..69395fd3b8
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/BoxShadow.cs
@@ -0,0 +1,133 @@
+using System;
+using System.Globalization;
+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(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 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
new file mode 100644
index 0000000000..9e4d6aacb0
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/BoxShadows.cs
@@ -0,0 +1,135 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+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];
+            }
+        }
+
+        [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
index f36cd88537..a19d5af8b7 100644
--- a/src/Avalonia.Visuals/Media/Brush.cs
+++ b/src/Avalonia.Visuals/Media/Brush.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.ComponentModel;
 using Avalonia.Animation;
@@ -22,6 +19,11 @@ namespace Avalonia.Media
         /// <inheritdoc/>
         public event EventHandler Invalidated;
 
+        static Brush()
+        {
+            AffectsRender<Brush>(OpacityProperty);
+        }
+
         /// <summary>
         /// Gets or sets the opacity of the brush.
         /// </summary>
@@ -69,14 +71,14 @@ namespace Avalonia.Media
         protected static void AffectsRender<T>(params AvaloniaProperty[] properties)
             where T : Brush
         {
-            void Invalidate(AvaloniaPropertyChangedEventArgs e)
+            static void Invalidate(AvaloniaPropertyChangedEventArgs e)
             {
                 (e.Sender as T)?.RaiseInvalidated(EventArgs.Empty);
             }
 
             foreach (var property in properties)
             {
-                property.Changed.Subscribe(Invalidate);
+                property.Changed.Subscribe(e => Invalidate(e));
             }
         }
 
diff --git a/src/Avalonia.Visuals/Media/BrushConverter.cs b/src/Avalonia.Visuals/Media/BrushConverter.cs
index c79360204a..b3c105ffc7 100644
--- a/src/Avalonia.Visuals/Media/BrushConverter.cs
+++ b/src/Avalonia.Visuals/Media/BrushConverter.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.ComponentModel;
 using System.Globalization;
diff --git a/src/Avalonia.Visuals/Media/BrushMappingMode.cs b/src/Avalonia.Visuals/Media/BrushMappingMode.cs
index eb64a063a1..b8f92696dc 100644
--- a/src/Avalonia.Visuals/Media/BrushMappingMode.cs
+++ b/src/Avalonia.Visuals/Media/BrushMappingMode.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 
 namespace Avalonia.Media
 {
diff --git a/src/Avalonia.Visuals/Media/Brushes.cs b/src/Avalonia.Visuals/Media/Brushes.cs
index 83ff043397..5957775f39 100644
--- a/src/Avalonia.Visuals/Media/Brushes.cs
+++ b/src/Avalonia.Visuals/Media/Brushes.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Media
 {
     /// <summary>
diff --git a/src/Avalonia.Visuals/Media/CharacterHit.cs b/src/Avalonia.Visuals/Media/CharacterHit.cs
new file mode 100644
index 0000000000..f018b2d8a9
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/CharacterHit.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Diagnostics;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    ///     Represents information about a character hit within a glyph run.
+    /// </summary>
+    /// <remarks>
+    ///     The CharacterHit structure provides information about the index of the first
+    ///     character that got hit as well as information about leading or trailing edge.
+    /// </remarks>
+    [DebuggerDisplay("CharacterHit({FirstCharacterIndex}, {TrailingLength})")]
+    public readonly struct CharacterHit : IEquatable<CharacterHit>
+    {
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="CharacterHit"/> structure.
+        /// </summary>
+        /// <param name="firstCharacterIndex">Index of the first character that got hit.</param>
+        /// <param name="trailingLength">In the case of a leading edge, this value is 0. In the case of a trailing edge,
+        /// this value is the number of code points until the next valid caret position.</param>
+        public CharacterHit(int firstCharacterIndex, int trailingLength = 0)
+        {
+            FirstCharacterIndex = firstCharacterIndex;
+
+            TrailingLength = trailingLength;
+        }
+
+        /// <summary>
+        ///     Gets the index of the first character that got hit.
+        /// </summary>
+        public int FirstCharacterIndex { get; }
+
+        /// <summary>
+        ///     Gets the trailing length value for the character that got hit.
+        /// </summary>
+        public int TrailingLength { get; }
+
+        public bool Equals(CharacterHit other)
+        {
+            return FirstCharacterIndex == other.FirstCharacterIndex && TrailingLength == other.TrailingLength;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is CharacterHit other && Equals(other);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return FirstCharacterIndex * 397 ^ TrailingLength;
+            }
+        }
+
+        public static bool operator ==(CharacterHit left, CharacterHit right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(CharacterHit left, CharacterHit right)
+        {
+            return !left.Equals(right);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Color.cs b/src/Avalonia.Visuals/Media/Color.cs
index a37463a0f0..a57a962db4 100644
--- a/src/Avalonia.Visuals/Media/Color.cs
+++ b/src/Avalonia.Visuals/Media/Color.cs
@@ -1,40 +1,43 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
-using Avalonia.Animation;
+#if !BUILDTASK
 using Avalonia.Animation.Animators;
+#endif
 
 namespace Avalonia.Media
 {
     /// <summary>
     /// An ARGB color.
     /// </summary>
-    public readonly struct Color
+#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 or sets the Alpha component of the color.
+        /// Gets the Alpha component of the color.
         /// </summary>
         public byte A { get; }
 
         /// <summary>
-        /// Gets or sets the Red component of the color.
+        /// Gets the Red component of the color.
         /// </summary>
         public byte R { get; }
 
         /// <summary>
-        /// Gets or sets the Green component of the color.
+        /// Gets the Green component of the color.
         /// </summary>
         public byte G { get; }
 
         /// <summary>
-        /// Gets or sets the Blue component of the color.
+        /// Gets the Blue component of the color.
         /// </summary>
         public byte B { get; }
 
@@ -93,33 +96,157 @@ namespace Avalonia.Media
         /// <returns>The <see cref="Color"/>.</returns>
         public static Color Parse(string s)
         {
-            if (s == null) throw new ArgumentNullException(nameof(s));
-            if (s.Length == 0) throw new FormatException();
+            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] == '#')
             {
-                var or = 0u;
+                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 (s.Length == 7)
+                if (input.Length == 6)
+                {
+                    alphaComponent = 0xff000000;
+                }
+                else if (input.Length != 8)
                 {
-                    or = 0xff000000;
+                    return false;
                 }
-                else if (s.Length != 9)
+
+                // TODO: (netstandard 2.1) Can use allocation free parsing.
+                if (!uint.TryParse(input.ToString(), NumberStyles.HexNumber, CultureInfo.InvariantCulture,
+                    out var parsed))
                 {
-                    throw new FormatException($"Invalid color string: '{s}'.");
+                    return false;
                 }
 
-                return FromUInt32(uint.Parse(s.Substring(1), NumberStyles.HexNumber, CultureInfo.InvariantCulture) | or);
+                color = FromUInt32(parsed | alphaComponent);
+
+                return true;
             }
 
-            var knownColor = KnownColors.GetKnownColor(s);
+            color = default;
 
-            if (knownColor != KnownColor.None)
+            ReadOnlySpan<char> input = s.Slice(1);
+
+            // Handle shorthand cases like #FFF (RGB) or #FFFF (ARGB).
+            if (input.Length == 3 || input.Length == 4)
             {
-                return knownColor.ToColor();
+                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);
             }
 
-            throw new FormatException($"Invalid color string: '{s}'.");
+            return TryParseCore(input, ref color);
         }
 
         /// <summary>
@@ -144,5 +271,40 @@ namespace Avalonia.Media
         {
             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/Colors.cs b/src/Avalonia.Visuals/Media/Colors.cs
index ca4a0793cb..394544f451 100644
--- a/src/Avalonia.Visuals/Media/Colors.cs
+++ b/src/Avalonia.Visuals/Media/Colors.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 
 namespace Avalonia.Media
 {
diff --git a/src/Avalonia.Visuals/Media/ConicGradientBrush.cs b/src/Avalonia.Visuals/Media/ConicGradientBrush.cs
new file mode 100644
index 0000000000..7c1266fa17
--- /dev/null
+++ b/src/Avalonia.Visuals/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<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
index 7784c73736..acba2d3615 100644
--- a/src/Avalonia.Visuals/Media/DashStyle.cs
+++ b/src/Avalonia.Visuals/Media/DashStyle.cs
@@ -1,11 +1,14 @@
+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
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using Avalonia.Animation;
-    using Avalonia.Media.Immutable;
-
     /// <summary>
     /// Represents the sequence of dashes and gaps that will be applied by a <see cref="Pen"/>.
     /// </summary>
@@ -14,19 +17,19 @@ namespace Avalonia.Media
         /// <summary>
         /// Defines the <see cref="Dashes"/> property.
         /// </summary>
-        public static readonly AvaloniaProperty<IReadOnlyList<double>> DashesProperty =
-            AvaloniaProperty.Register<DashStyle, IReadOnlyList<double>>(nameof(Dashes));
+        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 AvaloniaProperty<double> OffsetProperty =
+        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;
+        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.
@@ -41,9 +44,9 @@ namespace Avalonia.Media
         /// </summary>
         /// <param name="dashes">The dashes collection.</param>
         /// <param name="offset">The dash sequence offset.</param>
-        public DashStyle(IEnumerable<double> dashes, double offset)
+        public DashStyle(IEnumerable<double>? dashes, double offset)
         {
-            Dashes = (IReadOnlyList<double>)dashes?.ToList() ?? Array.Empty<double>();
+            Dashes = (dashes as AvaloniaList<double>) ?? new AvaloniaList<double>(dashes ?? Array.Empty<double>());
             Offset = offset;
         }
 
@@ -61,31 +64,27 @@ namespace Avalonia.Media
         /// <summary>
         /// Represents a dashed <see cref="DashStyle"/>.
         /// </summary>
-        public static IDashStyle Dash =>
-            s_dash ?? (s_dash = new ImmutableDashStyle(new double[] { 2, 2 }, 1));
+        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 ?? (s_dot = new ImmutableDashStyle(new double[] { 0, 2 }, 0));
+        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 ?? (s_dashDot = new ImmutableDashStyle(new double[] { 2, 2, 0, 2 }, 1));
+        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 ?? (s_dashDotDot = new ImmutableDashStyle(new double[] { 2, 2, 0, 2, 0, 2 }, 1));
+        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 IReadOnlyList<double> Dashes
+        public AvaloniaList<double> Dashes
         {
             get => GetValue(DashesProperty);
             set => SetValue(DashesProperty, value);
@@ -100,15 +99,43 @@ namespace Avalonia.Media
             set => SetValue(OffsetProperty, value);
         }
 
+        IReadOnlyList<double> IDashStyle.Dashes => Dashes;
+
         /// <summary>
         /// Raised when the dash style changes.
         /// </summary>
-        public event EventHandler Invalidated;
+        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/Drawing.cs b/src/Avalonia.Visuals/Media/Drawing.cs
index a60c591edc..66d05e7e48 100644
--- a/src/Avalonia.Visuals/Media/Drawing.cs
+++ b/src/Avalonia.Visuals/Media/Drawing.cs
@@ -1,9 +1,19 @@
 namespace Avalonia.Media
 {
+    /// <summary>
+    /// Abstract class that describes a 2-D drawing.
+    /// </summary>
     public abstract class Drawing : AvaloniaObject
     {
+        /// <summary>
+        /// Draws this drawing to the given <see cref="DrawingContext"/>.
+        /// </summary>
+        /// <param name="context">The drawing context.</param>
         public abstract void Draw(DrawingContext context);
 
+        /// <summary>
+        /// Gets the drawing's bounding rectangle.
+        /// </summary>
         public abstract Rect GetBounds();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Visuals/Media/DrawingContext.cs b/src/Avalonia.Visuals/Media/DrawingContext.cs
index 4c9bf9ebd4..ae4c927ae2 100644
--- a/src/Avalonia.Visuals/Media/DrawingContext.cs
+++ b/src/Avalonia.Visuals/Media/DrawingContext.cs
@@ -4,6 +4,7 @@ using Avalonia.Media.Imaging;
 using Avalonia.Platform;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.Threading;
+using Avalonia.Utilities;
 using Avalonia.Visuals.Media.Imaging;
 
 namespace Avalonia.Media
@@ -74,18 +75,29 @@ namespace Avalonia.Media
         public Matrix CurrentContainerTransform => _currentContainerTransform;
 
         /// <summary>
-        /// Draws a bitmap image.
+        /// Draws an image.
         /// </summary>
-        /// <param name="source">The bitmap image.</param>
-        /// <param name="opacity">The opacity to draw with.</param>
+        /// <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)
+        {
+            Contract.Requires<ArgumentNullException>(source != null);
+
+            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(IBitmap source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode = default)
+        public void DrawImage(IImage source, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode = default)
         {
             Contract.Requires<ArgumentNullException>(source != null);
 
-            PlatformImpl.DrawImage(source.PlatformImpl, opacity, sourceRect, destRect, bitmapInterpolationMode);
+            source.Draw(this, sourceRect, destRect, bitmapInterpolationMode);
         }
 
         /// <summary>
@@ -118,6 +130,44 @@ namespace Avalonia.Media
             }
         }
 
+        /// <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>
@@ -126,10 +176,7 @@ namespace Avalonia.Media
         /// <param name="cornerRadius">The corner radius.</param>
         public void DrawRectangle(IPen pen, Rect rect, float cornerRadius = 0.0f)
         {
-            if (PenIsVisible(pen))
-            {
-                PlatformImpl.DrawRectangle(pen, rect, cornerRadius);
-            }
+            DrawRectangle(null, pen, rect, cornerRadius, cornerRadius);
         }
 
         /// <summary>
@@ -154,6 +201,21 @@ namespace Avalonia.Media
             }
         }
 
+        /// <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)
+        {
+            Contract.Requires<ArgumentNullException>(glyphRun != null);
+
+            if (foreground != null)
+            {
+                PlatformImpl.DrawGlyphRun(foreground, glyphRun);
+            }
+        }
+
         /// <summary>
         /// Draws a filled rectangle.
         /// </summary>
@@ -162,10 +224,7 @@ namespace Avalonia.Media
         /// <param name="cornerRadius">The corner radius.</param>
         public void FillRectangle(IBrush brush, Rect rect, float cornerRadius = 0.0f)
         {
-            if (brush != null && rect != Rect.Empty)
-            {
-                PlatformImpl.FillRectangle(brush, rect, cornerRadius);
-            }
+            DrawRectangle(brush, null, rect, cornerRadius, cornerRadius);
         }
 
         public readonly struct PushedState : IDisposable
@@ -223,6 +282,12 @@ namespace Avalonia.Media
         }
 
 
+        public PushedState PushClip(RoundedRect clip)
+        {
+            PlatformImpl.PushClip(clip);
+            return new PushedState(this, PushedState.PushedStateType.Clip);
+        }
+
         /// <summary>
         /// Pushes a clip rectangle.
         /// </summary>
@@ -291,7 +356,7 @@ namespace Avalonia.Media
         /// </summary>
         /// <param name="matrix">The matrix</param>
         /// <returns>A disposable used to undo the transformation.</returns>
-        PushedState PushSetTransform(Matrix matrix)
+        public PushedState PushSetTransform(Matrix matrix)
         {
             var oldMatrix = CurrentTransform;
             CurrentTransform = matrix;
diff --git a/src/Avalonia.Visuals/Media/DrawingGroup.cs b/src/Avalonia.Visuals/Media/DrawingGroup.cs
index 744ff2af03..e581c8c553 100644
--- a/src/Avalonia.Visuals/Media/DrawingGroup.cs
+++ b/src/Avalonia.Visuals/Media/DrawingGroup.cs
@@ -1,5 +1,6 @@
 using Avalonia.Collections;
 using Avalonia.Metadata;
+using Avalonia.Platform;
 
 namespace Avalonia.Media
 {
@@ -55,4 +56,4 @@ namespace Avalonia.Media
             return rect;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Visuals/Media/DrawingImage.cs b/src/Avalonia.Visuals/Media/DrawingImage.cs
new file mode 100644
index 0000000000..56c883014a
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/DrawingImage.cs
@@ -0,0 +1,82 @@
+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
+    {
+        /// <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/EllipseGeometry.cs b/src/Avalonia.Visuals/Media/EllipseGeometry.cs
index c2df9db635..bae6dc3d8c 100644
--- a/src/Avalonia.Visuals/Media/EllipseGeometry.cs
+++ b/src/Avalonia.Visuals/Media/EllipseGeometry.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Platform;
 
 namespace Avalonia.Media
@@ -15,10 +12,28 @@ namespace Avalonia.Media
         /// </summary>
         public static readonly StyledProperty<Rect> RectProperty =
             AvaloniaProperty.Register<EllipseGeometry, Rect>(nameof(Rect));
+        
+        /// <summary>
+        /// Defines the <see cref="RadiusX"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> RadiusXProperty =
+            AvaloniaProperty.Register<EllipseGeometry, double>(nameof(RadiusX));
+        
+        /// <summary>
+        /// Defines the <see cref="RadiusY"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> RadiusYProperty =
+            AvaloniaProperty.Register<EllipseGeometry, double>(nameof(RadiusY));
+
+        /// <summary>
+        /// Defines the <see cref="Center"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Point> CenterProperty =
+            AvaloniaProperty.Register<EllipseGeometry, Point>(nameof(Center));
 
         static EllipseGeometry()
         {
-            AffectsGeometry(RectProperty);
+            AffectsGeometry(RectProperty, RadiusXProperty, RadiusYProperty, CenterProperty);
         }
 
         /// <summary>
@@ -46,6 +61,33 @@ namespace Avalonia.Media
             set => SetValue(RectProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets a double that defines the radius in the X-axis of the ellipse.
+        /// </summary>
+        public double RadiusX
+        {
+            get => GetValue(RadiusXProperty);
+            set => SetValue(RadiusXProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a double that defines the radius in the Y-axis of the ellipse.
+        /// </summary>
+        public double RadiusY
+        {
+            get => GetValue(RadiusYProperty);
+            set => SetValue(RadiusYProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a point that defines the center of the ellipse.
+        /// </summary>
+        public Point Center
+        {
+            get => GetValue(CenterProperty);
+            set => SetValue(CenterProperty, value);
+        }
+
         /// <inheritdoc/>
         public override Geometry Clone()
         {
@@ -57,7 +99,14 @@ namespace Avalonia.Media
         {
             var factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
 
-            return factory.CreateEllipseGeometry(Rect);
+            if (Rect != default) return factory.CreateEllipseGeometry(Rect);
+            
+            var originX = Center.X - RadiusX;
+            var originY = Center.Y - RadiusY;
+            var width = RadiusX * 2;
+            var height = RadiusY * 2;
+            
+            return factory.CreateEllipseGeometry(new Rect(originX, originY, width, height));
         }
     }
 }
diff --git a/src/Avalonia.Visuals/Media/ExperimentalAcrylicMaterial.cs b/src/Avalonia.Visuals/Media/ExperimentalAcrylicMaterial.cs
new file mode 100644
index 0000000000..6b699acd2e
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/ExperimentalAcrylicMaterial.cs
@@ -0,0 +1,345 @@
+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.Value);
+
+            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.Value * 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
index b57b4a0ca8..f018733235 100644
--- a/src/Avalonia.Visuals/Media/FontFamily.cs
+++ b/src/Avalonia.Visuals/Media/FontFamily.cs
@@ -1,18 +1,15 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System;
 using Avalonia.Media.Fonts;
 
 namespace Avalonia.Media
 {
     public sealed class FontFamily
     {
+        public const string DefaultFontFamilyName = "$Default";
+
         static FontFamily()
         {
-            Default = new FontFamily(FontManager.Default.DefaultFontFamilyName);
+            Default = new FontFamily(DefaultFontFamilyName);
         }
 
         /// <inheritdoc />
@@ -57,15 +54,6 @@ namespace Avalonia.Media
         /// </summary>
         public static FontFamily Default { get; }
 
-        /// <summary>
-        /// Represents all font families in the system. This can be an expensive call depending on platform implementation.
-        /// </summary>
-        /// <remarks>
-        /// Consider using the new <see cref="FontManager"/> instead.
-        /// </remarks>
-        public static IEnumerable<FontFamily> SystemFontFamilies =>
-            FontManager.Default.GetInstalledFontFamilyNames().Select(name => new FontFamily(name));
-
         /// <summary>
         /// Gets the primary family name of the font family.
         /// </summary>
@@ -86,10 +74,16 @@ namespace Avalonia.Media
         /// Gets the key for associated assets.
         /// </summary>
         /// <value>
-        /// The family familyNames.
+        /// 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>
@@ -139,6 +133,16 @@ namespace Avalonia.Media
             }
         }
 
+        /// <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>
@@ -148,7 +152,7 @@ namespace Avalonia.Media
         /// <exception cref="ArgumentException">
         /// Specified family is not supported.
         /// </exception>
-        public static FontFamily Parse(string s, Uri baseUri = null)
+        public static FontFamily Parse(string s, Uri baseUri)
         {
             if (string.IsNullOrEmpty(s))
             {
@@ -184,36 +188,40 @@ namespace Avalonia.Media
         {
             unchecked
             {
-                var hash = (int)2186146271;
-
-                if (Key != null)
-                {
-                    hash = (hash * 15768619) ^ Key.GetHashCode();
-                }
-                else
-                {
-                    hash = (hash * 15768619) ^ FamilyNames.GetHashCode();
-                }
+                return ((FamilyNames != null ? FamilyNames.GetHashCode() : 0) * 397) ^ (Key != null ? Key.GetHashCode() : 0);
+            }
+        }
 
-                if (Key != null)
-                {
-                    hash = (hash * 15768619) ^ Key.GetHashCode();
-                }
+        public static bool operator !=(FontFamily a, FontFamily b)
+        {
+            return !(a == b);
+        }
 
-                return hash;
+        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 (Key != null)
+            if (!Equals(Key, other.Key))
             {
-                return other.FamilyNames.Equals(FamilyNames) && other.Key.Equals(Key);
+                return false;
             }
 
             return other.FamilyNames.Equals(FamilyNames);
diff --git a/src/Avalonia.Visuals/Media/FontManager.cs b/src/Avalonia.Visuals/Media/FontManager.cs
index be1bd269ed..db87c7c6c4 100644
--- a/src/Avalonia.Visuals/Media/FontManager.cs
+++ b/src/Avalonia.Visuals/Media/FontManager.cs
@@ -1,8 +1,8 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
+using Avalonia.Media.Fonts;
 using Avalonia.Platform;
 
 namespace Avalonia.Media
@@ -11,9 +11,54 @@ namespace Avalonia.Media
     ///     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 abstract class FontManager
+    public sealed class FontManager
     {
-        public static readonly FontManager Default = CreateDefault();
+        private readonly ConcurrentDictionary<Typeface, GlyphTypeface> _glyphTypefaceCache =
+            new ConcurrentDictionary<Typeface, GlyphTypeface>();
+        private readonly FontFamily _defaultFontFamily;
+
+        public FontManager(IFontManagerImpl platformImpl)
+        {
+            PlatformImpl = platformImpl;
+
+            DefaultFontFamilyName = 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.
@@ -21,92 +66,62 @@ namespace Avalonia.Media
         public string DefaultFontFamilyName
         {
             get;
-            protected set;
         }
 
         /// <summary>
-        ///     Get all installed fonts in the system.
-        /// <param name="checkForUpdates">If <c>true</c> the font collection is updated.</param>
+        ///     Get all installed font family names.
         /// </summary>
-        public abstract IEnumerable<string> GetInstalledFontFamilyNames(bool checkForUpdates = false);
-
-        /// <summary>
-        ///     Get a cached typeface from specified parameters.
-        /// </summary>
-        /// <param name="fontFamily">The font family.</param>
-        /// <param name="fontWeight">The font weight.</param>
-        /// <param name="fontStyle">The font style.</param>
-        /// <returns>
-        ///     The cached typeface.
-        /// </returns>
-        public abstract Typeface GetCachedTypeface(FontFamily fontFamily, FontWeight fontWeight, FontStyle fontStyle);
+        /// <param name="checkForUpdates">If <c>true</c> the font collection is updated.</param>
+        public IEnumerable<string> GetInstalledFontFamilyNames(bool checkForUpdates = false) =>
+            PlatformImpl.GetInstalledFontFamilyNames(checkForUpdates);
 
         /// <summary>
-        ///     Tries to match a specified character to a typeface that supports specified font properties.
-        ///     Returns <c>null</c> if no fallback was found.
+        ///     Returns a new <see cref="GlyphTypeface"/>, or an existing one if a matching <see cref="GlyphTypeface"/> exists.
         /// </summary>
-        /// <param name="codepoint">The codepoint to match against.</param>
-        /// <param name="fontWeight">The font weight.</param>
-        /// <param name="fontStyle">The font style.</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 typeface.</param>
         /// <returns>
-        ///     The matched typeface.
+        ///     The <see cref="GlyphTypeface"/>.
         /// </returns>
-        public abstract Typeface MatchCharacter(int codepoint, FontWeight fontWeight = default,
-            FontStyle fontStyle = default,
-            FontFamily fontFamily = null, CultureInfo culture = null);
-
-        public static FontManager CreateDefault()
+        public GlyphTypeface GetOrAddGlyphTypeface(Typeface typeface)
         {
-            var platformImpl = AvaloniaLocator.Current.GetService<IFontManagerImpl>();
-
-            if (platformImpl != null)
+            while (true)
             {
-                return new PlatformFontManager(platformImpl);
-            }
+                if (_glyphTypefaceCache.TryGetValue(typeface, out var glyphTypeface))
+                {
+                    return glyphTypeface;
+                }
 
-            return new EmptyFontManager();
-        }
+                glyphTypeface = new GlyphTypeface(typeface);
 
-        private class PlatformFontManager : FontManager
-        {
-            private readonly IFontManagerImpl _platformImpl;
+                if (_glyphTypefaceCache.TryAdd(typeface, glyphTypeface))
+                {
+                    return glyphTypeface;
+                }
 
-            public PlatformFontManager(IFontManagerImpl platformImpl)
-            {
-                _platformImpl = platformImpl;
+                if (typeface.FontFamily == _defaultFontFamily)
+                {
+                    return null;
+                }
 
-                DefaultFontFamilyName = _platformImpl.DefaultFontFamilyName;
+                typeface = new Typeface(_defaultFontFamily, typeface.Style, typeface.Weight);
             }
-
-            public override IEnumerable<string> GetInstalledFontFamilyNames(bool checkForUpdates = false) =>
-                _platformImpl.GetInstalledFontFamilyNames(checkForUpdates);
-
-            public override Typeface GetCachedTypeface(FontFamily fontFamily, FontWeight fontWeight, FontStyle fontStyle) =>
-                _platformImpl.GetTypeface(fontFamily, fontWeight, fontStyle);
-
-            public override Typeface MatchCharacter(int codepoint, FontWeight fontWeight = default,
-                FontStyle fontStyle = default,
-                FontFamily fontFamily = null, CultureInfo culture = null) =>
-                _platformImpl.MatchCharacter(codepoint, fontWeight, fontStyle, fontFamily, culture);
         }
 
-        private class EmptyFontManager : FontManager
-        {
-            public EmptyFontManager()
-            {
-                DefaultFontFamilyName = "Empty";
-            }
-
-            public override IEnumerable<string> GetInstalledFontFamilyNames(bool checkForUpdates = false) =>
-                new[] { DefaultFontFamilyName };
-
-            public override Typeface GetCachedTypeface(FontFamily fontFamily, FontWeight fontWeight, FontStyle fontStyle) => new Typeface(fontFamily, fontWeight, fontStyle);
-
-            public override Typeface MatchCharacter(int codepoint, FontWeight fontWeight = default,
-                FontStyle fontStyle = default,
-                FontFamily fontFamily = null, CultureInfo culture = null) => null;
-        }
+        /// <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) =>
+            PlatformImpl.TryMatchCharacter(codepoint, fontStyle, fontWeight, fontFamily, culture, out typeface);
     }
 }
diff --git a/src/Avalonia.Visuals/Media/FontStyle.cs b/src/Avalonia.Visuals/Media/FontStyle.cs
index 1320f9d70e..b9d04bf9ff 100644
--- a/src/Avalonia.Visuals/Media/FontStyle.cs
+++ b/src/Avalonia.Visuals/Media/FontStyle.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Media
 {
     /// <summary>
@@ -14,13 +11,13 @@ namespace Avalonia.Media
         Normal,
 
         /// <summary>
-        /// An oblique font.
+        /// An italic font.
         /// </summary>
-        Oblique,
+        Italic,
 
         /// <summary>
-        /// An italic font.
+        /// An oblique font.
         /// </summary>
-        Italic,
+        Oblique
     }
 }
diff --git a/src/Avalonia.Visuals/Media/FontWeight.cs b/src/Avalonia.Visuals/Media/FontWeight.cs
index 776f14d647..5a4a4963a5 100644
--- a/src/Avalonia.Visuals/Media/FontWeight.cs
+++ b/src/Avalonia.Visuals/Media/FontWeight.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Media
 {
     /// <summary>
@@ -32,6 +29,11 @@ namespace Avalonia.Media
         /// </summary>
         Light = 300,
 
+        /// <summary>
+        /// Specifies a "semi light" font weight.
+        /// </summary>
+        SemiLight = 350,
+
         /// <summary>
         /// Specifies a "normal" font weight.
         /// </summary>
diff --git a/src/Avalonia.Visuals/Media/Fonts/FamilyNameCollection.cs b/src/Avalonia.Visuals/Media/Fonts/FamilyNameCollection.cs
index e777d93315..96312a5466 100644
--- a/src/Avalonia.Visuals/Media/Fonts/FamilyNameCollection.cs
+++ b/src/Avalonia.Visuals/Media/Fonts/FamilyNameCollection.cs
@@ -1,11 +1,8 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+using Avalonia.Utilities;
 
 namespace Avalonia.Media.Fonts
 {
@@ -23,7 +20,7 @@ namespace Avalonia.Media.Fonts
                 throw new ArgumentNullException(nameof(familyNames));
             }
 
-            Names = familyNames.Split(',').Select(x => x.Trim()).ToArray();
+            Names = Array.ConvertAll(familyNames.Split(','), p => p.Trim());
 
             PrimaryFamilyName = Names[0];
 
@@ -54,25 +51,19 @@ namespace Avalonia.Media.Fonts
         /// </value>
         internal IReadOnlyList<string> Names { get; }
 
-        /// <inheritdoc />
         /// <summary>
-        /// Returns an enumerator that iterates through the collection.
+        /// Returns an enumerator for the name collection.
         /// </summary>
-        /// <returns>
-        /// An enumerator that can be used to iterate through the collection.
-        /// </returns>
-        public IEnumerator<string> GetEnumerator()
+        public ImmutableReadOnlyListStructEnumerator<string> GetEnumerator()
         {
-            return Names.GetEnumerator();
+            return new ImmutableReadOnlyListStructEnumerator<string>(this);
+        }
+
+        IEnumerator<string> IEnumerable<string>.GetEnumerator()
+        {
+            return GetEnumerator();
         }
 
-        /// <inheritdoc />
-        /// <summary>
-        /// Returns an enumerator that iterates through a collection.
-        /// </summary>
-        /// <returns>
-        /// An <see cref="T:System.Collections.IEnumerator"></see> object that can be used to iterate through the collection.
-        /// </returns>
         IEnumerator IEnumerable.GetEnumerator()
         {
             return GetEnumerator();
@@ -111,7 +102,39 @@ namespace Avalonia.Media.Fonts
         /// </returns>
         public override int GetHashCode()
         {
-            return ToString().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>
@@ -128,7 +151,20 @@ namespace Avalonia.Media.Fonts
                 return false;
             }
 
-            return other.ToString().Equals(ToString());
+            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;
diff --git a/src/Avalonia.Visuals/Media/Fonts/FontFamilyKey.cs b/src/Avalonia.Visuals/Media/Fonts/FontFamilyKey.cs
index 7733dd7d2a..eee24e856d 100644
--- a/src/Avalonia.Visuals/Media/Fonts/FontFamilyKey.cs
+++ b/src/Avalonia.Visuals/Media/Fonts/FontFamilyKey.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Media.Fonts
 {
@@ -58,6 +55,21 @@ namespace Avalonia.Media.Fonts
             }
         }
 
+        public static bool operator !=(FontFamilyKey a, FontFamilyKey b)
+        {
+            return !(a == b);
+        }
+
+        public static bool operator ==(FontFamilyKey a, FontFamilyKey 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>
diff --git a/src/Avalonia.Visuals/Media/Fonts/FontFamilyLoader.cs b/src/Avalonia.Visuals/Media/Fonts/FontFamilyLoader.cs
index 063fe8f20d..02298417a4 100644
--- a/src/Avalonia.Visuals/Media/Fonts/FontFamilyLoader.cs
+++ b/src/Avalonia.Visuals/Media/Fonts/FontFamilyLoader.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Platform;
@@ -10,13 +7,6 @@ namespace Avalonia.Media.Fonts
 {
     public static class FontFamilyLoader
     {
-        private static readonly IAssetLoader s_assetLoader;
-
-        static FontFamilyLoader()
-        {
-            s_assetLoader = AvaloniaLocator.Current.GetService<IAssetLoader>();
-        }
-
         /// <summary>
         /// Loads all font assets that belong to the specified <see cref="FontFamilyKey"/>
         /// </summary>
@@ -42,7 +32,9 @@ namespace Avalonia.Media.Fonts
         /// <returns></returns>
         private static IEnumerable<Uri> GetFontAssetsBySource(FontFamilyKey fontFamilyKey)
         {
-            var availableAssets = s_assetLoader.GetAssets(fontFamilyKey.Source, fontFamilyKey.BaseUri);
+            var assetLoader = AvaloniaLocator.Current.GetService<IAssetLoader>();
+
+            var availableAssets = assetLoader.GetAssets(fontFamilyKey.Source, fontFamilyKey.BaseUri);
 
             var matchingAssets =
                 availableAssets.Where(x => x.AbsolutePath.EndsWith(".ttf") || x.AbsolutePath.EndsWith(".otf"));
@@ -58,9 +50,11 @@ namespace Avalonia.Media.Fonts
         /// <returns></returns>
         private static IEnumerable<Uri> GetFontAssetsByExpression(FontFamilyKey fontFamilyKey)
         {
+            var assetLoader = AvaloniaLocator.Current.GetService<IAssetLoader>();
+
             var fileName = GetFileName(fontFamilyKey, out var fileExtension, out var location);
 
-            var availableResources = s_assetLoader.GetAssets(location, fontFamilyKey.BaseUri);
+            var availableResources = assetLoader.GetAssets(location, fontFamilyKey.BaseUri);
 
             string compareTo;
 
diff --git a/src/Avalonia.Visuals/Media/FormattedText.cs b/src/Avalonia.Visuals/Media/FormattedText.cs
index 5013f925b3..53231ee1dd 100644
--- a/src/Avalonia.Visuals/Media/FormattedText.cs
+++ b/src/Avalonia.Visuals/Media/FormattedText.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Generic;
 using Avalonia.Platform;
 
@@ -203,7 +200,13 @@ namespace Avalonia.Media
 
         private void Set<T>(ref T field, T value)
         {
+            if (field != null && field.Equals(value))
+            {
+                return;
+            }
+
             field = value;
+
             _platformImpl = null;
         }
     }
diff --git a/src/Avalonia.Visuals/Media/FormattedTextLine.cs b/src/Avalonia.Visuals/Media/FormattedTextLine.cs
index 245e2bc108..42859f698a 100644
--- a/src/Avalonia.Visuals/Media/FormattedTextLine.cs
+++ b/src/Avalonia.Visuals/Media/FormattedTextLine.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Media
 {
     /// <summary>
diff --git a/src/Avalonia.Visuals/Media/Geometry.cs b/src/Avalonia.Visuals/Media/Geometry.cs
index f9bcea85af..ccef6665a9 100644
--- a/src/Avalonia.Visuals/Media/Geometry.cs
+++ b/src/Avalonia.Visuals/Media/Geometry.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Platform;
 
@@ -87,7 +84,7 @@ namespace Avalonia.Media
         /// </summary>
         /// <param name="pen">The stroke thickness.</param>
         /// <returns>The bounding rectangle.</returns>
-        public Rect GetRenderBounds(Pen pen) => PlatformImpl?.GetRenderBounds(pen) ?? Rect.Empty;
+        public Rect GetRenderBounds(IPen pen) => PlatformImpl?.GetRenderBounds(pen) ?? Rect.Empty;
 
         /// <summary>
         /// Indicates whether the geometry's fill contains the specified point.
@@ -105,7 +102,7 @@ namespace Avalonia.Media
         /// <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(Pen pen, Point point)
+        public bool StrokeContains(IPen pen, Point point)
         {
             return PlatformImpl?.StrokeContains(pen, point) == true;
         }
diff --git a/src/Avalonia.Visuals/Media/GeometryDrawing.cs b/src/Avalonia.Visuals/Media/GeometryDrawing.cs
index 3dad10fb8f..e46e3a7d5f 100644
--- a/src/Avalonia.Visuals/Media/GeometryDrawing.cs
+++ b/src/Avalonia.Visuals/Media/GeometryDrawing.cs
@@ -1,28 +1,57 @@
-namespace Avalonia.Media
+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);
         }
 
-        public static readonly StyledProperty<IBrush> BrushProperty =
-            AvaloniaProperty.Register<GeometryDrawing, IBrush>(nameof(Brush), Brushes.Transparent);
-
+        /// <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);
         }
 
-        public static readonly StyledProperty<Pen> PenProperty =
-            AvaloniaProperty.Register<GeometryDrawing, Pen>(nameof(Pen));
-
+        /// <summary>
+        /// Gets or sets the <see cref="Avalonia.Media.IPen"/> used to stroke this <see cref="GeometryDrawing"/>.
+        /// </summary>
         public IPen Pen
         {
             get => GetValue(PenProperty);
@@ -39,9 +68,7 @@
 
         public override Rect GetBounds()
         {
-            // adding the Pen's stroke thickness here could yield wrong results due to transforms
-            var pen = new Pen(Brushes.Black, 0);
-            return Geometry?.GetRenderBounds(pen) ?? new Rect();
+            return Geometry?.GetRenderBounds(s_boundsPen) ?? Rect.Empty;
         }
     }
 }
diff --git a/src/Avalonia.Visuals/Media/GlyphRun.cs b/src/Avalonia.Visuals/Media/GlyphRun.cs
new file mode 100644
index 0000000000..af228ec57b
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/GlyphRun.cs
@@ -0,0 +1,628 @@
+using System;
+using System.Collections.Generic;
+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<ushort> s_ascendingComparer = Comparer<ushort>.Default;
+        private static readonly IComparer<ushort> s_descendingComparer = new ReverseComparer<ushort>();
+
+        private IGlyphRunImpl _glyphRunImpl;
+        private GlyphTypeface _glyphTypeface;
+        private double _fontRenderingEmSize;
+        private Size? _size;
+        private int _biDiLevel;
+        private Point? _baselineOrigin;
+
+        private ReadOnlySlice<ushort> _glyphIndices;
+        private ReadOnlySlice<double> _glyphAdvances;
+        private ReadOnlySlice<Vector> _glyphOffsets;
+        private ReadOnlySlice<ushort> _glyphClusters;
+        private ReadOnlySlice<char> _characters;
+
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="GlyphRun"/> class.
+        /// </summary>
+        public GlyphRun()
+        {
+
+        }
+
+        /// <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<ushort> glyphIndices,
+            ReadOnlySlice<double> glyphAdvances = default,
+            ReadOnlySlice<Vector> glyphOffsets = default,
+            ReadOnlySlice<char> characters = default,
+            ReadOnlySlice<ushort> glyphClusters = default,
+            int biDiLevel = 0)
+        {
+            GlyphTypeface = glyphTypeface;
+
+            FontRenderingEmSize = fontRenderingEmSize;
+
+            GlyphIndices = glyphIndices;
+
+            GlyphAdvances = glyphAdvances;
+
+            GlyphOffsets = glyphOffsets;
+
+            Characters = characters;
+
+            GlyphClusters = glyphClusters;
+
+            BiDiLevel = biDiLevel;
+        }
+
+        /// <summary>
+        ///     Gets or sets the <see cref="Media.GlyphTypeface"/> for the <see cref="GlyphRun"/>.
+        /// </summary>
+        public GlyphTypeface GlyphTypeface
+        {
+            get => _glyphTypeface;
+            set => Set(ref _glyphTypeface, value);
+        }
+
+        /// <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 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 ReadOnlySlice<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 ReadOnlySlice<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 ReadOnlySlice<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 ReadOnlySlice<ushort> 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>
+        ///     Gets or sets the conservative bounding box of the <see cref="GlyphRun"/>.
+        /// </summary>
+        public Size Size
+        {
+            get
+            {
+                _size ??= CalculateSize();
+
+                return _size.Value;
+            }
+        }
+
+        /// <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 distance = 0.0;
+
+            if (characterHit.FirstCharacterIndex + characterHit.TrailingLength > Characters.End)
+            {
+                return Size.Width;
+            }
+
+            var glyphIndex = FindGlyphIndex(characterHit.FirstCharacterIndex);
+
+            if (!GlyphClusters.IsEmpty)
+            {
+                var currentCluster = GlyphClusters[glyphIndex];
+
+                if (characterHit.TrailingLength > 0)
+                {
+                    while (glyphIndex < GlyphClusters.Length && GlyphClusters[glyphIndex] == currentCluster)
+                    {
+                        glyphIndex++;
+                    }
+                }
+            }
+
+            for (var i = 0; i < glyphIndex; i++)
+            {
+                if (GlyphAdvances.IsEmpty)
+                {
+                    var glyph = GlyphIndices[i];
+
+                    distance += GlyphTypeface.GetGlyphAdvance(glyph) * Scale;
+                }
+                else
+                {
+                    distance += GlyphAdvances[i];
+                }
+            }
+
+            return 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)
+        {
+            // Before
+            if (distance < 0)
+            {
+                isInside = false;
+
+                var firstCharacterHit = FindNearestCharacterHit(_glyphClusters[0], out _);
+
+                return IsLeftToRight ? new CharacterHit(firstCharacterHit.FirstCharacterIndex) : firstCharacterHit;
+            }
+
+            //After
+            if (distance > Size.Width)
+            {
+                isInside = false;
+
+                var lastCharacterHit = FindNearestCharacterHit(_glyphClusters[_glyphClusters.Length - 1], out _);
+
+                return IsLeftToRight ? lastCharacterHit : new CharacterHit(lastCharacterHit.FirstCharacterIndex);
+            }
+
+            //Within
+            var currentX = 0.0;
+            var index = 0;
+
+            if (GlyphTypeface.IsFixedPitch)
+            {
+                var glyph = GlyphIndices[index];
+
+                var advance = GlyphTypeface.GetGlyphAdvance(glyph) * Scale;
+
+                index = Math.Min(GlyphIndices.Length - 1,
+                    (int)Math.Round(distance / advance, MidpointRounding.AwayFromZero));
+            }
+            else
+            {
+                for (; index < GlyphIndices.Length; index++)
+                {
+                    double advance;
+
+                    if (GlyphAdvances.IsEmpty)
+                    {
+                        var glyph = GlyphIndices[index];
+
+                        advance = GlyphTypeface.GetGlyphAdvance(glyph) * Scale;
+                    }
+                    else
+                    {
+                        advance = GlyphAdvances[index];
+                    }
+
+                    if (currentX + advance >= distance)
+                    {
+                        break;
+                    }
+
+                    currentX += advance;
+                }
+            }
+
+            var characterHit = FindNearestCharacterHit(GlyphClusters.IsEmpty ? index : GlyphClusters[index], out var width);
+
+            var offset = GetDistanceFromCharacterHit(new CharacterHit(characterHit.FirstCharacterIndex));
+
+            isInside = true;
+
+            var isTrailing = distance > offset + width / 2;
+
+            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)
+            {
+                return FindNearestCharacterHit(characterHit.FirstCharacterIndex, out _);
+            }
+
+            var nextCharacterHit = FindNearestCharacterHit(characterHit.FirstCharacterIndex + characterHit.TrailingLength, out _);
+
+            return 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);
+            }
+
+            return characterHit.FirstCharacterIndex == Characters.Start ?
+                new CharacterHit(Characters.Start) :
+                FindNearestCharacterHit(characterHit.FirstCharacterIndex - 1, out _);
+        }
+
+        private class ReverseComparer<T> : IComparer<T>
+        {
+            public int Compare(T x, T y)
+            {
+                return Comparer<T>.Default.Compare(y, x);
+            }
+        }
+
+        /// <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.IsEmpty)
+            {
+                return characterIndex;
+            }
+
+            if (IsLeftToRight)
+            {
+                if (characterIndex < GlyphClusters[0])
+                {
+                    return 0;
+                }
+
+                if (characterIndex > GlyphClusters[GlyphClusters.Length - 1])
+                {
+                    return _glyphClusters.Length - 1;
+                }
+            }
+            else
+            {
+                if (characterIndex < GlyphClusters[GlyphClusters.Length - 1])
+                {
+                    return _glyphClusters.Length - 1;
+                }
+
+                if (characterIndex > GlyphClusters[0])
+                {
+                    return 0;
+                }
+            }
+
+            var comparer = IsLeftToRight ? s_ascendingComparer : s_descendingComparer;
+
+            var clusters = GlyphClusters.Buffer.Span;
+
+            // Find the start of the cluster at the character index.
+            var start = clusters.BinarySearch((ushort)characterIndex, comparer);
+
+            // No cluster found.
+            if (start < 0)
+            {
+                while (characterIndex > 0 && start < 0)
+                {
+                    characterIndex--;
+
+                    start = clusters.BinarySearch((ushort)characterIndex, comparer);
+                }
+
+                if (start < 0)
+                {
+                    return -1;
+                }
+            }
+
+            if (IsLeftToRight)
+            {
+                while (start > 0 && clusters[start - 1] == clusters[start])
+                {
+                    start--;
+                }
+            }
+            else
+            {
+                while (start + 1 < clusters.Length && 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.IsEmpty)
+            {
+                width = GetGlyphWidth(index);
+
+                return new CharacterHit(start, 1);
+            }
+
+            var cluster = GlyphClusters[start];
+
+            var nextCluster = cluster;
+
+            var currentIndex = start;
+
+            while (nextCluster == cluster)
+            {
+                width += GetGlyphWidth(currentIndex);
+
+                if (IsLeftToRight)
+                {
+                    currentIndex++;
+
+                    if (currentIndex == GlyphClusters.Length)
+                    {
+                        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>
+        /// <returns>The glyph's width.</returns>
+        private double GetGlyphWidth(int index)
+        {
+            if (GlyphAdvances.IsEmpty)
+            {
+                var glyph = GlyphIndices[index];
+
+                return GlyphTypeface.GetGlyphAdvance(glyph) * Scale;
+            }
+
+            return GlyphAdvances[index];
+        }
+
+        /// <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);
+        }
+
+        /// <summary>
+        /// Calculates the size of the <see cref="GlyphRun"/>.
+        /// </summary>
+        /// <returns>
+        /// The calculated bounds.
+        /// </returns>
+        private Size CalculateSize()
+        {
+            var height = (GlyphTypeface.Descent - GlyphTypeface.Ascent + GlyphTypeface.LineGap) * Scale;
+
+            var width = 0.0;
+
+            if (GlyphAdvances.IsEmpty)
+            {
+                foreach (var glyph in GlyphIndices)
+                {
+                    width += GlyphTypeface.GetGlyphAdvance(glyph) * Scale;
+                }
+            }
+            else
+            {
+                foreach (var advance in GlyphAdvances)
+                {
+                    width += advance;
+                }
+            }
+
+            return new Size(width, height);
+        }
+
+        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.'");
+            }
+
+            field = value;
+        }
+
+        /// <summary>
+        /// Initializes the <see cref="GlyphRun"/>.
+        /// </summary>
+        private void Initialize()
+        {
+            if (GlyphIndices.Length == 0)
+            {
+                throw new InvalidOperationException();
+            }
+
+            var glyphCount = GlyphIndices.Length;
+
+            if (GlyphAdvances.Length > 0 && GlyphAdvances.Length != glyphCount)
+            {
+                throw new InvalidOperationException();
+            }
+
+            if (GlyphOffsets.Length > 0 && GlyphOffsets.Length != glyphCount)
+            {
+                throw new InvalidOperationException();
+            }
+
+            var platformRenderInterface = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
+
+            _glyphRunImpl = platformRenderInterface.CreateGlyphRun(this, out var width);
+
+            var height = (GlyphTypeface.Descent - GlyphTypeface.Ascent + GlyphTypeface.LineGap) * Scale;
+
+            _size = new Size(width, height);
+        }
+
+        void IDisposable.Dispose()
+        {
+            _glyphRunImpl?.Dispose();
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/GlyphRunDrawing.cs b/src/Avalonia.Visuals/Media/GlyphRunDrawing.cs
new file mode 100644
index 0000000000..7e0d5c3c81
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/GlyphRunDrawing.cs
@@ -0,0 +1,38 @@
+namespace Avalonia.Media
+{
+    public class GlyphRunDrawing : Drawing
+    {
+        public static readonly StyledProperty<IBrush> ForegroundProperty =
+            AvaloniaProperty.Register<GlyphRunDrawing, IBrush>(nameof(Foreground));
+
+        public static readonly StyledProperty<GlyphRun> GlyphRunProperty =
+            AvaloniaProperty.Register<GlyphRunDrawing, GlyphRun>(nameof(GlyphRun));
+
+        public IBrush Foreground
+        {
+            get => GetValue(ForegroundProperty);
+            set => SetValue(ForegroundProperty, value);
+        }
+
+        public GlyphRun GlyphRun
+        {
+            get => GetValue(GlyphRunProperty);
+            set => SetValue(GlyphRunProperty, value);
+        }
+
+        public override void Draw(DrawingContext context)
+        {
+            if (GlyphRun == null)
+            {
+                return;
+            }
+
+            context.DrawGlyphRun(Foreground, GlyphRun);
+        }
+
+        public override Rect GetBounds()
+        {
+            return GlyphRun != null ? new Rect(GlyphRun.Size) : Rect.Empty;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/GlyphTypeface.cs b/src/Avalonia.Visuals/Media/GlyphTypeface.cs
index 3ba31f7e84..35aa62aa65 100644
--- a/src/Avalonia.Visuals/Media/GlyphTypeface.cs
+++ b/src/Avalonia.Visuals/Media/GlyphTypeface.cs
@@ -1,19 +1,13 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-
+using System;
 using Avalonia.Platform;
 
 namespace Avalonia.Media
 {
     public sealed class GlyphTypeface : IDisposable
     {
-        private static readonly IPlatformRenderInterface s_platformRenderInterface =
-            AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
-
-        public GlyphTypeface(Typeface typeface) : this(s_platformRenderInterface.CreateGlyphTypeface(typeface))
-        {
+        public GlyphTypeface(Typeface typeface) 
+            : this(FontManager.Current?.PlatformImpl.CreateGlyphTypeface(typeface))
+        { 
         }
 
         public GlyphTypeface(IGlyphTypefaceImpl platformImpl)
@@ -68,11 +62,16 @@ namespace Avalonia.Media
         /// </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 <c>0</c> if a glyph isn't found.
+        ///     Returns a replacement glyph if a glyph isn't found.
         /// </remarks>
         /// <param name="codepoint">The codepoint.</param>
         /// <returns>
@@ -80,6 +79,21 @@ namespace Avalonia.Media
         /// </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>
diff --git a/src/Avalonia.Visuals/Media/GradientBrush.cs b/src/Avalonia.Visuals/Media/GradientBrush.cs
index 8fd2dcf27f..99923b8e06 100644
--- a/src/Avalonia.Visuals/Media/GradientBrush.cs
+++ b/src/Avalonia.Visuals/Media/GradientBrush.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
diff --git a/src/Avalonia.Visuals/Media/GradientSpreadMethod.cs b/src/Avalonia.Visuals/Media/GradientSpreadMethod.cs
index f9506d78a0..327f16d994 100644
--- a/src/Avalonia.Visuals/Media/GradientSpreadMethod.cs
+++ b/src/Avalonia.Visuals/Media/GradientSpreadMethod.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Media
 {
     public enum GradientSpreadMethod
diff --git a/src/Avalonia.Visuals/Media/GradientStop.cs b/src/Avalonia.Visuals/Media/GradientStop.cs
index 25a6eb10dc..de8c7fda2a 100644
--- a/src/Avalonia.Visuals/Media/GradientStop.cs
+++ b/src/Avalonia.Visuals/Media/GradientStop.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Media
 {
     /// <summary>
diff --git a/src/Avalonia.Visuals/Media/IBrush.cs b/src/Avalonia.Visuals/Media/IBrush.cs
index bf096076fd..15b7681be4 100644
--- a/src/Avalonia.Visuals/Media/IBrush.cs
+++ b/src/Avalonia.Visuals/Media/IBrush.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.ComponentModel;
 
 namespace Avalonia.Media
@@ -16,4 +13,4 @@ namespace Avalonia.Media
         /// </summary>
         double Opacity { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Visuals/Media/IConicGradientBrush.cs b/src/Avalonia.Visuals/Media/IConicGradientBrush.cs
new file mode 100644
index 0000000000..5368dd1851
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/IConicGradientBrush.cs
@@ -0,0 +1,19 @@
+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/IExperimentalAcrylicMaterial.cs b/src/Avalonia.Visuals/Media/IExperimentalAcrylicMaterial.cs
new file mode 100644
index 0000000000..e71584258a
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/IExperimentalAcrylicMaterial.cs
@@ -0,0 +1,33 @@
+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/IImage.cs b/src/Avalonia.Visuals/Media/IImage.cs
new file mode 100644
index 0000000000..aff2a9ddf9
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/IImage.cs
@@ -0,0 +1,29 @@
+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/IMutableExperimentalAcrylicMaterial.cs b/src/Avalonia.Visuals/Media/IMutableExperimentalAcrylicMaterial.cs
new file mode 100644
index 0000000000..fcfe4631a6
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/IMutableExperimentalAcrylicMaterial.cs
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000000..2033c434c0
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/IMutableTransform.cs
@@ -0,0 +1,12 @@
+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/ISolidColorBrush.cs b/src/Avalonia.Visuals/Media/ISolidColorBrush.cs
index 73a9fb6795..d0ab00599b 100644
--- a/src/Avalonia.Visuals/Media/ISolidColorBrush.cs
+++ b/src/Avalonia.Visuals/Media/ISolidColorBrush.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Media
 {
     /// <summary>
diff --git a/src/Avalonia.Visuals/Media/ITileBrush.cs b/src/Avalonia.Visuals/Media/ITileBrush.cs
index 5cffe02193..12fb221a89 100644
--- a/src/Avalonia.Visuals/Media/ITileBrush.cs
+++ b/src/Avalonia.Visuals/Media/ITileBrush.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Visuals.Media.Imaging;
 
 namespace Avalonia.Media
 {  
diff --git a/src/Avalonia.Visuals/Media/ITransform.cs b/src/Avalonia.Visuals/Media/ITransform.cs
new file mode 100644
index 0000000000..91577fe38e
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/ITransform.cs
@@ -0,0 +1,10 @@
+using System.ComponentModel;
+
+namespace Avalonia.Media
+{
+    [TypeConverter(typeof(TransformConverter))]
+    public interface ITransform
+    {
+        Matrix Value { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/ImageBrush.cs b/src/Avalonia.Visuals/Media/ImageBrush.cs
index 8b42a51d9f..19dcf00901 100644
--- a/src/Avalonia.Visuals/Media/ImageBrush.cs
+++ b/src/Avalonia.Visuals/Media/ImageBrush.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Media.Imaging;
 using Avalonia.Media.Immutable;
 
diff --git a/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs b/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs
index 8dd75d2374..5a0c57b333 100644
--- a/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs
+++ b/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs
@@ -1,10 +1,8 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.IO;
 using Avalonia.Platform;
 using Avalonia.Utilities;
+using Avalonia.Visuals.Media.Imaging;
 
 namespace Avalonia.Media.Imaging
 {
@@ -13,6 +11,46 @@ namespace Avalonia.Media.Imaging
     /// </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)
+        {
+            IPlatformRenderInterface factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
+            return new Bitmap(factory.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)
+        {
+            IPlatformRenderInterface factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
+            return new Bitmap(factory.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)
+        {
+            IPlatformRenderInterface factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
+            return new Bitmap(factory.ResizeBitmap(PlatformImpl.Item, destinationSize, interpolationMode));
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Bitmap"/> class.
         /// </summary>
@@ -41,7 +79,7 @@ namespace Avalonia.Media.Imaging
         {
             PlatformImpl = impl.Clone();
         }
-        
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Bitmap"/> class.
         /// </summary>
@@ -50,7 +88,7 @@ namespace Avalonia.Media.Imaging
         {
             PlatformImpl = RefCountable.Create(impl);
         }
-        
+
         /// <inheritdoc/>
         public virtual void Dispose()
         {
@@ -65,10 +103,28 @@ namespace Avalonia.Media.Imaging
         /// <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 = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
+
             PlatformImpl = RefCountable.Create(AvaloniaLocator.Current.GetService<IPlatformRenderInterface>()
-                .LoadBitmap(format, data, size, dpi, stride));
+                .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(AvaloniaLocator.Current.GetService<IPlatformRenderInterface>()
+                .LoadBitmap(format, alphaFormat, data, size, dpi, stride));
         }
 
         /// <inheritdoc/>
@@ -94,9 +150,28 @@ namespace Avalonia.Media.Imaging
             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);
+        }
     }
 }
diff --git a/src/Avalonia.Visuals/Media/Imaging/BitmapInterpolationMode.cs b/src/Avalonia.Visuals/Media/Imaging/BitmapInterpolationMode.cs
index 7e6d330618..5fa48a5ec8 100644
--- a/src/Avalonia.Visuals/Media/Imaging/BitmapInterpolationMode.cs
+++ b/src/Avalonia.Visuals/Media/Imaging/BitmapInterpolationMode.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Visuals.Media.Imaging
+namespace Avalonia.Visuals.Media.Imaging
 {
     /// <summary>
     /// Controls the performance and quality of bitmap scaling.
diff --git a/src/Avalonia.Visuals/Media/Imaging/CroppedBitmap.cs b/src/Avalonia.Visuals/Media/Imaging/CroppedBitmap.cs
new file mode 100644
index 0000000000..70823e114c
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/Imaging/CroppedBitmap.cs
@@ -0,0 +1,96 @@
+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 == null)
+                    return Size.Empty;
+                if (SourceRect.IsEmpty)
+                    return Source.Size;
+                return SourceRect.Size.ToSizeWithDpi((Source as IBitmap).Dpi);
+            }
+        }
+
+        public void Draw(DrawingContext context, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
+        {
+            if (Source == null)
+                return;
+            var topLeft = SourceRect.TopLeft.ToPointWithDpi((Source as IBitmap).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
index 90b13088e1..134bebc002 100644
--- a/src/Avalonia.Visuals/Media/Imaging/IBitmap.cs
+++ b/src/Avalonia.Visuals/Media/Imaging/IBitmap.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.IO;
 using Avalonia.Platform;
@@ -11,7 +8,7 @@ namespace Avalonia.Media.Imaging
     /// <summary>
     /// Represents a bitmap image.
     /// </summary>
-    public interface IBitmap : IDisposable
+    public interface IBitmap : IImage, IDisposable
     {
         /// <summary>
         /// Gets the dots per inch (DPI) of the image.
@@ -32,15 +29,6 @@ namespace Avalonia.Media.Imaging
         /// </summary>
         IRef<IBitmapImpl> PlatformImpl { get; }
 
-        /// <summary>
-        /// Gets the size of the image, in device independent pixels.
-        /// </summary>
-        /// <remarks>
-        /// Note that Skia does not currently support reading the DPI of an image so this value
-        /// will equal <see cref="PixelSize"/> on Skia.
-        /// </remarks>
-        Size Size { get; }
-
         /// <summary>
         /// Saves the bitmap to a file.
         /// </summary>
diff --git a/src/Avalonia.Visuals/Media/Imaging/RenderTargetBitmap.cs b/src/Avalonia.Visuals/Media/Imaging/RenderTargetBitmap.cs
index d0b85ef14e..928b188f8c 100644
--- a/src/Avalonia.Visuals/Media/Imaging/RenderTargetBitmap.cs
+++ b/src/Avalonia.Visuals/Media/Imaging/RenderTargetBitmap.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Platform;
 using Avalonia.Rendering;
diff --git a/src/Avalonia.Visuals/Media/Imaging/WriteableBitmap.cs b/src/Avalonia.Visuals/Media/Imaging/WriteableBitmap.cs
index 88c0799cb9..b86444bc2f 100644
--- a/src/Avalonia.Visuals/Media/Imaging/WriteableBitmap.cs
+++ b/src/Avalonia.Visuals/Media/Imaging/WriteableBitmap.cs
@@ -1,4 +1,5 @@
-using Avalonia.Platform;
+using System;
+using Avalonia.Platform;
 
 namespace Avalonia.Media.Imaging
 {
@@ -14,11 +15,35 @@ namespace Avalonia.Media.Imaging
         /// <param name="dpi">The DPI of the bitmap.</param>
         /// <param name="format">The pixel format (optional).</param>
         /// <returns>An <see cref="IWriteableBitmapImpl"/>.</returns>
-        public WriteableBitmap(PixelSize size, Vector dpi, PixelFormat? format = null) 
-            : base(AvaloniaLocator.Current.GetService<IPlatformRenderInterface>().CreateWriteableBitmap(size, dpi, format))
+        [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))
+        {
+        }
+
         public ILockedFramebuffer Lock() => ((IWriteableBitmapImpl) PlatformImpl.Item).Lock();
+
+        private static IBitmapImpl CreatePlatformImpl(PixelSize size, in Vector dpi, PixelFormat? format, AlphaFormat? alphaFormat)
+        {
+            var ri = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
+
+            PixelFormat finalFormat = format ?? ri.DefaultPixelFormat;
+            AlphaFormat finalAlphaFormat = alphaFormat ?? ri.DefaultAlphaFormat;
+
+            return ri.CreateWriteableBitmap(size, dpi, finalFormat, finalAlphaFormat);
+        }
     }
 }
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableConicGradientBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableConicGradientBrush.cs
new file mode 100644
index 0000000000..d3c80dfcad
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/Immutable/ImmutableConicGradientBrush.cs
@@ -0,0 +1,47 @@
+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/ImmutablePen.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutablePen.cs
index 4b3bd640cb..e586eaf3a9 100644
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutablePen.cs
+++ b/src/Avalonia.Visuals/Media/Immutable/ImmutablePen.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableSolidColorBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableSolidColorBrush.cs
index b55ca251a6..010184ad3b 100644
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableSolidColorBrush.cs
+++ b/src/Avalonia.Visuals/Media/Immutable/ImmutableSolidColorBrush.cs
@@ -1,12 +1,11 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
+using System;
 
 namespace Avalonia.Media.Immutable
 {
     /// <summary>
     /// Fills an area with a solid color.
     /// </summary>
-    public readonly struct ImmutableSolidColorBrush : ISolidColorBrush
+    public readonly struct ImmutableSolidColorBrush : ISolidColorBrush, IEquatable<ImmutableSolidColorBrush>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ImmutableSolidColorBrush"/> class.
@@ -47,6 +46,35 @@ namespace Avalonia.Media.Immutable
         /// </summary>
         public double Opacity { get; }
 
+        public bool Equals(ImmutableSolidColorBrush other)
+        {
+            // ReSharper disable once CompareOfFloatsByEqualityOperator
+            return Color == other.Color && Opacity == 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 left.Equals(right);
+        }
+
+        public static bool operator !=(ImmutableSolidColorBrush left, ImmutableSolidColorBrush right)
+        {
+            return !left.Equals(right);
+        }
+
         /// <summary>
         /// Returns a string representation of the brush.
         /// </summary>
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableTextDecoration.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableTextDecoration.cs
new file mode 100644
index 0000000000..cb83cfec64
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/Immutable/ImmutableTextDecoration.cs
@@ -0,0 +1,53 @@
+namespace Avalonia.Media.Immutable
+{
+    /// <summary>
+    /// An immutable representation of a <see cref="TextDecoration"/>.
+    /// </summary>
+    public class ImmutableTextDecoration
+    {
+        public ImmutableTextDecoration(TextDecorationLocation location, ImmutablePen pen,
+            TextDecorationUnit penThicknessUnit,
+            double penOffset, TextDecorationUnit penOffsetUnit)
+        {
+            Location = location;
+            Pen = pen;
+            PenThicknessUnit = penThicknessUnit;
+            PenOffset = penOffset;
+            PenOffsetUnit = penOffsetUnit;
+        }
+
+        /// <summary>
+        /// Gets or sets the location.
+        /// </summary>
+        /// <value>
+        /// The location.
+        /// </value>
+        public TextDecorationLocation Location { get; }
+
+        /// <summary>
+        /// Gets or sets the pen.
+        /// </summary>
+        /// <value>
+        /// The pen.
+        /// </value>
+        public ImmutablePen Pen { get; }
+
+        /// <summary>
+        /// Gets the units in which the Thickness of the text decoration's <see cref="Pen"/> is expressed.
+        /// </summary>
+        public TextDecorationUnit PenThicknessUnit { get; }
+
+        /// <summary>
+        /// Gets or sets the pen offset.
+        /// </summary>
+        /// <value>
+        /// The pen offset.
+        /// </value>
+        public double PenOffset { get; }
+
+        /// <summary>
+        /// Gets the units in which the <see cref="PenOffset"/> value is expressed.
+        /// </summary>
+        public TextDecorationUnit PenOffsetUnit { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableTileBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableTileBrush.cs
index c3dd159d04..fd4d921516 100644
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableTileBrush.cs
+++ b/src/Avalonia.Visuals/Media/Immutable/ImmutableTileBrush.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Visuals.Media.Imaging;
 
 namespace Avalonia.Media.Immutable
 {
diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutableVisualBrush.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutableVisualBrush.cs
index f1f61a6e65..4c6aae08ab 100644
--- a/src/Avalonia.Visuals/Media/Immutable/ImmutableVisualBrush.cs
+++ b/src/Avalonia.Visuals/Media/Immutable/ImmutableVisualBrush.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Visuals.Media.Imaging;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Media.Immutable
diff --git a/src/Avalonia.Visuals/Media/ImmutableExperimentalAcrylicMaterial.cs b/src/Avalonia.Visuals/Media/ImmutableExperimentalAcrylicMaterial.cs
new file mode 100644
index 0000000000..f46d76cf3f
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/ImmutableExperimentalAcrylicMaterial.cs
@@ -0,0 +1,73 @@
+using System;
+
+namespace Avalonia.Media
+{
+    public readonly struct ImmutableExperimentalAcrylicMaterial : IExperimentalAcrylicMaterial, IEquatable<ImmutableExperimentalAcrylicMaterial>
+    {
+        public ImmutableExperimentalAcrylicMaterial(IExperimentalAcrylicMaterial brush)
+        {
+            BackgroundSource = brush.BackgroundSource;
+            TintColor = brush.TintColor;
+            TintOpacity = brush.TintOpacity;
+            FallbackColor = brush.FallbackColor;
+            MaterialColor = brush.MaterialColor;
+        }
+
+        public AcrylicBackgroundSource BackgroundSource { get; }
+
+        public Color TintColor { get; }
+
+        public Color MaterialColor { get; }
+
+        public double TintOpacity { get; }
+
+        public Color FallbackColor { get; }
+
+        public bool Equals(ImmutableExperimentalAcrylicMaterial other)
+        {
+            // ReSharper disable once CompareOfFloatsByEqualityOperator
+            return
+                TintColor == other.TintColor &&                
+                TintOpacity == other.TintOpacity &&
+                BackgroundSource == other.BackgroundSource &&
+                FallbackColor == other.FallbackColor && MaterialColor == other.MaterialColor;
+
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is ImmutableExperimentalAcrylicMaterial other && Equals(other);
+        }
+
+        public Color GetEffectiveTintColor()
+        {
+            return TintColor;
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hash = 17;
+
+                hash = (hash * 23) + TintColor.GetHashCode();                
+                hash = (hash * 23) + TintOpacity.GetHashCode();
+                hash = (hash * 23) + BackgroundSource.GetHashCode();
+                hash = (hash * 23) + FallbackColor.GetHashCode();
+                hash = (hash * 23) + MaterialColor.GetHashCode();
+
+                return hash;
+            }
+        }
+
+        public static bool operator ==(ImmutableExperimentalAcrylicMaterial left, ImmutableExperimentalAcrylicMaterial right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(ImmutableExperimentalAcrylicMaterial left, ImmutableExperimentalAcrylicMaterial right)
+        {
+            return !left.Equals(right);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/KnownColors.cs b/src/Avalonia.Visuals/Media/KnownColors.cs
index 0887d2c913..fe09f5f538 100644
--- a/src/Avalonia.Visuals/Media/KnownColors.cs
+++ b/src/Avalonia.Visuals/Media/KnownColors.cs
@@ -8,7 +8,9 @@ namespace Avalonia.Media
     {
         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()
         {
@@ -32,14 +34,19 @@ namespace Avalonia.Media
 
             _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)
         {
@@ -61,6 +68,7 @@ namespace Avalonia.Media
             return Color.FromUInt32((uint)color);
         }
 
+#if !BUILDTASK
         public static ISolidColorBrush ToBrush(this KnownColor color)
         {
             lock (_knownBrushes)
@@ -74,6 +82,7 @@ namespace Avalonia.Media
                 return brush;
             }
         }
+#endif
     }
 
     internal enum KnownColor : uint
diff --git a/src/Avalonia.Visuals/Media/LineGeometry.cs b/src/Avalonia.Visuals/Media/LineGeometry.cs
index 90577dabd8..94b638114b 100644
--- a/src/Avalonia.Visuals/Media/LineGeometry.cs
+++ b/src/Avalonia.Visuals/Media/LineGeometry.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Platform;
 
 namespace Avalonia.Media
diff --git a/src/Avalonia.Visuals/Media/LineSegment.cs b/src/Avalonia.Visuals/Media/LineSegment.cs
index d81f67d99f..49d9ebeb72 100644
--- a/src/Avalonia.Visuals/Media/LineSegment.cs
+++ b/src/Avalonia.Visuals/Media/LineSegment.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Media
 {
     public sealed class LineSegment : PathSegment
@@ -27,5 +24,8 @@ namespace Avalonia.Media
         {
             ctx.LineTo(Point);
         }
+
+        public override string ToString()
+            => $"L {Point}";
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Media/LinearGradientBrush.cs b/src/Avalonia.Visuals/Media/LinearGradientBrush.cs
index 14adc0e0cd..a51adf0949 100644
--- a/src/Avalonia.Visuals/Media/LinearGradientBrush.cs
+++ b/src/Avalonia.Visuals/Media/LinearGradientBrush.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Media.Immutable;
 
 namespace Avalonia.Media
diff --git a/src/Avalonia.Visuals/Media/MaterialExtensions.cs b/src/Avalonia.Visuals/Media/MaterialExtensions.cs
new file mode 100644
index 0000000000..c0b445c357
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/MaterialExtensions.cs
@@ -0,0 +1,22 @@
+using System;
+
+namespace Avalonia.Media
+{
+    public static class MaterialExtensions
+    {
+        /// <summary>
+        /// Converts a brush to an immutable brush.
+        /// </summary>
+        /// <param name="material">The brush.</param>
+        /// <returns>
+        /// The result of calling <see cref="IMutableBrush.ToImmutable"/> if the brush is mutable,
+        /// otherwise <paramref name="material"/>.
+        /// </returns>
+        public static IExperimentalAcrylicMaterial ToImmutable(this IExperimentalAcrylicMaterial material)
+        {
+            Contract.Requires<ArgumentNullException>(material != null);
+
+            return (material as IMutableExperimentalAcrylicMaterial)?.ToImmutable() ?? material;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/MatrixTransform.cs b/src/Avalonia.Visuals/Media/MatrixTransform.cs
index 247a26dac1..4e60e1e290 100644
--- a/src/Avalonia.Visuals/Media/MatrixTransform.cs
+++ b/src/Avalonia.Visuals/Media/MatrixTransform.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.VisualTree;
 
diff --git a/src/Avalonia.Visuals/Media/MediaExtensions.cs b/src/Avalonia.Visuals/Media/MediaExtensions.cs
index 95d17b454e..d5995ff683 100644
--- a/src/Avalonia.Visuals/Media/MediaExtensions.cs
+++ b/src/Avalonia.Visuals/Media/MediaExtensions.cs
@@ -1,7 +1,5 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using Avalonia.Utilities;
 
 namespace Avalonia.Media
 {
@@ -16,24 +14,82 @@ namespace Avalonia.Media
         /// <param name="stretch">The stretch mode.</param>
         /// <param name="destinationSize">The size of the destination viewport.</param>
         /// <param name="sourceSize">The size of the source.</param>
+        /// <param name="stretchDirection">The stretch direction.</param>
         /// <returns>A vector with the X and Y scaling factors.</returns>
-        public static Vector CalculateScaling(this Stretch stretch, Size destinationSize, Size sourceSize)
+        public static Vector CalculateScaling(
+            this Stretch stretch,
+            Size destinationSize,
+            Size sourceSize,
+            StretchDirection stretchDirection = StretchDirection.Both)
         {
-            double scaleX = 1;
-            double scaleY = 1;
+            var scaleX = 1.0;
+            var scaleY = 1.0;
+
+            bool isConstrainedWidth = !double.IsPositiveInfinity(destinationSize.Width);
+            bool isConstrainedHeight = !double.IsPositiveInfinity(destinationSize.Height);
 
-            if (stretch != Stretch.None)
+            if ((stretch == Stretch.Uniform || stretch == Stretch.UniformToFill || stretch == Stretch.Fill)
+                 && (isConstrainedWidth || isConstrainedHeight))
             {
-                scaleX = destinationSize.Width / sourceSize.Width;
-                scaleY = destinationSize.Height / sourceSize.Height;
+                // Compute scaling factors for both axes
+                scaleX = MathUtilities.IsZero(sourceSize.Width) ? 0.0 : destinationSize.Width / sourceSize.Width;
+                scaleY = MathUtilities.IsZero(sourceSize.Height) ? 0.0 : destinationSize.Height / sourceSize.Height;
+
+                if (!isConstrainedWidth)
+                {
+                    scaleX = scaleY;
+                }
+                else if (!isConstrainedHeight)
+                {
+                    scaleY = scaleX;
+                }
+                else
+                {
+                    // If not preserving aspect ratio, then just apply transform to fit
+                    switch (stretch)
+                    {
+                        case Stretch.Uniform:
+                            // Find minimum scale that we use for both axes
+                            double minscale = scaleX < scaleY ? scaleX : scaleY;
+                            scaleX = scaleY = minscale;
+                            break;
 
-                switch (stretch)
+                        case Stretch.UniformToFill:
+                            // Find maximum scale that we use for both axes
+                            double maxscale = scaleX > scaleY ? scaleX : scaleY;
+                            scaleX = scaleY = maxscale;
+                            break;
+
+                        case Stretch.Fill:
+                            // We already computed the fill scale factors above, so just use them
+                            break;
+                    }
+                }
+
+                // Apply stretch direction by bounding scales.
+                // In the uniform case, scaleX=scaleY, so this sort of clamping will maintain aspect ratio
+                // In the uniform fill case, we have the same result too.
+                // In the fill case, note that we change aspect ratio, but that is okay
+                switch (stretchDirection)
                 {
-                    case Stretch.Uniform:
-                        scaleX = scaleY = Math.Min(scaleX, scaleY);
+                    case StretchDirection.UpOnly:
+                        if (scaleX < 1.0)
+                            scaleX = 1.0;
+                        if (scaleY < 1.0)
+                            scaleY = 1.0;
+                        break;
+
+                    case StretchDirection.DownOnly:
+                        if (scaleX > 1.0)
+                            scaleX = 1.0;
+                        if (scaleY > 1.0)
+                            scaleY = 1.0;
+                        break;
+
+                    case StretchDirection.Both:
                         break;
-                    case Stretch.UniformToFill:
-                        scaleX = scaleY = Math.Max(scaleX, scaleY);
+
+                    default:
                         break;
                 }
             }
@@ -47,10 +103,15 @@ namespace Avalonia.Media
         /// <param name="stretch">The stretch mode.</param>
         /// <param name="destinationSize">The size of the destination viewport.</param>
         /// <param name="sourceSize">The size of the source.</param>
+        /// <param name="stretchDirection">The stretch direction.</param>
         /// <returns>The size of the stretched source.</returns>
-        public static Size CalculateSize(this Stretch stretch, Size destinationSize, Size sourceSize)
+        public static Size CalculateSize(
+            this Stretch stretch,
+            Size destinationSize,
+            Size sourceSize,
+            StretchDirection stretchDirection = StretchDirection.Both)
         {
-            return sourceSize * stretch.CalculateScaling(destinationSize, sourceSize);
+            return sourceSize * stretch.CalculateScaling(destinationSize, sourceSize, stretchDirection);
         }
     }
 }
diff --git a/src/Avalonia.Visuals/Media/PathFigure.cs b/src/Avalonia.Visuals/Media/PathFigure.cs
index 6a438a85ee..caf86cb234 100644
--- a/src/Avalonia.Visuals/Media/PathFigure.cs
+++ b/src/Avalonia.Visuals/Media/PathFigure.cs
@@ -1,6 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+#nullable enable
+using System;
+using System.Linq;
+using Avalonia.Collections;
 using Avalonia.Metadata;
 
 namespace Avalonia.Media
@@ -11,22 +12,36 @@ namespace Avalonia.Media
         /// Defines the <see cref="IsClosed"/> property.
         /// </summary>
         public static readonly StyledProperty<bool> IsClosedProperty
-                            = AvaloniaProperty.Register<PathFigure, bool>(nameof(IsClosed), true);
+            = AvaloniaProperty.Register<PathFigure, bool>(nameof(IsClosed), true);
+
         /// <summary>
         /// Defines the <see cref="IsFilled"/> property.
         /// </summary>
         public static readonly StyledProperty<bool> IsFilledProperty
-                            = AvaloniaProperty.Register<PathFigure, bool>(nameof(IsFilled), true);
+            = AvaloniaProperty.Register<PathFigure, bool>(nameof(IsFilled), true);
+
         /// <summary>
         /// Defines the <see cref="Segments"/> property.
         /// </summary>
-        public static readonly DirectProperty<PathFigure, PathSegments> SegmentsProperty
-                        = AvaloniaProperty.RegisterDirect<PathFigure, PathSegments>(nameof(Segments), f => f.Segments, (f, s) => f.Segments = s);
+        public static readonly DirectProperty<PathFigure, PathSegments?> SegmentsProperty
+            = AvaloniaProperty.RegisterDirect<PathFigure, PathSegments?>(
+                nameof(Segments), 
+                f => f.Segments,
+                (f, s) => f.Segments = s);
+
         /// <summary>
         /// Defines the <see cref="StartPoint"/> property.
         /// </summary>
         public static readonly StyledProperty<Point> StartPointProperty
-                        = AvaloniaProperty.Register<PathFigure, Point>(nameof(StartPoint));
+            = AvaloniaProperty.Register<PathFigure, Point>(nameof(StartPoint));
+
+        internal event EventHandler? SegmentsInvalidated;
+
+        private PathSegments? _segments;
+
+        private IDisposable? _segmentsDisposable;
+
+        private IDisposable? _segmentsPropertiesDisposable;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PathFigure"/> class.
@@ -36,6 +51,31 @@ namespace Avalonia.Media
             Segments = new PathSegments();
         }
 
+        static PathFigure()
+        {
+            SegmentsProperty.Changed.AddClassHandler<PathFigure>(
+                (s, e) =>
+                s.OnSegmentsChanged());
+        }
+
+        private void OnSegmentsChanged()
+        {
+            _segmentsDisposable?.Dispose();
+            _segmentsPropertiesDisposable?.Dispose();
+
+            _segmentsDisposable = _segments?.ForEachItem(
+                _ => InvalidateSegments(),
+                _ => InvalidateSegments(),
+                InvalidateSegments);
+
+            _segmentsPropertiesDisposable = _segments?.TrackItemPropertyChanged(_ => InvalidateSegments());
+        }
+
+        private void InvalidateSegments()
+        {
+            SegmentsInvalidated?.Invoke(this, EventArgs.Empty);
+        }
+
         /// <summary>
         /// Gets or sets a value indicating whether this instance is closed.
         /// </summary>
@@ -67,7 +107,7 @@ namespace Avalonia.Media
         /// The segments.
         /// </value>
         [Content]
-        public PathSegments Segments
+        public PathSegments? Segments
         {
             get { return _segments; }
             set { SetAndRaise(SegmentsProperty, ref _segments, value); }
@@ -84,19 +124,23 @@ namespace Avalonia.Media
             get { return GetValue(StartPointProperty); }
             set { SetValue(StartPointProperty, value); }
         }
+        
+        public override string ToString()
+            => $"M {StartPoint} {string.Join(" ", _segments ?? Enumerable.Empty<PathSegment>())}{(IsClosed ? "Z" : "")}";
 
         internal void ApplyTo(StreamGeometryContext ctx)
         {
             ctx.BeginFigure(StartPoint, IsFilled);
 
-            foreach (var segment in Segments)
+            if (Segments != null)
             {
-                segment.ApplyTo(ctx);
+                foreach (var segment in Segments)
+                {
+                    segment.ApplyTo(ctx);
+                }
             }
 
             ctx.EndFigure(IsClosed);
         }
-
-        private PathSegments _segments;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Visuals/Media/PathGeometry.cs b/src/Avalonia.Visuals/Media/PathGeometry.cs
index 3a91c924d2..3d11c19b7d 100644
--- a/src/Avalonia.Visuals/Media/PathGeometry.cs
+++ b/src/Avalonia.Visuals/Media/PathGeometry.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Collections;
 using Avalonia.Metadata;
@@ -107,10 +104,28 @@ namespace Avalonia.Media
             _figuresPropertiesObserver?.Dispose();
 
             _figuresObserver = figures?.ForEachItem(
-                _ => InvalidateGeometry(),
-                _ => InvalidateGeometry(),
-                () => InvalidateGeometry());
+                s =>
+                {
+                    s.SegmentsInvalidated += InvalidateGeometryFromSegments;
+                    InvalidateGeometry();
+                },
+                s =>
+                {
+                    s.SegmentsInvalidated -= InvalidateGeometryFromSegments;
+                    InvalidateGeometry();
+                },
+                InvalidateGeometry);
+            
             _figuresPropertiesObserver = figures?.TrackItemPropertyChanged(_ => InvalidateGeometry());
+ 
         }
+
+        private void InvalidateGeometryFromSegments(object _, EventArgs __)
+        {
+            InvalidateGeometry();
+        }
+
+        public override string ToString()
+            => $"{(FillRule != FillRule.EvenOdd ? "F1 " : "")}{(string.Join(" ", Figures))}";
     }
 }
diff --git a/src/Avalonia.Visuals/Media/PathGeometryCollections.cs b/src/Avalonia.Visuals/Media/PathGeometryCollections.cs
index e161cfc32d..61099a0956 100644
--- a/src/Avalonia.Visuals/Media/PathGeometryCollections.cs
+++ b/src/Avalonia.Visuals/Media/PathGeometryCollections.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Collections;
 
 namespace Avalonia.Media
diff --git a/src/Avalonia.Visuals/Media/PathMarkupParser.cs b/src/Avalonia.Visuals/Media/PathMarkupParser.cs
index e8f149df11..9fefcb6645 100644
--- a/src/Avalonia.Visuals/Media/PathMarkupParser.cs
+++ b/src/Avalonia.Visuals/Media/PathMarkupParser.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Globalization;
diff --git a/src/Avalonia.Visuals/Media/PathSegment.cs b/src/Avalonia.Visuals/Media/PathSegment.cs
index 4ee2211763..89a33815ae 100644
--- a/src/Avalonia.Visuals/Media/PathSegment.cs
+++ b/src/Avalonia.Visuals/Media/PathSegment.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Media
 {
     public abstract class PathSegment : AvaloniaObject
diff --git a/src/Avalonia.Visuals/Media/Pen.cs b/src/Avalonia.Visuals/Media/Pen.cs
index b88fae28ff..eb44b3f21e 100644
--- a/src/Avalonia.Visuals/Media/Pen.cs
+++ b/src/Avalonia.Visuals/Media/Pen.cs
@@ -1,8 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Collections.Generic;
 using Avalonia.Media.Immutable;
 using Avalonia.Utilities;
 
@@ -197,7 +193,15 @@ namespace Avalonia.Media
         protected static void AffectsRender<T>(params AvaloniaProperty[] properties)
             where T : Pen
         {
-            void Invalidate(AvaloniaPropertyChangedEventArgs e)
+            static void Invalidate(AvaloniaPropertyChangedEventArgs e)
+            {
+                if (e.Sender is T sender)
+                {
+                    sender.RaiseInvalidated(EventArgs.Empty);
+                }
+            }
+
+            static void InvalidateAndSubscribe(AvaloniaPropertyChangedEventArgs e)
             {
                 if (e.Sender is T sender)
                 {
@@ -223,7 +227,14 @@ namespace Avalonia.Media
 
             foreach (var property in properties)
             {
-                property.Changed.Subscribe(Invalidate);
+                if (property.CanValueAffectRender())
+                {
+                    property.Changed.Subscribe(e => InvalidateAndSubscribe(e));
+                }
+                else
+                {
+                    property.Changed.Subscribe(e => Invalidate(e));
+                }
             }
         }
 
diff --git a/src/Avalonia.Visuals/Media/PixelPoint.cs b/src/Avalonia.Visuals/Media/PixelPoint.cs
index 5384a40be9..7d62d7bc23 100644
--- a/src/Avalonia.Visuals/Media/PixelPoint.cs
+++ b/src/Avalonia.Visuals/Media/PixelPoint.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Globalization;
 using Avalonia.Utilities;
 
diff --git a/src/Avalonia.Visuals/Media/PixelRect.cs b/src/Avalonia.Visuals/Media/PixelRect.cs
index a024e1af11..32a728475f 100644
--- a/src/Avalonia.Visuals/Media/PixelRect.cs
+++ b/src/Avalonia.Visuals/Media/PixelRect.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
 using Avalonia.Utilities;
@@ -380,7 +377,7 @@ namespace Avalonia
         /// <returns>The device-independent rect.</returns>
         public static PixelRect FromRect(Rect rect, double scale) => new PixelRect(
             PixelPoint.FromPoint(rect.Position, scale),
-            PixelSize.FromSize(rect.Size, scale));
+            FromPointCeiling(rect.BottomRight, new Vector(scale, scale)));
 
         /// <summary>
         /// Converts a <see cref="Rect"/> to device pixels using the specified scaling factor.
@@ -390,7 +387,7 @@ namespace Avalonia
         /// <returns>The device-independent point.</returns>
         public static PixelRect FromRect(Rect rect, Vector scale) => new PixelRect(
             PixelPoint.FromPoint(rect.Position, scale),
-            PixelSize.FromSize(rect.Size, scale));
+            FromPointCeiling(rect.BottomRight, scale));
 
         /// <summary>
         /// Converts a <see cref="Rect"/> to device pixels using the specified dots per inch (DPI).
@@ -400,7 +397,7 @@ namespace Avalonia
         /// <returns>The device-independent point.</returns>
         public static PixelRect FromRectWithDpi(Rect rect, double dpi) => new PixelRect(
             PixelPoint.FromPointWithDpi(rect.Position, dpi),
-            PixelSize.FromSizeWithDpi(rect.Size, 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).
@@ -410,7 +407,7 @@ namespace Avalonia
         /// <returns>The device-independent point.</returns>
         public static PixelRect FromRectWithDpi(Rect rect, Vector dpi) => new PixelRect(
             PixelPoint.FromPointWithDpi(rect.Position, dpi),
-            PixelSize.FromSizeWithDpi(rect.Size, dpi));
+            FromPointCeiling(rect.BottomRight, dpi / 96));
 
         /// <summary>
         /// Returns the string representation of the rectangle.
@@ -444,5 +441,12 @@ namespace Avalonia
                 );
             }
         }
+
+        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.Visuals/Media/PixelSize.cs
index a49aa82c0d..530b01ed90 100644
--- a/src/Avalonia.Visuals/Media/PixelSize.cs
+++ b/src/Avalonia.Visuals/Media/PixelSize.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Globalization;
 using Avalonia.Utilities;
 
diff --git a/src/Avalonia.Visuals/Media/PixelVector.cs b/src/Avalonia.Visuals/Media/PixelVector.cs
index 4a623e3bc2..f32e9c0178 100644
--- a/src/Avalonia.Visuals/Media/PixelVector.cs
+++ b/src/Avalonia.Visuals/Media/PixelVector.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
 using Avalonia.Animation.Animators;
diff --git a/src/Avalonia.Visuals/Media/PolylineGeometry.cs b/src/Avalonia.Visuals/Media/PolylineGeometry.cs
index 5ed16ca957..94c809d432 100644
--- a/src/Avalonia.Visuals/Media/PolylineGeometry.cs
+++ b/src/Avalonia.Visuals/Media/PolylineGeometry.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using Avalonia.Collections;
@@ -23,7 +20,7 @@ namespace Avalonia.Media
         /// <summary>
         /// Defines the <see cref="IsFilled"/> property.
         /// </summary>
-        public static readonly AvaloniaProperty<bool> IsFilledProperty =
+        public static readonly StyledProperty<bool> IsFilledProperty =
             AvaloniaProperty.Register<PolylineGeometry, bool>(nameof(IsFilled));
 
         private Points _points;
diff --git a/src/Avalonia.Visuals/Media/QuadraticBezierSegment .cs b/src/Avalonia.Visuals/Media/QuadraticBezierSegment .cs
index 31c364edf4..f1a0ccaaa0 100644
--- a/src/Avalonia.Visuals/Media/QuadraticBezierSegment .cs	
+++ b/src/Avalonia.Visuals/Media/QuadraticBezierSegment .cs	
@@ -42,5 +42,8 @@ namespace Avalonia.Media
         {
             ctx.QuadraticBezierTo(Point1, Point2);
         }
+
+        public override string ToString()
+            => $"Q {Point1} {Point2}";
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Media/RadialGradientBrush.cs b/src/Avalonia.Visuals/Media/RadialGradientBrush.cs
index 589cd83ca1..16c367c0d0 100644
--- a/src/Avalonia.Visuals/Media/RadialGradientBrush.cs
+++ b/src/Avalonia.Visuals/Media/RadialGradientBrush.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Media.Immutable;
 
 namespace Avalonia.Media
@@ -33,6 +30,11 @@ namespace Avalonia.Media
             AvaloniaProperty.Register<RadialGradientBrush, double>(
                 nameof(Radius),
                 0.5);
+        
+        static RadialGradientBrush()
+        {
+            AffectsRender<RadialGradientBrush>(CenterProperty, GradientOriginProperty, RadiusProperty);
+        }
 
         /// <summary>
         /// Gets or sets the start point for the gradient.
diff --git a/src/Avalonia.Visuals/Media/RectangleGeometry.cs b/src/Avalonia.Visuals/Media/RectangleGeometry.cs
index 9250500644..743e103a88 100644
--- a/src/Avalonia.Visuals/Media/RectangleGeometry.cs
+++ b/src/Avalonia.Visuals/Media/RectangleGeometry.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Platform;
 
 namespace Avalonia.Media
diff --git a/src/Avalonia.Visuals/Media/RenderOptions.cs b/src/Avalonia.Visuals/Media/RenderOptions.cs
index 180863f9e8..7abbc8a656 100644
--- a/src/Avalonia.Visuals/Media/RenderOptions.cs
+++ b/src/Avalonia.Visuals/Media/RenderOptions.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Visuals.Media.Imaging;
+using Avalonia.Visuals.Media.Imaging;
 
 namespace Avalonia.Media
 { 
diff --git a/src/Avalonia.Visuals/Media/RotateTransform.cs b/src/Avalonia.Visuals/Media/RotateTransform.cs
index c3babcfbab..653d38eb45 100644
--- a/src/Avalonia.Visuals/Media/RotateTransform.cs
+++ b/src/Avalonia.Visuals/Media/RotateTransform.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.VisualTree;
 
diff --git a/src/Avalonia.Visuals/Media/ScaleTransform.cs b/src/Avalonia.Visuals/Media/ScaleTransform.cs
index fd301802e0..259b23cbd2 100644
--- a/src/Avalonia.Visuals/Media/ScaleTransform.cs
+++ b/src/Avalonia.Visuals/Media/ScaleTransform.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.VisualTree;
 
diff --git a/src/Avalonia.Visuals/Media/SkewTransform.cs b/src/Avalonia.Visuals/Media/SkewTransform.cs
index 405e3947e8..a96710e331 100644
--- a/src/Avalonia.Visuals/Media/SkewTransform.cs
+++ b/src/Avalonia.Visuals/Media/SkewTransform.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Media
diff --git a/src/Avalonia.Visuals/Media/SolidColorBrush.cs b/src/Avalonia.Visuals/Media/SolidColorBrush.cs
index bacb9e4ad7..8e30880489 100644
--- a/src/Avalonia.Visuals/Media/SolidColorBrush.cs
+++ b/src/Avalonia.Visuals/Media/SolidColorBrush.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Animation;
 using Avalonia.Animation.Animators;
 using Avalonia.Media.Immutable;
diff --git a/src/Avalonia.Visuals/Media/StreamGeometry.cs b/src/Avalonia.Visuals/Media/StreamGeometry.cs
index d3cb788486..be914cc7b2 100644
--- a/src/Avalonia.Visuals/Media/StreamGeometry.cs
+++ b/src/Avalonia.Visuals/Media/StreamGeometry.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Platform;
 
 namespace Avalonia.Media
diff --git a/src/Avalonia.Visuals/Media/StreamGeometryContext.cs b/src/Avalonia.Visuals/Media/StreamGeometryContext.cs
index 9df67c226e..0bfd774c79 100644
--- a/src/Avalonia.Visuals/Media/StreamGeometryContext.cs
+++ b/src/Avalonia.Visuals/Media/StreamGeometryContext.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Platform;
 
 namespace Avalonia.Media
diff --git a/src/Avalonia.Visuals/Media/Stretch.cs b/src/Avalonia.Visuals/Media/Stretch.cs
index 3265d6eaa2..60ec8d4c6e 100644
--- a/src/Avalonia.Visuals/Media/Stretch.cs
+++ b/src/Avalonia.Visuals/Media/Stretch.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Media
 {
     /// <summary>
diff --git a/src/Avalonia.Visuals/Media/StretchDirection.cs b/src/Avalonia.Visuals/Media/StretchDirection.cs
new file mode 100644
index 0000000000..a4be26f6cd
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/StretchDirection.cs
@@ -0,0 +1,25 @@
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Describes the type of scaling that can be used when scaling content.
+    /// </summary>
+    public enum StretchDirection
+    {
+        /// <summary>
+        /// Only scales the content upwards when the content is smaller than the available space.
+        /// If the content is larger, no scaling downwards is done.
+        /// </summary>
+        UpOnly,
+
+        /// <summary>
+        /// Only scales the content downwards when the content is larger than the available space.
+        /// If the content is smaller, no scaling upwards is done.
+        /// </summary>
+        DownOnly,
+
+        /// <summary>
+        /// Always stretches to fit the available space according to the stretch mode.
+        /// </summary>
+        Both,
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/SweepDirection.cs b/src/Avalonia.Visuals/Media/SweepDirection.cs
index be1f74ee90..67b79f9dfd 100644
--- a/src/Avalonia.Visuals/Media/SweepDirection.cs
+++ b/src/Avalonia.Visuals/Media/SweepDirection.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Media
 {
     /// <summary>
diff --git a/src/Avalonia.Visuals/Media/TextAlignment.cs b/src/Avalonia.Visuals/Media/TextAlignment.cs
index 5dd152c4a5..b1a394e157 100644
--- a/src/Avalonia.Visuals/Media/TextAlignment.cs
+++ b/src/Avalonia.Visuals/Media/TextAlignment.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Media
 {
     /// <summary>
diff --git a/src/Avalonia.Visuals/Media/TextDecoration.cs b/src/Avalonia.Visuals/Media/TextDecoration.cs
new file mode 100644
index 0000000000..57936426f3
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextDecoration.cs
@@ -0,0 +1,216 @@
+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="shapedTextCharacters">The shaped characters that are decorated.</param>
+        internal void Draw(DrawingContext drawingContext, ShapedTextCharacters shapedTextCharacters)
+        {
+            var fontRenderingEmSize = shapedTextCharacters.Properties.FontRenderingEmSize;
+            var fontMetrics = shapedTextCharacters.FontMetrics;
+            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 = fontRenderingEmSize * thickness;
+                    break;
+            }
+
+            var origin = new Point();
+
+            switch (Location)
+            {
+                case TextDecorationLocation.Baseline:
+                    origin += shapedTextCharacters.GlyphRun.BaselineOrigin;
+                    break;
+                case TextDecorationLocation.Strikethrough:
+                    origin += new Point(shapedTextCharacters.GlyphRun.BaselineOrigin.X,
+                        shapedTextCharacters.GlyphRun.BaselineOrigin.Y + fontMetrics.StrikethroughPosition);
+                    break;
+                case TextDecorationLocation.Underline:
+                    origin += new Point(shapedTextCharacters.GlyphRun.BaselineOrigin.X,
+                        shapedTextCharacters.GlyphRun.BaselineOrigin.Y + fontMetrics.UnderlinePosition);
+                    break;
+            }
+
+            switch (StrokeOffsetUnit)
+            {
+                case TextDecorationUnit.FontRenderingEmSize:
+                    origin += new Point(0, StrokeOffset * fontRenderingEmSize);
+                    break;
+                case TextDecorationUnit.Pixel:
+                    origin += new Point(0, StrokeOffset);
+                    break;
+            }
+
+            var pen = new Pen(Stroke ?? shapedTextCharacters.Properties.ForegroundBrush, thickness,
+                new DashStyle(StrokeDashArray, StrokeDashOffset), StrokeLineCap);
+
+            drawingContext.DrawLine(pen, origin, origin + new Point(shapedTextCharacters.Size.Width, 0));
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextDecorationCollection.cs b/src/Avalonia.Visuals/Media/TextDecorationCollection.cs
new file mode 100644
index 0000000000..2dced2252e
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextDecorationCollection.cs
@@ -0,0 +1,62 @@
+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/TextDecorationLocation.cs b/src/Avalonia.Visuals/Media/TextDecorationLocation.cs
new file mode 100644
index 0000000000..0082ea8e62
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextDecorationLocation.cs
@@ -0,0 +1,28 @@
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Specifies the vertical position of a <see cref="TextDecoration"/> object.
+    /// </summary>
+    public enum TextDecorationLocation
+    {
+        /// <summary>
+        /// The underline position.
+        /// </summary>
+        Underline = 0,
+
+        /// <summary>
+        /// The over line position.
+        /// </summary>
+        Overline = 1,
+
+        /// <summary>
+        /// The strikethrough position.
+        /// </summary>
+        Strikethrough = 2,
+
+        /// <summary>
+        /// The baseline position.
+        /// </summary>
+        Baseline = 3,
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextDecorationUnit.cs b/src/Avalonia.Visuals/Media/TextDecorationUnit.cs
new file mode 100644
index 0000000000..a61983e8d5
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextDecorationUnit.cs
@@ -0,0 +1,26 @@
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Specifies the unit type of either a <see cref="TextDecoration.StrokeOffset"/> or a <see cref="TextDecoration.StrokeThickness"/> value.
+    /// </summary>
+    public enum TextDecorationUnit
+    {
+        /// <summary>
+        /// A unit value that is relative to the font used for the <see cref="TextDecoration"/>.
+        /// If the decoration spans multiple fonts, an average recommended value is calculated.
+        /// This is the default value.
+        /// </summary>
+        FontRecommended,
+
+        /// <summary>
+        /// A unit value that is relative to the em size of the font.
+        /// The value of the offset or thickness is equal to the offset or thickness value multiplied by the font em size.
+        /// </summary>
+        FontRenderingEmSize,
+
+        /// <summary>
+        /// A unit value that is expressed in pixels.
+        /// </summary>
+        Pixel
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextDecorations.cs b/src/Avalonia.Visuals/Media/TextDecorations.cs
new file mode 100644
index 0000000000..006075dde1
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextDecorations.cs
@@ -0,0 +1,63 @@
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Defines a set of commonly used text decorations.
+    /// </summary>
+    public static class TextDecorations
+    {
+        static TextDecorations()
+        {
+            Underline = new TextDecorationCollection
+                        {
+                            new TextDecoration
+                            {
+                                Location = TextDecorationLocation.Underline
+                            }
+                        };
+
+            Strikethrough = new TextDecorationCollection
+                            {
+                                new TextDecoration
+                                {
+                                    Location = TextDecorationLocation.Strikethrough
+                                }
+                            };
+
+            Overline = new TextDecorationCollection
+                       {
+                           new TextDecoration
+                           {
+                               Location = TextDecorationLocation.Overline
+                           }
+                       };
+
+            Baseline = new TextDecorationCollection
+                       {
+                           new TextDecoration
+                           {
+                               Location = TextDecorationLocation.Baseline
+                           }
+                       };
+        }
+
+        /// <summary>
+        /// Gets a <see cref="TextDecorationCollection"/> containing an underline.
+        /// </summary>
+        public static TextDecorationCollection Underline { get; }
+
+        /// <summary>
+        /// Gets a <see cref="TextDecorationCollection"/> containing a strikethrough.
+        /// </summary>
+        public static TextDecorationCollection Strikethrough { get; }
+
+        /// <summary>
+        /// Gets a <see cref="TextDecorationCollection"/> containing an overline.
+        /// </summary>
+        public static TextDecorationCollection Overline { get; }
+
+        /// <summary>
+        /// Gets a <see cref="TextDecorationCollection"/> containing a baseline.
+        /// </summary>
+        public static TextDecorationCollection Baseline { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/DrawableTextRun.cs b/src/Avalonia.Visuals/Media/TextFormatting/DrawableTextRun.cs
new file mode 100644
index 0000000000..338c92f6b1
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/DrawableTextRun.cs
@@ -0,0 +1,19 @@
+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>
+        public abstract void Draw(DrawingContext drawingContext);
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/FontMetrics.cs b/src/Avalonia.Visuals/Media/TextFormatting/FontMetrics.cs
new file mode 100644
index 0000000000..dd91dc04bd
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/FontMetrics.cs
@@ -0,0 +1,71 @@
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// A metric that holds information about font specific measurements.
+    /// </summary>
+    public readonly struct FontMetrics
+    {
+        public FontMetrics(Typeface typeface, double fontSize)
+        {
+            var glyphTypeface = typeface.GlyphTypeface;
+
+            var scale = fontSize / glyphTypeface.DesignEmHeight;
+
+            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>
+        /// 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/GenericTextParagraphProperties.cs b/src/Avalonia.Visuals/Media/TextFormatting/GenericTextParagraphProperties.cs
new file mode 100644
index 0000000000..8e7d934bca
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/GenericTextParagraphProperties.cs
@@ -0,0 +1,56 @@
+namespace Avalonia.Media.TextFormatting
+{
+    public class GenericTextParagraphProperties : TextParagraphProperties
+    {
+        private TextAlignment _textAlignment;
+        private TextWrapping _textWrapping;
+        private double _lineHeight;
+
+        public GenericTextParagraphProperties(
+            TextRunProperties defaultTextRunProperties,
+            TextAlignment textAlignment = TextAlignment.Left,
+            TextWrapping textWrapping = TextWrapping.NoWrap,
+            double lineHeight = 0)
+        {
+            DefaultTextRunProperties = defaultTextRunProperties;
+
+            _textAlignment = textAlignment;
+
+            _textWrapping = textWrapping;
+
+            _lineHeight = lineHeight;
+        }
+
+        public override TextRunProperties DefaultTextRunProperties { get; }
+
+        public override TextAlignment TextAlignment => _textAlignment;
+
+        public override TextWrapping TextWrapping => _textWrapping;
+
+        public override double LineHeight => _lineHeight;
+
+        /// <summary>
+        /// Set text alignment
+        /// </summary>
+        internal void SetTextAlignment(TextAlignment textAlignment)
+        {
+            _textAlignment = textAlignment;
+        }
+
+        /// <summary>
+        /// Set text wrap
+        /// </summary>
+        internal void SetTextWrapping(TextWrapping textWrapping)
+        {
+            _textWrapping = textWrapping;
+        }
+
+        /// <summary>
+        /// Set line height
+        /// </summary>
+        internal void SetLineHeight(double lineHeight)
+        {
+            _lineHeight = lineHeight;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/GenericTextRunProperties.cs b/src/Avalonia.Visuals/Media/TextFormatting/GenericTextRunProperties.cs
new file mode 100644
index 0000000000..3db3589498
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/GenericTextRunProperties.cs
@@ -0,0 +1,40 @@
+using System.Globalization;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Generic implementation of TextRunProperties
+    /// </summary>
+    public class GenericTextRunProperties : TextRunProperties
+    {
+        public GenericTextRunProperties(Typeface typeface, double fontRenderingEmSize = 12,
+            TextDecorationCollection textDecorations = null, IBrush foregroundBrush = null, IBrush backgroundBrush = null,
+            CultureInfo cultureInfo = null)
+        {
+            Typeface = typeface;
+            FontRenderingEmSize = fontRenderingEmSize;
+            TextDecorations = textDecorations;
+            ForegroundBrush = foregroundBrush;
+            BackgroundBrush = backgroundBrush;
+            CultureInfo = cultureInfo;
+        }
+
+        /// <inheritdoc />
+        public override Typeface Typeface { get; }
+
+        /// <inheritdoc />
+        public override double FontRenderingEmSize { get; }
+
+        /// <inheritdoc />
+        public override TextDecorationCollection TextDecorations { get; }
+
+        /// <inheritdoc />
+        public override IBrush ForegroundBrush { get; }
+
+        /// <inheritdoc />
+        public override IBrush BackgroundBrush { get; }
+
+        /// <inheritdoc />
+        public override CultureInfo CultureInfo { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/ITextSource.cs b/src/Avalonia.Visuals/Media/TextFormatting/ITextSource.cs
new file mode 100644
index 0000000000..0f9994bc65
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/ITextSource.cs
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 0000000000..0c6c722941
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/ShapeableTextCharacters.cs
@@ -0,0 +1,23 @@
+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)
+        {
+            TextSourceLength = text.Length;
+            Text = text;
+            Properties = properties;
+        }
+
+        public override int TextSourceLength { get; }
+
+        public override ReadOnlySlice<char> Text { get; }
+
+        public override TextRunProperties Properties { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs b/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs
new file mode 100644
index 0000000000..9f6f2b2f43
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs
@@ -0,0 +1,153 @@
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// A text run that holds shaped characters.
+    /// </summary>
+    public sealed class ShapedTextCharacters : DrawableTextRun
+    {
+        public ShapedTextCharacters(GlyphRun glyphRun, TextRunProperties properties)
+        {
+            Text = glyphRun.Characters;
+            Properties = properties;
+            TextSourceLength = Text.Length;
+            FontMetrics = new FontMetrics(Properties.Typeface, Properties.FontRenderingEmSize);
+            GlyphRun = glyphRun;
+        }
+
+        /// <inheritdoc/>
+        public override ReadOnlySlice<char> Text { get; }
+
+        /// <inheritdoc/>
+        public override TextRunProperties Properties { get; }
+
+        /// <inheritdoc/>
+        public override int TextSourceLength { get; }
+
+        /// <inheritdoc/>
+        public override Size Size => GlyphRun.Size;
+
+        /// <summary>
+        /// Gets the font metrics.
+        /// </summary>
+        /// <value>
+        /// The font metrics.
+        /// </value>
+        public FontMetrics FontMetrics { get; }
+
+        /// <summary>
+        /// Gets the glyph run.
+        /// </summary>
+        /// <value>
+        /// The glyphs.
+        /// </value>
+        public GlyphRun GlyphRun { get; }
+
+        /// <inheritdoc/>
+        public override void Draw(DrawingContext drawingContext)
+        {
+            if (GlyphRun.GlyphIndices.Length == 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, this);
+            }
+        }
+
+        /// <summary>
+        /// Splits the <see cref="TextRun"/> at specified length.
+        /// </summary>
+        /// <param name="length">The length.</param>
+        /// <returns>The split result.</returns>
+        public SplitTextCharactersResult Split(int length)
+        {
+            var glyphCount = GlyphRun.FindGlyphIndex(GlyphRun.Characters.Start + length);
+
+            if (GlyphRun.Characters.Length == length)
+            {
+                return new SplitTextCharactersResult(this, null);
+            }
+
+            if (GlyphRun.GlyphIndices.Length == glyphCount)
+            {
+                return new SplitTextCharactersResult(this, null);
+            }
+
+            var firstGlyphRun = new GlyphRun(
+                Properties.Typeface.GlyphTypeface,
+                Properties.FontRenderingEmSize,
+                GlyphRun.GlyphIndices.Take(glyphCount),
+                GlyphRun.GlyphAdvances.Take(glyphCount),
+                GlyphRun.GlyphOffsets.Take(glyphCount),
+                GlyphRun.Characters.Take(length),
+                GlyphRun.GlyphClusters.Take(glyphCount));
+
+            var firstTextRun = new ShapedTextCharacters(firstGlyphRun, Properties);
+
+            var secondGlyphRun = new GlyphRun(
+                Properties.Typeface.GlyphTypeface,
+                Properties.FontRenderingEmSize,
+                GlyphRun.GlyphIndices.Skip(glyphCount),
+                GlyphRun.GlyphAdvances.Skip(glyphCount),
+                GlyphRun.GlyphOffsets.Skip(glyphCount),
+                GlyphRun.Characters.Skip(length),
+                GlyphRun.GlyphClusters.Skip(glyphCount));
+
+            var secondTextRun = new ShapedTextCharacters(secondGlyphRun, Properties);
+
+            return new SplitTextCharactersResult(firstTextRun, secondTextRun);
+        }
+
+        public readonly struct SplitTextCharactersResult
+        {
+            public SplitTextCharactersResult(ShapedTextCharacters first, ShapedTextCharacters second)
+            {
+                First = first;
+
+                Second = second;
+            }
+
+            /// <summary>
+            /// Gets the first text run.
+            /// </summary>
+            /// <value>
+            /// The first text run.
+            /// </value>
+            public ShapedTextCharacters First { get; }
+
+            /// <summary>
+            /// Gets the second text run.
+            /// </summary>
+            /// <value>
+            /// The second text run.
+            /// </value>
+            public ShapedTextCharacters Second { get; }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextCharacters.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextCharacters.cs
new file mode 100644
index 0000000000..b91a50a27c
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextCharacters.cs
@@ -0,0 +1,191 @@
+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;
+        }
+
+        /// <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()
+        {
+            var shapeableCharacters = new List<ShapeableTextCharacters>(2);
+
+            var runText = Text;
+
+            while (!runText.IsEmpty)
+            {
+                var shapeableRun = CreateShapeableRun(runText, Properties);
+
+                shapeableCharacters.Add(shapeableRun);
+
+                runText = runText.Skip(shapeableRun.Text.Length);
+            }
+
+            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>
+        /// <returns>A list of shapeable text runs.</returns>
+        private ShapeableTextCharacters CreateShapeableRun(ReadOnlySlice<char> text, TextRunProperties defaultProperties)
+        {
+            var defaultTypeface = defaultProperties.Typeface;
+
+            var currentTypeface = defaultTypeface;
+
+            if (TryGetRunProperties(text, currentTypeface, defaultTypeface, out var count))
+            {
+                return new ShapeableTextCharacters(text.Take(count),
+                    new GenericTextRunProperties(currentTypeface, defaultProperties.FontRenderingEmSize,
+                        defaultProperties.TextDecorations, defaultProperties.ForegroundBrush));
+
+            }
+
+            var codepoint = Codepoint.ReadAt(text, count, out _);
+
+            //ToDo: Fix FontFamily fallback
+            var matchFound =
+                FontManager.Current.TryMatchCharacter(codepoint, defaultTypeface.Style, defaultTypeface.Weight,
+                    defaultTypeface.FontFamily, defaultProperties.CultureInfo, out currentTypeface);
+
+            if (matchFound && TryGetRunProperties(text, currentTypeface, defaultTypeface, out count))
+            {
+                //Fallback found
+                return new ShapeableTextCharacters(text.Take(count),
+                    new GenericTextRunProperties(currentTypeface, defaultProperties.FontRenderingEmSize,
+                    defaultProperties.TextDecorations, defaultProperties.ForegroundBrush));
+            }
+
+            // 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));
+        }
+
+        /// <summary>
+        /// Tries to get run properties.
+        /// </summary>
+        /// <param name="defaultTypeface"></param>
+        /// <param name="text"></param>
+        /// <param name="typeface">The typeface that is used to find matching characters.</param>
+        /// <param name="count"></param>
+        /// <returns></returns>
+        protected bool TryGetRunProperties(ReadOnlySlice<char> text, Typeface typeface, Typeface defaultTypeface,
+            out int count)
+        {
+            if (text.Length == 0)
+            {
+                count = 0;
+                return false;
+            }
+
+            var isFallback = typeface != defaultTypeface;
+
+            count = 0;
+            var script = Script.Common;
+            //var direction = BiDiClass.LeftToRight;
+
+            var font = typeface.GlyphTypeface;
+            var defaultFont = defaultTypeface.GlyphTypeface;
+
+            var enumerator = new GraphemeEnumerator(text);
+
+            while (enumerator.MoveNext())
+            {
+                var grapheme = enumerator.Current;
+
+                var currentScript = grapheme.FirstCodepoint.Script;
+
+                //var currentDirection = grapheme.FirstCodepoint.BiDiClass;
+
+                //// ToDo: Implement BiDi algorithm
+                //if (currentScript.HorizontalDirection != direction)
+                //{
+                //    if (!UnicodeUtility.IsWhiteSpace(grapheme.FirstCodepoint))
+                //    {
+                //        break;
+                //    }
+                //}
+
+                if (currentScript != script)
+                {
+                    if (currentScript != Script.Inherited && currentScript != Script.Common)
+                    {
+                        if (script == Script.Inherited || script == Script.Common)
+                        {
+                            script = currentScript;
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
+                }
+
+                if (isFallback)
+                {
+                    if (defaultFont.TryGetGlyph(grapheme.FirstCodepoint, out _))
+                    {
+                        break;
+                    }
+                }
+
+                if (!font.TryGetGlyph(grapheme.FirstCodepoint, out _))
+                {
+                    if (!grapheme.FirstCodepoint.IsWhiteSpace)
+                    {
+                        break;
+                    }
+                }
+
+                count += grapheme.Text.Length;
+            }
+
+            return count > 0;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextCollapsingProperties.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextCollapsingProperties.cs
new file mode 100644
index 0000000000..ffd65423a3
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextCollapsingProperties.cs
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 0000000000..1523cc4d9a
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextCollapsingStyle.cs
@@ -0,0 +1,18 @@
+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/TextEndOfLine.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextEndOfLine.cs
new file mode 100644
index 0000000000..fd71fb53e7
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextEndOfLine.cs
@@ -0,0 +1,9 @@
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// A text run that indicates the end of a line.
+    /// </summary>
+    public class TextEndOfLine : TextRun
+    {
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextEndOfParagraph.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextEndOfParagraph.cs
new file mode 100644
index 0000000000..682fd930f6
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextEndOfParagraph.cs
@@ -0,0 +1,9 @@
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    ///  A text run that indicates the end of a paragraph.
+    /// </summary>
+    public class TextEndOfParagraph : TextEndOfLine
+    {
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextFormatter.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextFormatter.cs
new file mode 100644
index 0000000000..e4c898e2b8
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextFormatter.cs
@@ -0,0 +1,46 @@
+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
new file mode 100644
index 0000000000..6ae5258323
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextFormatterImpl.cs
@@ -0,0 +1,552 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Media.TextFormatting.Unicode;
+
+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;
+
+            var textRuns = FetchTextRuns(textSource, firstTextSourceIndex, previousLineBreak, out var nextLineBreak);
+
+            var textRange = GetTextRange(textRuns);
+
+            TextLine textLine;
+
+            switch (textWrapping)
+            {
+                case TextWrapping.NoWrap:
+                    {
+                        var textLineMetrics =
+                            TextLineMetrics.Create(textRuns, textRange, paragraphWidth, paragraphProperties);
+
+                        textLine = new TextLineImpl(textRuns, textLineMetrics, nextLineBreak);
+                        break;
+                    }
+                case TextWrapping.WrapWithOverflow:
+                case TextWrapping.Wrap:
+                    {
+                        textLine = PerformTextWrapping(textRuns, textRange, paragraphWidth, paragraphProperties,
+                            nextLineBreak);
+                        break;
+                    }
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+
+            return textLine;
+        }
+
+        /// <summary>
+        /// Measures the number of characters that fit into available width.
+        /// </summary>
+        /// <param name="textCharacters">The text run.</param>
+        /// <param name="availableWidth">The available width.</param>
+        /// <param name="count">The count of fitting characters.</param>
+        /// <returns>
+        /// <c>true</c> if characters fit into the available width; otherwise, <c>false</c>.
+        /// </returns>
+        internal static bool TryMeasureCharacters(ShapedTextCharacters textCharacters, double availableWidth, out int count)
+        {
+            var glyphRun = textCharacters.GlyphRun;
+
+            if (glyphRun.Size.Width < availableWidth)
+            {
+                count = glyphRun.Characters.Length;
+
+                return true;
+            }
+
+            var glyphCount = 0;
+
+            var currentWidth = 0.0;
+
+            if (glyphRun.GlyphAdvances.IsEmpty)
+            {
+                var glyphTypeface = glyphRun.GlyphTypeface;
+
+                for (var i = 0; i < glyphRun.GlyphClusters.Length; i++)
+                {
+                    var glyph = glyphRun.GlyphIndices[i];
+
+                    var advance = glyphTypeface.GetGlyphAdvance(glyph) * glyphRun.Scale;
+
+                    if (currentWidth + advance > availableWidth)
+                    {
+                        break;
+                    }
+
+                    currentWidth += advance;
+
+                    glyphCount++;
+                }
+            }
+            else
+            {
+                foreach (var advance in glyphRun.GlyphAdvances)
+                {
+                    if (currentWidth + advance > availableWidth)
+                    {
+                        break;
+                    }
+
+                    currentWidth += advance;
+
+                    glyphCount++;
+                }
+            }
+
+            if (glyphCount == 0)
+            {
+                count = 0;
+
+                return false;
+            }
+
+            if (glyphCount == glyphRun.GlyphIndices.Length)
+            {
+                count = glyphRun.Characters.Length;
+
+                return true;
+            }
+
+            if (glyphRun.GlyphClusters.IsEmpty)
+            {
+                count = glyphCount;
+
+                return true;
+            }
+
+            var firstCluster = glyphRun.GlyphClusters[0];
+
+            var lastCluster = glyphRun.GlyphClusters[glyphCount];
+
+            if (glyphRun.IsLeftToRight)
+            {
+                count = lastCluster - firstCluster;
+            }
+            else
+            {
+                count = firstCluster - lastCluster;
+            }
+           
+
+            return count > 0;
+        }
+
+        /// <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 SplitTextRunsResult SplitTextRuns(List<ShapedTextCharacters> textRuns, int length)
+        {
+            var currentLength = 0;
+
+            for (var i = 0; i < textRuns.Count; i++)
+            {
+                var currentRun = textRuns[i];
+
+                if (currentLength + currentRun.GlyphRun.Characters.Length < length)
+                {
+                    currentLength += currentRun.GlyphRun.Characters.Length;
+                    continue;
+                }
+
+                var firstCount = currentRun.GlyphRun.Characters.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.GlyphRun.Characters.Length == length)
+                {
+                    var second = new List<ShapedTextCharacters>(secondCount);
+
+                    var offset = currentRun.GlyphRun.Characters.Length > 1 ? 1 : 0;
+
+                    if (secondCount > 0)
+                    {
+                        for (var j = 0; j < secondCount; j++)
+                        {
+                            second.Add(textRuns[i + j + offset]);
+                        }
+                    }
+
+                    first.Add(currentRun);
+
+                    return new SplitTextRunsResult(first, second);
+                }
+                else
+                {
+                    secondCount++;
+
+                    var second = new List<ShapedTextCharacters>(secondCount);
+
+                    var split = currentRun.Split(length - currentLength);
+
+                    first.Add(split.First);
+
+                    second.Add(split.Second);
+
+                    if (secondCount > 0)
+                    {
+                        for (var j = 1; j < secondCount; j++)
+                        {
+                            second.Add(textRuns[i + j]);
+                        }
+                    }
+
+                    return new SplitTextRunsResult(first, second);
+                }
+            }
+
+            return new SplitTextRunsResult(textRuns, null);
+        }
+
+        /// <summary>
+        /// Fetches text runs.
+        /// </summary>
+        /// <param name="textSource">The text source.</param>
+        /// <param name="firstTextSourceIndex">The first text source index.</param>
+        /// <param name="previousLineBreak">Previous line break. Can be null.</param>
+        /// <param name="nextLineBreak">Next line break. Can be null.</param>
+        /// <returns>
+        /// The formatted text runs.
+        /// </returns>
+        private static List<ShapedTextCharacters> FetchTextRuns(ITextSource textSource,
+            int firstTextSourceIndex, TextLineBreak previousLineBreak, out TextLineBreak nextLineBreak)
+        {
+            nextLineBreak = default;
+
+            var currentLength = 0;
+
+            var textRuns = new List<ShapedTextCharacters>();
+
+            if (previousLineBreak != null)
+            {
+                for (var index = 0; index < previousLineBreak.RemainingCharacters.Count; index++)
+                {
+                    var shapedCharacters = previousLineBreak.RemainingCharacters[index];
+
+                    if (shapedCharacters == null)
+                    {
+                        continue;
+                    }
+
+                    textRuns.Add(shapedCharacters);
+
+                    if (TryGetLineBreak(shapedCharacters, out var runLineBreak))
+                    {
+                        var splitResult = SplitTextRuns(textRuns, currentLength + runLineBreak.PositionWrap);
+
+                        if (++index < previousLineBreak.RemainingCharacters.Count)
+                        {
+                            for (; index < previousLineBreak.RemainingCharacters.Count; index++)
+                            {
+                                splitResult.Second.Add(previousLineBreak.RemainingCharacters[index]);
+                            }
+                        }
+
+                        nextLineBreak = new TextLineBreak(splitResult.Second);
+
+                        return splitResult.First;
+                    }
+
+                    currentLength += shapedCharacters.Text.Length;
+                }
+            }
+
+            firstTextSourceIndex += currentLength;
+
+            var textRunEnumerator = new TextRunEnumerator(textSource, firstTextSourceIndex);
+
+            while (textRunEnumerator.MoveNext())
+            {
+                var textRun = textRunEnumerator.Current;
+
+                switch (textRun)
+                {
+                    case TextCharacters textCharacters:
+                        {
+                            var shapeableRuns = textCharacters.GetShapeableCharacters();
+
+                            foreach (var run in shapeableRuns)
+                            {
+                                var glyphRun = TextShaper.Current.ShapeText(run.Text, run.Properties.Typeface,
+                                    run.Properties.FontRenderingEmSize, run.Properties.CultureInfo);
+
+                                var shapedCharacters = new ShapedTextCharacters(glyphRun, run.Properties);
+
+                                textRuns.Add(shapedCharacters);
+                            }
+
+                            break;
+                        }
+                }
+
+                if (TryGetLineBreak(textRun, out var runLineBreak))
+                {
+                    var splitResult = SplitTextRuns(textRuns, currentLength + runLineBreak.PositionWrap);
+
+                    nextLineBreak = new TextLineBreak(splitResult.Second);
+
+                    return splitResult.First;
+                }
+
+                currentLength += textRun.Text.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;
+
+                if (lineBreak.PositionWrap >= textRun.Text.Length)
+                {
+                    return true;
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Performs text wrapping returns a list of text lines.
+        /// </summary>
+        /// <param name="textRuns">The text run's.</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="currentLineBreak">The current line break if the line was explicitly broken.</param>
+        /// <returns>The wrapped text line.</returns>
+        private static TextLine PerformTextWrapping(List<ShapedTextCharacters> textRuns, TextRange textRange,
+            double paragraphWidth, TextParagraphProperties paragraphProperties, TextLineBreak currentLineBreak)
+        {
+            var availableWidth = paragraphWidth;
+            var currentWidth = 0.0;
+            var runIndex = 0;
+            var currentLength = 0;
+
+            while (runIndex < textRuns.Count)
+            {
+                var currentRun = textRuns[runIndex];
+
+                if (currentWidth + currentRun.Size.Width > availableWidth)
+                {
+                    var breakFound = false;
+
+                    var currentBreakPosition = 0;
+
+                    if (TryMeasureCharacters(currentRun, paragraphWidth - currentWidth, out var measuredLength))
+                    {
+                        if (measuredLength < currentRun.Text.Length)
+                        {
+                            var lineBreaker = new LineBreakEnumerator(currentRun.Text);
+
+                            while (currentBreakPosition < measuredLength && lineBreaker.MoveNext())
+                            {
+                                var nextBreakPosition = lineBreaker.Current.PositionWrap;
+
+                                if (nextBreakPosition == 0 || nextBreakPosition > measuredLength)
+                                {
+                                    break;
+                                }
+
+                                breakFound = lineBreaker.Current.Required ||
+                                             lineBreaker.Current.PositionWrap != currentRun.Text.Length;
+
+                                currentBreakPosition = nextBreakPosition;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // Make sure we wrap at least one character.
+                        if (currentLength == 0)
+                        {
+                            measuredLength = 1;
+                        }
+                    }
+
+                    if (breakFound)
+                    {
+                        measuredLength = currentBreakPosition;
+                    }
+                    else
+                    {
+                        if (paragraphProperties.TextWrapping == TextWrapping.WrapWithOverflow)
+                        {
+                            var lineBreaker = new LineBreakEnumerator(currentRun.Text.Skip(currentBreakPosition));
+
+                            if (lineBreaker.MoveNext())
+                            {
+                                measuredLength = currentBreakPosition + lineBreaker.Current.PositionWrap;
+                            }
+                        }
+                    }
+
+                    currentLength += measuredLength;
+
+                    var splitResult = SplitTextRuns(textRuns, currentLength);
+
+                    var textLineMetrics = TextLineMetrics.Create(splitResult.First,
+                        new TextRange(textRange.Start, currentLength), paragraphWidth, paragraphProperties);
+
+                    var remainingCharacters = splitResult.Second;
+
+                    if (currentLineBreak?.RemainingCharacters != null)
+                    {
+                        if (remainingCharacters != null)
+                        {
+                            remainingCharacters.AddRange(currentLineBreak.RemainingCharacters);
+                        }
+                        else
+                        {
+                            remainingCharacters = new List<ShapedTextCharacters>(currentLineBreak.RemainingCharacters);
+                        }
+                    }
+
+                    var lineBreak = remainingCharacters != null && remainingCharacters.Count > 0 ?
+                        new TextLineBreak(remainingCharacters) :
+                        null;
+
+                    return new TextLineImpl(splitResult.First, textLineMetrics, lineBreak);
+                }
+
+                currentWidth += currentRun.Size.Width;
+
+                currentLength += currentRun.GlyphRun.Characters.Length;
+
+                runIndex++;
+            }
+
+            return new TextLineImpl(textRuns,
+                TextLineMetrics.Create(textRuns, textRange, paragraphWidth, paragraphProperties),
+                currentLineBreak?.RemainingCharacters != null ?
+                    new TextLineBreak(currentLineBreak.RemainingCharacters) :
+                    null);
+        }
+
+        /// <summary>
+        /// Gets the text range that is covered by the text runs.
+        /// </summary>
+        /// <param name="textRuns">The text runs.</param>
+        /// <returns>The text range that is covered by the text runs.</returns>
+        private static TextRange GetTextRange(IReadOnlyList<TextRun> textRuns)
+        {
+            if (textRuns is null || textRuns.Count == 0)
+            {
+                return new TextRange();
+            }
+
+            var firstTextRun = textRuns[0];
+
+            if (textRuns.Count == 1)
+            {
+                return new TextRange(firstTextRun.Text.Start, firstTextRun.Text.Length);
+            }
+
+            var start = firstTextRun.Text.Start;
+
+            var end = textRuns[textRuns.Count - 1].Text.End + 1;
+
+            return new TextRange(start, end - start);
+        }
+
+        internal readonly struct SplitTextRunsResult
+        {
+            public SplitTextRunsResult(List<ShapedTextCharacters> first, List<ShapedTextCharacters> second)
+            {
+                First = first;
+
+                Second = second;
+            }
+
+            /// <summary>
+            /// Gets the first text runs.
+            /// </summary>
+            /// <value>
+            /// The first text runs.
+            /// </value>
+            public List<ShapedTextCharacters> First { get; }
+
+            /// <summary>
+            /// Gets the second text runs.
+            /// </summary>
+            /// <value>
+            /// The second text runs.
+            /// </value>
+            public List<ShapedTextCharacters> Second { get; }
+        }
+
+        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 !(Current is TextEndOfLine);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs
new file mode 100644
index 0000000000..daa8807bf6
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs
@@ -0,0 +1,407 @@
+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 = { '\u200B' };
+
+        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="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,
+            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, lineHeight);
+
+            _textTrimming = textTrimming;
+
+            _textStyleOverrides = textStyleOverrides;
+
+            LineHeight = lineHeight;
+
+            MaxWidth = maxWidth;
+
+            MaxHeight = maxHeight;
+
+            MaxLines = maxLines;
+
+            UpdateLayout();
+        }
+
+        /// <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>
+        public void Draw(DrawingContext context)
+        {
+            if (!TextLines.Any())
+            {
+                return;
+            }
+
+            var currentY = 0.0;
+
+            foreach (var textLine in TextLines)
+            {
+                var offsetX = TextLine.GetParagraphOffsetX(textLine.LineMetrics.Size.Width, Size.Width,
+                    _paragraphProperties.TextAlignment);
+
+                using (context.PushPostTransform(Matrix.CreateTranslation(offsetX, currentY)))
+                {
+                    textLine.Draw(context);
+                }
+
+                currentY += textLine.LineMetrics.Size.Height;
+            }
+        }
+
+        /// <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="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, double lineHeight)
+        {
+            var textRunStyle = new GenericTextRunProperties(typeface, fontSize, textDecorations, foreground);
+
+            return new GenericTextParagraphProperties(textRunStyle, textAlignment, textWrapping, lineHeight);
+        }
+
+        /// <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)
+        {
+            if (width < textLine.LineMetrics.Size.Width)
+            {
+                width = textLine.LineMetrics.Size.Width;
+            }
+
+            height += textLine.LineMetrics.Size.Height;
+        }
+
+        /// <summary>
+        /// Creates an empty text line.
+        /// </summary>
+        /// <returns>The empty text line.</returns>
+        private TextLine CreateEmptyTextLine(int startingIndex)
+        {
+            var properties = _paragraphProperties.DefaultTextRunProperties;
+
+            var glyphRun = TextShaper.Current.ShapeText(new ReadOnlySlice<char>(s_empty, startingIndex, 1),
+                properties.Typeface, properties.FontRenderingEmSize, properties.CultureInfo);
+
+            var textRuns = new List<ShapedTextCharacters>
+            {
+                new ShapedTextCharacters(glyphRun, _paragraphProperties.DefaultTextRunProperties)
+            };
+
+            return new TextLineImpl(textRuns,
+                TextLineMetrics.Create(textRuns, new TextRange(startingIndex, 1), MaxWidth, _paragraphProperties));
+        }
+
+        /// <summary>
+        /// Updates the layout and applies specified text style overrides.
+        /// </summary>
+        private void UpdateLayout()
+        {
+            if (_text.IsEmpty || MathUtilities.IsZero(MaxWidth) || MathUtilities.IsZero(MaxHeight))
+            {
+                var textLine = CreateEmptyTextLine(0);
+
+                TextLines = new List<TextLine> { textLine };
+
+                Size = new Size(0, textLine.LineMetrics.Size.Height);
+            }
+            else
+            {
+                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.LineMetrics.Size.Height > MaxHeight)
+                        {
+                            if (previousLine?.TextLineBreak != null && _textTrimming != TextTrimming.None)
+                            {
+                                var collapsedLine =
+                                    previousLine.Collapse(GetCollapsingProperties(MaxWidth));
+
+                                textLines[textLines.Count - 1] = collapsedLine;
+                            }
+
+                            break;
+                        }
+                    }
+
+                    var hasOverflowed = textLine.LineMetrics.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.TextLineBreak == null)
+                    {
+                        continue;
+                    }
+
+                    var emptyTextLine = CreateEmptyTextLine(currentPosition);
+
+                    textLines.Add(emptyTextLine);
+                }
+
+                Size = new Size(width, height);
+
+                TextLines = 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(),
+            };
+        }
+
+        private 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.End)
+                {
+                    return new TextEndOfLine();
+                }
+
+                var runText = _text.Skip(textSourceIndex);
+
+                if (runText.IsEmpty)
+                {
+                    return new TextEndOfLine();
+                }
+
+                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.End < 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.Min(text.Length - length, textRange.Length);
+
+                    if (hasOverride)
+                    {
+                        continue;
+                    }
+
+                    hasOverride = true;
+
+                    currentProperties = propertiesOverride.Value;
+                }
+
+                if (length < text.Length && i == textModifier.Count)
+                {
+                    if (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/TextLine.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextLine.cs
new file mode 100644
index 0000000000..8a1efa0611
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextLine.cs
@@ -0,0 +1,129 @@
+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 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 text runs.
+        /// </summary>
+        /// <value>
+        /// The text runs.
+        /// </value>
+        public abstract IReadOnlyList<TextRun> TextRuns { get; }
+
+        /// <summary>
+        /// Gets the line metrics.
+        /// </summary>
+        /// <value>
+        /// The line metrics.
+        /// </value>
+        public abstract TextLineMetrics LineMetrics { 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 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>
+        /// Draws the <see cref="TextLine"/> at the given origin.
+        /// </summary>
+        /// <param name="drawingContext">The drawing context.</param>
+        public abstract void Draw(DrawingContext drawingContext);
+
+        /// <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="lineWidth">The line width.</param>
+        /// <param name="paragraphWidth">The paragraph width.</param>
+        /// <param name="textAlignment">The text alignment.</param>
+        /// <returns>The paragraph offset.</returns>
+        internal static double GetParagraphOffsetX(double lineWidth, double paragraphWidth, TextAlignment textAlignment)
+        {
+            if (double.IsPositiveInfinity(paragraphWidth))
+            {
+                return 0;
+            }
+
+            switch (textAlignment)
+            {
+                case TextAlignment.Center:
+                    return (paragraphWidth - lineWidth) / 2;
+
+                case TextAlignment.Right:
+                    return paragraphWidth - lineWidth;
+
+                default:
+                    return 0.0f;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextLineBreak.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextLineBreak.cs
new file mode 100644
index 0000000000..c24454cb76
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextLineBreak.cs
@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Media.TextFormatting
+{
+    public class TextLineBreak
+    {
+        public TextLineBreak(IReadOnlyList<ShapedTextCharacters> remainingCharacters)
+        {
+            RemainingCharacters = remainingCharacters;
+        }
+
+        /// <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
new file mode 100644
index 0000000000..fc98e9f6f8
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextLineImpl.cs
@@ -0,0 +1,415 @@
+using System.Collections.Generic;
+using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.Platform;
+
+namespace Avalonia.Media.TextFormatting
+{
+    internal class TextLineImpl : TextLine
+    {
+        private readonly List<ShapedTextCharacters> _textRuns;
+
+        public TextLineImpl(List<ShapedTextCharacters> textRuns, TextLineMetrics lineMetrics,
+            TextLineBreak lineBreak = null, bool hasCollapsed = false)
+        {
+            _textRuns = textRuns;
+            LineMetrics = lineMetrics;
+            TextLineBreak = lineBreak;
+            HasCollapsed = hasCollapsed;
+        }
+
+        /// <inheritdoc/>
+        public override TextRange TextRange => LineMetrics.TextRange;
+
+        /// <inheritdoc/>
+        public override IReadOnlyList<TextRun> TextRuns => _textRuns;
+
+        /// <inheritdoc/>
+        public override TextLineMetrics LineMetrics { get; }
+
+        /// <inheritdoc/>
+        public override TextLineBreak TextLineBreak { get; }
+
+        /// <inheritdoc/>
+        public override bool HasCollapsed { get; }
+
+        /// <inheritdoc/>
+        public override void Draw(DrawingContext drawingContext)
+        {
+            var currentX = 0.0;
+
+            foreach (var textRun in _textRuns)
+            {
+                var offsetY = LineMetrics.TextBaseline - textRun.GlyphRun.BaselineOrigin.Y;
+
+                using (drawingContext.PushPostTransform(Matrix.CreateTranslation(currentX, offsetY)))
+                {
+                    textRun.Draw(drawingContext);
+                }
+
+                currentX += textRun.Size.Width;
+            }
+        }
+
+        /// <inheritdoc/>
+        public override TextLine Collapse(params TextCollapsingProperties[] collapsingPropertiesList)
+        {
+            if (collapsingPropertiesList == null || collapsingPropertiesList.Length == 0)
+            {
+                return this;
+            }
+
+            var collapsingProperties = collapsingPropertiesList[0];
+            var runIndex = 0;
+            var currentWidth = 0.0;
+            var textRange = TextRange;
+            var collapsedLength = 0;
+            TextLineMetrics textLineMetrics;
+
+            var shapedSymbol = CreateShapedSymbol(collapsingProperties.Symbol);
+
+            var availableWidth = collapsingProperties.Width - shapedSymbol.Size.Width;
+
+            while (runIndex < _textRuns.Count)
+            {
+                var currentRun = _textRuns[runIndex];
+
+                currentWidth += currentRun.Size.Width;
+
+                if (currentWidth > availableWidth)
+                {
+                    if (TextFormatterImpl.TryMeasureCharacters(currentRun, 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.PositionWrap;
+
+                                if (nextBreakPosition == 0)
+                                {
+                                    break;
+                                }
+
+                                if (nextBreakPosition > measuredLength)
+                                {
+                                    break;
+                                }
+
+                                currentBreakPosition = nextBreakPosition;
+                            }
+
+                            measuredLength = currentBreakPosition;
+                        }
+                    }
+
+                    collapsedLength += measuredLength;
+
+                    var splitResult = TextFormatterImpl.SplitTextRuns(_textRuns, collapsedLength);
+
+                    var shapedTextCharacters = new List<ShapedTextCharacters>(splitResult.First.Count + 1);
+
+                    shapedTextCharacters.AddRange(splitResult.First);
+
+                    shapedTextCharacters.Add(shapedSymbol);
+
+                    textRange = new TextRange(textRange.Start, collapsedLength);
+
+                    var shapedWidth = GetShapedWidth(shapedTextCharacters);
+
+                    textLineMetrics = new TextLineMetrics(new Size(shapedWidth, LineMetrics.Size.Height),
+                        LineMetrics.TextBaseline, textRange, false);
+
+                    return new TextLineImpl(shapedTextCharacters, textLineMetrics, TextLineBreak, true);
+                }
+
+                availableWidth -= currentRun.Size.Width;
+
+                collapsedLength += currentRun.GlyphRun.Characters.Length;
+
+                runIndex++;
+            }
+
+            textLineMetrics =
+                new TextLineMetrics(LineMetrics.Size.WithWidth(LineMetrics.Size.Width + shapedSymbol.Size.Width),
+                    LineMetrics.TextBaseline, TextRange, LineMetrics.HasOverflowed);
+
+            return new TextLineImpl(new List<ShapedTextCharacters>(_textRuns) { shapedSymbol }, textLineMetrics, null,
+                true);
+        }
+
+        /// <inheritdoc/>
+        public override CharacterHit GetCharacterHitFromDistance(double distance)
+        {
+            if (distance < 0)
+            {
+                // hit happens before the line, return the first position
+                return new CharacterHit(TextRange.Start);
+            }
+
+            // 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)
+        {
+            return DistanceFromCodepointIndex(characterHit.FirstCharacterIndex + (characterHit.TrailingLength != 0 ? 1 : 0));
+        }
+
+        /// <inheritdoc/>
+        public override CharacterHit GetNextCaretCharacterHit(CharacterHit characterHit)
+        {
+            if (TryFindNextCharacterHit(characterHit, out var nextCharacterHit))
+            {
+                return nextCharacterHit;
+            }
+
+            if (characterHit.FirstCharacterIndex + characterHit.TrailingLength <= TextRange.Start + TextRange.Length)
+            {
+                return characterHit; // Can't move, we're after the last character
+            }
+
+            var runIndex = GetRunIndexAtCodepointIndex(TextRange.End);
+
+            var textRun = _textRuns[runIndex];
+
+            characterHit = textRun.GlyphRun.GetNextCaretCharacterHit(characterHit);
+
+            return characterHit; // Can't move, we're after the last character
+        }
+
+        /// <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);
+        }
+
+        /// <summary>
+        /// Get distance from line start to the specified codepoint index.
+        /// </summary>
+        private double DistanceFromCodepointIndex(int codepointIndex)
+        {
+            var currentDistance = 0.0;
+
+            foreach (var textRun in _textRuns)
+            {
+                if (codepointIndex > textRun.Text.End)
+                {
+                    currentDistance += textRun.Size.Width;
+
+                    continue;
+                }
+
+                return currentDistance + textRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(codepointIndex));
+            }
+
+            return currentDistance;
+        }
+
+        /// <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
+            }
+
+            var runIndex = GetRunIndexAtCodepointIndex(codepointIndex);
+
+            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;
+
+                var characterIndex = codepointIndex - run.Text.Start;
+
+                var codepoint = Codepoint.ReadAt(run.GlyphRun.Characters, characterIndex, out _);
+
+                if (codepoint.IsBreakChar)
+                {
+                    foundCharacterHit = run.GlyphRun.FindNearestCharacterHit(codepointIndex - 1, out _);
+
+                    isAtEnd = true;
+                }
+
+                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)
+        {
+            if (characterHit.FirstCharacterIndex == TextRange.Start)
+            {
+                previousCharacterHit = new CharacterHit(TextRange.Start);
+
+                return true;
+            }
+
+            previousCharacterHit = characterHit;
+
+            var codepointIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
+
+            if (codepointIndex < TextRange.Start)
+            {
+                return false; // Cannot go backward anymore.
+            }
+
+            var runIndex = GetRunIndexAtCodepointIndex(codepointIndex);
+
+            while (runIndex >= 0)
+            {
+                var run = _textRuns[runIndex];
+
+                var foundCharacterHit = run.GlyphRun.FindNearestCharacterHit(characterHit.FirstCharacterIndex - 1, out _);
+
+                previousCharacterHit = characterHit.TrailingLength != 0 ?
+                    foundCharacterHit :
+                    new CharacterHit(foundCharacterHit.FirstCharacterIndex);
+
+                if (previousCharacterHit.FirstCharacterIndex < characterHit.FirstCharacterIndex)
+                {
+                    return true;
+                }
+
+                runIndex--;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Gets the run index of the specified codepoint index.
+        /// </summary>
+        /// <param name="codepointIndex">The codepoint index.</param>
+        /// <returns>The text run index.</returns>
+        private int GetRunIndexAtCodepointIndex(int codepointIndex)
+        {
+            if (codepointIndex >= TextRange.End)
+            {
+                return _textRuns.Count - 1;
+            }
+
+            if (codepointIndex <= 0)
+            {
+                return 0;
+            }
+
+            var runIndex = 0;
+
+            while (runIndex < _textRuns.Count)
+            {
+                var run = _textRuns[runIndex];
+
+                if (run.Text.End > codepointIndex)
+                {
+                    return runIndex;
+                }
+
+                runIndex++;
+            }
+
+            return runIndex;
+        }
+
+        /// <summary>
+        /// Creates a shaped symbol.
+        /// </summary>
+        /// <param name="textRun">The symbol run to shape.</param>
+        /// <returns>
+        /// The shaped symbol.
+        /// </returns>
+        internal static ShapedTextCharacters CreateShapedSymbol(TextRun textRun)
+        {
+            var formatterImpl = AvaloniaLocator.Current.GetService<ITextShaperImpl>();
+
+            var glyphRun = formatterImpl.ShapeText(textRun.Text, textRun.Properties.Typeface, textRun.Properties.FontRenderingEmSize,
+                textRun.Properties.CultureInfo);
+
+            return new ShapedTextCharacters(glyphRun, textRun.Properties);
+        }
+
+        /// <summary>
+        /// Gets the shaped width of specified shaped text characters.
+        /// </summary>
+        /// <param name="shapedTextCharacters">The shaped text characters.</param>
+        /// <returns>
+        /// The shaped width.
+        /// </returns>
+        private static double GetShapedWidth(IReadOnlyList<ShapedTextCharacters> shapedTextCharacters)
+        {
+            var shapedWidth = 0.0;
+
+            for (var i = 0; i < shapedTextCharacters.Count; i++)
+            {
+                shapedWidth += shapedTextCharacters[i].Size.Width;
+            }
+
+            return shapedWidth;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextLineMetrics.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextLineMetrics.cs
new file mode 100644
index 0000000000..c4d7527659
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextLineMetrics.cs
@@ -0,0 +1,96 @@
+using System.Collections.Generic;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Represents a metric for a <see cref="TextLine"/> objects,
+    /// that holds information about ascent, descent, line gap, size and origin of the text line.
+    /// </summary>
+    public readonly struct TextLineMetrics
+    {
+        public TextLineMetrics(Size size, double textBaseline, TextRange textRange, bool hasOverflowed)
+        {
+            Size = size;
+            TextBaseline = textBaseline;
+            TextRange = textRange;
+            HasOverflowed = hasOverflowed;
+        }
+
+        /// <summary>
+        /// Gets the text range that is covered by the text line.
+        /// </summary>
+        /// <value>
+        /// The text range that is covered by the text line.
+        /// </value>
+        public TextRange TextRange { get; }
+
+        /// <summary>
+        /// Gets the size of the text line.
+        /// </summary>
+        /// <value>
+        /// The size.
+        /// </value>
+        public Size Size { get; }
+
+        /// <summary>
+        /// Gets the distance from the top to the baseline of the line of text.
+        /// </summary>
+        public double TextBaseline { get; }
+
+        /// <summary>
+        /// Gets a boolean value that indicates whether content of the line overflows 
+        /// the specified paragraph width.
+        /// </summary>
+        public bool HasOverflowed { get; }
+
+        /// <summary>
+        /// Creates the text line metrics.
+        /// </summary>
+        /// <param name="textRuns">The text runs.</param>
+        /// <param name="textRange">The text range that is covered by the text line.</param>
+        /// <param name="paragraphWidth">The paragraph width.</param>
+        /// <param name="paragraphProperties">The text alignment.</param>
+        /// <returns></returns>
+        public static TextLineMetrics Create(IEnumerable<TextRun> textRuns, TextRange textRange, double paragraphWidth,
+            TextParagraphProperties paragraphProperties)
+        {
+            var lineWidth = 0.0;
+            var ascent = 0.0;
+            var descent = 0.0;
+            var lineGap = 0.0;
+
+            foreach (var textRun in textRuns)
+            {
+                var shapedRun = (ShapedTextCharacters)textRun;
+
+                var fontMetrics =
+                    new FontMetrics(shapedRun.Properties.Typeface, shapedRun.Properties.FontRenderingEmSize);
+
+                lineWidth += shapedRun.Size.Width;
+
+                if (ascent > fontMetrics.Ascent)
+                {
+                    ascent = fontMetrics.Ascent;
+                }
+
+                if (descent < fontMetrics.Descent)
+                {
+                    descent = fontMetrics.Descent;
+                }
+
+                if (lineGap < fontMetrics.LineGap)
+                {
+                    lineGap = fontMetrics.LineGap;
+                }
+            }
+
+            var size = new Size(lineWidth,
+                double.IsNaN(paragraphProperties.LineHeight) || MathUtilities.IsZero(paragraphProperties.LineHeight) ?
+                    descent - ascent + lineGap :
+                    paragraphProperties.LineHeight);
+
+            return new TextLineMetrics(size, -ascent, textRange, size.Width > paragraphWidth);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextParagraphProperties.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextParagraphProperties.cs
new file mode 100644
index 0000000000..3ecd1aafd9
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextParagraphProperties.cs
@@ -0,0 +1,34 @@
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Provides a set of properties that are used during the paragraph layout.
+    /// </summary>
+    public abstract class TextParagraphProperties
+    {
+        /// <summary>
+        /// Gets the text alignment.
+        /// </summary>
+        public abstract TextAlignment TextAlignment { get; }
+
+        /// <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>
+        /// Paragraph's line height
+        /// </summary>
+        public abstract double LineHeight { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextRange.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextRange.cs
new file mode 100644
index 0000000000..1177c758f4
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextRange.cs
@@ -0,0 +1,70 @@
+using System;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// References a portion of a text buffer.
+    /// </summary>
+    public readonly struct TextRange
+    {
+        public TextRange(int start, int length)
+        {
+            Start = start;
+            Length = length;
+        }
+
+        /// <summary>
+        /// Gets the start.
+        /// </summary>
+        /// <value>
+        /// The start.
+        /// </value>
+        public int Start { get; }
+
+        /// <summary>
+        /// Gets the length.
+        /// </summary>
+        /// <value>
+        /// The length.
+        /// </value>
+        public int Length { get; }
+
+        /// <summary>
+        /// Gets the end.
+        /// </summary>
+        /// <value>
+        /// The end.
+        /// </value>
+        public int End => Start + Length - 1;
+
+        /// <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="TextRange"/> that contains the specified number of elements from the start of this slice.</returns>
+        public TextRange Take(int length)
+        {
+            if (length > Length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(length));
+            }
+
+            return new TextRange(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="TextRange"/> that contains the elements that occur after the specified index in this slice.</returns>
+        public TextRange Skip(int length)
+        {
+            if (length > Length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(length));
+            }
+
+            return new TextRange(Start + length, Length - length);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextRun.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextRun.cs
new file mode 100644
index 0000000000..c15a771755
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextRun.cs
@@ -0,0 +1,55 @@
+using System.Diagnostics;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting
+{
+    /// <summary>
+    /// Represents a portion of a <see cref="TextLine"/> object.
+    /// </summary>
+    [DebuggerTypeProxy(typeof(TextRunDebuggerProxy))]
+    public abstract class TextRun
+    {
+        public static readonly int DefaultTextSourceLength = 1;
+
+        /// <summary>
+        ///  Gets the text source length.
+        /// </summary>
+        public virtual int TextSourceLength => DefaultTextSourceLength;
+
+        /// <summary>
+        /// Gets the text run's text.
+        /// </summary>
+        public virtual ReadOnlySlice<char> Text => default;
+
+        /// <summary>
+        /// A set of properties shared by every characters in the run
+        /// </summary>
+        public virtual TextRunProperties Properties => null;
+
+        private class TextRunDebuggerProxy
+        {
+            private readonly TextRun _textRun;
+
+            public TextRunDebuggerProxy(TextRun textRun)
+            {
+                _textRun = textRun;
+            }
+
+            public string Text
+            {
+                get
+                {
+                    unsafe
+                    {
+                        fixed (char* charsPtr = _textRun.Text.Buffer.Span)
+                        {
+                            return new string(charsPtr, 0, _textRun.Text.Length);
+                        }
+                    }
+                }
+            }
+
+            public TextRunProperties Properties => _textRun.Properties;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextRunProperties.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextRunProperties.cs
new file mode 100644
index 0000000000..c4f9443c3d
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextRunProperties.cs
@@ -0,0 +1,89 @@
+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; }
+
+        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 != null ? Typeface.GetHashCode() : 0);
+                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
new file mode 100644
index 0000000000..a02ace408f
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextShaper.cs
@@ -0,0 +1,54 @@
+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 GlyphRun ShapeText(ReadOnlySlice<char> text, Typeface typeface, double fontRenderingEmSize,
+            CultureInfo culture)
+        {
+            return _platformImpl.ShapeText(text, typeface, fontRenderingEmSize, culture);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextTrailingCharacterEllipsis.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextTrailingCharacterEllipsis.cs
new file mode 100644
index 0000000000..4bd46e8c75
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextTrailingCharacterEllipsis.cs
@@ -0,0 +1,33 @@
+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
new file mode 100644
index 0000000000..9dffddd207
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextTrailingWordEllipsis.cs
@@ -0,0 +1,37 @@
+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/BiDiClass.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiClass.cs
new file mode 100644
index 0000000000..ad3cc9141b
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BiDiClass.cs
@@ -0,0 +1,29 @@
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    public enum BiDiClass
+    {
+        LeftToRight, //L
+        ArabicLetter, //AL
+        ArabicNumber, //AN
+        ParagraphSeparator, //B
+        BoundaryNeutral, //BN
+        CommonSeparator, //CS
+        EuropeanNumber, //EN
+        EuropeanSeparator, //ES
+        EuropeanTerminator, //ET
+        FirstStrongIsolate, //FSI
+        LeftToRightEmbedding, //LRE
+        LeftToRightIsolate, //LRI
+        LeftToRightOverride, //LRO
+        NonspacingMark, //NSM
+        OtherNeutral, //ON
+        PopDirectionalFormat, //PDF
+        PopDirectionalIsolate, //PDI
+        RightToLeft, //R
+        RightToLeftEmbedding, //RLE
+        RightToLeftIsolate, //RLI
+        RightToLeftOverride, //RLO
+        SegmentSeparator, //S
+        WhiteSpace, //WS
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BinaryReaderExtensions.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BinaryReaderExtensions.cs
new file mode 100644
index 0000000000..412007c6e0
--- /dev/null
+++ b/src/Avalonia.Visuals/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
+// 
+// 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/BreakPairTable.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BreakPairTable.cs
new file mode 100644
index 0000000000..86d39a4283
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/BreakPairTable.cs
@@ -0,0 +1,56 @@
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    internal static class BreakPairTable
+    {
+        private static readonly byte[][] s_breakPairTable = 
+            {
+             new byte[] {4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,3,4,4,4,4,4,4,4,4,4,4,4},
+             new byte[] {0,4,4,1,1,4,4,4,4,1,1,0,0,0,0,4,1,1,0,0,4,2,4,0,0,0,0,0,0,0,0,1,0},
+             new byte[] {0,4,4,1,1,4,4,4,4,1,1,1,1,1,0,4,1,1,0,0,4,2,4,0,0,0,0,0,0,0,0,1,0},
+             new byte[] {4,4,4,1,1,1,4,4,4,1,1,1,1,1,1,1,1,1,1,1,4,2,4,1,1,1,1,1,1,1,1,1,1},
+             new byte[] {1,4,4,1,1,1,4,4,4,1,1,1,1,1,1,1,1,1,1,1,4,2,4,1,1,1,1,1,1,1,1,1,1},
+             new byte[] {0,4,4,1,1,1,4,4,4,0,0,0,0,0,0,0,1,1,0,0,4,2,4,0,0,0,0,0,0,0,0,1,0},
+             new byte[] {0,4,4,1,1,1,4,4,4,0,0,0,0,0,0,1,1,1,0,0,4,2,4,0,0,0,0,0,0,0,0,1,0},
+             new byte[] {0,4,4,1,1,1,4,4,4,0,0,1,0,1,0,0,1,1,0,0,4,2,4,0,0,0,0,0,0,0,0,1,0},
+             new byte[] {0,4,4,1,1,1,4,4,4,0,0,1,1,1,0,0,1,1,0,0,4,2,4,0,0,0,0,0,0,0,0,1,0},
+             new byte[] {1,4,4,1,1,1,4,4,4,0,0,1,1,1,1,0,1,1,0,0,4,2,4,1,1,1,1,1,0,1,1,1,0},
+             new byte[] {1,4,4,1,1,1,4,4,4,0,0,1,1,1,0,0,1,1,0,0,4,2,4,0,0,0,0,0,0,0,0,1,0},
+             new byte[] {1,4,4,1,1,1,4,4,4,1,1,1,1,1,0,1,1,1,0,0,4,2,4,0,0,0,0,0,0,0,0,1,0},
+             new byte[] {1,4,4,1,1,1,4,4,4,1,1,1,1,1,0,1,1,1,0,0,4,2,4,0,0,0,0,0,0,0,0,1,0},
+             new byte[] {1,4,4,1,1,1,4,4,4,1,1,1,1,1,0,1,1,1,0,0,4,2,4,0,0,0,0,0,0,0,0,1,0},
+             new byte[] {0,4,4,1,1,1,4,4,4,0,1,0,0,0,0,1,1,1,0,0,4,2,4,0,0,0,0,0,0,0,0,1,0},
+             new byte[] {0,4,4,1,1,1,4,4,4,0,0,0,0,0,0,1,1,1,0,0,4,2,4,0,0,0,0,0,0,0,0,1,0},
+             new byte[] {0,4,4,1,0,1,4,4,4,0,0,1,0,0,0,0,1,1,0,0,4,2,4,0,0,0,0,0,0,0,0,1,0},
+             new byte[] {0,4,4,1,0,1,4,4,4,0,0,0,0,0,0,0,1,1,0,0,4,2,4,0,0,0,0,0,0,0,0,1,0},
+             new byte[] {1,4,4,1,1,1,4,4,4,1,1,1,1,1,1,1,1,1,1,1,4,2,4,1,1,1,1,1,1,1,1,1,0},
+             new byte[] {0,4,4,1,1,1,4,4,4,0,0,0,0,0,0,0,1,1,0,4,4,2,4,0,0,0,0,0,0,0,0,1,0},
+             new byte[] {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},
+             new byte[] {1,4,4,1,1,1,4,4,4,1,1,1,1,1,0,1,1,1,0,0,4,2,4,0,0,0,0,0,0,0,0,1,0},
+             new byte[] {1,4,4,1,1,1,4,4,4,1,1,1,1,1,1,1,1,1,1,1,4,2,4,1,1,1,1,1,1,1,1,1,1},
+             new byte[] {0,4,4,1,1,1,4,4,4,0,1,0,0,0,0,1,1,1,0,0,4,2,4,0,0,0,1,1,0,0,0,1,0},
+             new byte[] {0,4,4,1,1,1,4,4,4,0,1,0,0,0,0,1,1,1,0,0,4,2,4,0,0,0,0,1,0,0,0,1,0},
+             new byte[] {0,4,4,1,1,1,4,4,4,0,1,0,0,0,0,1,1,1,0,0,4,2,4,1,1,1,1,0,0,0,0,1,0},
+             new byte[] {0,4,4,1,1,1,4,4,4,0,1,0,0,0,0,1,1,1,0,0,4,2,4,0,0,0,1,1,0,0,0,1,0},
+             new byte[] {0,4,4,1,1,1,4,4,4,0,1,0,0,0,0,1,1,1,0,0,4,2,4,0,0,0,0,1,0,0,0,1,0},
+             new byte[] {0,4,4,1,1,1,4,4,4,0,0,0,0,0,0,0,1,1,0,0,4,2,4,0,0,0,0,0,1,0,0,1,0},
+             new byte[] {0,4,4,1,1,1,4,4,4,0,1,0,0,0,0,1,1,1,0,0,4,2,4,0,0,0,0,0,0,0,1,1,0},
+             new byte[] {0,4,4,1,1,1,4,4,4,0,1,0,0,0,0,1,1,1,0,0,4,2,4,0,0,0,0,0,0,0,0,1,0},
+             new byte[] {1,4,4,1,1,1,4,4,4,1,1,1,1,1,0,1,1,1,0,0,4,2,4,0,0,0,0,0,0,0,0,1,0},
+             new byte[] {0,4,4,1,1,0,4,4,4,0,0,0,0,0,0,0,0,0,0,0,4,2,4,0,0,0,0,0,0,0,0,1,0},
+        };
+
+        public static PairBreakType Map(LineBreakClass first, LineBreakClass second)
+        {
+            return (PairBreakType)s_breakPairTable[(int)first][(int)second];
+        }
+    }
+
+    internal enum PairBreakType : byte
+    {
+        DI = 0, // Direct break opportunity
+        IN = 1, // Indirect break opportunity
+        CI = 2, // Indirect break opportunity for combining marks
+        CP = 3, // Prohibited break for combining marks
+        PR = 4 // Prohibited break
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/Codepoint.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/Codepoint.cs
new file mode 100644
index 0000000000..2f46fdd9d0
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/Codepoint.cs
@@ -0,0 +1,169 @@
+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');
+
+        private readonly int _value;
+
+        public Codepoint(int value)
+        {
+            _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.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;
+            }
+        }
+
+        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/CodepointEnumerator.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/CodepointEnumerator.cs
new file mode 100644
index 0000000000..9e1f748ebb
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/CodepointEnumerator.cs
@@ -0,0 +1,40 @@
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    public ref struct CodepointEnumerator
+    {
+        private ReadOnlySlice<char> _text;
+
+        public CodepointEnumerator(ReadOnlySlice<char> text)
+        {
+            _text = text;
+            Current = Codepoint.ReplacementCodepoint;
+        }
+
+        /// <summary>
+        /// Gets the current <see cref="Codepoint"/>.
+        /// </summary>
+        public Codepoint Current { get; private set; }
+
+        /// <summary>
+        /// Moves to the next <see cref="Codepoint"/>.
+        /// </summary>
+        /// <returns></returns>
+        public bool MoveNext()
+        {
+            if (_text.IsEmpty)
+            {
+                Current = Codepoint.ReplacementCodepoint;
+
+                return false;
+            }
+
+            Current = Codepoint.ReadAt(_text, 0, out var count);
+
+            _text = _text.Skip(count);
+
+            return true;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/GeneralCategory.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/GeneralCategory.cs
new file mode 100644
index 0000000000..3ca55e1336
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/GeneralCategory.cs
@@ -0,0 +1,44 @@
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    public enum GeneralCategory
+    {
+        Other, //C# Cc | Cf | Cn | Co | Cs
+        Control, //Cc
+        Format, //Cf
+        Unassigned, //Cn
+        PrivateUse, //Co
+        Surrogate, //Cs
+        Letter, //L# Ll | Lm | Lo | Lt | Lu
+        CasedLetter, //LC# Ll | Lt | Lu
+        LowercaseLetter, //Ll
+        ModifierLetter, //Lm
+        OtherLetter, //Lo
+        TitlecaseLetter, //Lt
+        UppercaseLetter, //Lu
+        Mark, //M
+        SpacingMark, //Mc
+        EnclosingMark, //Me
+        NonspacingMark, //Mn
+        Number, //N# Nd | Nl | No
+        DecimalNumber, //Nd
+        LetterNumber, //Nl
+        OtherNumber, //No
+        Punctuation, //P
+        ConnectorPunctuation, //Pc
+        DashPunctuation, //Pd
+        ClosePunctuation, //Pe
+        FinalPunctuation, //Pf
+        InitialPunctuation, //Pi
+        OtherPunctuation, //Po
+        OpenPunctuation, //Ps
+        Symbol, //S# Sc | Sk | Sm | So
+        CurrencySymbol, //Sc
+        ModifierSymbol, //Sk
+        MathSymbol, //Sm
+        OtherSymbol, //So
+        Separator, //Z# Zl | Zp | Zs
+        LineSeparator, //Zl
+        ParagraphSeparator, //Zp
+        SpaceSeparator, //Zs
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/Grapheme.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/Grapheme.cs
new file mode 100644
index 0000000000..f268340eb9
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/Grapheme.cs
@@ -0,0 +1,26 @@
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    /// <summary>
+    /// Represents the smallest unit of a writing system of any given language.
+    /// </summary>
+    public readonly struct Grapheme
+    {
+        public Grapheme(Codepoint firstCodepoint, ReadOnlySlice<char> text)
+        {
+            FirstCodepoint = firstCodepoint;
+            Text = text;
+        }
+
+        /// <summary>
+        /// The first <see cref="Codepoint"/> of the grapheme cluster.
+        /// </summary>
+        public Codepoint FirstCodepoint { get; }
+
+        /// <summary>
+        /// The text that is representing the <see cref="Grapheme"/>.
+        /// </summary>
+        public ReadOnlySlice<char> Text { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/GraphemeBreakClass.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/GraphemeBreakClass.cs
new file mode 100644
index 0000000000..71e4bce106
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/GraphemeBreakClass.cs
@@ -0,0 +1,21 @@
+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/GraphemeEnumerator.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/GraphemeEnumerator.cs
new file mode 100644
index 0000000000..1e4ac8fe0f
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/GraphemeEnumerator.cs
@@ -0,0 +1,263 @@
+// This source file is adapted from the .NET cross-platform runtime project. 
+// (https://github.com/dotnet/runtime/) 
+// 
+// Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
+
+using System.Runtime.InteropServices;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    public ref struct GraphemeEnumerator
+    {
+        private ReadOnlySlice<char> _text;
+
+        public GraphemeEnumerator(ReadOnlySlice<char> text)
+        {
+            _text = text;
+            Current = default;
+        }
+
+        /// <summary>
+        /// Gets the current <see cref="Grapheme"/>.
+        /// </summary>
+        public Grapheme Current { get; private set; }
+
+        /// <summary>
+        /// Moves to the next <see cref="Grapheme"/>.
+        /// </summary>
+        /// <returns></returns>
+        public bool MoveNext()
+        {
+            if (_text.IsEmpty)
+            {
+                return false;
+            }
+
+            // Algorithm given at https://www.unicode.org/reports/tr29/#Grapheme_Cluster_Boundary_Rules.
+
+            var processor = new Processor(_text);
+
+            processor.MoveNext();
+
+            var firstCodepoint = processor.CurrentCodepoint;
+
+            // First, consume as many Prepend scalars as we can (rule GB9b).
+            while (processor.CurrentType == GraphemeBreakClass.Prepend)
+            {
+                processor.MoveNext();
+            }
+
+            // Next, make sure we're not about to violate control character restrictions.
+            // Essentially, if we saw Prepend data, we can't have Control | CR | LF data afterward (rule GB5).
+            if (processor.CurrentCodeUnitOffset > 0)
+            {
+                if (processor.CurrentType == GraphemeBreakClass.Control
+                    || processor.CurrentType == GraphemeBreakClass.CR
+                    || processor.CurrentType == GraphemeBreakClass.LF)
+                {
+                    goto Return;
+                }
+            }
+
+            // Now begin the main state machine.
+
+            var previousClusterBreakType = processor.CurrentType;
+
+            processor.MoveNext();
+
+            switch (previousClusterBreakType)
+            {
+                case GraphemeBreakClass.CR:
+                    if (processor.CurrentType != GraphemeBreakClass.LF)
+                    {
+                        goto Return; // rules GB3 & GB4 (only <LF> can follow <CR>)
+                    }
+
+                    processor.MoveNext();
+                    goto case GraphemeBreakClass.LF;
+
+                case GraphemeBreakClass.Control:
+                case GraphemeBreakClass.LF:
+                    goto Return; // rule GB4 (no data after Control | LF)
+
+                case GraphemeBreakClass.L:
+                    if (processor.CurrentType == GraphemeBreakClass.L)
+                    {
+                        processor.MoveNext(); // rule GB6 (L x L)
+                        goto case GraphemeBreakClass.L;
+                    }
+                    else if (processor.CurrentType == GraphemeBreakClass.V)
+                    {
+                        processor.MoveNext(); // rule GB6 (L x V)
+                        goto case GraphemeBreakClass.V;
+                    }
+                    else if (processor.CurrentType == GraphemeBreakClass.LV)
+                    {
+                        processor.MoveNext(); // rule GB6 (L x LV)
+                        goto case GraphemeBreakClass.LV;
+                    }
+                    else if (processor.CurrentType == GraphemeBreakClass.LVT)
+                    {
+                        processor.MoveNext(); // rule GB6 (L x LVT)
+                        goto case GraphemeBreakClass.LVT;
+                    }
+                    else
+                    {
+                        break;
+                    }
+
+                case GraphemeBreakClass.LV:
+                case GraphemeBreakClass.V:
+                    if (processor.CurrentType == GraphemeBreakClass.V)
+                    {
+                        processor.MoveNext(); // rule GB7 (LV | V x V)
+                        goto case GraphemeBreakClass.V;
+                    }
+                    else if (processor.CurrentType == GraphemeBreakClass.T)
+                    {
+                        processor.MoveNext(); // rule GB7 (LV | V x T)
+                        goto case GraphemeBreakClass.T;
+                    }
+                    else
+                    {
+                        break;
+                    }
+
+                case GraphemeBreakClass.LVT:
+                case GraphemeBreakClass.T:
+                    if (processor.CurrentType == GraphemeBreakClass.T)
+                    {
+                        processor.MoveNext(); // rule GB8 (LVT | T x T)
+                        goto case GraphemeBreakClass.T;
+                    }
+                    else
+                    {
+                        break;
+                    }
+
+                case GraphemeBreakClass.ExtendedPictographic:
+                    // Attempt processing extended pictographic (rules GB11, GB9).
+                    // First, drain any Extend scalars that might exist
+                    while (processor.CurrentType == GraphemeBreakClass.Extend)
+                    {
+                        processor.MoveNext();
+                    }
+
+                    // Now see if there's a ZWJ + extended pictograph again.
+                    if (processor.CurrentType != GraphemeBreakClass.ZWJ)
+                    {
+                        break;
+                    }
+
+                    processor.MoveNext();
+                    if (processor.CurrentType != GraphemeBreakClass.ExtendedPictographic)
+                    {
+                        break;
+                    }
+
+                    processor.MoveNext();
+                    goto case GraphemeBreakClass.ExtendedPictographic;
+
+                case GraphemeBreakClass.RegionalIndicator:
+                    // We've consumed a single RI scalar. Try to consume another (to make it a pair).
+
+                    if (processor.CurrentType == GraphemeBreakClass.RegionalIndicator)
+                    {
+                        processor.MoveNext();
+                    }
+
+                    // Standlone RI scalars (or a single pair of RI scalars) can only be followed by trailers.
+
+                    break; // nothing but trailers after the final RI
+
+                default:
+                    break;
+            }
+
+            // rules GB9, GB9a
+            while (processor.CurrentType == GraphemeBreakClass.Extend
+                || processor.CurrentType == GraphemeBreakClass.ZWJ
+                || processor.CurrentType == GraphemeBreakClass.SpacingMark)
+            {
+                processor.MoveNext();
+            }
+
+            Return:
+
+            var text = _text.Take(processor.CurrentCodeUnitOffset);
+
+            Current = new Grapheme(firstCodepoint, text);
+
+            _text = _text.Skip(processor.CurrentCodeUnitOffset);
+
+            return true; // rules GB2, GB999
+        }
+
+        [StructLayout(LayoutKind.Auto)]
+        private ref struct Processor
+        {
+            private readonly ReadOnlySlice<char> _buffer;
+            private int _codeUnitLengthOfCurrentScalar;
+
+            internal Processor(ReadOnlySlice<char> buffer)
+            {
+                _buffer = buffer;
+                _codeUnitLengthOfCurrentScalar = 0;
+                CurrentCodepoint = Codepoint.ReplacementCodepoint;
+                CurrentType = GraphemeBreakClass.Other;
+                CurrentCodeUnitOffset = 0;
+            }
+
+            public int CurrentCodeUnitOffset { get; private set; }
+
+            /// <summary>
+            /// Will be <see cref="GraphemeBreakClass.Other"/> if invalid data or EOF reached.
+            /// Caller shouldn't need to special-case this since the normal rules will halt on this condition.
+            /// </summary>
+            public GraphemeBreakClass CurrentType { get; private set; }
+
+            /// <summary>
+            ///     Get the currently processed <see cref="Codepoint"/>.
+            /// </summary>
+            public Codepoint CurrentCodepoint { get; private set; }
+
+            public void MoveNext()
+            {
+                // For ill-formed subsequences (like unpaired UTF-16 surrogate code points), we rely on
+                // the decoder's default behavior of interpreting these ill-formed subsequences as
+                // equivalent to U+FFFD REPLACEMENT CHARACTER. This code point has a boundary property
+                // of Other (XX), which matches the modifications made to UAX#29, Rev. 35.
+                // See: https://www.unicode.org/reports/tr29/tr29-35.html#Modifications
+                // This change is also reflected in the UCD files. For example, Unicode 11.0's UCD file
+                // https://www.unicode.org/Public/11.0.0/ucd/auxiliary/GraphemeBreakProperty.txt
+                // has the line "D800..DFFF    ; Control # Cs [2048] <surrogate-D800>..<surrogate-DFFF>",
+                // but starting with Unicode 12.0 that line has been removed.
+                //
+                // If a later version of the Unicode Standard further modifies this guidance we should reflect
+                // that here.
+
+                if (CurrentCodeUnitOffset == _buffer.Length)
+                {
+                    CurrentCodepoint = Codepoint.ReplacementCodepoint;
+                }
+                else
+                {
+                    CurrentCodeUnitOffset += _codeUnitLengthOfCurrentScalar;
+
+                    if (CurrentCodeUnitOffset < _buffer.Length)
+                    {
+                        CurrentCodepoint = Codepoint.ReadAt(_buffer, CurrentCodeUnitOffset,
+                            out _codeUnitLengthOfCurrentScalar);
+                    }
+                    else
+                    {
+                        CurrentCodepoint = Codepoint.ReplacementCodepoint;
+                    }
+                }
+
+                CurrentType = CurrentCodepoint.GraphemeBreakClass;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreak.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreak.cs
new file mode 100644
index 0000000000..34b14f008f
--- /dev/null
+++ b/src/Avalonia.Visuals/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
+// 
+// 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
new file mode 100644
index 0000000000..8b2e3f41e3
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakClass.cs
@@ -0,0 +1,50 @@
+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
new file mode 100644
index 0000000000..76bb9ac44f
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
@@ -0,0 +1,244 @@
+// 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 Avalonia.Utilities;
+
+namespace Avalonia.Media.TextFormatting.Unicode
+{
+    /// <summary>
+    /// Implementation of the Unicode Line Break Algorithm
+    /// </summary>
+    public ref struct LineBreakEnumerator
+    {
+        // State
+        private readonly ReadOnlySlice<char> _text;
+        private int _pos;
+        private int _lastPos;
+        private LineBreakClass? _curClass;
+        private LineBreakClass? _nextClass;
+
+        public LineBreakEnumerator(ReadOnlySlice<char> text)
+        {
+            _text = text;
+            _pos = 0;
+            _lastPos = 0;
+            _curClass = null;
+            _nextClass = null;
+            Current = default;
+        }
+
+        public LineBreak Current { get; private set; }
+
+        public bool MoveNext()
+        {
+            // get the first char if we're at the beginning of the string
+            if (!_curClass.HasValue)
+            {
+                _curClass = PeekCharClass() == LineBreakClass.Space ? LineBreakClass.WordJoiner : MapFirst(ReadCharClass());
+            }
+
+            while (_pos < _text.Length)
+            {
+                _lastPos = _pos;
+                var lastClass = _nextClass;
+                _nextClass = ReadCharClass();
+
+                // explicit newline
+                if (_curClass.HasValue && (_curClass == LineBreakClass.MandatoryBreak || _curClass == LineBreakClass.CarriageReturn && _nextClass != LineBreakClass.LineFeed))
+                {
+                    _curClass = MapFirst(MapClass(_nextClass.Value));
+                    Current = new LineBreak(FindPriorNonWhitespace(_lastPos), _lastPos, true);
+                    return true;
+                }
+
+                // handle classes not handled by the pair table
+                LineBreakClass? cur = null;
+                switch (_nextClass.Value)
+                {
+                    case LineBreakClass.Space:
+                        cur = _curClass;
+                        break;
+
+                    case LineBreakClass.MandatoryBreak:
+                    case LineBreakClass.LineFeed:
+                    case LineBreakClass.NextLine:
+                        cur = LineBreakClass.MandatoryBreak;
+                        break;
+
+                    case LineBreakClass.CarriageReturn:
+                        cur = LineBreakClass.CarriageReturn;
+                        break;
+
+                    case LineBreakClass.ContingentBreak:
+                        cur = LineBreakClass.BreakAfter;
+                        break;
+                }
+
+                if (cur != null)
+                {
+                    _curClass = cur;
+
+                    if (_nextClass.Value == LineBreakClass.MandatoryBreak)
+                    {
+                        _lastPos = _pos;
+                        Current = new LineBreak(FindPriorNonWhitespace(_lastPos), _lastPos, true);
+                        return true;
+                    }
+
+                    continue;
+                }
+
+                // if not handled already, use the pair table
+                var shouldBreak = false;
+                switch (BreakPairTable.Map(_curClass.Value,_nextClass.Value))
+                {
+                    case PairBreakType.DI: // Direct break
+                        shouldBreak = true;
+                        break;
+
+                    case PairBreakType.IN: // possible indirect break
+                        shouldBreak = lastClass.HasValue && lastClass.Value == LineBreakClass.Space;
+                        break;
+
+                    case PairBreakType.CI:
+                        shouldBreak = lastClass.HasValue && lastClass.Value == LineBreakClass.Space;
+                        if (!shouldBreak)
+                        {
+                            continue;
+                        }
+                        break;
+
+                    case PairBreakType.CP: // prohibited for combining marks
+                        if (!lastClass.HasValue || lastClass.Value != LineBreakClass.Space)
+                        {
+                            continue;
+                        }
+                        break;
+                }
+
+                _curClass = _nextClass;
+
+                if (shouldBreak)
+                {
+                    Current = new LineBreak(FindPriorNonWhitespace(_lastPos), _lastPos);
+                    return true;
+                }
+            }
+
+            if (_pos >= _text.Length)
+            {
+                if (_lastPos < _text.Length)
+                {
+                    _lastPos = _text.Length;
+                    var cls = Codepoint.ReadAt(_text, _text.Length - 1, out _).LineBreakClass;
+                    bool required = cls == LineBreakClass.MandatoryBreak || cls == LineBreakClass.LineFeed || cls == LineBreakClass.CarriageReturn;
+                    Current = new LineBreak(FindPriorNonWhitespace(_text.Length), _text.Length, required);
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        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;
+        }
+
+        // Get the next character class
+        private LineBreakClass ReadCharClass()
+        {
+            var cp = Codepoint.ReadAt(_text, _pos, out var count);
+
+            _pos += count;
+
+            return MapClass(cp.LineBreakClass);
+        }
+
+        private LineBreakClass PeekCharClass()
+        {
+            return MapClass(Codepoint.ReadAt(_text, _pos, out _).LineBreakClass);
+        }
+
+        private static LineBreakClass MapClass(LineBreakClass c)
+        {
+            switch (c)
+            {
+                case LineBreakClass.Ambiguous:
+                    return LineBreakClass.Alphabetic;
+
+                case LineBreakClass.ComplexContext:
+                case LineBreakClass.Surrogate:
+                case LineBreakClass.Unknown:
+                    return LineBreakClass.Alphabetic;
+
+                case LineBreakClass.ConditionalJapaneseStarter:
+                    return LineBreakClass.Nonstarter;
+
+                default:
+                    return c;
+            }
+        }
+
+        private static LineBreakClass MapFirst(LineBreakClass c)
+        {
+            switch (c)
+            {
+                case LineBreakClass.LineFeed:
+                case LineBreakClass.NextLine:
+                    return LineBreakClass.MandatoryBreak;
+
+                case LineBreakClass.ContingentBreak:
+                    return LineBreakClass.BreakAfter;
+
+                case LineBreakClass.Space:
+                    return LineBreakClass.WordJoiner;
+
+                default:
+                    return c;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/PropertyValueAliasHelper.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/PropertyValueAliasHelper.cs
new file mode 100644
index 0000000000..388a7d257d
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/PropertyValueAliasHelper.cs
@@ -0,0 +1,178 @@
+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];
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/Script.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/Script.cs
new file mode 100644
index 0000000000..2593a77848
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/Script.cs
@@ -0,0 +1,164 @@
+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
new file mode 100644
index 0000000000..3c00c49707
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeData.cs
@@ -0,0 +1,89 @@
+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 BIDI_BITS = 5;
+        internal const int LINEBREAK_BITS = 6;
+
+        internal const int SCRIPT_SHIFT = CATEGORY_BITS;
+        internal const int BIDI_SHIFT = CATEGORY_BITS + SCRIPT_BITS;
+        internal const int LINEBREAK_SHIFT = CATEGORY_BITS + SCRIPT_BITS + BIDI_BITS;
+
+        internal const int CATEGORY_MASK = (1 << CATEGORY_BITS) - 1;
+        internal const int SCRIPT_MASK = (1 << SCRIPT_BITS) - 1;
+        internal const int BIDI_MASK = (1 << BIDI_BITS) - 1;
+        internal const int LINEBREAK_MASK = (1 << LINEBREAK_BITS) - 1;
+
+        private static readonly UnicodeTrie s_unicodeDataTrie;
+        private static readonly UnicodeTrie s_graphemeBreakTrie;
+
+        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"));
+        }
+
+        /// <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>
+        public static GeneralCategory GetGeneralCategory(int codepoint)
+        {
+            var value = s_unicodeDataTrie.Get(codepoint);
+
+            return (GeneralCategory)(value & 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>
+        public static Script GetScript(int codepoint)
+        {
+            var value = s_unicodeDataTrie.Get(codepoint);
+
+            return (Script)((value >> 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>
+        public static BiDiClass GetBiDiClass(int codepoint)
+        {
+            var value = s_unicodeDataTrie.Get(codepoint);
+
+            return (BiDiClass)((value >> BIDI_SHIFT) & BIDI_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>
+        public static LineBreakClass GetLineBreakClass(int codepoint)
+        {
+            var value = s_unicodeDataTrie.Get(codepoint);
+
+            return (LineBreakClass)((value >> 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>
+        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
new file mode 100644
index 0000000000..08b019ed33
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/UnicodeTrie.cs
@@ -0,0 +1,128 @@
+// 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
new file mode 100644
index 0000000000..29ee45acc2
--- /dev/null
+++ b/src/Avalonia.Visuals/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
+// 
+// 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
new file mode 100644
index 0000000000..a60bac4ce4
--- /dev/null
+++ b/src/Avalonia.Visuals/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
+// 
+// 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/TextHitTestResult.cs b/src/Avalonia.Visuals/Media/TextHitTestResult.cs
index bf6b2e53db..537dfed49d 100644
--- a/src/Avalonia.Visuals/Media/TextHitTestResult.cs
+++ b/src/Avalonia.Visuals/Media/TextHitTestResult.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Media
 {
     /// <summary>
diff --git a/src/Avalonia.Visuals/Media/TextTrimming.cs b/src/Avalonia.Visuals/Media/TextTrimming.cs
new file mode 100644
index 0000000000..f8a63dfede
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TextTrimming.cs
@@ -0,0 +1,23 @@
+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/TextWrapping.cs b/src/Avalonia.Visuals/Media/TextWrapping.cs
index 7d50e10799..b7915e5612 100644
--- a/src/Avalonia.Visuals/Media/TextWrapping.cs
+++ b/src/Avalonia.Visuals/Media/TextWrapping.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Media
 {
     /// <summary>
@@ -16,6 +13,13 @@ namespace Avalonia.Media
         /// <summary>
         /// Text can wrap.
         /// </summary>
-        Wrap
+        Wrap, 
+        
+        /// <summary>
+        /// Line-breaking occurs if the line overflows the available block width.
+        /// However, a line may overflow the block width if the line breaking algorithm
+        /// cannot determine a break opportunity, as in the case of a very long word.
+        /// </summary>
+        WrapWithOverflow
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Visuals/Media/TileBrush.cs b/src/Avalonia.Visuals/Media/TileBrush.cs
index 47f20fa285..0a4bc0e56d 100644
--- a/src/Avalonia.Visuals/Media/TileBrush.cs
+++ b/src/Avalonia.Visuals/Media/TileBrush.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Visuals.Media.Imaging;
 
 namespace Avalonia.Media
diff --git a/src/Avalonia.Visuals/Media/Transform.cs b/src/Avalonia.Visuals/Media/Transform.cs
index 7a70657ce0..7cf1b35ada 100644
--- a/src/Avalonia.Visuals/Media/Transform.cs
+++ b/src/Avalonia.Visuals/Media/Transform.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Animation;
 using Avalonia.Animation.Animators;
@@ -11,11 +8,12 @@ namespace Avalonia.Media
     /// <summary>
     /// Represents a transform on an <see cref="IVisual"/>.
     /// </summary>
-    public abstract class Transform : Animatable
+    public abstract class Transform : Animatable, IMutableTransform
     {
         static Transform()
         {
-            Animation.Animation.RegisterAnimator<TransformAnimator>(prop => typeof(Transform).IsAssignableFrom(prop.OwnerType));
+            Animation.Animation.RegisterAnimator<TransformAnimator>(prop =>
+                typeof(ITransform).IsAssignableFrom(prop.OwnerType));
         }
 
         /// <summary>
@@ -28,6 +26,16 @@ namespace Avalonia.Media
         /// </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>
@@ -35,5 +43,14 @@ namespace Avalonia.Media
         {
             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/TransformConverter.cs b/src/Avalonia.Visuals/Media/TransformConverter.cs
new file mode 100644
index 0000000000..e79c0b8b7b
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/TransformConverter.cs
@@ -0,0 +1,23 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using Avalonia.Media.Transformation;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Creates an <see cref="ITransform"/> from a string representation.
+    /// </summary>
+    public class TransformConverter : TypeConverter
+    {
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            return sourceType == typeof(string);
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            return TransformOperations.Parse((string)value);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TransformGroup.cs b/src/Avalonia.Visuals/Media/TransformGroup.cs
index 3a47f40045..8e3cfec274 100644
--- a/src/Avalonia.Visuals/Media/TransformGroup.cs
+++ b/src/Avalonia.Visuals/Media/TransformGroup.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Collections;
 using Avalonia.Metadata;
 
@@ -11,7 +8,7 @@ namespace Avalonia.Media
         /// <summary>
         /// Defines the <see cref="Children"/> property.
         /// </summary>
-        public static readonly AvaloniaProperty<Transforms> ChildrenProperty =
+        public static readonly StyledProperty<Transforms> ChildrenProperty =
             AvaloniaProperty.Register<TransformGroup, Transforms>(nameof(Children));
 
         public TransformGroup()
diff --git a/src/Avalonia.Visuals/Media/Transformation/InterpolationUtilities.cs b/src/Avalonia.Visuals/Media/Transformation/InterpolationUtilities.cs
new file mode 100644
index 0000000000..1e80eabfc8
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/Transformation/InterpolationUtilities.cs
@@ -0,0 +1,40 @@
+namespace Avalonia.Media.Transformation
+{
+    internal static class InterpolationUtilities
+    {
+        public static double InterpolateScalars(double from, double to, double progress)
+        {
+            return from * (1d - progress) + to * progress;
+        }
+
+        public static Vector InterpolateVectors(Vector from, Vector to, double progress)
+        {
+            var x = InterpolateScalars(from.X, to.X, progress);
+            var y = InterpolateScalars(from.Y, to.Y, progress);
+
+            return new Vector(x, y);
+        }
+
+        public static Matrix ComposeTransform(Matrix.Decomposed decomposed)
+        {
+            // According to https://www.w3.org/TR/css-transforms-1/#recomposing-to-a-2d-matrix
+
+            return Matrix.CreateTranslation(decomposed.Translate) *
+                   Matrix.CreateRotation(decomposed.Angle) *
+                   Matrix.CreateSkew(decomposed.Skew.X, decomposed.Skew.Y) *
+                   Matrix.CreateScale(decomposed.Scale);
+        }
+
+        public static Matrix.Decomposed InterpolateDecomposedTransforms(ref Matrix.Decomposed from, ref Matrix.Decomposed to, double progres)
+        {
+            Matrix.Decomposed result = default;
+
+            result.Translate = InterpolateVectors(from.Translate, to.Translate, progres);
+            result.Scale = InterpolateVectors(from.Scale, to.Scale, progres);
+            result.Skew = InterpolateVectors(from.Skew, to.Skew, progres);
+            result.Angle = InterpolateScalars(from.Angle, to.Angle, progres);
+
+            return result;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Transformation/TransformOperation.cs b/src/Avalonia.Visuals/Media/Transformation/TransformOperation.cs
new file mode 100644
index 0000000000..36f5dd98f1
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/Transformation/TransformOperation.cs
@@ -0,0 +1,230 @@
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Media.Transformation
+{
+    /// <summary>
+    /// Represents a single primitive transform (like translation, rotation, scale, etc.).
+    /// </summary>
+    public struct TransformOperation
+    {
+        public OperationType Type;
+        public Matrix Matrix;
+        public DataLayout Data;
+
+        public enum OperationType
+        {
+            Translate,
+            Rotate,
+            Scale,
+            Skew,
+            Matrix,
+            Identity
+        }
+
+        /// <summary>
+        /// Returns whether operation produces the identity matrix.
+        /// </summary>
+        public bool IsIdentity => Matrix.IsIdentity;
+
+        /// <summary>
+        /// Bakes this operation to a transform matrix.
+        /// </summary>
+        public void Bake()
+        {
+            Matrix = Matrix.Identity;
+
+            switch (Type)
+            {
+                case OperationType.Translate:
+                {
+                    Matrix = Matrix.CreateTranslation(Data.Translate.X, Data.Translate.Y);
+
+                    break;
+                }
+                case OperationType.Rotate:
+                {
+                    Matrix = Matrix.CreateRotation(Data.Rotate.Angle);
+
+                    break;
+                }
+                case OperationType.Scale:
+                {
+                    Matrix = Matrix.CreateScale(Data.Scale.X, Data.Scale.Y);
+
+                    break;
+                }
+                case OperationType.Skew:
+                {
+                    Matrix = Matrix.CreateSkew(Data.Skew.X, Data.Skew.Y);
+
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns new identity transform operation.
+        /// </summary>
+        public static TransformOperation Identity =>
+            new TransformOperation { Matrix = Matrix.Identity, Type = OperationType.Identity };
+
+        /// <summary>
+        /// Attempts to interpolate between two transform operations.
+        /// </summary>
+        /// <param name="from">Source operation.</param>
+        /// <param name="to">Target operation.</param>
+        /// <param name="progress">Interpolation progress.</param>
+        /// <param name="result">Interpolation result that will be filled in when operation was successful.</param>
+        /// <remarks>
+        /// Based upon https://www.w3.org/TR/css-transforms-1/#interpolation-of-transform-functions.
+        /// </remarks>
+        public static bool TryInterpolate(TransformOperation? from, TransformOperation? to, double progress,
+            ref TransformOperation result)
+        {
+            bool fromIdentity = IsOperationIdentity(ref from);
+            bool toIdentity = IsOperationIdentity(ref to);
+
+            if (fromIdentity && toIdentity)
+            {
+                return true;
+            }
+
+            // ReSharper disable PossibleInvalidOperationException
+            TransformOperation fromValue = fromIdentity ? Identity : from.Value;
+            TransformOperation toValue = toIdentity ? Identity : to.Value;
+            // ReSharper restore PossibleInvalidOperationException
+
+            var interpolationType = toIdentity ? fromValue.Type : toValue.Type;
+
+            result.Type = interpolationType;
+
+            switch (interpolationType)
+            {
+                case OperationType.Translate:
+                {
+                    double fromX = fromIdentity ? 0 : fromValue.Data.Translate.X;
+                    double fromY = fromIdentity ? 0 : fromValue.Data.Translate.Y;
+
+                    double toX = toIdentity ? 0 : toValue.Data.Translate.X;
+                    double toY = toIdentity ? 0 : toValue.Data.Translate.Y;
+
+                    result.Data.Translate.X = InterpolationUtilities.InterpolateScalars(fromX, toX, progress);
+                    result.Data.Translate.Y = InterpolationUtilities.InterpolateScalars(fromY, toY, progress);
+
+                    result.Bake();
+
+                    break;
+                }
+                case OperationType.Rotate:
+                {
+                    double fromAngle = fromIdentity ? 0 : fromValue.Data.Rotate.Angle;
+
+                    double toAngle = toIdentity ? 0 : toValue.Data.Rotate.Angle;
+
+                    result.Data.Rotate.Angle = InterpolationUtilities.InterpolateScalars(fromAngle, toAngle, progress);
+
+                    result.Bake();
+
+                    break;
+                }
+                case OperationType.Scale:
+                {
+                    double fromX = fromIdentity ? 1 : fromValue.Data.Scale.X;
+                    double fromY = fromIdentity ? 1 : fromValue.Data.Scale.Y;
+
+                    double toX = toIdentity ? 1 : toValue.Data.Scale.X;
+                    double toY = toIdentity ? 1 : toValue.Data.Scale.Y;
+
+                    result.Data.Scale.X = InterpolationUtilities.InterpolateScalars(fromX, toX, progress);
+                    result.Data.Scale.Y = InterpolationUtilities.InterpolateScalars(fromY, toY, progress);
+
+                    result.Bake();
+
+                    break;
+                }
+                case OperationType.Skew:
+                {
+                    double fromX = fromIdentity ? 0 : fromValue.Data.Skew.X;
+                    double fromY = fromIdentity ? 0 : fromValue.Data.Skew.Y;
+
+                    double toX = toIdentity ? 0 : toValue.Data.Skew.X;
+                    double toY = toIdentity ? 0 : toValue.Data.Skew.Y;
+
+                    result.Data.Skew.X = InterpolationUtilities.InterpolateScalars(fromX, toX, progress);
+                    result.Data.Skew.Y = InterpolationUtilities.InterpolateScalars(fromY, toY, progress);
+
+                    result.Bake();
+
+                    break;
+                }
+                case OperationType.Matrix:
+                {
+                    var fromMatrix = fromIdentity ? Matrix.Identity : fromValue.Matrix;
+                    var toMatrix = toIdentity ? Matrix.Identity : toValue.Matrix;
+
+                    if (!Matrix.TryDecomposeTransform(fromMatrix, out Matrix.Decomposed fromDecomposed) ||
+                        !Matrix.TryDecomposeTransform(toMatrix, out Matrix.Decomposed toDecomposed))
+                    {
+                        return false;
+                    }
+
+                    var interpolated =
+                        InterpolationUtilities.InterpolateDecomposedTransforms(
+                            ref fromDecomposed, ref toDecomposed,
+                            progress);
+
+                    result.Matrix = InterpolationUtilities.ComposeTransform(interpolated);
+
+                    break;
+                }
+                case OperationType.Identity:
+                {
+                    // Do nothing.
+                    break;
+                }
+            }
+
+            return true;
+        }
+
+        private static bool IsOperationIdentity(ref TransformOperation? operation)
+        {
+            return !operation.HasValue || operation.Value.IsIdentity;
+        }
+
+        [StructLayout(LayoutKind.Explicit)]
+        public struct DataLayout
+        {
+            [FieldOffset(0)] public SkewLayout Skew;
+
+            [FieldOffset(0)] public ScaleLayout Scale;
+
+            [FieldOffset(0)] public TranslateLayout Translate;
+
+            [FieldOffset(0)] public RotateLayout Rotate;
+
+            public struct SkewLayout
+            {
+                public double X;
+                public double Y;
+            }
+
+            public struct ScaleLayout
+            {
+                public double X;
+                public double Y;
+            }
+
+            public struct TranslateLayout
+            {
+                public double X;
+                public double Y;
+            }
+
+            public struct RotateLayout
+            {
+                public double Angle;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Transformation/TransformOperations.cs b/src/Avalonia.Visuals/Media/Transformation/TransformOperations.cs
new file mode 100644
index 0000000000..334bb93562
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/Transformation/TransformOperations.cs
@@ -0,0 +1,258 @@
+using System;
+using System.Collections.Generic;
+
+namespace Avalonia.Media.Transformation
+{
+    /// <summary>
+    /// Contains a list of <see cref="TransformOperation"/> that represent primitive transforms that will be
+    /// applied in declared order.
+    /// </summary>
+    public sealed class TransformOperations : ITransform
+    {
+        public static TransformOperations Identity { get; } = new TransformOperations(new List<TransformOperation>());
+
+        private readonly List<TransformOperation> _operations;
+
+        private TransformOperations(List<TransformOperation> operations)
+        {
+            _operations = operations ?? throw new ArgumentNullException(nameof(operations));
+
+            IsIdentity = CheckIsIdentity();
+
+            Value = ApplyTransforms();
+        }
+
+        /// <summary>
+        /// Returns whether all operations combined together produce the identity matrix.
+        /// </summary>
+        public bool IsIdentity { get; }
+
+        public IReadOnlyList<TransformOperation> Operations => _operations;
+
+        public Matrix Value { get; }
+
+        public static TransformOperations Parse(string s)
+        {
+            return TransformParser.Parse(s);
+        }
+
+        public static Builder CreateBuilder(int capacity)
+        {
+            return new Builder(capacity);
+        }
+
+        public static TransformOperations Interpolate(TransformOperations from, TransformOperations to, double progress)
+        {
+            TransformOperations result = Identity;
+
+            if (!TryInterpolate(from, to, progress, ref result))
+            {
+                // If the matrices cannot be interpolated, fallback to discrete animation logic.
+                // See https://drafts.csswg.org/css-transforms/#matrix-interpolation
+                result = progress < 0.5 ? from : to;
+            }
+
+            return result;
+        }
+
+        private Matrix ApplyTransforms(int startOffset = 0)
+        {
+            Matrix matrix = Matrix.Identity;
+
+            for (var i = startOffset; i < _operations.Count; i++)
+            {
+                TransformOperation operation = _operations[i];
+                matrix *= operation.Matrix;
+            }
+
+            return matrix;
+        }
+
+        private bool CheckIsIdentity()
+        {
+            foreach (TransformOperation operation in _operations)
+            {
+                if (!operation.IsIdentity)
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private static bool TryInterpolate(TransformOperations from, TransformOperations to, double progress, ref TransformOperations result)
+        {
+            bool fromIdentity = from.IsIdentity;
+            bool toIdentity = to.IsIdentity;
+
+            if (fromIdentity && toIdentity)
+            {
+                return true;
+            }
+
+            int matchingPrefixLength = ComputeMatchingPrefixLength(from, to);
+            int fromSize = fromIdentity ? 0 : from._operations.Count;
+            int toSize = toIdentity ? 0 : to._operations.Count;
+            int numOperations = Math.Max(fromSize, toSize);
+
+            var builder = new Builder(matchingPrefixLength);
+
+            for (int i = 0; i < matchingPrefixLength; i++)
+            {
+                TransformOperation interpolated = new TransformOperation
+                {
+                    Type = TransformOperation.OperationType.Identity
+                };
+
+                if (!TransformOperation.TryInterpolate(
+                    i >= fromSize ? default(TransformOperation?) : from._operations[i],
+                    i >= toSize ? default(TransformOperation?) : to._operations[i],
+                    progress,
+                    ref interpolated))
+                {
+                    return false;
+                }
+
+                builder.Append(interpolated);
+            }
+
+            if (matchingPrefixLength < numOperations)
+            {
+                if (!ComputeDecomposedTransform(from, matchingPrefixLength, out Matrix.Decomposed fromDecomposed) ||
+                    !ComputeDecomposedTransform(to, matchingPrefixLength, out Matrix.Decomposed toDecomposed))
+                {
+                    return false;
+                }
+
+                var transform = InterpolationUtilities.InterpolateDecomposedTransforms(ref fromDecomposed, ref toDecomposed, progress);
+
+                builder.AppendMatrix(InterpolationUtilities.ComposeTransform(transform));
+            }
+
+            result = builder.Build();
+
+            return true;
+        }
+
+        private static bool ComputeDecomposedTransform(TransformOperations operations, int startOffset, out Matrix.Decomposed decomposed)
+        {
+            Matrix transform = operations.ApplyTransforms(startOffset);
+
+            if (!Matrix.TryDecomposeTransform(transform, out decomposed))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        private static int ComputeMatchingPrefixLength(TransformOperations from, TransformOperations to)
+        {
+            int numOperations = Math.Min(from._operations.Count, to._operations.Count);
+
+            for (int i = 0; i < numOperations; i++)
+            {
+                if (from._operations[i].Type != to._operations[i].Type)
+                {
+                    return i;
+                }
+            }
+
+            // If the operations match to the length of the shorter list, then pad its
+            // length with the matching identity operations.
+            // https://drafts.csswg.org/css-transforms/#transform-function-lists
+            return Math.Max(from._operations.Count, to._operations.Count);
+        }
+
+        public readonly struct Builder
+        {
+            private readonly List<TransformOperation> _operations;
+
+            public Builder(int capacity)
+            {
+                _operations = new List<TransformOperation>(capacity);
+            }
+
+            public void AppendTranslate(double x, double y)
+            {
+                var toAdd = new TransformOperation();
+
+                toAdd.Type = TransformOperation.OperationType.Translate;
+                toAdd.Data.Translate.X = x;
+                toAdd.Data.Translate.Y = y;
+
+                toAdd.Bake();
+
+                _operations.Add(toAdd);
+            }
+
+            public void AppendRotate(double angle)
+            {
+                var toAdd = new TransformOperation();
+
+                toAdd.Type = TransformOperation.OperationType.Rotate;
+                toAdd.Data.Rotate.Angle = angle;
+
+                toAdd.Bake();
+
+                _operations.Add(toAdd);
+            }
+
+            public void AppendScale(double x, double y)
+            {
+                var toAdd = new TransformOperation();
+
+                toAdd.Type = TransformOperation.OperationType.Scale;
+                toAdd.Data.Scale.X = x;
+                toAdd.Data.Scale.Y = y;
+
+                toAdd.Bake();
+
+                _operations.Add(toAdd);
+            }
+
+            public void AppendSkew(double x, double y)
+            {
+                var toAdd = new TransformOperation();
+
+                toAdd.Type = TransformOperation.OperationType.Skew;
+                toAdd.Data.Skew.X = x;
+                toAdd.Data.Skew.Y = y;
+
+                toAdd.Bake();
+
+                _operations.Add(toAdd);
+            }
+
+            public void AppendMatrix(Matrix matrix)
+            {
+                var toAdd = new TransformOperation();
+
+                toAdd.Type = TransformOperation.OperationType.Matrix;
+                toAdd.Matrix = matrix;
+
+                _operations.Add(toAdd);
+            }
+
+            public void AppendIdentity()
+            {
+                var toAdd = new TransformOperation();
+
+                toAdd.Type = TransformOperation.OperationType.Identity;
+
+                _operations.Add(toAdd);
+            }
+
+            public void Append(TransformOperation toAdd)
+            {
+                _operations.Add(toAdd);
+            }
+
+            public TransformOperations Build()
+            {
+                return new TransformOperations(_operations);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/Transformation/TransformParser.cs b/src/Avalonia.Visuals/Media/Transformation/TransformParser.cs
new file mode 100644
index 0000000000..85f4f5fec1
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/Transformation/TransformParser.cs
@@ -0,0 +1,444 @@
+using System;
+using System.Globalization;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media.Transformation
+{
+    public static class TransformParser
+    {
+        private static readonly (string, TransformFunction)[] s_functionMapping =
+        {
+            ("translate", TransformFunction.Translate),
+            ("translateX", TransformFunction.TranslateX),
+            ("translateY", TransformFunction.TranslateY),
+            ("scale", TransformFunction.Scale),
+            ("scaleX", TransformFunction.ScaleX),
+            ("scaleY", TransformFunction.ScaleY),
+            ("skew", TransformFunction.Skew),
+            ("skewX", TransformFunction.SkewX),
+            ("skewY", TransformFunction.SkewY),
+            ("rotate", TransformFunction.Rotate),
+            ("matrix", TransformFunction.Matrix)
+        };
+
+        private static readonly (string, Unit)[] s_unitMapping =
+        {
+            ("deg", Unit.Degree),
+            ("grad", Unit.Gradian),
+            ("rad", Unit.Radian),
+            ("turn", Unit.Turn), 
+            ("px", Unit.Pixel)
+        };
+
+        public static TransformOperations Parse(string s)
+        {
+            void ThrowInvalidFormat()
+            {
+                throw new FormatException($"Invalid transform string: '{s}'.");
+            }
+
+            if (string.IsNullOrEmpty(s))
+            {
+                throw new ArgumentException(nameof(s));
+            }
+
+            var span = s.AsSpan().Trim();
+
+            if (span.Equals("none".AsSpan(), StringComparison.OrdinalIgnoreCase))
+            {
+                return TransformOperations.Identity;
+            }
+
+            var builder = TransformOperations.CreateBuilder(0);
+
+            while (true)
+            {
+                var beginIndex = span.IndexOf('(');
+                var endIndex = span.IndexOf(')');
+
+                if (beginIndex == -1 || endIndex == -1)
+                {
+                    ThrowInvalidFormat();
+                }
+
+                var namePart = span.Slice(0, beginIndex).Trim();
+
+                var function = ParseTransformFunction(in namePart);
+
+                if (function == TransformFunction.Invalid)
+                {
+                    ThrowInvalidFormat();
+                }
+
+                var valuePart = span.Slice(beginIndex + 1, endIndex - beginIndex - 1).Trim();
+
+                ParseFunction(in valuePart, function, in builder);
+
+                span = span.Slice(endIndex + 1);
+
+                if (span.IsWhiteSpace())
+                {
+                    break;
+                }
+            }
+
+            return builder.Build();
+        }
+
+        private static void ParseFunction(
+            in ReadOnlySpan<char> functionPart,
+            TransformFunction function,
+            in TransformOperations.Builder builder)
+        {
+            static UnitValue ParseValue(ReadOnlySpan<char> part)
+            {
+                int unitIndex = -1;
+
+                for (int i = 0; i < part.Length; i++)
+                {
+                    char c = part[i];
+
+                    if (char.IsDigit(c) || c == '-' || c == '.')
+                    {
+                        continue;
+                    }
+
+                    unitIndex = i;
+                    break;
+                }
+
+                Unit unit = Unit.None;
+
+                if (unitIndex != -1)
+                {
+                    var unitPart = part.Slice(unitIndex, part.Length - unitIndex);
+
+                    unit = ParseUnit(unitPart);
+
+                    part = part.Slice(0, unitIndex);
+                }
+
+                var value = double.Parse(part.ToString(), NumberStyles.Float, CultureInfo.InvariantCulture);
+
+                return new UnitValue(unit, value);
+            }
+
+            static int ParseValuePair(
+                in ReadOnlySpan<char> part,
+                ref UnitValue leftValue,
+                ref UnitValue rightValue)
+            {
+                var commaIndex = part.IndexOf(',');
+
+                if (commaIndex != -1)
+                {
+                    var leftPart = part.Slice(0, commaIndex).Trim();
+                    var rightPart = part.Slice(commaIndex + 1, part.Length - commaIndex - 1).Trim();
+
+                    leftValue = ParseValue(leftPart);
+                    rightValue = ParseValue(rightPart);
+
+                    return 2;
+                }
+
+                leftValue = ParseValue(part);
+
+                return 1;
+            }
+
+            static int ParseCommaDelimitedValues(ReadOnlySpan<char> part, in Span<UnitValue> outValues)
+            {
+                int valueIndex = 0;
+
+                while (true)
+                {
+                    if (valueIndex >= outValues.Length)
+                    {
+                        throw new FormatException("Too many provided values.");
+                    }
+
+                    var commaIndex = part.IndexOf(',');
+
+                    if (commaIndex == -1)
+                    {
+                        if (!part.IsWhiteSpace())
+                        {
+                            outValues[valueIndex++] = ParseValue(part);
+                        }
+
+                        break;
+                    }
+
+                    var valuePart = part.Slice(0, commaIndex).Trim();
+
+                    outValues[valueIndex++] = ParseValue(valuePart);
+
+                    part = part.Slice(commaIndex + 1, part.Length - commaIndex - 1);
+                }
+
+                return valueIndex;
+            }
+
+            switch (function)
+            {
+                case TransformFunction.Scale:
+                case TransformFunction.ScaleX:
+                case TransformFunction.ScaleY:
+                {
+                    var scaleX = UnitValue.One;
+                    var scaleY = UnitValue.One;
+
+                    int count = ParseValuePair(functionPart, ref scaleX, ref scaleY);
+
+                    if (count != 1 && (function == TransformFunction.ScaleX || function == TransformFunction.ScaleY))
+                    {
+                        ThrowFormatInvalidValueCount(function, 1);
+                    }
+
+                    VerifyZeroOrUnit(function, in scaleX, Unit.None);
+                    VerifyZeroOrUnit(function, in scaleY, Unit.None);
+
+                    if (function == TransformFunction.ScaleY)
+                    {
+                        scaleY = scaleX;
+                        scaleX = UnitValue.One;
+                    }
+                    else if (function == TransformFunction.Scale && count == 1)
+                    {
+                        scaleY = scaleX;
+                    }
+
+                    builder.AppendScale(scaleX.Value, scaleY.Value);
+
+                    break;
+                }
+                case TransformFunction.Skew:
+                case TransformFunction.SkewX:
+                case TransformFunction.SkewY:
+                {
+                    var skewX = UnitValue.Zero;
+                    var skewY = UnitValue.Zero;
+
+                    int count = ParseValuePair(functionPart, ref skewX, ref skewY);
+
+                    if (count != 1 && (function == TransformFunction.SkewX || function == TransformFunction.SkewY))
+                    {
+                        ThrowFormatInvalidValueCount(function, 1);
+                    }
+
+                    VerifyZeroOrAngle(function, in skewX);
+                    VerifyZeroOrAngle(function, in skewY);
+
+                    if (function == TransformFunction.SkewY)
+                    {
+                        skewY = skewX;
+                        skewX = UnitValue.Zero;
+                    }
+
+                    builder.AppendSkew(ToRadians(in skewX), ToRadians(in skewY));
+
+                    break;
+                }
+                case TransformFunction.Rotate:
+                {
+                    var angle = UnitValue.Zero;
+                    UnitValue _ = default;
+
+                    int count = ParseValuePair(functionPart, ref angle, ref _);
+
+                    if (count != 1)
+                    {
+                        ThrowFormatInvalidValueCount(function, 1);
+                    }
+
+                    VerifyZeroOrAngle(function, in angle);
+
+                    builder.AppendRotate(ToRadians(in angle));
+
+                    break;
+                }
+                case TransformFunction.Translate:
+                case TransformFunction.TranslateX:
+                case TransformFunction.TranslateY:
+                {
+                    var translateX = UnitValue.Zero;
+                    var translateY = UnitValue.Zero;
+
+                    int count = ParseValuePair(functionPart, ref translateX, ref translateY);
+
+                    if (count != 1 && (function == TransformFunction.TranslateX || function == TransformFunction.TranslateY))
+                    {
+                        ThrowFormatInvalidValueCount(function, 1);
+                    }
+
+                    VerifyZeroOrUnit(function, in translateX, Unit.Pixel);
+                    VerifyZeroOrUnit(function, in translateY, Unit.Pixel);
+
+                    if (function == TransformFunction.TranslateY)
+                    {
+                        translateY = translateX;
+                        translateX = UnitValue.Zero;
+                    }
+
+                    builder.AppendTranslate(translateX.Value, translateY.Value);
+
+                    break;
+                }
+                case TransformFunction.Matrix:
+                {
+                    Span<UnitValue> values = stackalloc UnitValue[6];
+
+                    int count = ParseCommaDelimitedValues(functionPart, in values);
+
+                    if (count != 6)
+                    {
+                        ThrowFormatInvalidValueCount(function, 6);
+                    }
+
+                    foreach (UnitValue value in values)
+                    {
+                        VerifyZeroOrUnit(function, value, Unit.None);
+                    }
+
+                    var matrix = new Matrix(
+                        values[0].Value,
+                        values[1].Value,
+                        values[2].Value,
+                        values[3].Value, 
+                        values[4].Value,
+                        values[5].Value);
+
+                    builder.AppendMatrix(matrix);
+
+                    break;
+                }
+            }
+        }
+
+        private static void VerifyZeroOrUnit(TransformFunction function, in UnitValue value, Unit unit)
+        {
+            bool isZero = value.Unit == Unit.None && value.Value == 0d;
+
+            if (!isZero && value.Unit != unit)
+            {
+                ThrowFormatInvalidValue(function, in value);
+            }
+        }
+
+        private static void VerifyZeroOrAngle(TransformFunction function, in UnitValue value)
+        {
+            if (value.Value != 0d && !IsAngleUnit(value.Unit))
+            {
+                ThrowFormatInvalidValue(function, in value);
+            }
+        }
+
+        private static bool IsAngleUnit(Unit unit)
+        {
+            switch (unit)
+            {
+                case Unit.Radian:
+                case Unit.Gradian:
+                case Unit.Degree:
+                case Unit.Turn:
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private static void ThrowFormatInvalidValue(TransformFunction function, in UnitValue value)
+        {
+            var unitString = value.Unit == Unit.None ? string.Empty : value.Unit.ToString();
+
+            throw new FormatException($"Invalid value {value.Value} {unitString} for {function}");
+        }
+
+        private static void ThrowFormatInvalidValueCount(TransformFunction function, int count)
+        {
+            throw new FormatException($"Invalid format. {function} expects {count} value(s).");
+        }
+
+        private static Unit ParseUnit(in ReadOnlySpan<char> part)
+        {
+            foreach (var (name, unit) in s_unitMapping)
+            {
+                if (part.Equals(name.AsSpan(), StringComparison.OrdinalIgnoreCase))
+                {
+                    return unit;
+                }
+            }
+
+            throw new FormatException($"Invalid unit: {part.ToString()}");
+        }
+
+        private static TransformFunction ParseTransformFunction(in ReadOnlySpan<char> part)
+        {
+            foreach (var (name, transformFunction) in s_functionMapping)
+            {
+                if (part.Equals(name.AsSpan(), StringComparison.OrdinalIgnoreCase))
+                {
+                    return transformFunction;
+                }
+            }
+
+            return TransformFunction.Invalid;
+        }
+
+        private static double ToRadians(in UnitValue value)
+        {
+            return value.Unit switch
+            {
+                Unit.Radian => value.Value,
+                Unit.Gradian => MathUtilities.Grad2Rad(value.Value),
+                Unit.Degree => MathUtilities.Deg2Rad(value.Value),
+                Unit.Turn => MathUtilities.Turn2Rad(value.Value),
+                _ => value.Value
+            };
+        }
+
+        private enum Unit
+        {
+            None,
+            Pixel,
+            Radian,
+            Gradian,
+            Degree,
+            Turn
+        }
+
+        private readonly struct UnitValue
+        {
+            public readonly Unit Unit;
+            public readonly double Value;
+
+            public UnitValue(Unit unit, double value)
+            {
+                Unit = unit;
+                Value = value;
+            }
+
+            public static UnitValue Zero => new UnitValue(Unit.None, 0);
+
+            public static UnitValue One => new UnitValue(Unit.None, 1);
+        }
+
+        private enum TransformFunction
+        {
+            Invalid,
+            Translate,
+            TranslateX,
+            TranslateY,
+            Scale,
+            ScaleX,
+            ScaleY,
+            Skew,
+            SkewX,
+            SkewY,
+            Rotate,
+            Matrix
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Media/TranslateTransform.cs b/src/Avalonia.Visuals/Media/TranslateTransform.cs
index 6ffbdb9623..d6d6809f3d 100644
--- a/src/Avalonia.Visuals/Media/TranslateTransform.cs
+++ b/src/Avalonia.Visuals/Media/TranslateTransform.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.VisualTree;
 
diff --git a/src/Avalonia.Visuals/Media/Typeface.cs b/src/Avalonia.Visuals/Media/Typeface.cs
index a6d5c8a43c..17824c3c5e 100644
--- a/src/Avalonia.Visuals/Media/Typeface.cs
+++ b/src/Avalonia.Visuals/Media/Typeface.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Diagnostics;
 using JetBrains.Annotations;
 
@@ -11,21 +8,17 @@ namespace Avalonia.Media
     /// Represents a typeface.
     /// </summary>
     [DebuggerDisplay("Name = {FontFamily.Name}, Weight = {Weight}, Style = {Style}")]
-    public class Typeface : IEquatable<Typeface>
+    public readonly struct Typeface : IEquatable<Typeface>
     {
-        public static readonly Typeface Default = new Typeface(FontFamily.Default);
-
-        private GlyphTypeface _glyphTypeface;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="Typeface"/> class.
         /// </summary>
         /// <param name="fontFamily">The font family.</param>
-        /// <param name="weight">The font weight.</param>
         /// <param name="style">The font style.</param>
-        public Typeface([NotNull]FontFamily fontFamily,
-            FontWeight weight = FontWeight.Normal,
-            FontStyle style = FontStyle.Normal)
+        /// <param name="weight">The font weight.</param>
+        public Typeface([NotNull] FontFamily fontFamily,
+            FontStyle style = FontStyle.Normal,
+            FontWeight weight = FontWeight.Normal)
         {
             if (weight <= 0)
             {
@@ -44,12 +37,14 @@ namespace Avalonia.Media
         /// <param name="style">The font style.</param>
         /// <param name="weight">The font weight.</param>
         public Typeface(string fontFamilyName,
-            FontWeight weight = FontWeight.Normal,
-            FontStyle style = FontStyle.Normal)
-            : this(new FontFamily(fontFamilyName), weight, style)
+            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>
@@ -71,7 +66,7 @@ namespace Avalonia.Media
         /// <value>
         /// The glyph typeface.
         /// </value>
-        public GlyphTypeface GlyphTypeface => _glyphTypeface ?? (_glyphTypeface = new GlyphTypeface(this));
+        public GlyphTypeface GlyphTypeface => FontManager.Current.GetOrAddGlyphTypeface(this);
 
         public static bool operator !=(Typeface a, Typeface b)
         {
@@ -80,32 +75,17 @@ namespace Avalonia.Media
 
         public static bool operator ==(Typeface a, Typeface b)
         {
-            if (ReferenceEquals(a, b))
-            {
-                return true;
-            }
-
-            return !(a is null) && a.Equals(b);
+            return  a.Equals(b);
         }
 
         public override bool Equals(object obj)
         {
-            if (obj is Typeface typeface)
-            {
-                return Equals(typeface);
-            }
-
-            return false;
+            return obj is Typeface typeface && Equals(typeface);
         }
 
         public bool Equals(Typeface other)
         {
-            if (other is null)
-            {
-                return false;
-            }
-
-            return FontFamily.Equals(other.FontFamily) && Style == other.Style && Weight == other.Weight;
+            return FontFamily == other.FontFamily && Style == other.Style && Weight == other.Weight;
         }
 
         public override int GetHashCode()
diff --git a/src/Avalonia.Visuals/Media/VisualBrush.cs b/src/Avalonia.Visuals/Media/VisualBrush.cs
index 963ba8f4a1..c665507652 100644
--- a/src/Avalonia.Visuals/Media/VisualBrush.cs
+++ b/src/Avalonia.Visuals/Media/VisualBrush.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Media.Immutable;
 using Avalonia.VisualTree;
 
diff --git a/src/Avalonia.Visuals/Platform/AlphaFormat.cs b/src/Avalonia.Visuals/Platform/AlphaFormat.cs
new file mode 100644
index 0000000000..3ef8fe9520
--- /dev/null
+++ b/src/Avalonia.Visuals/Platform/AlphaFormat.cs
@@ -0,0 +1,21 @@
+namespace Avalonia.Platform
+{
+    /// <summary>
+    /// Describes how to interpret the alpha component of a pixel.
+    /// </summary>
+    public enum AlphaFormat
+    {
+        /// <summary>
+        /// All pixels have their alpha premultiplied in their color components.
+        /// </summary>
+        Premul,
+        /// <summary>
+        /// All pixels have their color components stored without any regard to the alpha. e.g. this is the default configuration for PNG images.
+        /// </summary>
+        Unpremul,
+        /// <summary>
+        /// All pixels are stored as opaque.
+        /// </summary>
+        Opaque
+    }
+}
diff --git a/src/Avalonia.Visuals/Platform/IBitmapImpl.cs b/src/Avalonia.Visuals/Platform/IBitmapImpl.cs
index 1c8ac31955..1e68bc477d 100644
--- a/src/Avalonia.Visuals/Platform/IBitmapImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IBitmapImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.IO;
 
diff --git a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
index f74c551fe0..d6e88a7507 100644
--- a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Media;
 using Avalonia.Rendering.SceneGraph;
@@ -33,7 +30,7 @@ namespace Avalonia.Platform
         /// <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 DrawImage(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode = BitmapInterpolationMode.Default);
+        void DrawBitmap(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode = BitmapInterpolationMode.Default);
 
         /// <summary>
         /// Draws a bitmap image.
@@ -42,7 +39,7 @@ namespace Avalonia.Platform
         /// <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 DrawImage(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect);
+        void DrawBitmap(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect);
 
         /// <summary>
         /// Draws a line.
@@ -61,12 +58,18 @@ namespace Avalonia.Platform
         void DrawGeometry(IBrush brush, IPen pen, IGeometryImpl geometry);
 
         /// <summary>
-        /// Draws the outline of a rectangle.
+        /// Draws a rectangle with the specified Brush and Pen.
         /// </summary>
-        /// <param name="pen">The pen.</param>
+        /// <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="cornerRadius">The corner radius.</param>
-        void DrawRectangle(IPen pen, Rect rect, float cornerRadius = 0.0f);
+        /// <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 text.
@@ -77,12 +80,11 @@ namespace Avalonia.Platform
         void DrawText(IBrush foreground, Point origin, IFormattedTextImpl text);
 
         /// <summary>
-        /// Draws a filled rectangle.
+        /// Draws a glyph run.
         /// </summary>
-        /// <param name="brush">The brush.</param>
-        /// <param name="rect">The rectangle bounds.</param>
-        /// <param name="cornerRadius">The corner radius.</param>
-        void FillRectangle(IBrush brush, Rect rect, float cornerRadius = 0.0f);
+        /// <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
@@ -96,7 +98,7 @@ namespace Avalonia.Platform
         /// 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>
-        IRenderTargetBitmapImpl CreateLayer(Size size);
+        IDrawingContextLayerImpl CreateLayer(Size size);
 
         /// <summary>
         /// Pushes a clip rectangle.
@@ -104,6 +106,12 @@ namespace Avalonia.Platform
         /// <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>
@@ -147,4 +155,18 @@ namespace Avalonia.Platform
         /// <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/IDrawingContextWithAcrylicLikeSupport.cs b/src/Avalonia.Visuals/Platform/IDrawingContextWithAcrylicLikeSupport.cs
new file mode 100644
index 0000000000..a3cf0298dd
--- /dev/null
+++ b/src/Avalonia.Visuals/Platform/IDrawingContextWithAcrylicLikeSupport.cs
@@ -0,0 +1,9 @@
+using Avalonia.Media;
+
+namespace Avalonia.Platform
+{
+    public interface IDrawingContextWithAcrylicLikeSupport
+    {
+        void DrawRectangle(IExperimentalAcrylicMaterial material, RoundedRect rect);
+    }
+}
diff --git a/src/Avalonia.Visuals/Platform/IFontManagerImpl.cs b/src/Avalonia.Visuals/Platform/IFontManagerImpl.cs
index 254b5d07d1..e562b45ca8 100644
--- a/src/Avalonia.Visuals/Platform/IFontManagerImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IFontManagerImpl.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Globalization;
 using Avalonia.Media;
 
@@ -12,7 +9,7 @@ namespace Avalonia.Platform
         /// <summary>
         ///     Gets the system's default font family's name.
         /// </summary>
-        string DefaultFontFamilyName { get; }
+        string GetDefaultFontFamilyName();
 
         /// <summary>
         ///     Get all installed fonts in the system.
@@ -20,29 +17,29 @@ namespace Avalonia.Platform
         /// </summary>
         IEnumerable<string> GetInstalledFontFamilyNames(bool checkForUpdates = false);
 
-        /// <summary>
-        ///     Get a typeface from specified parameters.
-        /// </summary>
-        /// <param name="fontFamily">The font family.</param>
-        /// <param name="fontWeight">The font weight.</param>
-        /// <param name="fontStyle">The font style.</param>
-        /// <returns>
-        ///     The typeface.
-        /// </returns>
-        Typeface GetTypeface(FontFamily fontFamily, FontWeight fontWeight, FontStyle fontStyle);
-
         /// <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="fontWeight">The font weight.</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>
-        ///     The typeface.
+        ///     <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>
-        Typeface MatchCharacter(int codepoint, FontWeight fontWeight = default, FontStyle fontStyle = default,
-            FontFamily fontFamily = null, CultureInfo culture = null);
+        IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface);
     }
 }
diff --git a/src/Avalonia.Visuals/Platform/IFormattedTextImpl.cs b/src/Avalonia.Visuals/Platform/IFormattedTextImpl.cs
index 2543e4f363..330fcac50c 100644
--- a/src/Avalonia.Visuals/Platform/IFormattedTextImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IFormattedTextImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using Avalonia.Media;
diff --git a/src/Avalonia.Visuals/Platform/IGeometryContext.cs b/src/Avalonia.Visuals/Platform/IGeometryContext.cs
index ac63837428..3f7273b53b 100644
--- a/src/Avalonia.Visuals/Platform/IGeometryContext.cs
+++ b/src/Avalonia.Visuals/Platform/IGeometryContext.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Media;
 
diff --git a/src/Avalonia.Visuals/Platform/IGeometryImpl.cs b/src/Avalonia.Visuals/Platform/IGeometryImpl.cs
index b762859d1d..7490ad912a 100644
--- a/src/Avalonia.Visuals/Platform/IGeometryImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IGeometryImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Media;
 
 namespace Avalonia.Platform
diff --git a/src/Avalonia.Visuals/Platform/IGlyphRunImpl.cs b/src/Avalonia.Visuals/Platform/IGlyphRunImpl.cs
new file mode 100644
index 0000000000..08786d9689
--- /dev/null
+++ b/src/Avalonia.Visuals/Platform/IGlyphRunImpl.cs
@@ -0,0 +1,9 @@
+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
index 8c043a5129..6afd79d29c 100644
--- a/src/Avalonia.Visuals/Platform/IGlyphTypefaceImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IGlyphTypefaceImpl.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Platform
 {
@@ -47,6 +44,11 @@ namespace Avalonia.Platform
         /// </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>
diff --git a/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs b/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs
index 5a0a7b2f19..fb4a4427b7 100644
--- a/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs
+++ b/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs
@@ -1,10 +1,8 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.IO;
 using Avalonia.Media;
+using Avalonia.Visuals.Media.Imaging;
 
 namespace Avalonia.Platform
 {
@@ -83,42 +81,75 @@ namespace Avalonia.Platform
         /// </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 (optional).</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 = null);
+        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>
+        /// <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>
+        /// <param name="stream">The stream to read the bitmap from.</param>        
         /// <returns>An <see cref="IBitmapImpl"/>.</returns>
         IBitmapImpl LoadBitmap(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, IntPtr data, PixelSize size, Vector dpi, int stride);
+        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>
+        /// <param name="width">The glyph run's width.</param>
+        /// <returns></returns>
+        IGlyphRunImpl CreateGlyphRun(GlyphRun glyphRun, out double width);
+
+        bool SupportsIndividualRoundRects { get; }
+
+        /// <summary>
+        /// Default <see cref="AlphaFormat"/> used on this platform.
+        /// </summary>
+        public AlphaFormat DefaultAlphaFormat { get; }
 
         /// <summary>
-        ///     Creates a glyph typeface for specified typeface.
+        /// Default <see cref="PixelFormat"/> used on this platform.
         /// </summary>
-        /// <param name="typeface">The typeface.</param>
-        /// <returns>
-        ///     The glyph typeface implementation.
-        /// </returns>
-        IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface);
+        public PixelFormat DefaultPixelFormat { get; }
     }
 }
diff --git a/src/Avalonia.Visuals/Platform/IPlatformSettings.cs b/src/Avalonia.Visuals/Platform/IPlatformSettings.cs
index e52135433b..bcb00df5d6 100644
--- a/src/Avalonia.Visuals/Platform/IPlatformSettings.cs
+++ b/src/Avalonia.Visuals/Platform/IPlatformSettings.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Platform
diff --git a/src/Avalonia.Visuals/Platform/IRenderTarget.cs b/src/Avalonia.Visuals/Platform/IRenderTarget.cs
index 516bea782e..68b3b4c17d 100644
--- a/src/Avalonia.Visuals/Platform/IRenderTarget.cs
+++ b/src/Avalonia.Visuals/Platform/IRenderTarget.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Rendering;
 
diff --git a/src/Avalonia.Visuals/Platform/IRenderTargetBitmapImpl.cs b/src/Avalonia.Visuals/Platform/IRenderTargetBitmapImpl.cs
index 6464fdd41b..9add07afe3 100644
--- a/src/Avalonia.Visuals/Platform/IRenderTargetBitmapImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IRenderTargetBitmapImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 
 namespace Avalonia.Platform
 {
diff --git a/src/Avalonia.Visuals/Platform/IStreamGeometryContextImpl.cs b/src/Avalonia.Visuals/Platform/IStreamGeometryContextImpl.cs
index da9505cd2d..4587979308 100644
--- a/src/Avalonia.Visuals/Platform/IStreamGeometryContextImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IStreamGeometryContextImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Platform
 {
     /// <summary>
diff --git a/src/Avalonia.Visuals/Platform/IStreamGeometryImpl.cs b/src/Avalonia.Visuals/Platform/IStreamGeometryImpl.cs
index 956864fc73..5b070fde02 100644
--- a/src/Avalonia.Visuals/Platform/IStreamGeometryImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IStreamGeometryImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Platform
 {
     /// <summary>
diff --git a/src/Avalonia.Visuals/Platform/ITextShaperImpl.cs b/src/Avalonia.Visuals/Platform/ITextShaperImpl.cs
new file mode 100644
index 0000000000..d915da2603
--- /dev/null
+++ b/src/Avalonia.Visuals/Platform/ITextShaperImpl.cs
@@ -0,0 +1,22 @@
+using System.Globalization;
+using Avalonia.Media;
+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 resulting glyph run.
+        /// </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>
+        /// <returns>A shaped glyph run.</returns>
+        GlyphRun ShapeText(ReadOnlySlice<char> text, Typeface typeface, double fontRenderingEmSize, CultureInfo culture);
+    }
+}
diff --git a/src/Avalonia.Visuals/Platform/PathGeometryContext.cs b/src/Avalonia.Visuals/Platform/PathGeometryContext.cs
index 19322b9620..391a43d1cf 100644
--- a/src/Avalonia.Visuals/Platform/PathGeometryContext.cs
+++ b/src/Avalonia.Visuals/Platform/PathGeometryContext.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using Avalonia.Media;
 using Avalonia.Platform;
 
diff --git a/src/Avalonia.Visuals/Point.cs b/src/Avalonia.Visuals/Point.cs
index d92f8b0fc4..6febe9c802 100644
--- a/src/Avalonia.Visuals/Point.cs
+++ b/src/Avalonia.Visuals/Point.cs
@@ -1,9 +1,8 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
+#if !BUILDTASK
 using Avalonia.Animation.Animators;
+#endif
 using Avalonia.Utilities;
 
 namespace Avalonia
@@ -11,11 +10,16 @@ namespace Avalonia
     /// <summary>
     /// Defines a point.
     /// </summary>
-    public readonly struct Point : IEquatable<Point>
+#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>
@@ -175,7 +179,7 @@ namespace Avalonia
         /// Parses a <see cref="Point"/> string.
         /// </summary>
         /// <param name="s">The string.</param>
-        /// <returns>The <see cref="Thickness"/>.</returns>
+        /// <returns>The <see cref="Point"/>.</returns>
         public static Point Parse(string s)
         {
             using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid Point."))
@@ -270,5 +274,24 @@ namespace Avalonia
         {
             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.Visuals/Points.cs
index 867d3d4d24..b655dbcb38 100644
--- a/src/Avalonia.Visuals/Points.cs
+++ b/src/Avalonia.Visuals/Points.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Collections;
 
 namespace Avalonia
diff --git a/src/Avalonia.Visuals/Properties/AssemblyInfo.cs b/src/Avalonia.Visuals/Properties/AssemblyInfo.cs
index 05c3d7e62a..48107a31f8 100644
--- a/src/Avalonia.Visuals/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Visuals/Properties/AssemblyInfo.cs
@@ -1,14 +1,21 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// 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: InternalsVisibleTo("Avalonia.Visuals.UnitTests")]
 [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")]
 
+#if SIGNED_BUILD
+[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")]
+#else
+[assembly: InternalsVisibleTo("Avalonia.Visuals.UnitTests")]
 [assembly: InternalsVisibleTo("Avalonia.Direct2D1.RenderTests")]
-[assembly: InternalsVisibleTo("Avalonia.Skia.RenderTests")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("Avalonia.Skia.RenderTests")]
+[assembly: InternalsVisibleTo("Avalonia.Skia.UnitTests")]
+#endif
diff --git a/src/Avalonia.Visuals/Rect.cs b/src/Avalonia.Visuals/Rect.cs
index 4dfd641525..d2a72db6ae 100644
--- a/src/Avalonia.Visuals/Rect.cs
+++ b/src/Avalonia.Visuals/Rect.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
 using Avalonia.Animation.Animators;
@@ -135,6 +132,16 @@ namespace Avalonia
         /// 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.
@@ -204,6 +211,21 @@ namespace Avalonia
                 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.
@@ -414,11 +436,50 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Gets the union of two rectangles.
-        /// </summary>
-        /// <param name="rect">The other rectangle.</param>
-        /// <returns>The union.</returns>
-        public Rect Union(Rect rect)
+		/// 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)
             {
diff --git a/src/Avalonia.Visuals/RelativePoint.cs b/src/Avalonia.Visuals/RelativePoint.cs
index 2e8fb16bc1..097ea69be4 100644
--- a/src/Avalonia.Visuals/RelativePoint.cs
+++ b/src/Avalonia.Visuals/RelativePoint.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
 using Avalonia.Utilities;
@@ -177,5 +174,16 @@ namespace Avalonia
                     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.Visuals/RelativeRect.cs
index d2e4b2dc26..1d1f53e299 100644
--- a/src/Avalonia.Visuals/RelativeRect.cs
+++ b/src/Avalonia.Visuals/RelativeRect.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
 using Avalonia.Utilities;
diff --git a/src/Avalonia.Visuals/Rendering/DefaultRenderTimer.cs b/src/Avalonia.Visuals/Rendering/DefaultRenderTimer.cs
index d0eb181c65..8d6c3e67c1 100644
--- a/src/Avalonia.Visuals/Rendering/DefaultRenderTimer.cs
+++ b/src/Avalonia.Visuals/Rendering/DefaultRenderTimer.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using Avalonia.Platform;
diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index d9a68b236a..3bd8e05ee2 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -38,6 +35,7 @@ namespace Avalonia.Rendering
         private IRef<IDrawOperation> _currentDraw;
         private readonly IDeferredRendererLock _lock;
         private readonly object _sceneLock = new object();
+        private readonly Action _updateSceneIfNeededDelegate;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DeferredRenderer"/> class.
@@ -52,7 +50,7 @@ namespace Avalonia.Rendering
             IRenderLoop renderLoop,
             ISceneBuilder sceneBuilder = null,
             IDispatcher dispatcher = null,
-            IDeferredRendererLock rendererLock = null)
+            IDeferredRendererLock rendererLock = null) : base(true)
         {
             Contract.Requires<ArgumentNullException>(root != null);
 
@@ -62,6 +60,7 @@ namespace Avalonia.Rendering
             Layers = new RenderLayers();
             _renderLoop = renderLoop;
             _lock = rendererLock ?? new ManagedDeferredRendererLock();
+            _updateSceneIfNeededDelegate = UpdateSceneIfNeeded;
         }
 
         /// <summary>
@@ -76,7 +75,7 @@ namespace Avalonia.Rendering
         public DeferredRenderer(
             IVisual root,
             IRenderTarget renderTarget,
-            ISceneBuilder sceneBuilder = null)
+            ISceneBuilder sceneBuilder = null) : base(true)
         {
             Contract.Requires<ArgumentNullException>(root != null);
             Contract.Requires<ArgumentNullException>(renderTarget != null);
@@ -86,6 +85,7 @@ namespace Avalonia.Rendering
             _sceneBuilder = sceneBuilder ?? new SceneBuilder();
             Layers = new RenderLayers();
             _lock = new ManagedDeferredRendererLock();
+            _updateSceneIfNeededDelegate = UpdateSceneIfNeeded;
         }
 
         /// <inheritdoc/>
@@ -99,6 +99,11 @@ namespace Avalonia.Rendering
         /// </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;
 
@@ -160,24 +165,64 @@ namespace Avalonia.Rendering
         /// <inheritdoc/>
         public IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool> filter)
         {
-            if (_renderLoop == null && (_dirty == null || _dirty.Count > 0))
-            {
-                // When unit testing the renderLoop may be null, so update the scene manually.
-                UpdateScene();
-            }
+            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)
         {
-            var t = (IRenderLoopTask)this;
-            if(t.NeedsUpdate)
-                UpdateScene();
-            if(_scene?.Item != null)
-                Render(true);
+            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/>
@@ -235,6 +280,15 @@ namespace Avalonia.Rendering
 
         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();
+            }
+        }
+
         private void Render(bool forceComposite)
         {
             using (var l = _lock.TryLock())
@@ -248,18 +302,26 @@ namespace Avalonia.Rendering
                     try
                     {
                         var (scene, updated) = UpdateRenderLayersAndConsumeSceneIfNeeded(ref context);
-
+                        if (updated)
+                            FpsTick();
                         using (scene)
                         {
                             if (scene?.Item != null)
                             {
-                                var overlay = DrawDirtyRects || DrawFps;
-                                if (DrawDirtyRects)
-                                    _dirtyRectsDisplay.Tick();
-                                if (overlay)
-                                    RenderOverlay(scene.Item, ref context);
-                                if (updated || forceComposite || overlay)
-                                    RenderComposite(scene.Item, ref context);
+                                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();
+                                }
                             }
                         }
                     }
@@ -270,7 +332,7 @@ namespace Avalonia.Rendering
                 }
                 catch (RenderTargetCorruptedException ex)
                 {
-                    Logger.TryGet(LogEventLevel.Information)?.Log("Renderer", this, "Render target was corrupted. Exception: {0}", ex);
+                    Logger.TryGet(LogEventLevel.Information, LogArea.Animations)?.Log(this, "Render target was corrupted. Exception: {0}", ex);
                     RenderTarget?.Dispose();
                     RenderTarget = null;
                 }
@@ -305,17 +367,25 @@ namespace Avalonia.Rendering
                         _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 && Dispatcher.UIThread.CheckAccess() && NeedsUpdate)
+                    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);
                 }
@@ -339,15 +409,21 @@ namespace Avalonia.Rendering
 
                     node.BeginRender(context, isLayerRoot);
 
-                    foreach (var operation in node.DrawOperations)
+                    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;
                     }
 
-                    foreach (var child in node.Children)
+                    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);
                     }
 
@@ -412,11 +488,12 @@ namespace Avalonia.Rendering
         private static Rect SnapToDevicePixels(Rect rect, double scale)
         {
             return new Rect(
-                Math.Floor(rect.X * scale) / scale,
-                Math.Floor(rect.Y * scale) / scale,
-                Math.Ceiling(rect.Width * scale) / scale,
-                Math.Ceiling(rect.Height * scale) / scale);
-                
+                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)
@@ -445,7 +522,7 @@ namespace Avalonia.Rendering
             foreach (var r in _dirtyRectsDisplay)
             {
                 var brush = new ImmutableSolidColorBrush(Colors.Magenta, r.Opacity);
-                context.FillRectangle(brush, r.Rect);
+                context.DrawRectangle(brush,null, r.Rect);
             }
         }
 
@@ -457,6 +534,7 @@ namespace Avalonia.Rendering
 
             var clientRect = new Rect(scene.Size);
 
+            var firstLayer = true;
             foreach (var layer in scene.Layers)
             {
                 var bitmap = Layers[layer.LayerRoot].Bitmap;
@@ -469,23 +547,28 @@ namespace Avalonia.Rendering
 
                 if (layer.OpacityMask == null)
                 {
-                    context.DrawImage(bitmap, layer.Opacity, sourceRect, clientRect);
+                    if (firstLayer && bitmap.Item.CanBlit)
+                        bitmap.Item.Blit(context);
+                    else
+                        context.DrawBitmap(bitmap, layer.Opacity, sourceRect, clientRect);
                 }
                 else
                 {
-                    context.DrawImage(bitmap, layer.OpacityMask, layer.OpacityMaskRect, sourceRect);
+                    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.DrawImage(_overlay, 0.5, sourceRect, clientRect);
+                context.DrawBitmap(_overlay, 0.5, sourceRect, clientRect);
             }
 
             if (DrawFps)
@@ -515,15 +598,22 @@ namespace Avalonia.Rendering
             context = RenderTarget.CreateDrawingContext(this);
         }
 
-        private void UpdateScene()
+        private void UpdateSceneIfNeeded()
+        {
+            if(NeedsUpdate)
+                UpdateScene();
+        }
+        
+        private bool? UpdateScene()
         {
             Dispatcher.UIThread.VerifyAccess();
+            using var noPump = NonPumpingLockHelper.Use();
             lock (_sceneLock)
             {
                 if (_disposed)
-                    return;
+                    return null;
                 if (_scene?.Item.Generation > _lastSceneId)
-                    return;
+                    return false;
             }
             if (_root.IsVisible)
             {
@@ -575,6 +665,8 @@ namespace Avalonia.Rendering
 
                     SceneInvalidated(this, new SceneInvalidatedEventArgs((IRenderRoot)_root, rect));
                 }
+
+                return true;
             }
             else
             {
@@ -584,6 +676,8 @@ namespace Avalonia.Rendering
                     _scene = null;
                     oldScene?.Dispose();
                 }
+
+                return null;
             }
         }
 
diff --git a/src/Avalonia.Visuals/Rendering/DirtyRects.cs b/src/Avalonia.Visuals/Rendering/DirtyRects.cs
index d206d23a24..f4b6a6b6ce 100644
--- a/src/Avalonia.Visuals/Rendering/DirtyRects.cs
+++ b/src/Avalonia.Visuals/Rendering/DirtyRects.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 
 namespace Avalonia.Rendering
diff --git a/src/Avalonia.Visuals/Rendering/ICustomSimpleHitTest.cs b/src/Avalonia.Visuals/Rendering/ICustomSimpleHitTest.cs
index 7199053b08..245888a351 100644
--- a/src/Avalonia.Visuals/Rendering/ICustomSimpleHitTest.cs
+++ b/src/Avalonia.Visuals/Rendering/ICustomSimpleHitTest.cs
@@ -1,3 +1,7 @@
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.VisualTree;
+
 namespace Avalonia.Rendering
 {
     /// <summary>
@@ -9,4 +13,24 @@ namespace Avalonia.Rendering
     {
         bool HitTest(Point point);
     }
+
+    /// <summary>
+    /// Allows customization of hit-testing for all renderers.
+    /// </summary>
+    /// <remarks>
+    /// Note that this interface can only used to make a portion of a control non-hittable, it
+    /// cannot expand the hittable area of a control.
+    /// </remarks>
+    public interface ICustomHitTest : ICustomSimpleHitTest
+    {
+    }
+
+    public static class CustomSimpleHitTestExtensions
+    {
+        public static bool HitTestCustom(this IVisual visual, Point point)
+            => (visual as ICustomSimpleHitTest)?.HitTest(point) ?? visual.TransformedBounds?.Contains(point) == true;
+
+        public static bool HitTestCustom(this IEnumerable<IVisual> children, Point point)
+            => children.Any(ctrl => ctrl.HitTestCustom(point));
+    }
 }
diff --git a/src/Avalonia.Visuals/Rendering/IRenderRoot.cs b/src/Avalonia.Visuals/Rendering/IRenderRoot.cs
index 044911ca95..54e58bf39c 100644
--- a/src/Avalonia.Visuals/Rendering/IRenderRoot.cs
+++ b/src/Avalonia.Visuals/Rendering/IRenderRoot.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Platform;
 using Avalonia.VisualTree;
 
diff --git a/src/Avalonia.Visuals/Rendering/IRenderer.cs b/src/Avalonia.Visuals/Rendering/IRenderer.cs
index 9ad7186dca..0c7440d159 100644
--- a/src/Avalonia.Visuals/Rendering/IRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/IRenderer.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using Avalonia.VisualTree;
 using System.Collections.Generic;
 
@@ -50,6 +47,18 @@ namespace Avalonia.Rendering
         /// <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>
diff --git a/src/Avalonia.Visuals/Rendering/IRendererFactory.cs b/src/Avalonia.Visuals/Rendering/IRendererFactory.cs
index 27af39e40d..11d89ef94c 100644
--- a/src/Avalonia.Visuals/Rendering/IRendererFactory.cs
+++ b/src/Avalonia.Visuals/Rendering/IRendererFactory.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-
+
 namespace Avalonia.Rendering
 {
     /// <summary>
diff --git a/src/Avalonia.Visuals/Rendering/IVisualBrushInitialize.cs b/src/Avalonia.Visuals/Rendering/IVisualBrushInitialize.cs
index 2949c9c051..00449c5344 100644
--- a/src/Avalonia.Visuals/Rendering/IVisualBrushInitialize.cs
+++ b/src/Avalonia.Visuals/Rendering/IVisualBrushInitialize.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Media;
+using Avalonia.Media;
 
 namespace Avalonia.Rendering
 {
diff --git a/src/Avalonia.Visuals/Rendering/IVisualBrushRenderer.cs b/src/Avalonia.Visuals/Rendering/IVisualBrushRenderer.cs
index 84f540ca8e..1cd6515635 100644
--- a/src/Avalonia.Visuals/Rendering/IVisualBrushRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/IVisualBrushRenderer.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Media;
+using Avalonia.Media;
 using Avalonia.Platform;
 
 namespace Avalonia.Rendering
diff --git a/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs b/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
index 68d56eeedd..9ea1b84311 100644
--- a/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Logging;
@@ -81,7 +78,7 @@ namespace Avalonia.Rendering
             }
             catch (RenderTargetCorruptedException ex)
             {
-                Logger.TryGet(LogEventLevel.Information)?.Log("Renderer", this, "Render target was corrupted. Exception: {0}", ex);
+                Logger.TryGet(LogEventLevel.Information, LogArea.Animations)?.Log(this, "Render target was corrupted. Exception: {0}", ex);
                 _renderTarget.Dispose();
                 _renderTarget = null;
             }
@@ -164,6 +161,11 @@ namespace Avalonia.Rendering
             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);
 
@@ -287,7 +289,11 @@ namespace Avalonia.Rendering
 
                 using (context.PushPostTransform(m))
                 using (context.PushOpacity(opacity))
-                using (clipToBounds ? context.PushClip(bounds) : default(DrawingContext.PushedState))
+                using (clipToBounds 
+                    ? visual is IVisualWithRoundRectClip roundClipVisual 
+                        ? context.PushClip(new RoundedRect(bounds, roundClipVisual.ClipToBoundsRadius))
+                        : context.PushClip(bounds) 
+                    : default(DrawingContext.PushedState))
                 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())
@@ -307,7 +313,9 @@ namespace Avalonia.Rendering
 
                         if (!child.ClipToBounds || clipRect.Intersects(childBounds))
                         {
-                            var childClipRect = clipRect.Translate(-childBounds.Position);
+                            var childClipRect = child.RenderTransform == null
+                                ? clipRect.Translate(-childBounds.Position)
+                                : clipRect;
                             Render(context, child, childClipRect);
                         }
                         else
diff --git a/src/Avalonia.Visuals/Rendering/ManagedDeferredRendererLock.cs b/src/Avalonia.Visuals/Rendering/ManagedDeferredRendererLock.cs
index 259874423e..158fecbfc6 100644
--- a/src/Avalonia.Visuals/Rendering/ManagedDeferredRendererLock.cs
+++ b/src/Avalonia.Visuals/Rendering/ManagedDeferredRendererLock.cs
@@ -1,53 +1,11 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Threading;
+using Avalonia.Utilities;
 
 namespace Avalonia.Rendering
 {
-    public class ManagedDeferredRendererLock : IDeferredRendererLock
+    public class ManagedDeferredRendererLock : DisposableLock, IDeferredRendererLock
     {
-        private readonly object _lock = new object();
-
-        /// <summary>
-        /// Tries to lock the target surface or window
-        /// </summary>
-        /// <returns>IDisposable if succeeded to obtain the lock</returns>
-        public IDisposable TryLock()
-        {
-            if (Monitor.TryEnter(_lock))
-                return new UnlockDisposable(_lock);
-            return null;
-        }
-
-        /// <summary>
-        /// Enters a waiting lock, only use from platform code, not from the renderer
-        /// </summary>
-        public IDisposable Lock()
-        {
-            Monitor.Enter(_lock);
-            return new UnlockDisposable(_lock);
-        }
-
-        private sealed class UnlockDisposable : IDisposable
-        {
-            private object _lock;
-
-            public UnlockDisposable(object @lock)
-            {
-                _lock = @lock;
-            }
-
-            public void Dispose()
-            {
-                object @lock = Interlocked.Exchange(ref _lock, null);
-
-                if (@lock != null)
-                {
-                    Monitor.Exit(@lock);
-                }
-            }
-        }
+       
     }
 }
diff --git a/src/Avalonia.Visuals/Rendering/RenderLayer.cs b/src/Avalonia.Visuals/Rendering/RenderLayer.cs
index d6676e25ff..768e832fe5 100644
--- a/src/Avalonia.Visuals/Rendering/RenderLayer.cs
+++ b/src/Avalonia.Visuals/Rendering/RenderLayer.cs
@@ -20,7 +20,7 @@ namespace Avalonia.Rendering
             IsEmpty = true;
         }
 
-        public IRef<IRenderTargetBitmapImpl> Bitmap { get; private set; }
+        public IRef<IDrawingContextLayerImpl> Bitmap { get; private set; }
         public bool IsEmpty { get; set; }
         public double Scaling { get; private set; }
         public Size Size { get; private set; }
@@ -34,8 +34,9 @@ namespace Avalonia.Rendering
 
                 using (var context = resized.Item.CreateDrawingContext(null))
                 {
-                    context.Clear(Colors.Transparent);
                     Bitmap.Dispose();
+                    context.Clear(default);
+                    
                     Bitmap = resized;
                     Scaling = scaling;
                     Size = size;
diff --git a/src/Avalonia.Visuals/Rendering/RenderLoop.cs b/src/Avalonia.Visuals/Rendering/RenderLoop.cs
index c2594658b9..b2a6b0da19 100644
--- a/src/Avalonia.Visuals/Rendering/RenderLoop.cs
+++ b/src/Avalonia.Visuals/Rendering/RenderLoop.cs
@@ -18,6 +18,7 @@ namespace Avalonia.Rendering
     {
         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;
@@ -63,11 +64,14 @@ namespace Avalonia.Rendering
             Contract.Requires<ArgumentNullException>(i != null);
             Dispatcher.UIThread.VerifyAccess();
 
-            _items.Add(i);
-
-            if (_items.Count == 1)
+            lock (_items)
             {
-                Timer.Tick += TimerTick;
+                _items.Add(i);
+
+                if (_items.Count == 1)
+                {
+                    Timer.Tick += TimerTick;
+                }
             }
         }
 
@@ -76,12 +80,14 @@ namespace Avalonia.Rendering
         {
             Contract.Requires<ArgumentNullException>(i != null);
             Dispatcher.UIThread.VerifyAccess();
-
-            _items.Remove(i);
-
-            if (_items.Count == 0)
+            lock (_items)
             {
-                Timer.Tick -= TimerTick;
+                _items.Remove(i);
+
+                if (_items.Count == 0)
+                {
+                    Timer.Tick -= TimerTick;
+                }
             }
         }
 
@@ -120,7 +126,7 @@ namespace Avalonia.Rendering
                                     }
                                     catch (Exception ex)
                                     {
-                                        Logger.TryGet(LogEventLevel.Error)?.Log(LogArea.Visual, this, "Exception in render update: {Error}", ex);
+                                        Logger.TryGet(LogEventLevel.Error, LogArea.Visual)?.Log(this, "Exception in render update: {Error}", ex);
                                     }
                                 }
                             }
@@ -129,14 +135,24 @@ namespace Avalonia.Rendering
                         }, DispatcherPriority.Render);
                     }
 
-                    for(int i = 0; i < _items.Count; i++)
+                    lock (_items)
+                    {
+                        _itemsCopy.Clear();
+                        foreach (var i in _items)
+                            _itemsCopy.Add(i);
+                    }
+
+                    for (int i = 0; i < _itemsCopy.Count; i++)
                     {
-                        _items[i].Render();
+                        _itemsCopy[i].Render();
                     }
+                    
+                    _itemsCopy.Clear();
+
                 }
                 catch (Exception ex)
                 {
-                    Logger.TryGet(LogEventLevel.Error)?.Log(LogArea.Visual, this, "Exception in render loop: {Error}", ex);
+                    Logger.TryGet(LogEventLevel.Error, LogArea.Visual)?.Log(this, "Exception in render loop: {Error}", ex);
                 }
                 finally
                 {
diff --git a/src/Avalonia.Visuals/Rendering/RendererBase.cs b/src/Avalonia.Visuals/Rendering/RendererBase.cs
index e341f02901..5c9cace4cd 100644
--- a/src/Avalonia.Visuals/Rendering/RendererBase.cs
+++ b/src/Avalonia.Visuals/Rendering/RendererBase.cs
@@ -7,7 +7,7 @@ namespace Avalonia.Rendering
 {
     public class RendererBase
     {
-        private static readonly Typeface s_fpsTypeface = new Typeface("Arial");
+        private readonly bool _useManualFpsCounting;
         private static int s_fontSize = 18;
         private readonly Stopwatch _stopwatch = Stopwatch.StartNew();
         private int _framesThisSecond;
@@ -15,21 +15,25 @@ namespace Avalonia.Rendering
         private FormattedText _fpsText;
         private TimeSpan _lastFpsUpdate;
 
-        public RendererBase()
+        public RendererBase(bool useManualFpsCounting = false)
         {
+            _useManualFpsCounting = useManualFpsCounting;
             _fpsText = new FormattedText
             {
-                Typeface = s_fpsTypeface,
+                Typeface = new Typeface(FontFamily.Default),
                 FontSize = s_fontSize
             };
         }
 
+        protected void FpsTick() => _framesThisSecond++;
+
         protected void RenderFps(IDrawingContextImpl context, Rect clientRect, int? layerCount)
         {
             var now = _stopwatch.Elapsed;
             var elapsed = now - _lastFpsUpdate;
 
-            ++_framesThisSecond;
+            if (!_useManualFpsCounting)
+                ++_framesThisSecond;
 
             if (elapsed.TotalSeconds > 1)
             {
@@ -51,7 +55,7 @@ namespace Avalonia.Rendering
             var rect = new Rect(clientRect.Right - size.Width, 0, size.Width, size.Height);
 
             context.Transform = Matrix.Identity;
-            context.FillRectangle(Brushes.Black, rect);
+            context.DrawRectangle(Brushes.Black,null, rect);
             context.DrawText(Brushes.White, rect.TopLeft, _fpsText.PlatformImpl);
         }
     }
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/BrushDrawOperation.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/BrushDrawOperation.cs
index b2c0581388..c559f05d70 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/BrushDrawOperation.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/BrushDrawOperation.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Avalonia.Media;
 using Avalonia.VisualTree;
 
@@ -12,8 +9,8 @@ namespace Avalonia.Rendering.SceneGraph
     /// </summary>
     internal abstract class BrushDrawOperation : DrawOperation
     {
-        public BrushDrawOperation(Rect bounds, Matrix transform, IPen pen)
-            : base(bounds, transform, pen)
+        public BrushDrawOperation(Rect bounds, Matrix transform)
+            : base(bounds, transform)
         {
         }
 
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/ClipNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/ClipNode.cs
index 34f042e334..ada04bfefd 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/ClipNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/ClipNode.cs
@@ -16,6 +16,16 @@ namespace Avalonia.Rendering.SceneGraph
         {
             Clip = clip;
         }
+        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ClipNode"/> class that represents a
+        /// clip push.
+        /// </summary>
+        /// <param name="clip">The clip to push.</param>
+        public ClipNode(RoundedRect clip)
+        {
+            Clip = clip;
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ClipNode"/> class that represents a
@@ -31,7 +41,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// <summary>
         /// Gets the clip to be pushed or null if the operation represents a pop.
         /// </summary>
-        public Rect? Clip { get; }
+        public RoundedRect? Clip { get; }
 
         /// <inheritdoc/>
         public bool HitTest(Point p) => false;
@@ -45,7 +55,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// 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(Rect? clip) => Clip == clip;
+        public bool Equals(RoundedRect? clip) => Clip == clip;
 
         /// <inheritdoc/>
         public void Render(IDrawingContextImpl context)
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/CustomDrawOperation.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/CustomDrawOperation.cs
index 68e2237430..15e5660671 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/CustomDrawOperation.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/CustomDrawOperation.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Rendering.SceneGraph
         public Matrix Transform { get; }
         public ICustomDrawOperation Custom { get; }
         public CustomDrawOperation(ICustomDrawOperation custom, Matrix transform) 
-            : base(custom.Bounds, transform, null)
+            : base(custom.Bounds, transform)
         {
             Transform = transform;
             Custom = custom;
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
index 3af56f5215..28f426266d 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
 using Avalonia.Media;
 using Avalonia.Platform;
@@ -14,7 +11,7 @@ namespace Avalonia.Rendering.SceneGraph
     /// <summary>
     /// A drawing context which builds a scene graph.
     /// </summary>
-    internal class DeferredDrawingContextImpl : IDrawingContextImpl
+    internal class DeferredDrawingContextImpl : IDrawingContextImpl, IDrawingContextWithAcrylicLikeSupport
     {
         private readonly ISceneBuilder _sceneBuilder;
         private VisualNode _node;
@@ -115,7 +112,7 @@ namespace Avalonia.Rendering.SceneGraph
         }
 
         /// <inheritdoc/>
-        public void DrawImage(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
+        public void DrawBitmap(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
         {
             var next = NextDrawAs<ImageNode>();
 
@@ -130,7 +127,7 @@ namespace Avalonia.Rendering.SceneGraph
         }
 
         /// <inheritdoc/>
-        public void DrawImage(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect sourceRect)
+        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();
@@ -152,20 +149,36 @@ namespace Avalonia.Rendering.SceneGraph
         }
 
         /// <inheritdoc/>
-        public void DrawRectangle(IPen pen, Rect rect, float cornerRadius = 0)
+        public void DrawRectangle(IBrush brush, IPen pen, RoundedRect rect,
+            BoxShadows boxShadows = default)
         {
             var next = NextDrawAs<RectangleNode>();
 
-            if (next == null || !next.Item.Equals(Transform, null, pen, rect, cornerRadius))
+            if (next == null || !next.Item.Equals(Transform, brush, pen, rect, boxShadows))
             {
-                Add(new RectangleNode(Transform, null, pen, rect, cornerRadius, CreateChildScene(pen.Brush)));
+                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 Custom(ICustomDrawOperation custom)
         {
             var next = NextDrawAs<CustomDrawOperation>();
@@ -191,21 +204,21 @@ namespace Avalonia.Rendering.SceneGraph
         }
 
         /// <inheritdoc/>
-        public void FillRectangle(IBrush brush, Rect rect, float cornerRadius = 0)
+        public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
         {
-            var next = NextDrawAs<RectangleNode>();
+            var next = NextDrawAs<GlyphRunNode>();
 
-            if (next == null || !next.Item.Equals(Transform, brush, null, rect, cornerRadius))
+            if (next == null || !next.Item.Equals(Transform, foreground, glyphRun))
             {
-                Add(new RectangleNode(Transform, brush, null, rect, cornerRadius, CreateChildScene(brush)));
+                Add(new GlyphRunNode(Transform, foreground, glyphRun, CreateChildScene(foreground)));
             }
+
             else
             {
                 ++_drawOperationindex;
             }
         }
-
-        public IRenderTargetBitmapImpl CreateLayer(Size size)
+        public IDrawingContextLayerImpl CreateLayer(Size size)
         {
             throw new NotSupportedException("Creating layers on a deferred drawing context not supported");
         }
@@ -285,6 +298,21 @@ namespace Avalonia.Rendering.SceneGraph
             }
         }
 
+        /// <inheritdoc />
+        public void PushClip(RoundedRect clip)
+        {
+            var next = NextDrawAs<ClipNode>();
+
+            if (next == null || !next.Item.Equals(clip))
+            {
+                Add(new ClipNode(clip));
+            }
+            else
+            {
+                ++_drawOperationindex;
+            }
+        }
+
         /// <inheritdoc/>
         public void PushGeometryClip(IGeometryImpl clip)
         {
@@ -366,11 +394,11 @@ namespace Avalonia.Rendering.SceneGraph
             public int DrawOperationIndex { get; }
         }
 
-        private void Add(IDrawOperation node)
+        private void Add<T>(T node) where T : class, IDrawOperation
         {
             using (var refCounted = RefCountable.Create(node))
             {
-                Add(refCounted); 
+                Add(refCounted);
             }
         }
 
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/DrawOperation.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/DrawOperation.cs
index d9dfd8bd55..c49e7705e0 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/DrawOperation.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/DrawOperation.cs
@@ -9,9 +9,10 @@ namespace Avalonia.Rendering.SceneGraph
     /// </summary>
     internal abstract class DrawOperation : IDrawOperation
     {
-        public DrawOperation(Rect bounds, Matrix transform, IPen pen)
+        public DrawOperation(Rect bounds, Matrix transform)
         {
-            bounds = bounds.Inflate((pen?.Thickness ?? 0) / 2).TransformToAABB(transform);
+            bounds = bounds.Normalize().TransformToAABB(transform);
+
             Bounds = new Rect(
                 new Point(Math.Floor(bounds.X), Math.Floor(bounds.Y)),
                 new Point(Math.Ceiling(bounds.Right), Math.Ceiling(bounds.Bottom)));
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/ExperimentalAcrylicNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/ExperimentalAcrylicNode.cs
new file mode 100644
index 0000000000..8bd079d070
--- /dev/null
+++ b/src/Avalonia.Visuals/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.Contains(p);
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs
index d5aa1251f3..508ca0ad18 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Avalonia.Media;
 using Avalonia.Media.Immutable;
 using Avalonia.Platform;
@@ -22,13 +19,12 @@ namespace Avalonia.Rendering.SceneGraph
         /// <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,
+        public GeometryNode(Matrix transform,
             IBrush brush,
             IPen pen,
             IGeometryImpl geometry,
             IDictionary<IVisual, Scene> childScenes = null)
-            : base(geometry.GetRenderBounds(pen), transform, null)
+            : base(geometry.GetRenderBounds(pen), transform)
         {
             Transform = transform;
             Brush = brush?.ToImmutable();
@@ -75,9 +71,9 @@ namespace Avalonia.Rendering.SceneGraph
         public bool Equals(Matrix transform, IBrush brush, IPen pen, IGeometryImpl geometry)
         {
             return transform == Transform &&
-                Equals(brush, Brush) && 
-                Equals(Pen, pen) &&
-                Equals(geometry, Geometry);
+                   Equals(brush, Brush) &&
+                   Equals(Pen, pen) &&
+                   Equals(geometry, Geometry);
         }
 
         /// <inheritdoc/>
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/GlyphRunNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/GlyphRunNode.cs
new file mode 100644
index 0000000000..a6dba1bd32
--- /dev/null
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/GlyphRunNode.cs
@@ -0,0 +1,81 @@
+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/IDrawOperation.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/IDrawOperation.cs
index f8d5bf5b7a..6d30358119 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/IDrawOperation.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/IDrawOperation.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using Avalonia.Platform;
 
 namespace Avalonia.Rendering.SceneGraph
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs
index 10c8d36dc8..6d12b5bca4 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/IVisualNode.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
 using Avalonia.Platform;
 using Avalonia.Utilities;
@@ -29,6 +26,11 @@ namespace Avalonia.Rendering.SceneGraph
         /// </summary>
         Matrix Transform { get; }
 
+        /// <summary>
+        /// Gets the corner radius of visual. Contents are clipped to this radius.
+        /// </summary>
+        CornerRadius ClipToBoundsRadius { get; }
+
         /// <summary>
         /// Gets the bounds of the node's geometry in global coordinates.
         /// </summary>
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs
index e1bdcaab3b..c9052c6ef2 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Platform;
+using Avalonia.Platform;
 using Avalonia.Utilities;
 using Avalonia.Visuals.Media.Imaging;
 
@@ -22,7 +19,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// <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, null)
+            : base(destRect, transform)
         {
             Transform = transform;
             Source = source.Clone();
@@ -100,7 +97,7 @@ namespace Avalonia.Rendering.SceneGraph
         public override void Render(IDrawingContextImpl context)
         {
             context.Transform = Transform;
-            context.DrawImage(Source, Opacity, SourceRect, DestRect, BitmapInterpolationMode);
+            context.DrawBitmap(Source, Opacity, SourceRect, DestRect, BitmapInterpolationMode);
         }
 
         /// <inheritdoc/>
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/LineBoundsHelper.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/LineBoundsHelper.cs
new file mode 100644
index 0000000000..56d218e398
--- /dev/null
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/LineBoundsHelper.cs
@@ -0,0 +1,68 @@
+using System;
+using Avalonia.Media;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+    internal static class LineBoundsHelper
+    {
+        private static double CalculateAngle(Point p1, Point p2)
+        {
+            var xDiff = p2.X - p1.X;
+            var yDiff = p2.Y - p1.Y;
+
+            return Math.Atan2(yDiff, xDiff);
+        }
+
+        internal static double CalculateOppSide(double angle, double hyp)
+        {
+            return Math.Sin(angle) * hyp;
+        }
+
+        internal static double CalculateAdjSide(double angle, double hyp)
+        {
+            return Math.Cos(angle) * hyp;
+        }
+
+        private static (Point p1, Point p2) TranslatePointsAlongTangent(Point p1, Point p2, double angle, double distance)
+        {
+            var xDiff = CalculateOppSide(angle, distance);
+            var yDiff = CalculateAdjSide(angle, distance);
+
+            var c1 = new Point(p1.X + xDiff, p1.Y - yDiff);
+            var c2 = new Point(p1.X - xDiff, p1.Y + yDiff);
+
+            var c3 = new Point(p2.X + xDiff, p2.Y - yDiff);
+            var c4 = new Point(p2.X - xDiff, p2.Y + yDiff);
+
+            var minX = Math.Min(c1.X, Math.Min(c2.X, Math.Min(c3.X, c4.X)));
+            var minY = Math.Min(c1.Y, Math.Min(c2.Y, Math.Min(c3.Y, c4.Y)));
+            var maxX = Math.Max(c1.X, Math.Max(c2.X, Math.Max(c3.X, c4.X)));
+            var maxY = Math.Max(c1.Y, Math.Max(c2.Y, Math.Max(c3.Y, c4.Y)));
+
+            return (new Point(minX, minY), new Point(maxX, maxY));
+        }
+
+        private static Rect CalculateBounds(Point p1, Point p2, double thickness, double angleToCorner)
+        {
+            var pts = TranslatePointsAlongTangent(p1, p2, angleToCorner, thickness / 2);
+
+            return new Rect(pts.p1, pts.p2);
+        }
+
+        public static Rect CalculateBounds(Point p1, Point p2, IPen p)
+        {
+            var radians = CalculateAngle(p1, p2);
+
+            if (p.LineCap != PenLineCap.Flat)
+            {
+                var pts = TranslatePointsAlongTangent(p1, p2, radians - Math.PI / 2, p.Thickness / 2);
+
+                return CalculateBounds(pts.p1, pts.p2, p.Thickness, radians);
+            }
+            else
+            {
+                return CalculateBounds(p1, p2, p.Thickness, radians);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/LineNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/LineNode.cs
index 9a65fac078..54a9ff733d 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/LineNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/LineNode.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Avalonia.Media;
 using Avalonia.Media.Immutable;
 using Avalonia.Platform;
@@ -28,7 +25,7 @@ namespace Avalonia.Rendering.SceneGraph
             Point p1,
             Point p2,
             IDictionary<IVisual, Scene> childScenes = null)
-            : base(new Rect(p1, p2), transform, pen)
+            : base(LineBoundsHelper.CalculateBounds(p1, p2, pen), transform)
         {
             Transform = transform;
             Pen = pen?.ToImmutable();
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/OpacityMaskNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/OpacityMaskNode.cs
index d6dbc1a8cb..b8e7b150ac 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/OpacityMaskNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/OpacityMaskNode.cs
@@ -18,7 +18,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// <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, null)
+            : base(Rect.Empty, Matrix.Identity)
         {
             Mask = mask?.ToImmutable();
             MaskBounds = bounds;
@@ -30,7 +30,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// opacity mask pop.
         /// </summary>
         public OpacityMaskNode()
-            : base(Rect.Empty, Matrix.Identity, null)
+            : base(Rect.Empty, Matrix.Identity)
         {
         }
 
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs
index 0f3581b84c..d0c4566485 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs
@@ -1,6 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using System;
 using System.Collections.Generic;
 using Avalonia.Media;
 using Avalonia.Media.Immutable;
@@ -21,23 +19,23 @@ namespace Avalonia.Rendering.SceneGraph
         /// <param name="brush">The fill brush.</param>
         /// <param name="pen">The stroke pen.</param>
         /// <param name="rect">The rectangle to draw.</param>
-        /// <param name="cornerRadius">The rectangle corner radius.</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,
-            Rect rect,
-            float cornerRadius,
+            RoundedRect rect,
+            BoxShadows boxShadows,
             IDictionary<IVisual, Scene> childScenes = null)
-            : base(rect, transform, pen)
+            : base(boxShadows.TransformBounds(rect.Rect).Inflate((pen?.Thickness ?? 0) / 2), transform)
         {
             Transform = transform;
             Brush = brush?.ToImmutable();
             Pen = pen?.ToImmutable();
             Rect = rect;
-            CornerRadius = cornerRadius;
             ChildScenes = childScenes;
+            BoxShadows = boxShadows;
         }
 
         /// <summary>
@@ -58,12 +56,12 @@ namespace Avalonia.Rendering.SceneGraph
         /// <summary>
         /// Gets the rectangle to draw.
         /// </summary>
-        public Rect Rect { get; }
-
+        public RoundedRect Rect { get; }
+        
         /// <summary>
-        /// Gets the rectangle corner radius.
+        /// The parameters for the box-shadow effect
         /// </summary>
-        public float CornerRadius { get; }
+        public BoxShadows BoxShadows { get; }
 
         /// <inheritdoc/>
         public override IDictionary<IVisual, Scene> ChildScenes { get; }
@@ -75,19 +73,19 @@ namespace Avalonia.Rendering.SceneGraph
         /// <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="cornerRadius">The rectangle corner radius 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, Rect rect, float cornerRadius)
+        public bool Equals(Matrix transform, IBrush brush, IPen pen, RoundedRect rect, BoxShadows boxShadows)
         {
             return transform == Transform &&
-                Equals(brush, Brush) &&
-                Equals(Pen, pen) &&
-                rect == Rect &&
-                cornerRadius == CornerRadius;
+                   Equals(brush, Brush) &&
+                   Equals(Pen, pen) &&
+                   Media.BoxShadows.Equals(BoxShadows, boxShadows) &&
+                   rect.Equals(Rect);
         }
 
         /// <inheritdoc/>
@@ -95,15 +93,7 @@ namespace Avalonia.Rendering.SceneGraph
         {
             context.Transform = Transform;
 
-            if (Brush != null)
-            {
-                context.FillRectangle(Brush, Rect, CornerRadius);
-            }
-
-            if (Pen != null)
-            {
-                context.DrawRectangle(Pen, Rect, CornerRadius);
-            }
+            context.DrawRectangle(Brush, Pen, Rect, BoxShadows);
         }
 
         /// <inheritdoc/>
@@ -116,13 +106,13 @@ namespace Avalonia.Rendering.SceneGraph
 
                 if (Brush != null)
                 {
-                    var rect = Rect.Inflate((Pen?.Thickness / 2) ?? 0);
+                    var rect = Rect.Rect.Inflate((Pen?.Thickness / 2) ?? 0);
                     return rect.Contains(p);
                 }
                 else
                 {
-                    var borderRect = Rect.Inflate((Pen?.Thickness / 2) ?? 0);
-                    var emptyRect = Rect.Deflate((Pen?.Thickness / 2) ?? 0);
+                    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);
                 }
             }
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
index 1afc096c98..6a4c532d4a 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
@@ -1,9 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+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
@@ -13,7 +13,8 @@ namespace Avalonia.Rendering.SceneGraph
     /// </summary>
     public class Scene : IDisposable
     {
-        private Dictionary<IVisual, IVisualNode> _index;
+        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.
@@ -42,6 +43,8 @@ namespace Avalonia.Rendering.SceneGraph
             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>
@@ -84,7 +87,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// <returns>The cloned scene.</returns>
         public Scene CloneScene()
         {
-            var index = new Dictionary<IVisual, IVisualNode>();
+            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)
@@ -98,6 +101,7 @@ namespace Avalonia.Rendering.SceneGraph
 
         public void Dispose()
         {
+            _rendered.TrySetResult(false);
             foreach (var node in _index.Values)
             {
                 node.Dispose();
@@ -128,7 +132,20 @@ namespace Avalonia.Rendering.SceneGraph
         public IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool> filter)
         {
             var node = FindNode(root);
-            return (node != null) ? HitTest(node, p, null, filter) : Enumerable.Empty<IVisual>();
+            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>
@@ -150,48 +167,185 @@ namespace Avalonia.Rendering.SceneGraph
 
             index.Add(result.Visual, result);
 
-            foreach (var child in source.Children)
+            var children = source.Children;
+            var childrenCount = children.Count;
+
+            if (childrenCount > 0)
             {
-                result.AddChild(Clone((VisualNode)child, result, index));
+                result.TryPreallocateChildren(childrenCount);
+
+                for (var i = 0; i < childrenCount; i++)
+                {
+                    var child = children[i];
+
+                    result.AddChild(Clone((VisualNode)child, result, index));
+                }
             }
 
             return result;
         }
 
-        private IEnumerable<IVisual> HitTest(IVisualNode node, Point p, Rect? clip, Func<IVisual, bool> filter)
+        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>
         {
-            if (filter?.Invoke(node.Visual) != false && node.Visual.IsAttachedToVisualTree)
+            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)
             {
-                var clipped = false;
+                _root = root;
+                _filter = filter;
+                _point = point;
+                _sceneRoot = sceneRoot;
+            }
 
-                if (node.ClipToBounds)
-                {
-                    clip = clip == null ? node.ClipBounds : clip.Value.Intersect(node.ClipBounds);
-                    clipped = !clip.Value.Contains(p);
-                }
+            public IEnumerator<IVisual> GetEnumerator()
+            {
+                return new HitTestEnumerator(_root, _filter, _point, _sceneRoot);
+            }
 
-                if (node.GeometryClip != null)
-                {
-                    var controlPoint = Root.Visual.TranslatePoint(p, node.Visual);
-                    clipped = !node.GeometryClip.FillContains(controlPoint.Value);
-                }
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                return GetEnumerator();
+            }
+        }
 
-                if (!clipped)
+        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)
                 {
-                    for (var i = node.Children.Count - 1; i >= 0; --i)
+                    (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)
                     {
-                        foreach (var h in HitTest(node.Children[i], p, clip, filter))
+                        if ((wasVisited || FilterAndClip(node, ref clip)) && node.HitTest(_point))
                         {
-                            yield return h;
+                            _current = node.Visual;
+
+                            return true;
                         }
                     }
+                    else if (FilterAndClip(node, ref clip))
+                    {
+                        _nodeStack.Push(new Entry(node, true, null));
 
-                    if (node.HitTest(p))
+                        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)
                     {
-                        yield return node.Visual;
+                        var controlPoint = _sceneRoot.Visual.TranslatePoint(_point, node.Visual);
+                        clipped = !node.GeometryClip.FillContains(controlPoint.Value);
                     }
+
+                    if (!clipped && node.Visual is ICustomHitTest custom)
+                    {
+                        var controlPoint = _sceneRoot.Visual.TranslatePoint(_point, node.Visual);
+                        clipped = !custom.HitTest(controlPoint.Value);
+                    }
+
+                    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
index 1689f2e964..7d5d62a091 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Linq;
 using Avalonia.Media;
 using Avalonia.Platform;
@@ -27,7 +24,8 @@ namespace Avalonia.Rendering.SceneGraph
             using (var impl = new DeferredDrawingContextImpl(this, scene.Layers))
             using (var context = new DrawingContext(impl))
             {
-                Update(context, scene, (VisualNode)scene.Root, scene.Root.Visual.Bounds, true);
+                var clip = new Rect(scene.Root.Visual.Bounds.Size);
+                Update(context, scene, (VisualNode)scene.Root, clip, true);
             }
         }
 
@@ -80,7 +78,7 @@ namespace Avalonia.Rendering.SceneGraph
                         using (var impl = new DeferredDrawingContextImpl(this, scene.Layers))
                         using (var context = new DrawingContext(impl))
                         {
-                            var clip = scene.Root.Visual.Bounds;
+                            var clip = new Rect(scene.Root.Visual.Bounds.Size);
 
                             if (node.Parent != null)
                             {
@@ -166,6 +164,10 @@ namespace Avalonia.Rendering.SceneGraph
             var visual = node.Visual;
             var opacity = visual.Opacity;
             var clipToBounds = visual.ClipToBounds;
+            var clipToBoundsRadius = visual is IVisualWithRoundRectClip roundRectClip ?
+                roundRectClip.ClipToBoundsRadius :
+                default;
+            
             var bounds = new Rect(visual.Bounds.Size);
             var contextImpl = (DeferredDrawingContextImpl)context.PlatformImpl;
 
@@ -173,7 +175,9 @@ namespace Avalonia.Rendering.SceneGraph
 
             if (visual.IsVisible)
             {
-                var m = Matrix.CreateTranslation(visual.Bounds.Position);
+                var m = node != scene.Root ? 
+                    Matrix.CreateTranslation(visual.Bounds.Position) :
+                    Matrix.Identity;
 
                 var renderTransform = Matrix.Identity;
 
@@ -204,6 +208,7 @@ namespace Avalonia.Rendering.SceneGraph
                     node.ClipBounds = clipBounds;
                     node.ClipToBounds = clipToBounds;
                     node.LayoutBounds = globalBounds;
+                    node.ClipToBoundsRadius = clipToBoundsRadius;
                     node.GeometryClip = visual.Clip?.PlatformImpl;
                     node.Opacity = opacity;
 
@@ -392,13 +397,8 @@ namespace Avalonia.Rendering.SceneGraph
             }
         }
 
-        private static bool ShouldStartLayer(IVisual visual)
-        {
-            var o = visual as IAvaloniaObject;
-            return visual.VisualChildren.Count > 0 &&
-                o != null &&
-                o.IsAnimating(Visual.OpacityProperty);
-        }
+        // 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)
         {
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneLayers.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneLayers.cs
index 5960b4f560..25f7383a1a 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneLayers.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneLayers.cs
@@ -11,16 +11,28 @@ namespace Avalonia.Rendering.SceneGraph
     public class SceneLayers : IEnumerable<SceneLayer>
     {
         private readonly IVisual _root;
-        private readonly List<SceneLayer> _inner = new List<SceneLayer>();
-        private readonly Dictionary<IVisual, SceneLayer> _index = new Dictionary<IVisual, SceneLayer>();
+        private readonly List<SceneLayer> _inner;
+        private readonly Dictionary<IVisual, SceneLayer> _index;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SceneLayers"/> class.
         /// </summary>
         /// <param name="root">The scene's root visual.</param>
-        public SceneLayers(IVisual root)
+        public SceneLayers(IVisual root) : this(root, 0)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SceneLayers"/> class.
+        /// </summary>
+        /// <param name="root">The scene's root visual.</param>
+        /// <param name="capacity">Initial layer capacity.</param>
+        public SceneLayers(IVisual root, int capacity)
         {
             _root = root;
+
+            _inner = new List<SceneLayer>(capacity);
+            _index = new Dictionary<IVisual, SceneLayer>(capacity);
         }
 
         /// <summary>
@@ -84,7 +96,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// <returns>The cloned layers.</returns>
         public SceneLayers Clone()
         {
-            var result = new SceneLayers(_root);
+            var result = new SceneLayers(_root, Count);
 
             foreach (var src in _inner)
             {
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/TextNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/TextNode.cs
index ef392cd2af..4b6c331023 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/TextNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/TextNode.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.VisualTree;
@@ -27,7 +24,7 @@ namespace Avalonia.Rendering.SceneGraph
             Point origin,
             IFormattedTextImpl text,
             IDictionary<IVisual, Scene> childScenes = null)
-            : base(text.Bounds.Translate(origin), transform, null)
+            : base(text.Bounds.Translate(origin), transform)
         {
             Transform = transform;
             Foreground = foreground?.ToImmutable();
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
index d2a9e0a673..8fb6b2542a 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs
@@ -1,10 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reactive.Disposables;
+using Avalonia.Collections;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Utilities;
@@ -49,6 +46,9 @@ namespace Avalonia.Rendering.SceneGraph
         /// <inheritdoc/>
         public IVisualNode Parent { get; }
 
+        /// <inheritdoc/>
+        public CornerRadius ClipToBoundsRadius { get; set; }
+
         /// <inheritdoc/>
         public Matrix Transform { get; set; }
 
@@ -265,6 +265,7 @@ namespace Avalonia.Rendering.SceneGraph
             {
                 Transform = Transform,
                 ClipBounds = ClipBounds,
+                ClipToBoundsRadius =  ClipToBoundsRadius,
                 ClipToBounds = ClipToBounds,
                 LayoutBounds = LayoutBounds,
                 GeometryClip = GeometryClip,
@@ -280,8 +281,13 @@ namespace Avalonia.Rendering.SceneGraph
         /// <inheritdoc/>
         public bool HitTest(Point p)
         {
-            foreach (var operation in DrawOperations)
+            var drawOperations = DrawOperations;
+            var drawOperationsCount = drawOperations.Count;
+
+            for (var i = 0; i < drawOperationsCount; i++)
             {
+                var operation = drawOperations[i];
+
                 if (operation?.Item?.HitTest(p) == true)
                 {
                     return true;
@@ -299,7 +305,10 @@ namespace Avalonia.Rendering.SceneGraph
             if (ClipToBounds)
             {
                 context.Transform = Matrix.Identity;
-                context.PushClip(ClipBounds);
+                if (ClipToBoundsRadius.IsEmpty)
+                    context.PushClip(ClipBounds);
+                else
+                    context.PushClip(new RoundedRect(ClipBounds, ClipToBoundsRadius));
             }
 
             context.Transform = Transform;
@@ -347,6 +356,11 @@ namespace Avalonia.Rendering.SceneGraph
             context.Transform = transformRestore;
         }
 
+        internal void TryPreallocateChildren(int count)
+        {
+            EnsureChildrenCreated(count);
+        }
+
         private Rect CalculateBounds()
         {
             var result = new Rect();
@@ -360,11 +374,11 @@ namespace Avalonia.Rendering.SceneGraph
             return result;
         }
 
-        private void EnsureChildrenCreated()
+        private void EnsureChildrenCreated(int capacity = 0)
         {
             if (_children == null)
             {
-                _children = new List<IVisualNode>();
+                _children = new List<IVisualNode>(capacity);
             }
         }
 
@@ -381,7 +395,15 @@ namespace Avalonia.Rendering.SceneGraph
             }
             else if (_drawOperationsCloned)
             {
-                _drawOperations = new List<IRef<IDrawOperation>>(_drawOperations.Select(op => op.Clone()));
+                var oldDrawOperations = _drawOperations;
+
+                _drawOperations = new List<IRef<IDrawOperation>>(oldDrawOperations.Count);
+
+                foreach (var drawOperation in oldDrawOperations)
+                {
+                    _drawOperations.Add(drawOperation.Clone());
+                }
+
                 _drawOperationsRefCounter.Dispose();
                 _drawOperationsRefCounter = RefCountable.Create(CreateDisposeDrawOperations(_drawOperations));
                 _drawOperationsCloned = false;
@@ -397,9 +419,9 @@ namespace Avalonia.Rendering.SceneGraph
         /// <returns>Disposable for given draw operations.</returns>
         private static IDisposable CreateDisposeDrawOperations(List<IRef<IDrawOperation>> drawOperations)
         {
-            return Disposable.Create(() =>
+            return Disposable.Create(drawOperations, operations =>
             {
-                foreach (var operation in drawOperations)
+                foreach (var operation in operations)
                 {
                     operation.Dispose();
                 }
diff --git a/src/Avalonia.Visuals/Rendering/SceneInvalidatedEventArgs.cs b/src/Avalonia.Visuals/Rendering/SceneInvalidatedEventArgs.cs
index 40cb9f3356..cac4d1693a 100644
--- a/src/Avalonia.Visuals/Rendering/SceneInvalidatedEventArgs.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneInvalidatedEventArgs.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 
 namespace Avalonia.Rendering
 {
diff --git a/src/Avalonia.Visuals/Rendering/SleepLoopRenderTimer.cs b/src/Avalonia.Visuals/Rendering/SleepLoopRenderTimer.cs
new file mode 100644
index 0000000000..9cc94ffac3
--- /dev/null
+++ b/src/Avalonia.Visuals/Rendering/SleepLoopRenderTimer.cs
@@ -0,0 +1,71 @@
+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/Rendering/Utilities/TileBrushCalculator.cs b/src/Avalonia.Visuals/Rendering/Utilities/TileBrushCalculator.cs
index 27949fcf55..af2c7f71dc 100644
--- a/src/Avalonia.Visuals/Rendering/Utilities/TileBrushCalculator.cs
+++ b/src/Avalonia.Visuals/Rendering/Utilities/TileBrushCalculator.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Media;
+using Avalonia.Media;
 
 namespace Avalonia.Rendering.Utilities
 {
diff --git a/src/Avalonia.Visuals/RoundedRect.cs b/src/Avalonia.Visuals/RoundedRect.cs
new file mode 100644
index 0000000000..3452bc1ff8
--- /dev/null
+++ b/src/Avalonia.Visuals/RoundedRect.cs
@@ -0,0 +1,147 @@
+using System;
+
+namespace Avalonia
+{
+    public struct RoundedRect
+    {
+        public bool Equals(RoundedRect other)
+        {
+            return Rect.Equals(other.Rect) && RadiiTopLeft.Equals(other.RadiiTopLeft) && RadiiTopRight.Equals(other.RadiiTopRight) && RadiiBottomLeft.Equals(other.RadiiBottomLeft) && RadiiBottomRight.Equals(other.RadiiBottomRight);
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is RoundedRect other && Equals(other);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                var hashCode = Rect.GetHashCode();
+                hashCode = (hashCode * 397) ^ RadiiTopLeft.GetHashCode();
+                hashCode = (hashCode * 397) ^ RadiiTopRight.GetHashCode();
+                hashCode = (hashCode * 397) ^ RadiiBottomLeft.GetHashCode();
+                hashCode = (hashCode * 397) ^ RadiiBottomRight.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        public static bool operator ==(RoundedRect left, RoundedRect right) => left.Equals(right);
+
+        public static bool operator !=(RoundedRect left, RoundedRect right) => !left.Equals(right);
+
+        public Rect Rect { get; }
+        public Vector RadiiTopLeft { get; }
+        public Vector RadiiTopRight { get; }
+        public Vector RadiiBottomLeft { get; }
+        public Vector RadiiBottomRight { get; }
+        
+        public RoundedRect(Rect rect, Vector radiiTopLeft, Vector radiiTopRight, Vector radiiBottomRight, Vector radiiBottomLeft)
+        {
+            Rect = rect;
+            RadiiTopLeft = radiiTopLeft;
+            RadiiTopRight = radiiTopRight;
+            RadiiBottomRight = radiiBottomRight;
+            RadiiBottomLeft = radiiBottomLeft;
+        }
+
+        public RoundedRect(Rect rect, double radiusTopLeft, double radiusTopRight, double radiusBottomRight,
+            double radiusBottomLeft)
+            : this(rect,
+                new Vector(radiusTopLeft, radiusTopLeft),
+                new Vector(radiusTopRight, radiusTopRight),
+                new Vector(radiusBottomRight, radiusBottomRight),
+                new Vector(radiusBottomLeft, radiusBottomLeft)
+            )
+        {
+            
+        }
+
+        public RoundedRect(Rect rect, Vector radii) : this(rect, radii, radii, radii, radii) 
+        {
+            
+        }
+
+        public RoundedRect(Rect rect, double radiusX, double radiusY) : this(rect, new Vector(radiusX, radiusY))
+        {
+            
+        }
+
+        public RoundedRect(Rect rect, double radius) : this(rect, radius, radius)
+        {
+            
+        }
+
+        public RoundedRect(Rect rect) : this(rect, 0)
+        {
+            
+        }
+
+        public RoundedRect(in Rect bounds, in CornerRadius radius) : this(bounds,
+            radius.TopLeft, radius.TopRight,
+            radius.BottomRight, radius.BottomLeft)
+        {
+
+        }
+
+        public static implicit operator RoundedRect(Rect r) => new RoundedRect(r);
+
+        public bool IsRounded => RadiiTopLeft != default || RadiiTopRight != default || RadiiBottomRight != default ||
+                                 RadiiBottomLeft != default;
+
+        public bool IsUniform =>
+            RadiiTopLeft.Equals(RadiiTopRight) &&
+            RadiiTopLeft.Equals(RadiiBottomRight) &&
+            RadiiTopLeft.Equals(RadiiBottomLeft);
+
+        public RoundedRect Inflate(double dx, double dy)
+        {
+            return Deflate(-dx, -dy);
+        }
+        
+        public unsafe RoundedRect Deflate(double dx, double dy)
+        {
+            if (!IsRounded)
+                return new RoundedRect(Rect.Deflate(new Thickness(dx, dy)));
+            
+            // Ported from SKRRect
+            var left = Rect.X + dx;
+            var top = Rect.Y + dy;
+            var right = left + Rect.Width - dx * 2;
+            var bottom = top + Rect.Height - dy * 2;
+            var radii = stackalloc Vector[4];
+            radii[0] = RadiiTopLeft;
+            radii[1] = RadiiTopRight;
+            radii[2] = RadiiBottomRight;
+            radii[3] = RadiiBottomLeft;
+            
+            bool degenerate = false;
+            if (right <= left) {
+                degenerate = true;
+                left = right = (left + right)*0.5;
+            }
+            if (bottom <= top) {
+                degenerate = true;
+                top = bottom = (top + bottom) * 0.5;
+            }
+            if (degenerate)
+            {
+                return new RoundedRect(new Rect(left, top, right - left, bottom - top));
+            }
+
+            for (var c = 0; c < 4; c++)
+            {
+                var rx = Math.Max(0, radii[c].X - dx);
+                var ry = Math.Max(0, radii[c].Y - dy);
+                if (rx == 0 || ry == 0)
+                    radii[c] = default;
+                else
+                    radii[c] = new Vector(rx, ry);
+            }
+
+            return new RoundedRect(new Rect(left, top, right - left, bottom - top),
+                radii[0], radii[1], radii[2], radii[3]);
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Size.cs b/src/Avalonia.Visuals/Size.cs
index aba2ed8d62..8a805dc6c5 100644
--- a/src/Avalonia.Visuals/Size.cs
+++ b/src/Avalonia.Visuals/Size.cs
@@ -1,9 +1,8 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
+#if !BUILDTASK
 using Avalonia.Animation.Animators;
+#endif
 using Avalonia.Utilities;
 
 namespace Avalonia
@@ -11,11 +10,16 @@ namespace Avalonia
     /// <summary>
     /// Defines a size.
     /// </summary>
-    public readonly struct Size : IEquatable<Size>
+#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>
@@ -192,7 +196,7 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Returns a boolean indicating whether the size is equal to the other given size.
+        /// 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>
@@ -204,6 +208,17 @@ namespace Avalonia
             // 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>
@@ -268,5 +283,24 @@ namespace Avalonia
         {
             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/Thickness.cs b/src/Avalonia.Visuals/Thickness.cs
index 44ff66069f..06ebc9bfe7 100644
--- a/src/Avalonia.Visuals/Thickness.cs
+++ b/src/Avalonia.Visuals/Thickness.cs
@@ -1,9 +1,8 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
+#if !BUILDTASK
 using Avalonia.Animation.Animators;
+#endif
 using Avalonia.Utilities;
 
 namespace Avalonia
@@ -11,11 +10,16 @@ namespace Avalonia
     /// <summary>
     /// Describes the thickness of a frame around a rectangle.
     /// </summary>
-    public readonly struct Thickness : IEquatable<Thickness>
+#if !BUILDTASK
+    public
+#endif
+    readonly struct Thickness : IEquatable<Thickness>
     {
         static Thickness()
         {
+#if !BUILDTASK
             Animation.Animation.RegisterAnimator<ThicknessAnimator>(prop => typeof(Thickness).IsAssignableFrom(prop.PropertyType));
+#endif
         }
 
         /// <summary>
@@ -275,5 +279,28 @@ namespace Avalonia
         {
             return $"{_left},{_top},{_right},{_bottom}";
         }
+
+        /// <summary>
+        /// Deconstructor the thickness into its left, top, right and bottom thickness values.
+        /// </summary>
+        /// <param name="left">The thickness on the left.</param>
+        /// <param name="top">The thickness on the top.</param>
+        /// <param name="right">The thickness on the right.</param>
+        /// <param name="bottom">The thickness on the bottom.</param>
+        public void Deconstruct(out double left, out double top, out double right, out double bottom)
+        {
+            left = this._left;
+            top = this._top;
+            right = this._right;
+            bottom = this._bottom;        
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the left, top, right and bottom thickness values are zero.
+        /// </summary>
+        public bool IsDefault
+        {
+            get { return (_left == 0) && (_top == 0) && (_right == 0) && (_bottom == 0); }
+        }
     }
 }
diff --git a/src/Avalonia.Visuals/Utilities/ReadOnlySlice.cs b/src/Avalonia.Visuals/Utilities/ReadOnlySlice.cs
new file mode 100644
index 0000000000..5feaa88e26
--- /dev/null
+++ b/src/Avalonia.Visuals/Utilities/ReadOnlySlice.cs
@@ -0,0 +1,180 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+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>
+    {
+        public ReadOnlySlice(ReadOnlyMemory<T> buffer) : this(buffer, 0, buffer.Length) { }
+
+        public ReadOnlySlice(ReadOnlyMemory<T> buffer, int start, int length)
+        {
+            Buffer = buffer;
+            Start = start;
+            Length = length;
+        }
+
+        /// <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 buffer.
+        /// </summary>
+        public ReadOnlyMemory<T> Buffer { get; }
+
+        public T this[int index] => Buffer.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 (start < Start || start > End)
+            {
+                throw new ArgumentOutOfRangeException(nameof(start));
+            }
+
+            if (start + length > Start + Length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(length));
+            }
+
+            var bufferOffset = start - Start;
+
+            return new ReadOnlySlice<T>(Buffer.Slice(bufferOffset), 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="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.Slice(0, length), 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="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.Slice(length), Start + length, Length - 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 ReadOnlyMemory<T> Items => _readOnlySlice.Buffer;
+        }
+    }
+}
diff --git a/src/Avalonia.Visuals/Utilities/ValueSpan.cs b/src/Avalonia.Visuals/Utilities/ValueSpan.cs
new file mode 100644
index 0000000000..7a10d865ef
--- /dev/null
+++ b/src/Avalonia.Visuals/Utilities/ValueSpan.cs
@@ -0,0 +1,30 @@
+namespace Avalonia.Utilities
+{
+    /// <summary>
+    /// Pairing of value and positions sharing that value.
+    /// </summary>
+    public readonly struct ValueSpan<T>
+    {
+        public ValueSpan(int start, int length, T value)
+        {
+            Start = start;
+            Length = length;
+            Value = value;
+        }
+
+        /// <summary>
+        /// Get's the start of the span.
+        /// </summary>
+        public int Start { get; }
+
+        /// <summary>
+        /// Get's the length of the span.
+        /// </summary>
+        public int Length { get; }
+
+        /// <summary>
+        /// Get's the value of the span.
+        /// </summary>
+        public T Value { get; }
+    }
+}
diff --git a/src/Avalonia.Visuals/Vector.cs b/src/Avalonia.Visuals/Vector.cs
index 576d2daaaa..1b9f5c67d5 100644
--- a/src/Avalonia.Visuals/Vector.cs
+++ b/src/Avalonia.Visuals/Vector.cs
@@ -1,38 +1,44 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
+#if !BUILDTASK
 using Avalonia.Animation.Animators;
-using JetBrains.Annotations;
+#endif
+using Avalonia.Utilities;
+
+#nullable enable
 
 namespace Avalonia
 {
     /// <summary>
     /// Defines a vector.
     /// </summary>
-    public readonly struct Vector : IEquatable<Vector>
+#if !BUILDTASK
+    public
+#endif
+    readonly struct Vector : IEquatable<Vector>
     {
         static Vector()
         {
+#if !BUILDTASK
             Animation.Animation.RegisterAnimator<VectorAnimator>(prop => typeof(Vector).IsAssignableFrom(prop.PropertyType));
+#endif
         }
 
         /// <summary>
-        /// The X vector.
+        /// The X component.
         /// </summary>
         private readonly double _x;
 
         /// <summary>
-        /// The Y vector.
+        /// The Y component.
         /// </summary>
         private readonly double _y;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Vector"/> structure.
         /// </summary>
-        /// <param name="x">The X vector.</param>
-        /// <param name="y">The Y vector.</param>
+        /// <param name="x">The X component.</param>
+        /// <param name="y">The Y component.</param>
         public Vector(double x, double y)
         {
             _x = x;
@@ -40,12 +46,12 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Gets the X vector.
+        /// Gets the X component.
         /// </summary>
         public double X => _x;
 
         /// <summary>
-        /// Gets the Y vector.
+        /// Gets the Y component.
         /// </summary>
         public double Y => _y;
 
@@ -59,18 +65,18 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Calculates the dot product of two vectors
+        /// Calculates the dot product of two vectors.
         /// </summary>
-        /// <param name="a">First vector</param>
-        /// <param name="b">Second vector</param>
-        /// <returns>The dot product</returns>
+        /// <param name="a">First vector.</param>
+        /// <param name="b">Second vector.</param>
+        /// <returns>The dot product.</returns>
         public static double operator *(Vector a, Vector b)
             => Dot(a, b);
 
         /// <summary>
         /// Scales a vector.
         /// </summary>
-        /// <param name="vector">The vector</param>
+        /// <param name="vector">The vector.</param>
         /// <param name="scale">The scaling factor.</param>
         /// <returns>The scaled vector.</returns>
         public static Vector operator *(Vector vector, double scale)
@@ -79,19 +85,35 @@ namespace Avalonia
         /// <summary>
         /// Scales a vector.
         /// </summary>
-        /// <param name="vector">The vector</param>
+        /// <param name="vector">The vector.</param>
         /// <param name="scale">The divisor.</param>
         /// <returns>The scaled vector.</returns>
         public static Vector operator /(Vector vector, double scale)
             => Divide(vector, scale);
 
         /// <summary>
-        /// Length of the vector
+        /// Parses a <see cref="Vector"/> string.
+        /// </summary>
+        /// <param name="s">The string.</param>
+        /// <returns>The <see cref="Vector"/>.</returns>
+        public static Vector Parse(string s)
+        {
+            using (var tokenizer = new StringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid Vector."))
+            {
+                return new Vector(
+                    tokenizer.ReadDouble(),
+                    tokenizer.ReadDouble()
+                );
+            }
+        }
+
+        /// <summary>
+        /// Length of the vector.
         /// </summary>
         public double Length => Math.Sqrt(SquaredLength);
 
         /// <summary>
-        /// Squared Length of the vector
+        /// Squared Length of the vector.
         /// </summary>
         public double SquaredLength => _x * _x + _y * _y;
 
@@ -140,9 +162,8 @@ namespace Avalonia
         /// <returns>True if vectors are nearly equal.</returns>
         public bool NearlyEquals(Vector other)
         {
-            const float tolerance = float.Epsilon;
-
-            return Math.Abs(_x - other._x) < tolerance && Math.Abs(_y - other._y) < tolerance;
+            return MathUtilities.AreClose(_x, other._x) && 
+                   MathUtilities.AreClose(_y, other._y);
         }
 
         public override bool Equals(object obj) => obj is Vector other && Equals(other);
@@ -166,18 +187,18 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Returns the string representation of the point.
+        /// Returns the string representation of the vector.
         /// </summary>
-        /// <returns>The string representation of the point.</returns>
+        /// <returns>The string representation of the vector.</returns>
         public override string ToString()
         {
             return string.Format(CultureInfo.InvariantCulture, "{0}, {1}", _x, _y);
         }
 
         /// <summary>
-        /// Returns a new vector with the specified X coordinate.
+        /// Returns a new vector with the specified X component.
         /// </summary>
-        /// <param name="x">The X coordinate.</param>
+        /// <param name="x">The X component.</param>
         /// <returns>The new vector.</returns>
         public Vector WithX(double x)
         {
@@ -185,9 +206,9 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Returns a new vector with the specified Y coordinate.
+        /// Returns a new vector with the specified Y component.
         /// </summary>
-        /// <param name="y">The Y coordinate.</param>
+        /// <param name="y">The Y component.</param>
         /// <returns>The new vector.</returns>
         public Vector WithY(double y)
         {
@@ -297,27 +318,46 @@ namespace Avalonia
             => new Vector(-vector._x, -vector._y);
 
         /// <summary>
-        /// Returnes the vector (0.0, 0.0)
+        /// Returns the vector (0.0, 0.0).
         /// </summary>
         public static Vector Zero
             => new Vector(0, 0);
 
         /// <summary>
-        /// Returnes the vector (1.0, 1.0)
+        /// Returns the vector (1.0, 1.0).
         /// </summary>
         public static Vector One
             => new Vector(1, 1);
 
         /// <summary>
-        /// Returnes the vector (1.0, 0.0)
+        /// Returns the vector (1.0, 0.0).
         /// </summary>
         public static Vector UnitX
             => new Vector(1, 0);
 
         /// <summary>
-        /// Returnes the vector (0.0, 1.0)
+        /// Returns the vector (0.0, 1.0).
         /// </summary>
         public static Vector UnitY
             => new Vector(0, 1);
+
+        /// <summary>
+        /// Deconstructs the vector into its X and Y components.
+        /// </summary>
+        /// <param name="x">The X component.</param>
+        /// <param name="y">The Y component.</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 components are zero.
+        /// </summary>
+        public bool IsDefault
+        {
+            get { return (_x == 0) && (_y == 0); }
+        }
     }
 }
diff --git a/src/Avalonia.Visuals/Visual.cs b/src/Avalonia.Visuals/Visual.cs
index f4306d3929..9327531b46 100644
--- a/src/Avalonia.Visuals/Visual.cs
+++ b/src/Avalonia.Visuals/Visual.cs
@@ -1,10 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using System.Collections;
 using System.Collections.Specialized;
-using System.Linq;
-using System.Reactive.Linq;
 using Avalonia.Collections;
 using Avalonia.Data;
 using Avalonia.Logging;
@@ -73,8 +69,8 @@ namespace Avalonia
         /// <summary>
         /// Defines the <see cref="RenderTransform"/> property.
         /// </summary>
-        public static readonly StyledProperty<Transform> RenderTransformProperty =
-            AvaloniaProperty.Register<Visual, Transform>(nameof(RenderTransform));
+        public static readonly StyledProperty<ITransform> RenderTransformProperty =
+            AvaloniaProperty.Register<Visual, ITransform>(nameof(RenderTransform));
 
         /// <summary>
         /// Defines the <see cref="RenderTransformOrigin"/> property.
@@ -119,9 +115,12 @@ namespace Avalonia
         /// </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 = ValidateVisualChild;
+            visualChildren.Validate = visual => ValidateVisualChild(visual);
             visualChildren.CollectionChanged += VisualChildrenChanged;
             VisualChildren = visualChildren;
         }
@@ -173,7 +172,22 @@ namespace Avalonia
         /// </summary>
         public bool IsEffectivelyVisible
         {
-            get { return this.GetSelfAndVisualAncestors().All(x => x.IsVisible); }
+            get
+            {
+                IVisual node = this;
+
+                while (node != null)
+                {
+                    if (!node.IsVisible)
+                    {
+                        return false;
+                    }
+
+                    node = node.VisualParent;
+                }
+
+                return true;
+            }
         }
 
         /// <summary>
@@ -206,7 +220,7 @@ namespace Avalonia
         /// <summary>
         /// Gets the render transform of the control.
         /// </summary>
-        public Transform RenderTransform
+        public ITransform RenderTransform
         {
             get { return GetValue(RenderTransformProperty); }
             set { SetValue(RenderTransformProperty, value); }
@@ -322,7 +336,15 @@ namespace Avalonia
         protected static void AffectsRender<T>(params AvaloniaProperty[] properties)
             where T : Visual
         {
-            void Invalidate(AvaloniaPropertyChangedEventArgs e)
+            static void Invalidate(AvaloniaPropertyChangedEventArgs e)
+            {
+                if (e.Sender is T sender)
+                {
+                    sender.InvalidateVisual();
+                }
+            }
+
+            static void InvalidateAndSubscribe(AvaloniaPropertyChangedEventArgs e)
             {
                 if (e.Sender is T sender)
                 {
@@ -333,7 +355,7 @@ namespace Avalonia
 
                     if (e.NewValue is IAffectsRender newValue)
                     {
-                        WeakEventHandlerManager.Subscribe<IAffectsRender, EventArgs, T>(newValue, nameof(newValue.Invalidated), sender.AffectsRenderInvalidated);                        
+                        WeakEventHandlerManager.Subscribe<IAffectsRender, EventArgs, T>(newValue, nameof(newValue.Invalidated), sender.AffectsRenderInvalidated);
                     }
 
                     sender.InvalidateVisual();
@@ -342,7 +364,14 @@ namespace Avalonia
 
             foreach (var property in properties)
             {
-                property.Changed.Subscribe(Invalidate);
+                if (property.CanValueAffectRender())
+                {
+                    property.Changed.Subscribe(e => InvalidateAndSubscribe(e));
+                }
+                else
+                {
+                    property.Changed.Subscribe(e => Invalidate(e));
+                }
             }
         }
 
@@ -359,24 +388,32 @@ namespace Avalonia
         /// <param name="e">The event args.</param>
         protected virtual void OnAttachedToVisualTreeCore(VisualTreeAttachmentEventArgs e)
         {
-            Logger.TryGet(LogEventLevel.Verbose)?.Log(LogArea.Visual, this, "Attached to visual tree");
+            Logger.TryGet(LogEventLevel.Verbose, LogArea.Visual)?.Log(this, "Attached to visual tree");
 
             _visualRoot = e.Root;
 
-            if (RenderTransform != null)
+            if (RenderTransform is IMutableTransform mutableTransform)
             {
-                RenderTransform.Changed += RenderTransformChanged;
+                mutableTransform.Changed += RenderTransformChanged;
             }
 
+            EnableTransitions();
             OnAttachedToVisualTree(e);
             AttachedToVisualTree?.Invoke(this, e);
             InvalidateVisual();
 
-            if (VisualChildren != null)
+            var visualChildren = VisualChildren;
+
+            if (visualChildren != null)
             {
-                foreach (Visual child in VisualChildren.OfType<Visual>())
+                var visualChildrenCount = visualChildren.Count;
+
+                for (var i = 0; i < visualChildrenCount; i++)
                 {
-                    child.OnAttachedToVisualTreeCore(e);
+                    if (visualChildren[i] is Visual child)
+                    {
+                        child.OnAttachedToVisualTreeCore(e);
+                    }
                 }
             }
         }
@@ -388,30 +425,38 @@ namespace Avalonia
         /// <param name="e">The event args.</param>
         protected virtual void OnDetachedFromVisualTreeCore(VisualTreeAttachmentEventArgs e)
         {
-            Logger.TryGet(LogEventLevel.Verbose)?.Log(LogArea.Visual, this, "Detached from visual tree");
+            Logger.TryGet(LogEventLevel.Verbose, LogArea.Visual)?.Log(this, "Detached from visual tree");
 
             _visualRoot = null;
 
-            if (RenderTransform != null)
+            if (RenderTransform is IMutableTransform mutableTransform)
             {
-                RenderTransform.Changed -= RenderTransformChanged;
+                mutableTransform.Changed -= RenderTransformChanged;
             }
 
+            DisableTransitions();
             OnDetachedFromVisualTree(e);
             DetachedFromVisualTree?.Invoke(this, e);
             e.Root?.Renderer?.AddDirty(this);
 
-            if (VisualChildren != null)
+            var visualChildren = VisualChildren;
+
+            if (visualChildren != null)
             {
-                foreach (Visual child in VisualChildren.OfType<Visual>())
+                var visualChildrenCount = visualChildren.Count;
+
+                for (var i = 0; i < visualChildrenCount; i++)
                 {
-                    child.OnDetachedFromVisualTreeCore(e);
+                    if (visualChildren[i] is Visual child)
+                    {
+                        child.OnDetachedFromVisualTreeCore(e);
+                    }
                 }
             }
         }
 
         /// <summary>
-        /// Called when the control is added to a visual tree.
+        /// 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)
@@ -419,7 +464,7 @@ namespace Avalonia
         }
 
         /// <summary>
-        /// Called when the control is removed from a visual tree.
+        /// 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)
@@ -433,10 +478,14 @@ namespace Avalonia
         /// <param name="newParent">The new visual parent.</param>
         protected virtual void OnVisualParentChanged(IVisual oldParent, IVisual newParent)
         {
-            RaisePropertyChanged(VisualParentProperty, oldParent, newParent, BindingPriority.LocalValue);
+            RaisePropertyChanged(
+                VisualParentProperty,
+                new Optional<IVisual>(oldParent),
+                new BindingValue<IVisual>(newParent),
+                BindingPriority.LocalValue);
         }
 
-        protected override sealed void LogBindingError(AvaloniaProperty property, Exception e)
+        protected internal sealed override void LogBindingError(AvaloniaProperty property, Exception e)
         {
             // Don't log a binding error unless the control is attached to a logical or visual tree.
             // In theory this should only need to check for logical tree attachment, but in practise
@@ -453,8 +502,7 @@ namespace Avalonia
                     return;
                 }
 
-                Logger.TryGet(LogEventLevel.Warning)?.Log(
-                    LogArea.Binding,
+                Logger.TryGet(LogEventLevel.Warning, LogArea.Binding)?.Log(
                     this,
                     "Error in binding to {Target}.{Property}: {Message}",
                     this,
@@ -552,7 +600,7 @@ namespace Avalonia
 
             if (_visualParent is IRenderRoot || _visualParent?.IsAttachedToVisualTree == true)
             {
-                var root = this.GetVisualAncestors().OfType<IRenderRoot>().FirstOrDefault();
+                var root = this.FindAncestorOfType<IRenderRoot>();
                 var e = new VisualTreeAttachmentEventArgs(_visualParent, root);
                 OnAttachedToVisualTreeCore(e);
             }
@@ -572,34 +620,30 @@ namespace Avalonia
             switch (e.Action)
             {
                 case NotifyCollectionChangedAction.Add:
-                    foreach (Visual v in e.NewItems)
-                    {
-                        v.SetVisualParent(this);
-                    }
-
+                    SetVisualParent(e.NewItems, this);
                     break;
 
                 case NotifyCollectionChangedAction.Remove:
-                    foreach (Visual v in e.OldItems)
-                    {
-                        v.SetVisualParent(null);
-                    }
-
+                    SetVisualParent(e.OldItems, null);
                     break;
 
                 case NotifyCollectionChangedAction.Replace:
-                    foreach (Visual v in e.OldItems)
-                    {
-                        v.SetVisualParent(null);
-                    }
-
-                    foreach (Visual v in e.NewItems)
-                    {
-                        v.SetVisualParent(this);
-                    }
-
+                    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
index b191d044db..e6523a1469 100644
--- a/src/Avalonia.Visuals/VisualExtensions.cs
+++ b/src/Avalonia.Visuals/VisualExtensions.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.VisualTree;
 
@@ -53,7 +50,13 @@ namespace Avalonia
             {
                 var thisOffset = GetOffsetFrom(common, from);
                 var thatOffset = GetOffsetFrom(common, to);
-                return -thatOffset * thisOffset;
+
+                if (!thatOffset.TryInvert(out var thatOffsetInverted))
+                {
+                    return null;
+                }
+
+                return thatOffsetInverted * thisOffset;
             }
 
             return null;
diff --git a/src/Avalonia.Visuals/VisualTree/IHostedVisualTreeRoot.cs b/src/Avalonia.Visuals/VisualTree/IHostedVisualTreeRoot.cs
index 6baf5d18a1..cb757e0a57 100644
--- a/src/Avalonia.Visuals/VisualTree/IHostedVisualTreeRoot.cs
+++ b/src/Avalonia.Visuals/VisualTree/IHostedVisualTreeRoot.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.VisualTree
 {
     /// <summary>
diff --git a/src/Avalonia.Visuals/VisualTree/IVisual.cs b/src/Avalonia.Visuals/VisualTree/IVisual.cs
index dd3686ce3d..50787655d9 100644
--- a/src/Avalonia.Visuals/VisualTree/IVisual.cs
+++ b/src/Avalonia.Visuals/VisualTree/IVisual.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Collections;
 using Avalonia.Media;
@@ -79,7 +76,7 @@ namespace Avalonia.VisualTree
         /// <summary>
         /// Gets or sets the render transform of the control.
         /// </summary>
-        Transform RenderTransform { get; set; }
+        ITransform RenderTransform { get; set; }
 
         /// <summary>
         /// Gets or sets the render transform origin of the control.
diff --git a/src/Avalonia.Visuals/VisualTree/IVisualTreeHost.cs b/src/Avalonia.Visuals/VisualTree/IVisualTreeHost.cs
index 43560476da..b63c49bd5a 100644
--- a/src/Avalonia.Visuals/VisualTree/IVisualTreeHost.cs
+++ b/src/Avalonia.Visuals/VisualTree/IVisualTreeHost.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.VisualTree
 {
     /// <summary>
diff --git a/src/Avalonia.Visuals/VisualTree/IVisualWithRoundRectClip.cs b/src/Avalonia.Visuals/VisualTree/IVisualWithRoundRectClip.cs
new file mode 100644
index 0000000000..9ace215d03
--- /dev/null
+++ b/src/Avalonia.Visuals/VisualTree/IVisualWithRoundRectClip.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace Avalonia.VisualTree
+{
+    [Obsolete("Internal API, will be removed in future versions, you've been warned")]
+    public interface IVisualWithRoundRectClip
+    {
+        /// <summary>
+        /// Gets a value indicating the corner radius of control's clip bounds
+        /// </summary>
+        [Obsolete("Internal API, will be removed in future versions, you've been warned")]
+        CornerRadius ClipToBoundsRadius { get; }
+
+    }
+}
diff --git a/src/Avalonia.Visuals/VisualTree/TransformedBounds.cs b/src/Avalonia.Visuals/VisualTree/TransformedBounds.cs
index b2121aa8da..3aa0392496 100644
--- a/src/Avalonia.Visuals/VisualTree/TransformedBounds.cs
+++ b/src/Avalonia.Visuals/VisualTree/TransformedBounds.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.VisualTree
@@ -79,5 +76,7 @@ namespace Avalonia.VisualTree
         {
             return !left.Equals(right);
         }
+
+        public override string ToString() => $"Bounds: {Bounds} Clip: {Clip} Transform {Transform}";
     }
 }
diff --git a/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs b/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs
index 567b676b1e..8c4004efdc 100644
--- a/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs
+++ b/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,7 +11,7 @@ namespace Avalonia.VisualTree
     public static class VisualExtensions
     {
         /// <summary>
-        /// Calculates the distance from a visual's <see cref="IRenderRoot"/>.
+        /// Calculates the distance from a visual's ancestor.
         /// </summary>
         /// <param name="visual">The visual.</param>
         /// <param name="ancestor">The ancestor visual.</param>
@@ -30,13 +27,39 @@ namespace Avalonia.VisualTree
 
             while (visual != null && visual != ancestor)
             {
-                ++result;
                 visual = visual.VisualParent;
+
+                result++;
             }
 
             return visual != 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)
+        {
+            Contract.Requires<ArgumentNullException>(visual != null);
+
+            var result = 0;
+
+            visual = visual?.VisualParent;
+
+            while (visual != null)
+            {
+                visual = visual.VisualParent;
+
+                result++;
+            }
+
+            return result;
+        }
+
         /// <summary>
         /// Tries to get the first common ancestor of two visuals.
         /// </summary>
@@ -47,8 +70,53 @@ namespace Avalonia.VisualTree
         {
             Contract.Requires<ArgumentNullException>(visual != null);
 
-            return visual.GetSelfAndVisualAncestors().Intersect(target.GetSelfAndVisualAncestors())
-                .FirstOrDefault();
+            if (target is null)
+            {
+                return null;
+            }
+
+            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(visual);
+            var secondHeight = CalculateDistanceFromRoot(target);
+
+            if (firstHeight > secondHeight)
+            {
+                GoUpwards(ref visual, firstHeight - secondHeight);
+            }
+            else
+            {
+                GoUpwards(ref target, secondHeight - firstHeight);
+            }
+
+            if (visual == target)
+            {
+                return visual;
+            }
+
+            while (visual != null && target != null)
+            {
+                IVisual firstParent = visual.VisualParent;
+                IVisual secondParent = target.VisualParent;
+
+                if (firstParent == secondParent)
+                {
+                    return firstParent;
+                }
+
+                visual = visual.VisualParent;
+                target = target.VisualParent;
+            }
+
+            return null;
         }
 
         /// <summary>
@@ -69,6 +137,57 @@ namespace Avalonia.VisualTree
             }
         }
 
+        /// <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>
@@ -91,12 +210,37 @@ namespace Avalonia.VisualTree
         /// </summary>
         /// <param name="visual">The root visual to test.</param>
         /// <param name="p">The point.</param>
-        /// <returns>The visuals at the requested point.</returns>
+        /// <returns>The visual at the requested point.</returns>
         public static IVisual GetVisualAt(this IVisual visual, Point p)
         {
             Contract.Requires<ArgumentNullException>(visual != null);
 
-            return visual.GetVisualsAt(p).FirstOrDefault();
+            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)
+        {
+            Contract.Requires<ArgumentNullException>(visual != null);
+
+            var root = visual.GetVisualRoot();
+            var rootPoint = visual.TranslatePoint(p, root);
+
+            if (rootPoint.HasValue)
+            {
+                return root.Renderer.HitTestFirst(rootPoint.Value, visual, filter);
+            }
+
+            return null;
         }
 
         /// <summary>
@@ -233,7 +377,19 @@ namespace Avalonia.VisualTree
         /// </returns>
         public static bool IsVisualAncestorOf(this IVisual visual, IVisual target)
         {
-            return target.GetVisualAncestors().Any(x => x == visual);
+            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)
@@ -249,6 +405,31 @@ namespace Avalonia.VisualTree
                 .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; }
diff --git a/src/Avalonia.Visuals/VisualTree/VisualLocator.cs b/src/Avalonia.Visuals/VisualTree/VisualLocator.cs
index eaca9ed9d7..1e0662c17a 100644
--- a/src/Avalonia.Visuals/VisualTree/VisualLocator.cs
+++ b/src/Avalonia.Visuals/VisualTree/VisualLocator.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Linq;
-using System.Reactive.Linq;
-using System.Reflection;
 using Avalonia.Reactive;
 
 namespace Avalonia.VisualTree
@@ -50,7 +48,7 @@ namespace Avalonia.VisualTree
                 if (_relativeTo.IsAttachedToVisualTree)
                 {
                     return _relativeTo.GetVisualAncestors()
-                        .Where(x => _ancestorType?.GetTypeInfo().IsAssignableFrom(x.GetType().GetTypeInfo()) ?? true)
+                        .Where(x => _ancestorType?.IsAssignableFrom(x.GetType()) ?? true)
                         .ElementAtOrDefault(_ancestorLevel);
                 }
                 else
diff --git a/src/Avalonia.Visuals/VisualTreeAttachmentEventArgs.cs b/src/Avalonia.Visuals/VisualTreeAttachmentEventArgs.cs
index 8c6e660d10..d8f6ea8296 100644
--- a/src/Avalonia.Visuals/VisualTreeAttachmentEventArgs.cs
+++ b/src/Avalonia.Visuals/VisualTreeAttachmentEventArgs.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Rendering;
 using Avalonia.VisualTree;
diff --git a/src/Avalonia.X11/Glx/Glx.cs b/src/Avalonia.X11/Glx/Glx.cs
index c3a2fd2050..37ca7f5603 100644
--- a/src/Avalonia.X11/Glx/Glx.cs
+++ b/src/Avalonia.X11/Glx/Glx.cs
@@ -15,11 +15,30 @@ namespace Avalonia.X11.Glx
         public GlxMakeContextCurrent MakeContextCurrent { get; }
         public delegate bool GlxMakeContextCurrent(IntPtr display, IntPtr draw, IntPtr read, IntPtr context);
 
+        [GlEntryPoint("glXGetCurrentContext")]
+        public GlxGetCurrentContext GetCurrentContext { get; }
+        public delegate IntPtr GlxGetCurrentContext();
+
+        [GlEntryPoint("glXGetCurrentDisplay")]
+        public GlxGetCurrentDisplay GetCurrentDisplay { get; }
+        public delegate IntPtr GlxGetCurrentDisplay();
+        
+        [GlEntryPoint("glXGetCurrentDrawable")]
+        public GlxGetCurrentDrawable GetCurrentDrawable { get; }
+        public delegate IntPtr GlxGetCurrentDrawable();
+        
+        [GlEntryPoint("glXGetCurrentReadDrawable")]
+        public GlxGetCurrentReadDrawable GetCurrentReadDrawable { get; }
+        public delegate IntPtr GlxGetCurrentReadDrawable();
+        
         [GlEntryPoint("glXCreatePbuffer")]
         public GlxCreatePbuffer CreatePbuffer { get; }
-
         public delegate IntPtr GlxCreatePbuffer(IntPtr dpy, IntPtr fbc, int[] attrib_list);
         
+        [GlEntryPoint("glXDestroyPbuffer")]
+        public GlxDestroyPbuffer DestroyPbuffer { get; }
+        public delegate IntPtr GlxDestroyPbuffer(IntPtr dpy, IntPtr fb);
+        
         [GlEntryPointAttribute("glXChooseVisual")]
         public GlxChooseVisual ChooseVisual { get; }
         public delegate  XVisualInfo* GlxChooseVisual(IntPtr dpy, int screen, int[] attribList);
@@ -78,14 +97,42 @@ namespace Avalonia.X11.Glx
         
         [GlEntryPointAttribute("glXWaitGL")]
         public GlxWaitGL WaitGL { get; }
-        public delegate  void GlxWaitGL();
+        public delegate void GlxWaitGL();
         
         public delegate int GlGetError();
         [GlEntryPoint("glGetError")]
         public GlGetError GetError { get; }
 
-        public GlxInterface() : base(GlxGetProcAddress)
+        public delegate IntPtr GlxQueryExtensionsString(IntPtr display, int screen);
+        [GlEntryPoint("glXQueryExtensionsString")]
+        public GlxQueryExtensionsString QueryExtensionsString { get; }
+
+        public GlxInterface() : base(SafeGetProcAddress)
+        {
+        }
+
+        // Ignores egl functions.
+        // On some Linux systems, glXGetProcAddress will return valid pointers for even EGL functions.
+        // This makes Skia try to load some data from EGL,
+        // which can then cause segmentation faults because they return garbage.
+        public static IntPtr SafeGetProcAddress(string proc)
+        {
+            if (proc.StartsWith("egl", StringComparison.InvariantCulture))
+            {
+                return IntPtr.Zero;
+            }
+
+            return GlxConverted(proc);
+        }
+
+        private static readonly Func<string, IntPtr> GlxConverted = ConvertNative(GlxGetProcAddress);
+
+        public string[] GetExtensions(IntPtr display)
         {
+            var s = Marshal.PtrToStringAnsi(QueryExtensionsString(display, 0));
+            return s.Split(new[] { ',', ' ' }, StringSplitOptions.RemoveEmptyEntries)
+                .Select(x => x.Trim()).ToArray();
+
         }
     }
 }
diff --git a/src/Avalonia.X11/Glx/GlxConsts.cs b/src/Avalonia.X11/Glx/GlxConsts.cs
index 65f253696a..9d153a6ade 100644
--- a/src/Avalonia.X11/Glx/GlxConsts.cs
+++ b/src/Avalonia.X11/Glx/GlxConsts.cs
@@ -100,6 +100,8 @@ namespace Avalonia.X11.Glx
         public const int GLX_CONTEXT_FLAGS_ARB = 0x2094;
         public const int GLX_CONTEXT_CORE_PROFILE_BIT_ARB = 0x00000001;
         public const int GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB = 0x00000002;
+        public const int GLX_CONTEXT_ES2_PROFILE_BIT_EXT = 0x00000004;
+        
         public const int GLX_CONTEXT_PROFILE_MASK_ARB = 0x9126;
 
     }
diff --git a/src/Avalonia.X11/Glx/GlxContext.cs b/src/Avalonia.X11/Glx/GlxContext.cs
index dd95841d57..e9cb88cb8f 100644
--- a/src/Avalonia.X11/Glx/GlxContext.cs
+++ b/src/Avalonia.X11/Glx/GlxContext.cs
@@ -8,34 +8,111 @@ namespace Avalonia.X11.Glx
     {
         public  IntPtr Handle { get; }
         public GlxInterface Glx { get; }
+        private readonly GlxContext _sharedWith;
         private readonly X11Info _x11;
         private readonly IntPtr _defaultXid;
+        private readonly bool _ownsPBuffer;
         private readonly object _lock = new object();
 
-        public GlxContext(GlxInterface glx, IntPtr handle, GlxDisplay display, X11Info x11, IntPtr defaultXid)
+        public GlxContext(GlxInterface glx, IntPtr handle, GlxDisplay display,
+            GlxContext sharedWith,
+            GlVersion version, int sampleCount, int stencilSize,
+            X11Info x11, IntPtr defaultXid,
+            bool ownsPBuffer)
         {
             Handle = handle;
             Glx = glx;
+            _sharedWith = sharedWith;
             _x11 = x11;
             _defaultXid = defaultXid;
+            _ownsPBuffer = ownsPBuffer;
             Display = display;
+            Version = version;
+            SampleCount = sampleCount;
+            StencilSize = stencilSize;
+            using (MakeCurrent())
+                GlInterface = new GlInterface(version, GlxInterface.SafeGetProcAddress);
         }
         
         public GlxDisplay Display { get; }
-        IGlDisplay IGlContext.Display => Display;
+        public GlVersion Version { get; }
+        public GlInterface GlInterface { get; }
+        public int SampleCount { get; }
+        public int StencilSize { get; }
         
-        public IDisposable Lock()
+        class RestoreContext : IDisposable
         {
-            Monitor.Enter(_lock);
-            return Disposable.Create(() => Monitor.Exit(_lock));
+            private GlxInterface _glx;
+            private IntPtr _defaultDisplay;
+            private readonly object _l;
+            private IntPtr _display;
+            private IntPtr _context;
+            private IntPtr _read;
+            private IntPtr _draw;
+
+            public RestoreContext(GlxInterface glx, IntPtr defaultDisplay, object l)
+            {
+                _glx = glx;
+                _defaultDisplay = defaultDisplay;
+                _l = l;
+                _display = _glx.GetCurrentDisplay();
+                _context = _glx.GetCurrentContext();
+                _read = _glx.GetCurrentReadDrawable();
+                _draw = _glx.GetCurrentDrawable();
+            }
+
+            public void Dispose()
+            {
+                var disp = _display == IntPtr.Zero ? _defaultDisplay : _display;
+                _glx.MakeContextCurrent(disp, _draw, _read, _context);
+                Monitor.Exit(_l);
+            }
         }
         
-        public void MakeCurrent() => MakeCurrent(_defaultXid);
+        public IDisposable MakeCurrent() => MakeCurrent(_defaultXid);
+        public IDisposable EnsureCurrent()
+        {
+            if(IsCurrent)
+                return Disposable.Empty;
+            return MakeCurrent();
+        }
+
+        public bool IsSharedWith(IGlContext context)
+        {
+            var c = (GlxContext)context;
+            return c == this
+                   || c._sharedWith == this
+                   || _sharedWith == context
+                   || _sharedWith != null && _sharedWith == c._sharedWith;
+        }
+
+        public IDisposable MakeCurrent(IntPtr xid)
+        {
+            Monitor.Enter(_lock);
+            var success = false;
+            try
+            {
+                var old = new RestoreContext(Glx, _x11.Display, _lock);
+                if (!Glx.MakeContextCurrent(_x11.Display, xid, xid, Handle))
+                    throw new OpenGlException("glXMakeContextCurrent failed ");
+
+                success = true;
+                return old;
+            }
+            finally
+            {
+                if (!success)
+                    Monitor.Exit(_lock);
+            }
+        }
+
+        public bool IsCurrent => Glx.GetCurrentContext() == Handle;
 
-        public void MakeCurrent(IntPtr xid)
+        public void Dispose()
         {
-            if (!Glx.MakeContextCurrent(_x11.Display, xid, xid, Handle))
-                throw new OpenGlException("glXMakeContextCurrent failed ");
+            Glx.DestroyContext(_x11.Display, Handle);
+            if (_ownsPBuffer)
+                Glx.DestroyPbuffer(_x11.Display, _defaultXid);
         }
     }
 }
diff --git a/src/Avalonia.X11/Glx/GlxDisplay.cs b/src/Avalonia.X11/Glx/GlxDisplay.cs
index 04f2a7137c..fa8c866c09 100644
--- a/src/Avalonia.X11/Glx/GlxDisplay.cs
+++ b/src/Avalonia.X11/Glx/GlxDisplay.cs
@@ -1,28 +1,28 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Avalonia.OpenGL;
 using static Avalonia.X11.Glx.GlxConsts;
 
 namespace Avalonia.X11.Glx
 {
-    unsafe class GlxDisplay : IGlDisplay
+    unsafe class GlxDisplay
     {
         private readonly X11Info _x11;
+        private readonly List<GlVersion> _probeProfiles;
         private readonly IntPtr _fbconfig;
         private readonly XVisualInfo* _visual;
-        public GlDisplayType Type => GlDisplayType.OpenGL2;
-        public GlInterface GlInterface { get; }
+        private string[] _displayExtensions;
+        private GlVersion? _version;
         
         public XVisualInfo* VisualInfo => _visual;
-        public int SampleCount { get; }
-        public int StencilSize { get; }
-        
-        public GlxContext ImmediateContext { get; }
         public GlxContext DeferredContext { get; }
         public GlxInterface Glx { get; } = new GlxInterface();
-        public GlxDisplay(X11Info x11) 
+        public GlxDisplay(X11Info x11, IList<GlVersion> probeProfiles) 
         {
             _x11 = x11;
+            _probeProfiles = probeProfiles.ToList();
+            _displayExtensions = Glx.GetExtensions(_x11.Display);
 
             var baseAttribs = new[]
             {
@@ -38,7 +38,8 @@ namespace Avalonia.X11.Glx
                 GLX_STENCIL_SIZE, 8,
 
             };
-
+            int sampleCount = 0;
+            int stencilSize = 0;
             foreach (var attribs in new[]
             {
                 //baseAttribs.Concat(multiattribs),
@@ -71,9 +72,9 @@ namespace Avalonia.X11.Glx
             if (_visual == null)
                 throw new OpenGlException("Unable to get visual info from FBConfig");
             if (Glx.GetFBConfigAttrib(_x11.Display, _fbconfig, GLX_SAMPLES, out var samples) == 0)
-                SampleCount = samples;
+                sampleCount = samples;
             if (Glx.GetFBConfigAttrib(_x11.Display, _fbconfig, GLX_STENCIL_SIZE, out var stencil) == 0)
-                StencilSize = stencil;
+                stencilSize = stencil;
 
             var pbuffers = Enumerable.Range(0, 2).Select(_ => Glx.CreatePbuffer(_x11.Display, _fbconfig, new[]
             {
@@ -81,67 +82,104 @@ namespace Avalonia.X11.Glx
             })).ToList();
             
             XLib.XFlush(_x11.Display);
-            
-            ImmediateContext = CreateContext(pbuffers[0],null);
-            DeferredContext = CreateContext(pbuffers[1], ImmediateContext);
-            ImmediateContext.MakeCurrent();
-            var err = Glx.GetError();
-            
-            GlInterface = new GlInterface(GlxInterface.GlxGetProcAddress);
-            if (GlInterface.Version == null)
-                throw new OpenGlException("GL version string is null, aborting");
-            if (GlInterface.Renderer == null)
-                throw new OpenGlException("GL renderer string is null, aborting");
 
-            if (Environment.GetEnvironmentVariable("AVALONIA_GLX_IGNORE_RENDERER_BLACKLIST") != "1")
+            DeferredContext = CreateContext(CreatePBuffer(), null,
+                sampleCount, stencilSize, true);
+            using (DeferredContext.MakeCurrent())
             {
-                var blacklist = AvaloniaLocator.Current.GetService<X11PlatformOptions>()
-                    ?.GlxRendererBlacklist;
-                if (blacklist != null)
-                    foreach(var item in blacklist)
-                        if (GlInterface.Renderer.Contains(item))
-                            throw new OpenGlException($"Renderer '{GlInterface.Renderer}' is blacklisted by '{item}'");
+                var glInterface = DeferredContext.GlInterface;
+                if (glInterface.Version == null)
+                    throw new OpenGlException("GL version string is null, aborting");
+                if (glInterface.Renderer == null)
+                    throw new OpenGlException("GL renderer string is null, aborting");
+
+                if (Environment.GetEnvironmentVariable("AVALONIA_GLX_IGNORE_RENDERER_BLACKLIST") != "1")
+                {
+                    var blacklist = AvaloniaLocator.Current.GetService<X11PlatformOptions>()
+                        ?.GlxRendererBlacklist;
+                    if (blacklist != null)
+                        foreach (var item in blacklist)
+                            if (glInterface.Renderer.Contains(item))
+                                throw new OpenGlException(
+                                    $"Renderer '{glInterface.Renderer}' is blacklisted by '{item}'");
+                }
             }
-            
+
+        }
+
+        IntPtr CreatePBuffer()
+        {
+            return Glx.CreatePbuffer(_x11.Display, _fbconfig, new[] { GLX_PBUFFER_WIDTH, 1, GLX_PBUFFER_HEIGHT, 1, 0 });
         }
 
-        public void ClearContext() => Glx.MakeContextCurrent(_x11.Display,
-            IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
 
-        public GlxContext CreateContext(IGlContext share) => CreateContext(IntPtr.Zero, share);
-        public GlxContext CreateContext(IntPtr defaultXid, IGlContext share)
+        public GlxContext CreateContext() => CreateContext();
+        
+        public GlxContext CreateContext(IGlContext share) => CreateContext(CreatePBuffer(), share,
+            share.SampleCount, share.StencilSize, true);
+        
+        GlxContext CreateContext(IntPtr defaultXid, IGlContext share,
+            int sampleCount, int stencilSize, bool ownsPBuffer)
         {
             var sharelist = ((GlxContext)share)?.Handle ?? IntPtr.Zero;
             IntPtr handle = default;
-            foreach (var ver in new[]
-            {
-                new Version(4, 0), new Version(3, 2),
-                new Version(3, 0), new Version(2, 0)
-            })
+            
+            GlxContext Create(GlVersion profile)
             {
+                var profileMask = GLX_CONTEXT_CORE_PROFILE_BIT_ARB;
+                if (profile.Type == GlProfileType.OpenGLES) 
+                    profileMask = GLX_CONTEXT_ES2_PROFILE_BIT_EXT;
 
-                var attrs = new[]
+                var attrs = new int[]
                 {
-                    GLX_CONTEXT_MAJOR_VERSION_ARB, ver.Major,
-                    GLX_CONTEXT_MINOR_VERSION_ARB, ver.Minor,
-                    GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
+                    GLX_CONTEXT_MAJOR_VERSION_ARB, profile.Major,
+                    GLX_CONTEXT_MINOR_VERSION_ARB, profile.Minor,
+                    GLX_CONTEXT_PROFILE_MASK_ARB, profileMask,
                     0
                 };
+                
                 try
                 {
                     handle = Glx.CreateContextAttribsARB(_x11.Display, _fbconfig, sharelist, true, attrs);
                     if (handle != IntPtr.Zero)
-                        break;
+                    {
+                        _version = profile;
+                        return new GlxContext(new GlxInterface(), handle, this, (GlxContext)share, profile,
+                            sampleCount, stencilSize, _x11, defaultXid, ownsPBuffer);
+                        
+                    }
                 }
                 catch
                 {
-                    break;
+                    return null;
                 }
+
+                return null;
+            }
+
+            GlxContext rv = null;
+            if (_version.HasValue)
+            {
+                rv = Create(_version.Value);
             }
             
-            if (handle == IntPtr.Zero)
-                throw new OpenGlException("Unable to create direct GLX context");
-            return new GlxContext(new GlxInterface(), handle, this, _x11, defaultXid);
+            foreach (var v in _probeProfiles)
+            {
+                if (v.Type == GlProfileType.OpenGLES
+                    && !_displayExtensions.Contains("GLX_EXT_create_context_es2_profile"))
+                    continue;
+                rv = Create(v);
+                if (rv != null)
+                {
+                    _version = v;
+                    break;
+                }
+            }
+
+            if (rv != null)
+                return rv;
+
+            throw new OpenGlException("Unable to create direct GLX context");
         }
 
         public void SwapBuffers(IntPtr xid) => Glx.SwapBuffers(_x11.Display, xid);
diff --git a/src/Avalonia.X11/Glx/GlxGlPlatformSurface.cs b/src/Avalonia.X11/Glx/GlxGlPlatformSurface.cs
index 45a46bd6f5..cb4ab4aca0 100644
--- a/src/Avalonia.X11/Glx/GlxGlPlatformSurface.cs
+++ b/src/Avalonia.X11/Glx/GlxGlPlatformSurface.cs
@@ -1,5 +1,8 @@
 using System;
 using Avalonia.OpenGL;
+using Avalonia.OpenGL.Egl;
+using Avalonia.OpenGL.Surfaces;
+using static Avalonia.OpenGL.GlConsts;
 
 namespace Avalonia.X11.Glx
 {
@@ -40,46 +43,41 @@ namespace Avalonia.X11.Glx
 
             public IGlPlatformSurfaceRenderingSession BeginDraw()
             {
-                var l = _context.Lock();
-                try
-                {
-                    _context.MakeCurrent(_info.Handle);
-                    return new Session(_context, _info, l);
-                }
-                catch
-                {
-                    l.Dispose();
-                    throw;
-                }
+                var oldContext = _context.MakeCurrent(_info.Handle);
+                
+                // Reset to default FBO first
+                _context.GlInterface.BindFramebuffer(GL_FRAMEBUFFER, 0);
+                    
+                return new Session(_context, _info, oldContext);
             }
             
             class Session : IGlPlatformSurfaceRenderingSession
             {
                 private readonly GlxContext _context;
                 private readonly EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo _info;
-                private IDisposable _lock;
+                private readonly IDisposable _clearContext;
+                public IGlContext Context => _context;
 
                 public Session(GlxContext context, EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo info,
-                    IDisposable @lock)
+                    IDisposable clearContext)
                 {
                     _context = context;
                     _info = info;
-                    _lock = @lock;
+                    _clearContext = clearContext;
                 }
 
                 public void Dispose()
                 {
-                    _context.Display.GlInterface.Flush();
+                    _context.GlInterface.Flush();
                     _context.Glx.WaitGL();
                     _context.Display.SwapBuffers(_info.Handle);
                     _context.Glx.WaitX();
-                    _context.Display.ClearContext();
-                    _lock.Dispose();
+                    _clearContext.Dispose();
                 }
 
-                public IGlDisplay Display => _context.Display;
                 public PixelSize Size => _info.Size;
                 public double Scaling => _info.Scaling;
+                public bool IsYFlipped { get; }
             }
         }
     }
diff --git a/src/Avalonia.X11/Glx/GlxPlatformFeature.cs b/src/Avalonia.X11/Glx/GlxPlatformFeature.cs
index 3dc2e8e41f..6735a32ffe 100644
--- a/src/Avalonia.X11/Glx/GlxPlatformFeature.cs
+++ b/src/Avalonia.X11/Glx/GlxPlatformFeature.cs
@@ -1,42 +1,46 @@
 using System;
+using System.Collections.Generic;
 using Avalonia.Logging;
 using Avalonia.OpenGL;
 
 namespace Avalonia.X11.Glx
 {
-    class GlxGlPlatformFeature : IWindowingPlatformGlFeature
+    class GlxPlatformOpenGlInterface : IPlatformOpenGlInterface
     {
         public GlxDisplay Display { get; private set; }
-        public IGlContext ImmediateContext { get; private set; }
+        public bool CanCreateContexts => true;
+        public bool CanShareContexts => true;
+        public IGlContext CreateContext() => Display.CreateContext();
+        public IGlContext CreateSharedContext() => Display.CreateContext(PrimaryContext);
         public GlxContext DeferredContext { get; private set; }
+        public IGlContext PrimaryContext => DeferredContext;
 
-        public static bool TryInitialize(X11Info x11)
+        public static bool TryInitialize(X11Info x11, IList<GlVersion> glProfiles)
         {
-            var feature = TryCreate(x11);
+            var feature = TryCreate(x11, glProfiles);
             if (feature != null)
             {
-                AvaloniaLocator.CurrentMutable.Bind<IWindowingPlatformGlFeature>().ToConstant(feature);
+                AvaloniaLocator.CurrentMutable.Bind<IPlatformOpenGlInterface>().ToConstant(feature);
                 return true;
             }
 
             return false;
         }
         
-        public static GlxGlPlatformFeature TryCreate(X11Info x11)
+        public static GlxPlatformOpenGlInterface TryCreate(X11Info x11, IList<GlVersion> glProfiles)
         {
             try
             {
-                var disp = new GlxDisplay(x11);
-                return new GlxGlPlatformFeature
+                var disp = new GlxDisplay(x11, glProfiles);
+                return new GlxPlatformOpenGlInterface
                 {
                     Display = disp,
-                    ImmediateContext = disp.ImmediateContext,
                     DeferredContext = disp.DeferredContext
                 };
             }
             catch(Exception e)
             {
-                Logger.TryGet(LogEventLevel.Error)?.Log("OpenGL", null, "Unable to initialize GLX-based rendering: {0}", e);
+                Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log(null, "Unable to initialize GLX-based rendering: {0}", e);
                 return null;
             }
         }
diff --git a/src/Avalonia.X11/NativeDialogs/Gtk.cs b/src/Avalonia.X11/NativeDialogs/Gtk.cs
index 42acb087bc..77e410162f 100644
--- a/src/Avalonia.X11/NativeDialogs/Gtk.cs
+++ b/src/Avalonia.X11/NativeDialogs/Gtk.cs
@@ -190,6 +190,9 @@ namespace Avalonia.X11.NativeDialogs
         [DllImport(GtkName)]
         public static extern void gtk_file_chooser_set_filename(IntPtr chooser, Utf8Buffer file);
 
+        [DllImport(GtkName)]
+        public static extern void gtk_file_chooser_set_current_name(IntPtr chooser, Utf8Buffer file);
+        
         [DllImport(GtkName)]
         public static extern IntPtr gtk_file_filter_new();
         
@@ -201,9 +204,15 @@ namespace Avalonia.X11.NativeDialogs
         
         [DllImport(GtkName)]
         public static extern IntPtr gtk_file_chooser_add_filter(IntPtr chooser, IntPtr filter);
+
+        [DllImport(GtkName)]
+        public static extern IntPtr gtk_file_chooser_get_filter(IntPtr chooser);
         
         [DllImport(GtkName)]
         public static extern void gtk_widget_realize(IntPtr gtkWidget);
+        
+        [DllImport(GtkName)]
+        public static extern void gtk_widget_destroy(IntPtr gtkWidget);
 
         [DllImport(GtkName)]
         public static extern IntPtr gtk_widget_get_window(IntPtr gtkWidget);
@@ -216,6 +225,13 @@ namespace Avalonia.X11.NativeDialogs
 
         [DllImport(GdkName)]
         static extern IntPtr gdk_x11_window_foreign_new_for_display(IntPtr display, IntPtr xid);
+        
+        [DllImport(GdkName)]
+        public static extern IntPtr gdk_x11_window_get_xid(IntPtr window);
+
+
+        [DllImport(GtkName)]
+        public static extern IntPtr gtk_container_add(IntPtr container, IntPtr widget);
 
         [DllImport(GdkName)]
         static extern IntPtr gdk_set_allowed_backends(Utf8Buffer backends);
diff --git a/src/Avalonia.X11/NativeDialogs/GtkNativeFileDialogs.cs b/src/Avalonia.X11/NativeDialogs/GtkNativeFileDialogs.cs
index ffd1c1b57e..6cf6c6f35f 100644
--- a/src/Avalonia.X11/NativeDialogs/GtkNativeFileDialogs.cs
+++ b/src/Avalonia.X11/NativeDialogs/GtkNativeFileDialogs.cs
@@ -16,7 +16,7 @@ namespace Avalonia.X11.NativeDialogs
     {
         private Task<bool> _initialized;
         private unsafe  Task<string[]> ShowDialog(string title, IWindowImpl parent, GtkFileChooserAction action,
-            bool multiSelect, string initialFileName, IEnumerable<FileDialogFilter> filters)
+            bool multiSelect, string initialFileName, IEnumerable<FileDialogFilter> filters, string defaultExtension)
         {
             IntPtr dlg;
             using (var name = new Utf8Buffer(title))
@@ -35,11 +35,13 @@ namespace Avalonia.X11.NativeDialogs
                 foreach (var d in disposables) d.Dispose();
                 disposables.Clear();
             }
-            
+
+            var filtersDic = new Dictionary<IntPtr, FileDialogFilter>();
             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);
                     
@@ -74,6 +76,15 @@ namespace Avalonia.X11.NativeDialogs
                         }
                         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);
+                        }
                     }
 
                     gtk_widget_hide(dlg);
@@ -91,29 +102,65 @@ namespace Avalonia.X11.NativeDialogs
                 gtk_dialog_add_button(dlg, open, GtkResponseType.Cancel);
             if (initialFileName != null)
                 using (var fn = new Utf8Buffer(initialFileName))
-                    gtk_file_chooser_set_filename(dlg, fn);
+                {
+                    if (action == GtkFileChooserAction.Save)
+                        gtk_file_chooser_set_current_name(dlg, fn);
+                    else
+                        gtk_file_chooser_set_filename(dlg, fn);
+                }
+
             gtk_window_present(dlg);
             return tcs.Task;
         }
-        
-        public async Task<string[]> ShowFileDialogAsync(FileDialog dialog, IWindowImpl parent)
+
+        string NameWithExtension(string path, string defaultExtension, FileDialogFilter filter)
+        {
+            var name = Path.GetFileName(path);
+            if (name != null && !name.Contains("."))
+            {
+                if (filter?.Extensions?.Count > 0)
+                {
+                    if (defaultExtension != null
+                        && filter.Extensions.Contains(defaultExtension))
+                        return path + "." + defaultExtension.TrimStart('.');
+
+                    var ext = filter.Extensions.FirstOrDefault(x => x != "*");
+                    if (ext != null)
+                        return path + "." + ext.TrimStart('.');
+                }
+
+                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, parent,
+                () => ShowDialog(dialog.Title, platformImpl,
                     dialog is OpenFileDialog ? GtkFileChooserAction.Open : GtkFileChooserAction.Save,
                     (dialog as OpenFileDialog)?.AllowMultiple ?? false,
-                    Path.Combine(string.IsNullOrEmpty(dialog.InitialDirectory) ? "" : dialog.InitialDirectory,
-                        string.IsNullOrEmpty(dialog.InitialFileName) ? "" : dialog.InitialFileName), dialog.Filters));
+                    Path.Combine(string.IsNullOrEmpty(dialog.Directory) ? "" : dialog.Directory,
+                        string.IsNullOrEmpty(dialog.InitialFileName) ? "" : dialog.InitialFileName), dialog.Filters,
+                    (dialog as SaveFileDialog)?.DefaultExtension));
         }
 
-        public async Task<string> ShowFolderDialogAsync(OpenFolderDialog dialog, IWindowImpl parent)
+        public async Task<string> ShowFolderDialogAsync(OpenFolderDialog dialog, Window parent)
         {
             await EnsureInitialized();
+
+            var platformImpl = parent?.PlatformImpl;
+
             return await await RunOnGlibThread(async () =>
             {
-                var res = await ShowDialog(dialog.Title, parent,
-                    GtkFileChooserAction.SelectFolder, false, dialog.InitialDirectory, null);
+                var res = await ShowDialog(dialog.Title, platformImpl,
+                    GtkFileChooserAction.SelectFolder, false, dialog.Directory, null, null);
                 return res?.FirstOrDefault();
             });
         }
diff --git a/src/Avalonia.X11/TransparencyHelper.cs b/src/Avalonia.X11/TransparencyHelper.cs
new file mode 100644
index 0000000000..0578680136
--- /dev/null
+++ b/src/Avalonia.X11/TransparencyHelper.cs
@@ -0,0 +1,82 @@
+using System;
+using Avalonia.Controls;
+
+namespace Avalonia.X11
+{
+    class TransparencyHelper :  IDisposable, X11Globals.IGlobalsSubscriber
+    {
+        private readonly X11Info _x11;
+        private readonly IntPtr _window;
+        private readonly X11Globals _globals;
+        private WindowTransparencyLevel _currentLevel;
+        private WindowTransparencyLevel _requestedLevel;
+        private bool _isCompositing;
+        private bool _blurAtomsAreSet;
+        
+        public Action<WindowTransparencyLevel> TransparencyLevelChanged { get; set; }
+        public WindowTransparencyLevel CurrentLevel => _currentLevel;
+
+        public TransparencyHelper(X11Info x11, IntPtr window, X11Globals globals)
+        {
+            _x11 = x11;
+            _window = window;
+            _globals = globals;
+            _globals.AddSubscriber(this);
+        }
+
+        public void SetTransparencyRequest(WindowTransparencyLevel level)
+        {
+            _requestedLevel = level;
+            UpdateTransparency();
+        }
+
+        private void UpdateTransparency()
+        {
+            var newLevel = UpdateAtomsAndGetTransparency();
+            if (newLevel != _currentLevel)
+            {
+                _currentLevel = newLevel;
+                TransparencyLevelChanged?.Invoke(newLevel);
+            }
+        }
+        
+        private WindowTransparencyLevel UpdateAtomsAndGetTransparency()
+        {
+            if (_requestedLevel >= WindowTransparencyLevel.Blur)
+            {
+                if (!_blurAtomsAreSet)
+                {
+                    IntPtr value = IntPtr.Zero;
+                    XLib.XChangeProperty(_x11.Display, _window, _x11.Atoms._KDE_NET_WM_BLUR_BEHIND_REGION,
+                        _x11.Atoms.XA_CARDINAL, 32, PropertyMode.Replace, ref value, 1);
+                    _blurAtomsAreSet = true;
+                }
+            }
+            else
+            {
+                if (_blurAtomsAreSet)
+                {
+                    XLib.XDeleteProperty(_x11.Display, _window, _x11.Atoms._KDE_NET_WM_BLUR_BEHIND_REGION);
+                    _blurAtomsAreSet = false;
+                }
+            }
+
+            if (!_globals.IsCompositionEnabled)
+                return WindowTransparencyLevel.None;
+            if (_requestedLevel >= WindowTransparencyLevel.Blur && CanBlur)
+                return WindowTransparencyLevel.Blur;
+            return WindowTransparencyLevel.Transparent;
+        }
+
+        private bool CanBlur => _globals.WmName == "KWin" && _globals.IsCompositionEnabled;
+        
+        public void Dispose()
+        {
+            _globals.RemoveSubscriber(this);
+        }
+
+        void X11Globals.IGlobalsSubscriber.WmChanged(string wmName) => UpdateTransparency();
+
+        void X11Globals.IGlobalsSubscriber.CompositionChanged(bool compositing) => UpdateTransparency();
+    }
+}
diff --git a/src/Avalonia.X11/X11Atoms.cs b/src/Avalonia.X11/X11Atoms.cs
index db74a32b99..32f1822e51 100644
--- a/src/Avalonia.X11/X11Atoms.cs
+++ b/src/Avalonia.X11/X11Atoms.cs
@@ -22,6 +22,7 @@
 //
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using static Avalonia.X11.XLib;
 // ReSharper disable FieldCanBeMadeReadOnly.Global
@@ -40,8 +41,9 @@ namespace Avalonia.X11
 
     internal class X11Atoms
     {
+        private readonly IntPtr _display;
 
-// Our atoms
+        // Our atoms
         public readonly IntPtr AnyPropertyType = (IntPtr)0;
         public readonly IntPtr XA_PRIMARY = (IntPtr)1;
         public readonly IntPtr XA_SECONDARY = (IntPtr)2;
@@ -156,6 +158,7 @@ namespace Avalonia.X11
         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;
@@ -184,10 +187,15 @@ namespace Avalonia.X11
         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;
 
-
+        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;
 
             // make sure this array stays in sync with the statements below
 
@@ -201,7 +209,33 @@ namespace Avalonia.X11
             XInternAtoms(display, atomNames, atomNames.Length, true, atoms);
 
             for (var c = 0; c < fields.Length; c++)
+            {
+                _namesToAtoms[fields[c].Name] = atoms[c];
+                _atomsToNames[atoms[c]] = fields[c].Name;
                 fields[c].SetValue(this, atoms[c]);
+            }
+        }
+
+        public IntPtr GetAtom(string name)
+        {
+            if (_namesToAtoms.TryGetValue(name, out var rv))
+                return rv;
+            var atom = XInternAtom(_display, name, false);
+            _namesToAtoms[name] = atom;
+            _atomsToNames[atom] = name;
+            return atom;
+        }
+
+        public string GetAtomName(IntPtr atom)
+        {
+            if (_atomsToNames.TryGetValue(atom, out var rv))
+                return rv;
+            var name = XLib.GetAtomName(_display, atom);
+            if (name == null)
+                return null;
+            _atomsToNames[atom] = name;
+            _namesToAtoms[name] = atom;
+            return name;
         }
     }
 }
diff --git a/src/Avalonia.X11/X11Clipboard.cs b/src/Avalonia.X11/X11Clipboard.cs
index cb9d3389e4..7023bb3ef3 100644
--- a/src/Avalonia.X11/X11Clipboard.cs
+++ b/src/Avalonia.X11/X11Clipboard.cs
@@ -1,8 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
+using Avalonia.Input;
 using Avalonia.Input.Platform;
 using static Avalonia.X11.XLib;
 namespace Avalonia.X11
@@ -10,12 +12,14 @@ namespace Avalonia.X11
     class X11Clipboard : IClipboard
     {
         private readonly X11Info _x11;
-        private string _storedString;
+        private IDataObject _storedDataObject;
         private IntPtr _handle;
         private TaskCompletionSource<IntPtr[]> _requestedFormatsTcs;
-        private TaskCompletionSource<string> _requestedTextTcs;
+        private TaskCompletionSource<object> _requestedDataTcs;
         private readonly IntPtr[] _textAtoms;
         private readonly IntPtr _avaloniaSaveTargetsAtom;
+        private readonly Dictionary<string, IntPtr> _formatAtoms = new Dictionary<string, IntPtr>();
+        private readonly Dictionary<IntPtr, string> _atomFormats = new Dictionary<IntPtr, string>();
 
         public X11Clipboard(AvaloniaX11Platform platform)
         {
@@ -31,6 +35,11 @@ namespace Avalonia.X11
             }.Where(a => a != IntPtr.Zero).ToArray();
         }
 
+        bool IsStringAtom(IntPtr atom)
+        {
+            return _textAtoms.Contains(atom);
+        }
+        
         Encoding GetStringEncoding(IntPtr atom)
         {
             return (atom == _x11.Atoms.XA_STRING
@@ -75,21 +84,31 @@ namespace Avalonia.X11
                 Encoding textEnc;
                 if (target == _x11.Atoms.TARGETS)
                 {
-                    var atoms = _textAtoms;
-                    atoms = atoms.Concat(new[] {_x11.Atoms.TARGETS, _x11.Atoms.MULTIPLE})
-                        .ToArray();
+                    var atoms = new HashSet<IntPtr> { _x11.Atoms.TARGETS, _x11.Atoms.MULTIPLE };
+                    foreach (var fmt in _storedDataObject.GetDataFormats())
+                    {
+                        if (fmt == DataFormats.Text)
+                            foreach (var ta in _textAtoms)
+                                atoms.Add(ta);
+                        else
+                            atoms.Add(_x11.Atoms.GetAtom(fmt));
+                    }
+
                     XChangeProperty(_x11.Display, window, property,
-                        target, 32, PropertyMode.Replace, atoms, atoms.Length);
+                        _x11.Atoms.XA_ATOM, 32, PropertyMode.Replace, atoms.ToArray(), atoms.Count);
                     return property;
                 }
                 else if(target == _x11.Atoms.SAVE_TARGETS && _x11.Atoms.SAVE_TARGETS != IntPtr.Zero)
                 {
                     return property;
                 }
-                else if ((textEnc = GetStringEncoding(target)) != null)
+                else if ((textEnc = GetStringEncoding(target)) != null 
+                         && _storedDataObject?.Contains(DataFormats.Text) == true)
                 {
-
-                    var data = textEnc.GetBytes(_storedString ?? "");
+                    var text = _storedDataObject.GetText();
+                    if(text == null)
+                        return IntPtr.Zero;
+                    var data = textEnc.GetBytes(text);
                     fixed (void* pdata = data)
                         XChangeProperty(_x11.Display, window, property, target, 8,
                             PropertyMode.Replace,
@@ -121,6 +140,23 @@ namespace Avalonia.X11
 
                     return property;
                 }
+                else if(_storedDataObject?.Contains(_x11.Atoms.GetAtomName(target)) == true)
+                {
+                    var objValue = _storedDataObject.Get(_x11.Atoms.GetAtomName(target));
+                    
+                    if(!(objValue is byte[] bytes))
+                    {
+                        if (objValue is string s)
+                            bytes = Encoding.UTF8.GetBytes(s);
+                        else
+                            return IntPtr.Zero;
+                    }
+
+                    XChangeProperty(_x11.Display, window, property, target, 8,
+                        PropertyMode.Replace,
+                        bytes, bytes.Length);
+                    return property;
+                }
                 else
                     return IntPtr.Zero;
             }
@@ -131,15 +167,15 @@ namespace Avalonia.X11
                 if (sel.property == IntPtr.Zero)
                 {
                     _requestedFormatsTcs?.TrySetResult(null);
-                    _requestedTextTcs?.TrySetResult(null);
+                    _requestedDataTcs?.TrySetResult(null);
                 }
                 XGetWindowProperty(_x11.Display, _handle, sel.property, IntPtr.Zero, new IntPtr (0x7fffffff), true, (IntPtr)Atom.AnyPropertyType,
-                    out var actualAtom, out var actualFormat, out var nitems, out var bytes_after, out var prop);
+                    out var actualTypeAtom, out var actualFormat, out var nitems, out var bytes_after, out var prop);
                 Encoding textEnc = null;
                 if (nitems == IntPtr.Zero)
                 {
                     _requestedFormatsTcs?.TrySetResult(null);
-                    _requestedTextTcs?.TrySetResult(null);
+                    _requestedDataTcs?.TrySetResult(null);
                 }
                 else
                 {
@@ -154,10 +190,24 @@ namespace Avalonia.X11
                             _requestedFormatsTcs?.TrySetResult(formats);
                         }
                     }
-                    else if ((textEnc = GetStringEncoding(sel.property)) != null)
+                    else if ((textEnc = GetStringEncoding(actualTypeAtom)) != null)
                     {
                         var text = textEnc.GetString((byte*)prop.ToPointer(), nitems.ToInt32());
-                        _requestedTextTcs?.TrySetResult(text);
+                        _requestedDataTcs?.TrySetResult(text);
+                    }
+                    else
+                    {
+                        if (actualTypeAtom == _x11.Atoms.INCR)
+                        {
+                            // TODO: Actually implement that monstrosity
+                            _requestedDataTcs.TrySetResult(null);
+                        }
+                        else
+                        {
+                            var data = new byte[(int)nitems * (actualFormat / 8)];
+                            Marshal.Copy(prop, data, 0, data.Length);
+                            _requestedDataTcs?.TrySetResult(data);
+                        }
                     }
                 }
 
@@ -174,17 +224,19 @@ namespace Avalonia.X11
             return _requestedFormatsTcs.Task;
         }
 
-        Task<string> SendTextRequest(IntPtr format)
+        Task<object> SendDataRequest(IntPtr format)
         {
-            if (_requestedTextTcs == null || _requestedFormatsTcs.Task.IsCompleted)
-                _requestedTextTcs = new TaskCompletionSource<string>();
+            if (_requestedDataTcs == null || _requestedFormatsTcs.Task.IsCompleted)
+                _requestedDataTcs = new TaskCompletionSource<object>();
             XConvertSelection(_x11.Display, _x11.Atoms.CLIPBOARD, format, format, _handle, IntPtr.Zero);
-            return _requestedTextTcs.Task;
+            return _requestedDataTcs.Task;
         }
+
+        bool HasOwner => XGetSelectionOwner(_x11.Display, _x11.Atoms.CLIPBOARD) != IntPtr.Zero;
         
         public async Task<string> GetTextAsync()
         {
-            if (XGetSelectionOwner(_x11.Display, _x11.Atoms.CLIPBOARD) == IntPtr.Zero)
+            if (!HasOwner)
                 return null;
             var res = await SendFormatRequest();
             var target = _x11.Atoms.UTF8_STRING;
@@ -199,7 +251,7 @@ namespace Avalonia.X11
                     }
             }
 
-            return await SendTextRequest(target);
+            return (string)await SendDataRequest(target);
         }
 
         void StoreAtomsInClipboardManager(IntPtr[] atoms)
@@ -220,15 +272,52 @@ namespace Avalonia.X11
 
         public Task SetTextAsync(string text)
         {
-            _storedString = text;
+            var data = new DataObject();
+            data.Set(DataFormats.Text, text);
+            return SetDataObjectAsync(data);
+        }
+
+        public Task ClearAsync()
+        {
+            return SetTextAsync(null);
+        }
+
+        public Task SetDataObjectAsync(IDataObject data)
+        {
+            _storedDataObject = data;
             XSetSelectionOwner(_x11.Display, _x11.Atoms.CLIPBOARD, _handle, IntPtr.Zero);
             StoreAtomsInClipboardManager(_textAtoms);
             return Task.CompletedTask;
         }
 
-        public Task ClearAsync()
+        public async Task<string[]> GetFormatsAsync()
         {
-            return SetTextAsync(null);
+            if (!HasOwner)
+                return null;
+            var res = await SendFormatRequest();
+            if (res == null)
+                return null;
+            var rv = new List<string>();
+            if (_textAtoms.Any(res.Contains))
+                rv.Add(DataFormats.Text);
+            foreach (var t in res)
+                rv.Add(_x11.Atoms.GetAtomName(t));
+            return rv.ToArray();
+        }
+
+        public async Task<object> GetDataAsync(string format)
+        {
+            if (!HasOwner)
+                return null;
+            if (format == DataFormats.Text)
+                return await GetTextAsync();
+
+            var formatAtom = _x11.Atoms.GetAtom(format);
+            var res = await SendFormatRequest();
+            if (!res.Contains(formatAtom))
+                return null;
+            
+            return await SendDataRequest(formatAtom);
         }
     }
 }
diff --git a/src/Avalonia.X11/X11Framebuffer.cs b/src/Avalonia.X11/X11Framebuffer.cs
index 00288f300d..94f930e9ec 100644
--- a/src/Avalonia.X11/X11Framebuffer.cs
+++ b/src/Avalonia.X11/X11Framebuffer.cs
@@ -14,6 +14,10 @@ namespace Avalonia.X11
 
         public X11Framebuffer(IntPtr display, IntPtr xid, int depth, int width, int height, double factor)
         {
+            // HACK! Please fix renderer, should never ask for 0x0 bitmap.
+            width = Math.Max(1, width);
+            height = Math.Max(1, height);
+
             _display = display;
             _xid = xid;
             _depth = depth;
diff --git a/src/Avalonia.X11/X11Globals.cs b/src/Avalonia.X11/X11Globals.cs
new file mode 100644
index 0000000000..afde15b808
--- /dev/null
+++ b/src/Avalonia.X11/X11Globals.cs
@@ -0,0 +1,182 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using static Avalonia.X11.XLib;
+namespace Avalonia.X11
+{
+    unsafe class X11Globals
+    {
+        private readonly AvaloniaX11Platform _plat;
+        private readonly int _screenNumber;
+        private readonly X11Info _x11;
+        private readonly IntPtr _rootWindow;
+        private readonly IntPtr _compositingAtom;
+        private readonly List<IGlobalsSubscriber> _subscribers = new List<IGlobalsSubscriber>();
+        
+        private string _wmName;
+        private IntPtr _compositionAtomOwner;
+        private bool _isCompositionEnabled;
+
+        public X11Globals(AvaloniaX11Platform plat)
+        {
+            _plat = plat;
+            _x11 = plat.Info;
+            _screenNumber = XDefaultScreen(_x11.Display);
+            _rootWindow = XRootWindow(_x11.Display, _screenNumber);
+            plat.Windows[_rootWindow] = OnRootWindowEvent;
+            XSelectInput(_x11.Display, _rootWindow,
+                new IntPtr((int)(EventMask.StructureNotifyMask | EventMask.PropertyChangeMask)));
+            _compositingAtom = XInternAtom(_x11.Display, "_NET_WM_CM_S" + _screenNumber, false);
+            UpdateWmName();
+            UpdateCompositingAtomOwner();
+        }
+        
+        public string WmName
+        {
+            get => _wmName;
+            private set
+            {
+                if (_wmName != value)
+                {
+                    _wmName = value;
+                    // The collection might change during enumeration
+                    foreach (var s in _subscribers.ToList()) 
+                        s.WmChanged(value);
+                }
+            }
+        }
+
+        private IntPtr CompositionAtomOwner
+        {
+            get => _compositionAtomOwner;
+            set
+            {
+                if (_compositionAtomOwner != value)
+                {
+                    _compositionAtomOwner = value;
+                    IsCompositionEnabled = _compositionAtomOwner != IntPtr.Zero;
+                }
+            }
+        }
+
+        public bool IsCompositionEnabled
+        {
+            get => _isCompositionEnabled;
+            set
+            {
+                if (_isCompositionEnabled != value)
+                {
+                    _isCompositionEnabled = value;
+                    // The collection might change during enumeration
+                    foreach (var s in _subscribers.ToList()) 
+                        s.CompositionChanged(value);
+                }
+            }
+        }
+
+        IntPtr GetSupportingWmCheck(IntPtr window)
+        {
+            XGetWindowProperty(_x11.Display, _rootWindow, _x11.Atoms._NET_SUPPORTING_WM_CHECK,
+                IntPtr.Zero, new IntPtr(IntPtr.Size), false,
+                _x11.Atoms.XA_WINDOW, out IntPtr actualType, out int actualFormat, out IntPtr nitems,
+                out IntPtr bytesAfter, out IntPtr prop);
+            if (nitems.ToInt32() != 1)
+                return IntPtr.Zero;
+            try
+            {
+                if (actualType != _x11.Atoms.XA_WINDOW)
+                    return IntPtr.Zero;
+                return *(IntPtr*)prop.ToPointer();
+            }
+            finally
+            {
+                XFree(prop);
+            }
+        }
+
+        void UpdateCompositingAtomOwner()
+        {
+            // This procedure is described in https://tronche.com/gui/x/icccm/sec-2.html#s-2.8
+            
+            // Check the server-side selection owner
+            var newOwner = XGetSelectionOwner(_x11.Display, _compositingAtom);
+            while (CompositionAtomOwner != newOwner)
+            {
+                // We have a new owner, unsubscribe from the previous one first
+                if (CompositionAtomOwner != IntPtr.Zero)
+                {
+                    _plat.Windows.Remove(CompositionAtomOwner);
+                    XSelectInput(_x11.Display, CompositionAtomOwner, IntPtr.Zero);
+                }
+
+                // Set it as the current owner and select input
+                CompositionAtomOwner = newOwner;
+                if (CompositionAtomOwner != IntPtr.Zero)
+                {
+                    _plat.Windows[newOwner] = HandleCompositionAtomOwnerEvents;
+                    XSelectInput(_x11.Display, CompositionAtomOwner, new IntPtr((int)(EventMask.StructureNotifyMask)));
+                }
+                
+                // Check for the new owner again and repeat the procedure if it was changed between XGetSelectionOwner and XSelectInput call
+                newOwner = XGetSelectionOwner(_x11.Display, _compositingAtom);
+            }
+        }
+
+        private void HandleCompositionAtomOwnerEvents(XEvent ev)
+        {
+            if(ev.type == XEventName.DestroyNotify)
+                UpdateCompositingAtomOwner();
+        }
+        
+        void UpdateWmName() => WmName = GetWmName();
+
+        string GetWmName()
+        {
+            var wm = GetSupportingWmCheck(_rootWindow);
+            if (wm == IntPtr.Zero || wm != GetSupportingWmCheck(wm))
+                return null;
+            XGetWindowProperty(_x11.Display, wm, _x11.Atoms._NET_WM_NAME,
+                IntPtr.Zero, new IntPtr(0x7fffffff),
+                false, _x11.Atoms.UTF8_STRING, out var actualType, out var actualFormat,
+                out var nitems, out _, out var prop);
+            if (nitems == IntPtr.Zero)
+                return null;
+            try
+            {
+                if (actualFormat != 8)
+                    return null;
+                return Marshal.PtrToStringAnsi(prop, nitems.ToInt32());
+            }
+            finally
+            {
+                XFree(prop);
+            }
+        }
+        
+        private void OnRootWindowEvent(XEvent ev)
+        {
+            if (ev.type == XEventName.PropertyNotify)
+            {
+                if(ev.PropertyEvent.atom == _x11.Atoms._NET_SUPPORTING_WM_CHECK)
+                    UpdateWmName();
+            }
+
+            if (ev.type == XEventName.ClientMessage)
+            {
+                if(ev.ClientMessageEvent.message_type == _x11.Atoms.MANAGER
+                    && ev.ClientMessageEvent.ptr2 == _compositingAtom)
+                    UpdateCompositingAtomOwner();
+            }
+        }
+        
+        public interface IGlobalsSubscriber
+        {
+            void WmChanged(string wmName);
+            void CompositionChanged(bool compositing);
+        }
+
+        public void AddSubscriber(IGlobalsSubscriber subscriber) => _subscribers.Add(subscriber);
+        public void RemoveSubscriber(IGlobalsSubscriber subscriber) => _subscribers.Remove(subscriber);
+    }
+}
diff --git a/src/Avalonia.X11/X11IconLoader.cs b/src/Avalonia.X11/X11IconLoader.cs
index f0e75536d0..093f2b12c1 100644
--- a/src/Avalonia.X11/X11IconLoader.cs
+++ b/src/Avalonia.X11/X11IconLoader.cs
@@ -59,7 +59,7 @@ namespace Avalonia.X11
             }
             using(var rt = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>().CreateRenderTarget(new[]{this}))
             using (var ctx = rt.CreateDrawingContext(null))
-                ctx.DrawImage(bitmap.PlatformImpl, 1, new Rect(bitmap.Size),
+                ctx.DrawBitmap(bitmap.PlatformImpl, 1, new Rect(bitmap.Size),
                     new Rect(0, 0, _width, _height));
             Data = new UIntPtr[_width * _height + 2];
             Data[0] = new UIntPtr((uint)_width);
diff --git a/src/Avalonia.X11/X11ImmediateRendererProxy.cs b/src/Avalonia.X11/X11ImmediateRendererProxy.cs
new file mode 100644
index 0000000000..7280567bb3
--- /dev/null
+++ b/src/Avalonia.X11/X11ImmediateRendererProxy.cs
@@ -0,0 +1,115 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Rendering;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+
+namespace Avalonia.X11
+{
+    public class X11ImmediateRendererProxy : IRenderer, IRenderLoopTask
+    {
+        private readonly IRenderLoop _loop;
+        private ImmediateRenderer _renderer;
+        private bool _invalidated;
+        private bool _running;
+        private object _lock = new object();
+
+        public X11ImmediateRendererProxy(IVisual root, IRenderLoop loop)
+        {
+            _loop = loop;
+            _renderer = new ImmediateRenderer(root);
+            
+        }
+
+        public void Dispose()
+        {
+            _running = false;
+            _renderer.Dispose();
+        }
+
+        public bool DrawFps
+        {
+            get => _renderer.DrawFps;
+            set => _renderer.DrawFps = value;
+        }
+
+        public bool DrawDirtyRects
+        {
+            get => _renderer.DrawDirtyRects;
+            set => _renderer.DrawDirtyRects = value;
+        }
+
+        public event EventHandler<SceneInvalidatedEventArgs> SceneInvalidated
+        {
+            add => _renderer.SceneInvalidated += value;
+            remove => _renderer.SceneInvalidated -= value;
+        }
+
+        public void AddDirty(IVisual visual)
+        {
+            lock (_lock)
+                _invalidated = true;
+            _renderer.AddDirty(visual);
+        }
+
+        public IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool> filter)
+        {
+            return _renderer.HitTest(p, root, filter);
+        }
+
+        public IVisual HitTestFirst(Point p, IVisual root, Func<IVisual, bool> filter)
+        {
+            return _renderer.HitTestFirst(p, root, filter);
+        }
+
+        public void RecalculateChildren(IVisual visual)
+        {
+            _renderer.RecalculateChildren(visual);
+        }
+
+        public void Resized(Size size)
+        {
+            _renderer.Resized(size);
+        }
+
+        public void Paint(Rect rect)
+        {
+            _invalidated = false;
+            _renderer.Paint(rect);
+        }
+
+        public void Start()
+        {
+            _running = true;
+            _loop.Add(this);
+            _renderer.Start();
+        }
+
+        public void Stop()
+        {
+            _running = false;
+            _loop.Remove(this);
+            _renderer.Stop();
+        }
+
+        public bool NeedsUpdate => false;
+        public void Update(TimeSpan time)
+        {
+            
+        }
+
+        public void Render()
+        {
+            if (_invalidated)
+            {
+                lock (_lock)
+                    _invalidated = false;
+                Dispatcher.UIThread.Post(() =>
+                {
+                    if (_running)
+                        Paint(new Rect(0, 0, 100000, 100000));
+                });
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.X11/X11NativeControlHost.cs b/src/Avalonia.X11/X11NativeControlHost.cs
new file mode 100644
index 0000000000..6c4eb81c84
--- /dev/null
+++ b/src/Avalonia.X11/X11NativeControlHost.cs
@@ -0,0 +1,198 @@
+using System;
+using Avalonia.Controls.Platform;
+using Avalonia.Platform;
+using Avalonia.VisualTree;
+using static Avalonia.X11.XLib;
+namespace Avalonia.X11
+{
+    // TODO: Actually implement XEmbed instead of simply using XReparentWindow
+    class X11NativeControlHost : INativeControlHostImpl
+    {
+        private readonly AvaloniaX11Platform _platform;
+        public X11Window Window { get; }
+
+        public X11NativeControlHost(AvaloniaX11Platform platform, X11Window window)
+        {
+            _platform = platform;
+            Window = window;
+        }
+
+        public INativeControlHostDestroyableControlHandle CreateDefaultChild(IPlatformHandle parent)
+        {
+            var ch = new DumbWindow(_platform.Info);
+            XSync(_platform.Display, false);
+            return ch;
+        }
+
+        public INativeControlHostControlTopLevelAttachment CreateNewAttachment(Func<IPlatformHandle, IPlatformHandle> create)
+        {
+            var holder = new DumbWindow(_platform.Info, Window.Handle.Handle);
+            Attachment attachment = null;
+            try
+            {
+                var child = create(holder);
+                // ReSharper disable once UseObjectOrCollectionInitializer
+                // It has to be assigned to the variable before property setter is called so we dispose it on exception
+                attachment = new Attachment(_platform.Display, holder, _platform.OrphanedWindow, child);
+                attachment.AttachedTo = this;
+                return attachment;
+            }
+            catch
+            {
+                attachment?.Dispose();
+                holder?.Destroy();
+                throw;
+            }
+        }
+
+        public INativeControlHostControlTopLevelAttachment CreateNewAttachment(IPlatformHandle handle)
+        {
+            if (!IsCompatibleWith(handle))
+                throw new ArgumentException(handle.HandleDescriptor + " is not compatible with the current window",
+                    nameof(handle));
+            var attachment = new Attachment(_platform.Display, new DumbWindow(_platform.Info, Window.Handle.Handle),
+                _platform.OrphanedWindow, handle) { AttachedTo = this };
+            return attachment;
+        }
+
+        public bool IsCompatibleWith(IPlatformHandle handle) => handle.HandleDescriptor == "XID";
+
+        class DumbWindow : INativeControlHostDestroyableControlHandle
+        {
+            private readonly IntPtr _display;
+
+            public DumbWindow(X11Info x11, IntPtr? parent = null)
+            {
+                _display = x11.Display;
+                /*Handle = XCreateSimpleWindow(x11.Display, XLib.XDefaultRootWindow(_display),
+                    0, 0, 1, 1, 0, IntPtr.Zero, IntPtr.Zero);*/
+                var attr = new XSetWindowAttributes
+                {
+                    backing_store = 1,
+                    bit_gravity = Gravity.NorthWestGravity,
+                    win_gravity = Gravity.NorthWestGravity,
+                    
+                };
+
+                parent = parent ?? XDefaultRootWindow(x11.Display);
+
+                Handle = XCreateWindow(_display, parent.Value, 0, 0,
+                    1,1, 0, 0,
+                    (int)CreateWindowArgs.InputOutput,
+                    IntPtr.Zero, 
+                    new UIntPtr((uint)(SetWindowValuemask.BorderPixel | SetWindowValuemask.BitGravity |
+                                       SetWindowValuemask.BackPixel |
+                                       SetWindowValuemask.WinGravity | SetWindowValuemask.BackingStore)), ref attr);
+            }
+
+            public IntPtr Handle { get; private set; }
+            public string HandleDescriptor => "XID";
+            public void Destroy()
+            {
+                if (Handle != IntPtr.Zero)
+                {
+                    XDestroyWindow(_display, Handle);
+                    Handle = IntPtr.Zero;
+                }
+            }
+        }
+        
+        class Attachment : INativeControlHostControlTopLevelAttachment
+        {
+            private readonly IntPtr _display;
+            private readonly IntPtr _orphanedWindow;
+            private DumbWindow _holder;
+            private IPlatformHandle _child;
+            private X11NativeControlHost _attachedTo;
+            private bool _mapped;
+            
+            public Attachment(IntPtr display, DumbWindow holder, IntPtr orphanedWindow, IPlatformHandle child)
+            {
+                _display = display;
+                _orphanedWindow = orphanedWindow;
+                _holder = holder;
+                _child = child;
+                XReparentWindow(_display, child.Handle, holder.Handle, 0, 0);
+                XMapWindow(_display, child.Handle);
+            }
+            
+            public void Dispose()
+            {
+                if (_child != null)
+                {
+                    XReparentWindow(_display, _child.Handle, _orphanedWindow, 0, 0);
+                    _child = null;
+                }
+
+                _holder?.Destroy();
+                _holder = null;
+                _attachedTo = null;
+            }
+
+            void CheckDisposed()
+            {
+                if (_child == null)
+                    throw new ObjectDisposedException("X11 INativeControlHostControlTopLevelAttachment");
+            }
+
+            public INativeControlHostImpl AttachedTo
+            {
+                get => _attachedTo;
+                set
+                {
+                    CheckDisposed();
+                    _attachedTo = (X11NativeControlHost)value;
+                    if (value == null)
+                    {
+                        _mapped = false;
+                        XUnmapWindow(_display, _holder.Handle);
+                        XReparentWindow(_display, _holder.Handle, _orphanedWindow, 0, 0);
+                    }
+                    else
+                    {
+                        XReparentWindow(_display, _holder.Handle, _attachedTo.Window.Handle.Handle, 0, 0);
+                    }
+                }
+            }
+
+            public bool IsCompatibleWith(INativeControlHostImpl host) => host is X11NativeControlHost;
+
+            public void HideWithSize(Size size)
+            {
+                if(_attachedTo == null || _child == null)
+                    return;
+                if (_mapped)
+                {
+                    _mapped = false;
+                    XUnmapWindow(_display, _holder.Handle);
+                }
+
+                size *= _attachedTo.Window.RenderScaling;
+                XResizeWindow(_display, _child.Handle,
+                    Math.Max(1, (int)size.Width), Math.Max(1, (int)size.Height));
+            }
+            
+            
+            
+            public void ShowInBounds(Rect bounds)
+            {
+                CheckDisposed();
+                if (_attachedTo == null)
+                    throw new InvalidOperationException("The control isn't currently attached to a toplevel");
+                bounds *= _attachedTo.Window.RenderScaling;
+                
+                var pixelRect = new PixelRect((int)bounds.X, (int)bounds.Y, Math.Max(1, (int)bounds.Width),
+                    Math.Max(1, (int)bounds.Height));
+                XMoveResizeWindow(_display, _child.Handle, 0, 0, pixelRect.Width, pixelRect.Height);
+                XMoveResizeWindow(_display, _holder.Handle, pixelRect.X, pixelRect.Y, pixelRect.Width,
+                    pixelRect.Height);
+                if (!_mapped)
+                {
+                    XMapWindow(_display, _holder.Handle);
+                    XRaiseWindow(_display, _holder.Handle);
+                    _mapped = true;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.X11/X11Platform.cs b/src/Avalonia.X11/X11Platform.cs
index 6ba562bb69..c6db146f7b 100644
--- a/src/Avalonia.X11/X11Platform.cs
+++ b/src/Avalonia.X11/X11Platform.cs
@@ -7,6 +7,7 @@ using Avalonia.FreeDesktop;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.OpenGL;
+using Avalonia.OpenGL.Egl;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.X11;
@@ -26,25 +27,30 @@ namespace Avalonia.X11
         public IX11Screens X11Screens { get; private set; }
         public IScreenImpl Screens { get; private set; }
         public X11PlatformOptions Options { get; private set; }
+        public IntPtr OrphanedWindow { get; private set; }
+        public X11Globals Globals { get; private set; }
         public void Initialize(X11PlatformOptions options)
         {
             Options = options;
             XInitThreads();
             Display = XOpenDisplay(IntPtr.Zero);
             DeferredDisplay = XOpenDisplay(IntPtr.Zero);
+            OrphanedWindow = XCreateSimpleWindow(Display, XDefaultRootWindow(Display), 0, 0, 1, 1, 0, IntPtr.Zero,
+                IntPtr.Zero);
             if (Display == IntPtr.Zero)
                 throw new Exception("XOpenDisplay failed");
             XError.Init();
             Info = new X11Info(Display, DeferredDisplay);
+            Globals = new X11Globals(this);
             //TODO: log
             if (options.UseDBusMenu)
                 DBusHelper.TryInitialize();
             AvaloniaLocator.CurrentMutable.BindToSelf(this)
                 .Bind<IWindowingPlatform>().ToConstant(this)
                 .Bind<IPlatformThreadingInterface>().ToConstant(new X11PlatformThreading(this))
-                .Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(60))
+                .Bind<IRenderTimer>().ToConstant(new SleepLoopRenderTimer(60))
                 .Bind<IRenderLoop>().ToConstant(new RenderLoop())
-                .Bind<PlatformHotkeyConfiguration>().ToConstant(new PlatformHotkeyConfiguration(InputModifiers.Control))
+                .Bind<PlatformHotkeyConfiguration>().ToConstant(new PlatformHotkeyConfiguration(KeyModifiers.Control))
                 .Bind<IKeyboardDevice>().ToFunc(() => KeyboardDevice)
                 .Bind<IStandardCursorFactory>().ToConstant(new X11CursorFactory(Display))
                 .Bind<IClipboard>().ToConstant(new X11Clipboard(this))
@@ -65,9 +71,9 @@ namespace Avalonia.X11
             if (options.UseGpu)
             {
                 if (options.UseEGL)
-                    EglGlPlatformFeature.TryInitialize();
+                    EglPlatformOpenGlInterface.TryInitialize();
                 else
-                    GlxGlPlatformFeature.TryInitialize(Info);
+                    GlxPlatformOpenGlInterface.TryInitialize(Info, Options.GlProfiles);
             }
 
             
@@ -80,7 +86,7 @@ namespace Avalonia.X11
             return new X11Window(this, null);
         }
 
-        public IEmbeddableWindowImpl CreateEmbeddableWindow()
+        public IWindowImpl CreateEmbeddableWindow()
         {
             throw new NotSupportedException();
         }
@@ -96,8 +102,19 @@ namespace Avalonia
         public bool UseGpu { get; set; } = true;
         public bool OverlayPopups { get; set; }
         public bool UseDBusMenu { get; set; }
+        public bool UseDeferredRendering { get; set; } = true;
 
-        public List<string> GlxRendererBlacklist { get; set; } = new List<string>
+        public IList<GlVersion> GlProfiles { get; set; } = new List<GlVersion>
+        {
+            new GlVersion(GlProfileType.OpenGL, 4, 0),
+            new GlVersion(GlProfileType.OpenGL, 3, 2),
+            new GlVersion(GlProfileType.OpenGL, 3, 0),
+            new GlVersion(GlProfileType.OpenGLES, 3, 2),
+            new GlVersion(GlProfileType.OpenGLES, 3, 0),
+            new GlVersion(GlProfileType.OpenGLES, 2, 0)
+        };
+
+        public IList<string> GlxRendererBlacklist { get; set; } = new List<string>
         {
             // llvmpipe is a software GL rasterizer. If it's returned by glGetString,
             // that usually means that something in the system is horribly misconfigured
diff --git a/src/Avalonia.X11/X11Screens.cs b/src/Avalonia.X11/X11Screens.cs
index e247a4241a..af6d2674b6 100644
--- a/src/Avalonia.X11/X11Screens.cs
+++ b/src/Avalonia.X11/X11Screens.cs
@@ -48,9 +48,13 @@ namespace Avalonia.X11
             var pwa = (IntPtr*)prop;
             var wa = new PixelRect(pwa[0].ToInt32(), pwa[1].ToInt32(), pwa[2].ToInt32(), pwa[3].ToInt32());
 
-            
-            foreach (var s in screens) 
+
+            foreach (var s in screens)
+            {
                 s.WorkingArea = s.Bounds.Intersect(wa);
+                if (s.WorkingArea.Width <= 0 || s.WorkingArea.Height <= 0)
+                    s.WorkingArea = s.Bounds;
+            }
 
             XFree(prop);
             return screens;
@@ -134,8 +138,14 @@ namespace Avalonia.X11
                                 settings.GlobalScaleFactor)
                         });
                 }
-
-                Screens = new[] {new X11Screen(new PixelRect(0, 0, 1920, 1280), true, "Default", null, settings.GlobalScaleFactor)};
+                else
+                {
+                    Screens = new[]
+                    {
+                        new X11Screen(new PixelRect(0, 0, 1920, 1280), true, "Default", null,
+                            settings.GlobalScaleFactor)
+                    };
+                }
             }
 
             public X11Screen[] Screens { get; }
diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs
index 32460fed86..b061920d6a 100644
--- a/src/Avalonia.X11/X11Window.cs
+++ b/src/Avalonia.X11/X11Window.cs
@@ -12,6 +12,7 @@ using Avalonia.FreeDesktop;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.OpenGL;
+using Avalonia.OpenGL.Egl;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Threading;
@@ -21,13 +22,14 @@ using static Avalonia.X11.XLib;
 // ReSharper disable StringLiteralTypo
 namespace Avalonia.X11
 {
-    unsafe class X11Window : IWindowImpl, IPopupImpl, IXI2Client, ITopLevelImplWithNativeMenuExporter
+    unsafe class X11Window : IWindowImpl, IPopupImpl, IXI2Client,
+        ITopLevelImplWithNativeMenuExporter,
+        ITopLevelImplWithNativeControlHost
     {
         private readonly AvaloniaX11Platform _platform;
         private readonly IWindowImpl _popupParent;
         private readonly bool _popup;
         private readonly X11Info _x11;
-        private bool _invalidated;
         private XConfigureEvent? _configure;
         private PixelPoint? _configurePoint;
         private bool _triggeredExpose;
@@ -41,9 +43,11 @@ namespace Avalonia.X11
         private IntPtr _xic;
         private IntPtr _renderHandle;
         private bool _mapped;
-        private HashSet<X11Window> _transientChildren = new HashSet<X11Window>();
-        private X11Window _transientParent;
+        private bool _wasMappedAtLeastOnce = false;
         private double? _scalingOverride;
+        private bool _disabled;
+        private TransparencyHelper _transparencyHelper;
+
         public object SyncRoot { get; } = new object();
 
         class InputEventContainer
@@ -62,7 +66,7 @@ namespace Avalonia.X11
             _touch = new TouchDevice();
             _keyboard = platform.KeyboardDevice;
 
-            var glfeature = AvaloniaLocator.Current.GetService<IWindowingPlatformGlFeature>();
+            var glfeature = AvaloniaLocator.Current.GetService<IPlatformOpenGlInterface>();
             XSetWindowAttributes attr = new XSetWindowAttributes();
             var valueMask = default(SetWindowValuemask);
 
@@ -84,13 +88,13 @@ namespace Avalonia.X11
             // OpenGL seems to be do weird things to it's current window which breaks resize sometimes
             _useRenderWindow = glfeature != null;
             
-            var glx = glfeature as GlxGlPlatformFeature;
+            var glx = glfeature as GlxPlatformOpenGlInterface;
             if (glx != null)
                 visualInfo = *glx.Display.VisualInfo;
             else if (glfeature == null)
                 visualInfo = _x11.TransparentVisualInfo;
 
-            var egl = glfeature as EglGlPlatformFeature;
+            var egl = glfeature as EglPlatformOpenGlInterface;
             
             var visual = IntPtr.Zero;
             var depth = 24;
@@ -102,7 +106,7 @@ namespace Avalonia.X11
                 valueMask |= SetWindowValuemask.ColorMap;   
             }
 
-            int defaultWidth = 300, defaultHeight = 200;
+            int defaultWidth = 0, defaultHeight = 0;
 
             if (!_popup && Screen != null)
             {
@@ -117,6 +121,10 @@ namespace Avalonia.X11
                 }
             }
 
+            // check if the calculated size is zero then compensate to hardcoded resolution
+            defaultWidth = Math.Max(defaultWidth, 300);
+            defaultHeight = Math.Max(defaultHeight, 200);
+
             _handle = XCreateWindow(_x11.Display, _x11.RootWindow, 10, 10, defaultWidth, defaultHeight, 0,
                 depth,
                 (int)CreateWindowArgs.InputOutput, 
@@ -133,7 +141,7 @@ namespace Avalonia.X11
                 _renderHandle = _handle;
                 
             Handle = new PlatformHandle(_handle, "XID");
-            _realSize = new PixelSize(300, 200);
+            _realSize = new PixelSize(defaultWidth, defaultHeight);
             platform.Windows[_handle] = OnEvent;
             XEventMask ignoredMask = XEventMask.SubstructureRedirectMask
                                      | XEventMask.ResizeRedirectMask
@@ -156,12 +164,12 @@ namespace Avalonia.X11
             var surfaces = new List<object>
             {
                 new X11FramebufferSurface(_x11.DeferredDisplay, _renderHandle, 
-                   depth, () => Scaling)
+                   depth, () => RenderScaling)
             };
             
             if (egl != null)
                 surfaces.Insert(0,
-                    new EglGlPlatformSurface((EglDisplay)egl.Display, egl.DeferredContext,
+                    new EglGlPlatformSurface(egl,
                         new SurfaceInfo(this, _x11.DeferredDisplay, _handle, _renderHandle)));
             if (glx != null)
                 surfaces.Insert(0, new GlxGlPlatformSurface(glx.Display, glx.DeferredContext,
@@ -169,13 +177,23 @@ namespace Avalonia.X11
             
             Surfaces = surfaces.ToArray();
             UpdateMotifHints();
+            UpdateSizeHints(null);
             _xic = XCreateIC(_x11.Xim, XNames.XNInputStyle, XIMProperties.XIMPreeditNothing | XIMProperties.XIMStatusNothing,
                 XNames.XNClientWindow, _handle, IntPtr.Zero);
+            _transparencyHelper = new TransparencyHelper(_x11, _handle, platform.Globals);
+            _transparencyHelper.SetTransparencyRequest(WindowTransparencyLevel.None);
+
             XFlush(_x11.Display);
             if(_popup)
                 PopupPositioner = new ManagedPopupPositioner(new ManagedPopupPositionerPopupImplHelper(popupParent, MoveResize));
             if (platform.Options.UseDBusMenu)
                 NativeMenuExporter = DBusMenuExporter.TryCreate(_handle);
+            NativeControlHost = new X11NativeControlHost(_platform, this);
+            DispatcherTimer.Run(() =>
+            {
+                Paint?.Invoke(default);
+                return _handle != IntPtr.Zero;
+            }, TimeSpan.FromMilliseconds(100));
         }
 
         class SurfaceInfo  : EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo
@@ -205,7 +223,7 @@ namespace Avalonia.X11
                 }
             }
 
-            public double Scaling => _window.Scaling;
+            public double Scaling => _window.RenderScaling;
         }
 
         void UpdateMotifHints()
@@ -215,10 +233,9 @@ namespace Avalonia.X11
             var decorations = MotifDecorations.Menu | MotifDecorations.Title | MotifDecorations.Border |
                               MotifDecorations.Maximize | MotifDecorations.Minimize | MotifDecorations.ResizeH;
 
-            if (_popup || !_systemDecorations)
-            {
+            if (_popup 
+                || _systemDecorations == SystemDecorations.None) 
                 decorations = 0;
-            }
 
             if (!_canResize)
             {
@@ -273,9 +290,9 @@ namespace Avalonia.X11
             XSetWMNormalHints(_x11.Display, _handle, ref hints);
         }
 
-        public Size ClientSize => new Size(_realSize.Width / Scaling, _realSize.Height / Scaling);
+        public Size ClientSize => new Size(_realSize.Width / RenderScaling, _realSize.Height / RenderScaling);
 
-        public double Scaling
+        public double RenderScaling
         {
             get
             {
@@ -285,6 +302,8 @@ namespace Avalonia.X11
             }
             private set => _scaling = value;
         }
+        
+        public double DesktopScaling => RenderScaling;
 
         public IEnumerable<object> Surfaces { get; }
         public Action<RawInputEventArgs> Input { get; set; }
@@ -296,11 +315,40 @@ namespace Avalonia.X11
         public Action Activated { get; set; }
         public Func<bool> Closing { get; set; }
         public Action<WindowState> WindowStateChanged { get; set; }
+
+        public Action<WindowTransparencyLevel> TransparencyLevelChanged
+        {
+            get => _transparencyHelper.TransparencyLevelChanged;
+            set => _transparencyHelper.TransparencyLevelChanged = value;
+        }        
+
+        public Action<bool> ExtendClientAreaToDecorationsChanged { get; set; }
+
+        public Thickness ExtendedMargins { get; } = new Thickness();
+
+        public Thickness OffScreenMargin { get; } = new Thickness();
+
+        public bool IsClientAreaExtendedToDecorations { get; }
+
         public Action Closed { get; set; }
         public Action<PixelPoint> PositionChanged { get; set; }
+        public Action LostFocus { get; set; }
 
-        public IRenderer CreateRenderer(IRenderRoot root) =>
-            new DeferredRenderer(root, AvaloniaLocator.Current.GetService<IRenderLoop>());
+        public IRenderer CreateRenderer(IRenderRoot root)
+        {
+            var loop = AvaloniaLocator.Current.GetService<IRenderLoop>();
+            var customRendererFactory = AvaloniaLocator.Current.GetService<IRendererFactory>();
+
+            if (customRendererFactory != null)
+                return customRendererFactory.Create(root, loop);
+            
+            return _platform.Options.UseDeferredRendering ?
+                new DeferredRenderer(root, loop)
+                {
+                    RenderOnlyOnRenderThread = true
+                } :
+                (IRenderer)new X11ImmediateRendererProxy(root, loop);
+        }
 
         void OnEvent(XEvent ev)
         {
@@ -319,7 +367,9 @@ namespace Avalonia.X11
             }
             else if (ev.type == XEventName.UnmapNotify)
                 _mapped = false;
-            else if (ev.type == XEventName.Expose)
+            else if (ev.type == XEventName.Expose ||
+                     (ev.type == XEventName.VisibilityNotify &&
+                      ev.VisibilityEvent.state < 2))
             {
                 if (!_triggeredExpose)
                 {
@@ -351,10 +401,17 @@ namespace Avalonia.X11
             {
                 if (ActivateTransientChildIfNeeded())
                     return;
-                if (ev.ButtonEvent.button < 4)
-                    MouseEvent(ev.ButtonEvent.button == 1 ? RawPointerEventType.LeftButtonDown
-                        : ev.ButtonEvent.button == 2 ? RawPointerEventType.MiddleButtonDown
-                        : RawPointerEventType.RightButtonDown, ref ev, ev.ButtonEvent.state);
+                if (ev.ButtonEvent.button < 4 || ev.ButtonEvent.button == 8 || ev.ButtonEvent.button == 9)
+                    MouseEvent(
+                        ev.ButtonEvent.button switch
+                        {
+                            1 => RawPointerEventType.LeftButtonDown,
+                            2 => RawPointerEventType.MiddleButtonDown,
+                            3 => RawPointerEventType.RightButtonDown,
+                            8 => RawPointerEventType.XButton1Down,
+                            9 => RawPointerEventType.XButton2Down
+                        },
+                        ref ev, ev.ButtonEvent.state);
                 else
                 {
                     var delta = ev.ButtonEvent.button == 4
@@ -372,10 +429,17 @@ namespace Avalonia.X11
             }
             else if (ev.type == XEventName.ButtonRelease)
             {
-                if (ev.ButtonEvent.button < 4)
-                    MouseEvent(ev.ButtonEvent.button == 1 ? RawPointerEventType.LeftButtonUp
-                        : ev.ButtonEvent.button == 2 ? RawPointerEventType.MiddleButtonUp
-                        : RawPointerEventType.RightButtonUp, ref ev, ev.ButtonEvent.state);
+                if (ev.ButtonEvent.button < 4 || ev.ButtonEvent.button == 8 || ev.ButtonEvent.button == 9)
+                    MouseEvent(
+                        ev.ButtonEvent.button switch
+                        {
+                            1 => RawPointerEventType.LeftButtonUp,
+                            2 => RawPointerEventType.MiddleButtonUp,
+                            3 => RawPointerEventType.RightButtonUp,
+                            8 => RawPointerEventType.XButton1Up,
+                            9 => RawPointerEventType.XButton2Up
+                        },
+                        ref ev, ev.ButtonEvent.state);
             }
             else if (ev.type == XEventName.ConfigureNotify)
             {
@@ -414,7 +478,7 @@ namespace Avalonia.X11
                             updatedSizeViaScaling = UpdateScaling();
                         }
 
-                        if (changedSize && !updatedSizeViaScaling)
+                        if (changedSize && !updatedSizeViaScaling && !_popup)
                             Resized?.Invoke(ClientSize);
 
                         Dispatcher.UIThread.RunJobs(DispatcherPriority.Layout);
@@ -490,14 +554,14 @@ namespace Avalonia.X11
                 {
                     var monitor = _platform.X11Screens.Screens.OrderBy(x => x.PixelDensity)
                         .FirstOrDefault(m => m.Bounds.Contains(Position));
-                    newScaling = monitor?.PixelDensity ?? Scaling;
+                    newScaling = monitor?.PixelDensity ?? RenderScaling;
                 }
 
-                if (Scaling != newScaling)
+                if (RenderScaling != newScaling)
                 {
                     var oldScaledSize = ClientSize;
-                    Scaling = newScaling;
-                    ScalingChanged?.Invoke(Scaling);
+                    RenderScaling = newScaling;
+                    ScalingChanged?.Invoke(RenderScaling);
                     SetMinMaxSize(_scaledMinMaxSize.minSize, _scaledMinMaxSize.maxSize);
                     if(!skipResize)
                         Resize(oldScaledSize, true);
@@ -523,14 +587,23 @@ namespace Avalonia.X11
                 }
                 else if (value == WindowState.Maximized)
                 {
-                    SendNetWMMessage(_x11.Atoms._NET_WM_STATE, (IntPtr)0, _x11.Atoms._NET_WM_STATE_HIDDEN, IntPtr.Zero);
-                    SendNetWMMessage(_x11.Atoms._NET_WM_STATE, (IntPtr)1, _x11.Atoms._NET_WM_STATE_MAXIMIZED_VERT,
+                    ChangeWMAtoms(false, _x11.Atoms._NET_WM_STATE_HIDDEN);
+                    ChangeWMAtoms(false, _x11.Atoms._NET_WM_STATE_FULLSCREEN);
+                    ChangeWMAtoms(true, _x11.Atoms._NET_WM_STATE_MAXIMIZED_VERT,
+                        _x11.Atoms._NET_WM_STATE_MAXIMIZED_HORZ);
+                }
+                else if (value == WindowState.FullScreen)
+                {
+                    ChangeWMAtoms(false, _x11.Atoms._NET_WM_STATE_HIDDEN);
+                    ChangeWMAtoms(true, _x11.Atoms._NET_WM_STATE_FULLSCREEN);
+                    ChangeWMAtoms(false, _x11.Atoms._NET_WM_STATE_MAXIMIZED_VERT,
                         _x11.Atoms._NET_WM_STATE_MAXIMIZED_HORZ);
                 }
                 else
                 {
-                    SendNetWMMessage(_x11.Atoms._NET_WM_STATE, (IntPtr)0, _x11.Atoms._NET_WM_STATE_HIDDEN, IntPtr.Zero);
-                    SendNetWMMessage(_x11.Atoms._NET_WM_STATE, (IntPtr)0, _x11.Atoms._NET_WM_STATE_MAXIMIZED_VERT,
+                    ChangeWMAtoms(false, _x11.Atoms._NET_WM_STATE_HIDDEN);
+                    ChangeWMAtoms(false, _x11.Atoms._NET_WM_STATE_FULLSCREEN);
+                    ChangeWMAtoms(false, _x11.Atoms._NET_WM_STATE_MAXIMIZED_VERT,
                         _x11.Atoms._NET_WM_STATE_MAXIMIZED_HORZ);
                 }
             }
@@ -557,6 +630,12 @@ namespace Avalonia.X11
                             break;
                         }
 
+                        if(pitems[c] == _x11.Atoms._NET_WM_STATE_FULLSCREEN)
+                        {
+                            state = WindowState.FullScreen;
+                            break;
+                        }
+
                         if (pitems[c] == _x11.Atoms._NET_WM_STATE_MAXIMIZED_HORZ ||
                             pitems[c] == _x11.Atoms._NET_WM_STATE_MAXIMIZED_VERT)
                         {
@@ -586,8 +665,12 @@ namespace Avalonia.X11
                 rv |= RawInputModifiers.LeftMouseButton;
             if (state.HasFlag(XModifierMask.Button2Mask))
                 rv |= RawInputModifiers.RightMouseButton;
-            if (state.HasFlag(XModifierMask.Button2Mask))
+            if (state.HasFlag(XModifierMask.Button3Mask))
                 rv |= RawInputModifiers.MiddleMouseButton;
+            if (state.HasFlag(XModifierMask.Button4Mask))
+                rv |= RawInputModifiers.XButton1MouseButton;
+            if (state.HasFlag(XModifierMask.Button5Mask))
+                rv |= RawInputModifiers.XButton2MouseButton;
             if (state.HasFlag(XModifierMask.ShiftMask))
                 rv |= RawInputModifiers.Shift;
             if (state.HasFlag(XModifierMask.ControlMask))
@@ -599,7 +682,7 @@ namespace Avalonia.X11
             return rv;
         }
         
-        private bool _systemDecorations = true;
+        private SystemDecorations _systemDecorations = SystemDecorations.Full;
         private bool _canResize = true;
         private const int MaxWindowDimension = 100000;
 
@@ -617,12 +700,32 @@ namespace Avalonia.X11
             ScheduleInput(args);
         }
 
-        public void ScheduleInput(RawInputEventArgs args)
+        public void ScheduleXI2Input(RawInputEventArgs args)
+        {
+            if (args is RawPointerEventArgs pargs)
+            {
+                if ((pargs.Type == RawPointerEventType.TouchBegin
+                     || pargs.Type == RawPointerEventType.TouchUpdate
+                     || pargs.Type == RawPointerEventType.LeftButtonDown
+                     || pargs.Type == RawPointerEventType.RightButtonDown
+                     || pargs.Type == RawPointerEventType.MiddleButtonDown
+                     || pargs.Type == RawPointerEventType.NonClientLeftButtonDown)
+                    && ActivateTransientChildIfNeeded())
+                    return;
+                if (pargs.Type == RawPointerEventType.TouchEnd
+                    && ActivateTransientChildIfNeeded())
+                    pargs.Type = RawPointerEventType.TouchCancel;
+            }
+
+            ScheduleInput(args);
+        }
+        
+        private void ScheduleInput(RawInputEventArgs args)
         {
             if (args is RawPointerEventArgs mouse)
-                mouse.Position = mouse.Position / Scaling;
+                mouse.Position = mouse.Position / RenderScaling;
             if (args is RawDragEvent drag)
-                drag.Location = drag.Location / Scaling;
+                drag.Location = drag.Location / RenderScaling;
             
             _lastEvent = new InputEventContainer() {Event = args};
             _inputQueue.Enqueue(_lastEvent);
@@ -656,20 +759,12 @@ namespace Avalonia.X11
 
         void DoPaint()
         {
-            _invalidated = false;
             Paint?.Invoke(new Rect());
         }
         
         public void Invalidate(Rect rect)
         {
-            if(_invalidated)
-                return;
-            _invalidated = true;
-            Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                if (_mapped)
-                    DoPaint();
-            });
+
         }
 
         public IInputRoot InputRoot => _inputRoot;
@@ -681,16 +776,11 @@ namespace Avalonia.X11
 
         public void Dispose()
         {
-            if (_handle != IntPtr.Zero)
-            {
-                XDestroyWindow(_x11.Display, _handle);
-                Cleanup();
-            }
+            Cleanup();            
         }
 
         void Cleanup()
         {
-            SetTransientParent(null, false);
             if (_xic != IntPtr.Zero)
             {
                 XDestroyIC(_xic);
@@ -709,56 +799,50 @@ namespace Avalonia.X11
             }
             
             if (_useRenderWindow && _renderHandle != IntPtr.Zero)
-            {
-                XDestroyWindow(_x11.Display, _renderHandle);
+            {                
                 _renderHandle = IntPtr.Zero;
             }
         }
 
         bool ActivateTransientChildIfNeeded()
         {
-            if (_transientChildren.Count == 0)
-                return false;
-            var child = _transientChildren.First();
-            if (!child.ActivateTransientChildIfNeeded())
-                child.Activate();
-            return true;
-        }
-        
-        void SetTransientParent(X11Window window, bool informServer = true)
-        {
-            _transientParent?._transientChildren.Remove(this);
-            _transientParent = window;
-            _transientParent?._transientChildren.Add(this);
-            if (informServer)
-                XSetTransientForHint(_x11.Display, _handle, _transientParent?._handle ?? IntPtr.Zero);
+            if (_disabled)
+            {
+                GotInputWhenDisabled?.Invoke();
+                return true;
+            }
+
+            return false;
         }
 
-        public void Show()
+        public void SetParent(IWindowImpl parent)
         {
-            SetTransientParent(null);
-            ShowCore();
+            if (parent == null || parent.Handle == null || parent.Handle.Handle == IntPtr.Zero)
+                XDeleteProperty(_x11.Display, _handle, _x11.Atoms.XA_WM_TRANSIENT_FOR);
+            else
+                XSetTransientForHint(_x11.Display, _handle, parent.Handle.Handle);
         }
-        
-        void ShowCore()
+
+        public void Show(bool activate)
         {
+            _wasMappedAtLeastOnce = true;
             XMapWindow(_x11.Display, _handle);
             XFlush(_x11.Display);
         }
 
         public void Hide() => XUnmapWindow(_x11.Display, _handle);
         
-        
-        public Point PointToClient(PixelPoint point) => new Point((point.X - Position.X) / Scaling, (point.Y - Position.Y) / Scaling);
+        public Point PointToClient(PixelPoint point) => new Point((point.X - Position.X) / RenderScaling, (point.Y - Position.Y) / RenderScaling);
 
         public PixelPoint PointToScreen(Point point) => new PixelPoint(
-            (int)(point.X * Scaling + Position.X),
-            (int)(point.Y * Scaling + Position.Y));
+            (int)(point.X * RenderScaling + Position.X),
+            (int)(point.Y * RenderScaling + Position.Y));
         
-        public void SetSystemDecorations(bool enabled)
+        public void SetSystemDecorations(SystemDecorations enabled)
         {
-            _systemDecorations = enabled;
+            _systemDecorations = enabled == SystemDecorations.Full ? SystemDecorations.Full : SystemDecorations.None;
             UpdateMotifHints();
+            UpdateSizeHints(null);
         }
 
 
@@ -772,7 +856,7 @@ namespace Avalonia.X11
             Resize(size, true);
         }
 
-        PixelSize ToPixelSize(Size size) => new PixelSize((int)(size.Width * Scaling), (int)(size.Height * Scaling));
+        PixelSize ToPixelSize(Size size) => new PixelSize((int)(size.Width * RenderScaling), (int)(size.Height * RenderScaling));
         
         void Resize(Size clientSize, bool force)
         {
@@ -788,7 +872,7 @@ namespace Avalonia.X11
                 XConfigureResizeWindow(_x11.Display, _renderHandle, pixelSize);
             XFlush(_x11.Display);
 
-            if (force || (_popup && needImmediatePopupResize))
+            if (force || !_wasMappedAtLeastOnce || (_popup && needImmediatePopupResize))
             {
                 _realSize = pixelSize;
                 Resized?.Invoke(ClientSize);
@@ -829,6 +913,11 @@ namespace Avalonia.X11
                 XConfigureWindow(_x11.Display, _handle, ChangeWindowFlags.CWX | ChangeWindowFlags.CWY,
                     ref changes);
                 XFlush(_x11.Display);
+                if (!_wasMappedAtLeastOnce)
+                {
+                    _position = value;
+                    PositionChanged?.Invoke(value);
+                }
 
             }
         }
@@ -856,7 +945,7 @@ namespace Avalonia.X11
 
         public IScreenImpl Screen => _platform.Screens;
 
-        public Size MaxClientSize => _platform.X11Screens.Screens.Select(s => s.Bounds.Size.ToSize(s.PixelDensity))
+        public Size MaxAutoSizeHint => _platform.X11Screens.Screens.Select(s => s.Bounds.Size.ToSize(s.PixelDensity))
             .OrderByDescending(x => x.Width + x.Height).FirstOrDefault();
 
 
@@ -947,13 +1036,13 @@ namespace Avalonia.X11
         {
             _scaledMinMaxSize = (minSize, maxSize);
             var min = new PixelSize(
-                (int)(minSize.Width < 1 ? 1 : minSize.Width * Scaling),
-                (int)(minSize.Height < 1 ? 1 : minSize.Height * Scaling));
+                (int)(minSize.Width < 1 ? 1 : minSize.Width * RenderScaling),
+                (int)(minSize.Height < 1 ? 1 : minSize.Height * RenderScaling));
 
             const int maxDim = MaxWindowDimension;
             var max = new PixelSize(
-                (int)(maxSize.Width > maxDim ? maxDim : Math.Max(min.Width, maxSize.Width * Scaling)),
-                (int)(maxSize.Height > maxDim ? maxDim : Math.Max(min.Height, maxSize.Height * Scaling)));
+                (int)(maxSize.Width > maxDim ? maxDim : Math.Max(min.Width, maxSize.Width * RenderScaling)),
+                (int)(maxSize.Height > maxDim ? maxDim : Math.Max(min.Height, maxSize.Height * RenderScaling)));
             
             _minMaxSize = (min, max);
             UpdateSizeHints(null);
@@ -961,32 +1050,97 @@ namespace Avalonia.X11
 
         public void SetTopmost(bool value)
         {
-            SendNetWMMessage(_x11.Atoms._NET_WM_STATE,
-                (IntPtr)(value ? 1 : 0), _x11.Atoms._NET_WM_STATE_ABOVE, IntPtr.Zero);
+            ChangeWMAtoms(value, _x11.Atoms._NET_WM_STATE_ABOVE);
+        }
+        
+        public void SetEnabled(bool enable)
+        {
+            _disabled = !enable;
         }
 
-        public void ShowDialog(IWindowImpl parent)
+        public void SetExtendClientAreaToDecorationsHint(bool extendIntoClientAreaHint)
         {
-            SetTransientParent((X11Window)parent);
-            ShowCore();
         }
 
+        public void SetExtendClientAreaChromeHints(ExtendClientAreaChromeHints hints)
+        {
+        }
+
+        public void SetExtendClientAreaTitleBarHeightHint(double titleBarHeight)
+        {
+        }
+
+        public Action GotInputWhenDisabled { get; set; }
+
         public void SetIcon(IWindowIconImpl icon)
         {
-            var data = ((X11IconData)icon).Data;
-            fixed (void* pdata = data)
-                XChangeProperty(_x11.Display, _handle, _x11.Atoms._NET_WM_ICON,
-                    new IntPtr((int)Atom.XA_CARDINAL), 32, PropertyMode.Replace,
-                    pdata, data.Length);
+            if (icon != null)
+            {
+                var data = ((X11IconData)icon).Data;
+                fixed (void* pdata = data)
+                    XChangeProperty(_x11.Display, _handle, _x11.Atoms._NET_WM_ICON,
+                        new IntPtr((int)Atom.XA_CARDINAL), 32, PropertyMode.Replace,
+                        pdata, data.Length);
+            }
+            else
+            {
+                XDeleteProperty(_x11.Display, _handle, _x11.Atoms._NET_WM_ICON);
+            }
         }
 
         public void ShowTaskbarIcon(bool value)
         {
+            ChangeWMAtoms(!value, _x11.Atoms._NET_WM_STATE_SKIP_TASKBAR);
+        }
+
+        void ChangeWMAtoms(bool enable, params IntPtr[] atoms)
+        {
+            if (atoms.Length != 1 && atoms.Length != 2)
+                throw new ArgumentException();
+
+            if (!_mapped)
+            {
+                XGetWindowProperty(_x11.Display, _handle, _x11.Atoms._NET_WM_STATE, IntPtr.Zero, new IntPtr(256),
+                    false, (IntPtr)Atom.XA_ATOM, out _, out _, out var nitems, out _,
+                    out var prop);
+                var ptr = (IntPtr*)prop.ToPointer();
+                var newAtoms = new HashSet<IntPtr>();
+                for (var c = 0; c < nitems.ToInt64(); c++) 
+                    newAtoms.Add(*ptr);
+                XFree(prop);
+                foreach(var atom in atoms)
+                    if (enable)
+                        newAtoms.Add(atom);
+                    else
+                        newAtoms.Remove(atom);
+
+                XChangeProperty(_x11.Display, _handle, _x11.Atoms._NET_WM_STATE, (IntPtr)Atom.XA_ATOM, 32,
+                    PropertyMode.Replace, newAtoms.ToArray(), newAtoms.Count);
+            }
+            
             SendNetWMMessage(_x11.Atoms._NET_WM_STATE,
-                (IntPtr)(value ? 0 : 1), _x11.Atoms._NET_WM_STATE_SKIP_TASKBAR, IntPtr.Zero);
+                (IntPtr)(enable ? 1 : 0),
+                atoms[0],
+                atoms.Length > 1 ? atoms[1] : IntPtr.Zero,
+                atoms.Length > 2 ? atoms[2] : IntPtr.Zero,
+                atoms.Length > 3 ? atoms[3] : IntPtr.Zero
+            );
         }
 
         public IPopupPositioner PopupPositioner { get; }
         public ITopLevelNativeMenuExporter NativeMenuExporter { get; }
+        public INativeControlHostImpl NativeControlHost { get; }
+        public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel) =>
+            _transparencyHelper.SetTransparencyRequest(transparencyLevel);
+
+        public void SetWindowManagerAddShadowHint(bool enabled)
+        {
+        }
+
+        public WindowTransparencyLevel TransparencyLevel => _transparencyHelper.CurrentLevel;
+
+        public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; } = new AcrylicPlatformCompensationLevels(1, 0.8, 0.8);
+
+        public bool NeedsManagedDecorations => false;
     }
 }
diff --git a/src/Avalonia.X11/XI2Manager.cs b/src/Avalonia.X11/XI2Manager.cs
index e37ed39bee..8cdf24cc7b 100644
--- a/src/Avalonia.X11/XI2Manager.cs
+++ b/src/Avalonia.X11/XI2Manager.cs
@@ -13,7 +13,10 @@ namespace Avalonia.X11
         {
             XiEventType.XI_Motion,
             XiEventType.XI_ButtonPress,
-            XiEventType.XI_ButtonRelease
+            XiEventType.XI_ButtonRelease,
+            XiEventType.XI_Leave,
+            XiEventType.XI_Enter,
+            
         };
 
         private static readonly XiEventType[] MultiTouchEventTypes = new XiEventType[]
@@ -97,7 +100,7 @@ namespace Avalonia.X11
         {
             _platform = platform;
             _x11 = platform.Info;
-            _multitouch = platform.Options?.EnableMultiTouch ?? false;
+            _multitouch = platform.Options?.EnableMultiTouch ?? true;
             var devices =(XIDeviceInfo*) XIQueryDevice(_x11.Display,
                 (int)XiPredefinedDeviceId.XIAllMasterDevices, out int num);
             for (var c = 0; c < num; c++)
@@ -162,7 +165,9 @@ namespace Avalonia.X11
                    | XEventMask.Button4MotionMask
                    | XEventMask.Button5MotionMask
                    | XEventMask.ButtonPressMask
-                   | XEventMask.ButtonReleaseMask;
+                   | XEventMask.ButtonReleaseMask
+                   | XEventMask.LeaveWindowMask
+                   | XEventMask.EnterWindowMask;
         }
 
         public void OnWindowDestroyed(IntPtr xid) => _clients.Remove(xid);
@@ -175,14 +180,39 @@ namespace Avalonia.X11
                 _pointerDevice.Update(changed->Classes, changed->NumClasses);
             }
 
-            
+
             if ((xev->evtype >= XiEventType.XI_ButtonPress && xev->evtype <= XiEventType.XI_Motion)
-                || (xev->evtype>=XiEventType.XI_TouchBegin&&xev->evtype<=XiEventType.XI_TouchEnd))
+                || (xev->evtype >= XiEventType.XI_TouchBegin && xev->evtype <= XiEventType.XI_TouchEnd))
             {
                 var dev = (XIDeviceEvent*)xev;
                 if (_clients.TryGetValue(dev->EventWindow, out var client))
                     OnDeviceEvent(client, new ParsedDeviceEvent(dev));
             }
+
+            if (xev->evtype == XiEventType.XI_Leave || xev->evtype == XiEventType.XI_Enter)
+            {
+                var rev = (XIEnterLeaveEvent*)xev;
+                if (_clients.TryGetValue(rev->EventWindow, out var client))
+                    OnEnterLeaveEvent(client, ref *rev);
+            }
+        }
+
+        void OnEnterLeaveEvent(IXI2Client client, ref XIEnterLeaveEvent ev)
+        {
+            if (ev.evtype == XiEventType.XI_Leave)
+            {
+                var buttons = ParsedDeviceEvent.ParseButtonState(ev.buttons.MaskLen, ev.buttons.Mask);
+                var detail = ev.detail;
+                if ((detail == XiEnterLeaveDetail.XINotifyNonlinearVirtual ||
+                     detail == XiEnterLeaveDetail.XINotifyNonlinear ||
+                     detail == XiEnterLeaveDetail.XINotifyVirtual)
+                    && buttons == default)
+                {
+                    client.ScheduleXI2Input(new RawPointerEventArgs(client.MouseDevice, (ulong)ev.time.ToInt64(),
+                        client.InputRoot,
+                        RawPointerEventType.LeaveWindow, new Point(ev.event_x, ev.event_y), buttons));
+                }
+            }
         }
 
         void OnDeviceEvent(IXI2Client client, ParsedDeviceEvent ev)
@@ -196,7 +226,7 @@ namespace Avalonia.X11
                     (ev.Type == XiEventType.XI_TouchUpdate ?
                         RawPointerEventType.TouchUpdate :
                         RawPointerEventType.TouchEnd);
-                client.ScheduleInput(new RawTouchEventArgs(client.TouchDevice,
+                client.ScheduleXI2Input(new RawTouchEventArgs(client.TouchDevice,
                     ev.Timestamp, client.InputRoot, type, ev.Position, ev.Modifiers, ev.Detail));
                 return;
             }
@@ -230,23 +260,43 @@ namespace Avalonia.X11
                 }
 
                 if (scrollDelta != default)
-                    client.ScheduleInput(new RawMouseWheelEventArgs(client.MouseDevice, ev.Timestamp,
+                    client.ScheduleXI2Input(new RawMouseWheelEventArgs(client.MouseDevice, ev.Timestamp,
                         client.InputRoot, ev.Position, scrollDelta, ev.Modifiers));
                 if (_pointerDevice.HasMotion(ev))
-                    client.ScheduleInput(new RawPointerEventArgs(client.MouseDevice, ev.Timestamp, client.InputRoot,
+                    client.ScheduleXI2Input(new RawPointerEventArgs(client.MouseDevice, ev.Timestamp, client.InputRoot,
                         RawPointerEventType.Move, ev.Position, ev.Modifiers));
             }
 
+            if (ev.Type == XiEventType.XI_ButtonPress && ev.Button >= 4 && ev.Button <= 7 && !ev.Emulated)
+            {
+                var scrollDelta = ev.Button switch
+                {
+                    4 => new Vector(0, 1),
+                    5 => new Vector(0, -1),
+                    6 => new Vector(1, 0),
+                    7 => new Vector(-1, 0),
+                    _ => (Vector?)null
+                };
+
+                if (scrollDelta.HasValue)
+                    client.ScheduleXI2Input(new RawMouseWheelEventArgs(client.MouseDevice, ev.Timestamp,
+                        client.InputRoot, ev.Position, scrollDelta.Value, ev.Modifiers));
+            }
+
             if (ev.Type == XiEventType.XI_ButtonPress || ev.Type == XiEventType.XI_ButtonRelease)
             {
                 var down = ev.Type == XiEventType.XI_ButtonPress;
-                var type =
-                    ev.Button == 1 ? (down ? RawPointerEventType.LeftButtonDown : RawPointerEventType.LeftButtonUp)
-                    : ev.Button == 2 ? (down ? RawPointerEventType.MiddleButtonDown : RawPointerEventType.MiddleButtonUp)
-                    : ev.Button == 3 ? (down ? RawPointerEventType.RightButtonDown : RawPointerEventType.RightButtonUp)
-                    : (RawPointerEventType?)null;
+                var type = ev.Button switch
+                {
+                    1 => down ? RawPointerEventType.LeftButtonDown : RawPointerEventType.LeftButtonUp,
+                    2 => down ? RawPointerEventType.MiddleButtonDown : RawPointerEventType.MiddleButtonUp,
+                    3 => down ? RawPointerEventType.RightButtonDown : RawPointerEventType.RightButtonUp,
+                    8 => down ? RawPointerEventType.XButton1Down : RawPointerEventType.XButton1Up,
+                    9 => down ? RawPointerEventType.XButton2Down : RawPointerEventType.XButton2Up,
+                    _ => (RawPointerEventType?)null
+                };
                 if (type.HasValue)
-                    client.ScheduleInput(new RawPointerEventArgs(client.MouseDevice, ev.Timestamp, client.InputRoot,
+                    client.ScheduleXI2Input(new RawPointerEventArgs(client.MouseDevice, ev.Timestamp, client.InputRoot,
                         type.Value, ev.Position, ev.Modifiers));
             }
             
@@ -264,6 +314,29 @@ namespace Avalonia.X11
         public int Detail { get; set; }
         public bool Emulated { get; set; }
         public Dictionary<int, double> Valuators { get; }
+
+        public static RawInputModifiers ParseButtonState(int len, byte* buttons)
+        {
+            RawInputModifiers rv = default;
+            if (len > 0)
+            {
+                if (XIMaskIsSet(buttons, 1))
+                    rv |= RawInputModifiers.LeftMouseButton;
+                if (XIMaskIsSet(buttons, 2))
+                    rv |= RawInputModifiers.MiddleMouseButton;
+                if (XIMaskIsSet(buttons, 3))
+                    rv |= RawInputModifiers.RightMouseButton;
+                if (len > 1)
+                {
+                    if (XIMaskIsSet(buttons, 8))
+                        rv |= RawInputModifiers.XButton1MouseButton;
+                    if (XIMaskIsSet(buttons, 9))
+                        rv |= RawInputModifiers.XButton2MouseButton;
+                }
+            }
+            return rv;
+        }
+        
         public ParsedDeviceEvent(XIDeviceEvent* ev)
         {
             Type = ev->evtype;
@@ -278,25 +351,16 @@ namespace Avalonia.X11
             if (state.HasFlag(XModifierMask.Mod4Mask))
                 Modifiers |= RawInputModifiers.Meta;
 
-            if (ev->buttons.MaskLen > 0)
-            {
-                var buttons = ev->buttons.Mask;
-                if (XIMaskIsSet(buttons, 1))
-                    Modifiers |= RawInputModifiers.LeftMouseButton;
-                
-                if (XIMaskIsSet(buttons, 2))
-                    Modifiers |= RawInputModifiers.MiddleMouseButton;
-                
-                if (XIMaskIsSet(buttons, 3))
-                    Modifiers |= RawInputModifiers.RightMouseButton;
-            }
+            Modifiers |= ParseButtonState(ev->buttons.MaskLen, ev->buttons.Mask);
 
             Valuators = new Dictionary<int, double>();
             Position = new Point(ev->event_x, ev->event_y);
             var values = ev->valuators.Values;
-            for (var c = 0; c < ev->valuators.MaskLen * 8; c++)
-                if (XIMaskIsSet(ev->valuators.Mask, c))
-                    Valuators[c] = *values++;
+            if(ev->valuators.Mask != null)
+                for (var c = 0; c < ev->valuators.MaskLen * 8; c++)
+                    if (XIMaskIsSet(ev->valuators.Mask, c))
+                        Valuators[c] = *values++;
+            
             if (Type == XiEventType.XI_ButtonPress || Type == XiEventType.XI_ButtonRelease)
                 Button = ev->detail;
             Detail = ev->detail;
@@ -307,7 +371,7 @@ namespace Avalonia.X11
     interface IXI2Client
     {
         IInputRoot InputRoot { get; }
-        void ScheduleInput(RawInputEventArgs args);
+        void ScheduleXI2Input(RawInputEventArgs args);
         IMouseDevice MouseDevice { get; }
         TouchDevice TouchDevice { get; }
     }
diff --git a/src/Avalonia.X11/XIStructs.cs b/src/Avalonia.X11/XIStructs.cs
index 4675ef47f2..f4581a99ba 100644
--- a/src/Avalonia.X11/XIStructs.cs
+++ b/src/Avalonia.X11/XIStructs.cs
@@ -236,6 +236,34 @@ namespace Avalonia.X11
         public XIModifierState mods;
         public XIModifierState group;
     }
+    
+    [StructLayout(LayoutKind.Sequential)]
+    unsafe struct XIEnterLeaveEvent
+    {
+        public XEventName type; /* GenericEvent */
+        public UIntPtr serial; /* # of last request processed by server */
+        public Bool send_event; /* true if this came from a SendEvent request */
+        public IntPtr display; /* Display the event was read from */
+        public int extension; /* XI extension offset */
+        public XiEventType evtype;
+        public IntPtr time;
+        public int deviceid;
+        public int sourceid;
+        public XiEnterLeaveDetail detail;
+        public IntPtr RootWindow;
+        public IntPtr EventWindow;
+        public IntPtr ChildWindow;
+        public double root_x;
+        public double root_y;
+        public double event_x;
+        public double event_y;
+        public int mode;
+        public int focus;
+        public int same_screen;
+        public XIButtonState buttons;
+        public XIModifierState mods;
+        public XIModifierState group;
+    }
 
     [Flags]
     public enum XiDeviceEventFlags : int
@@ -286,5 +314,18 @@ namespace Avalonia.X11
         XI_BarrierLeave = 26,
         XI_LASTEVENT = XI_BarrierLeave,
     }
-    
+
+    enum XiEnterLeaveDetail
+    {
+        XINotifyAncestor = 0,
+        XINotifyVirtual = 1,
+        XINotifyInferior = 2,
+        XINotifyNonlinear = 3,
+        XINotifyNonlinearVirtual = 4,
+        XINotifyPointer = 5,
+        XINotifyPointerRoot = 6,
+        XINotifyDetailNone = 7
+
+    }
+
 }
diff --git a/src/Avalonia.X11/XLib.cs b/src/Avalonia.X11/XLib.cs
index 3c41f7bdde..85aa4862b7 100644
--- a/src/Avalonia.X11/XLib.cs
+++ b/src/Avalonia.X11/XLib.cs
@@ -236,6 +236,10 @@ namespace Avalonia.X11
         public static extern int XChangeProperty(IntPtr display, IntPtr window, IntPtr property, IntPtr type,
             int format, PropertyMode mode, ref IntPtr value, int nelements);
 
+        [DllImport(libX11)]
+        public static extern int XChangeProperty(IntPtr display, IntPtr window, IntPtr property, IntPtr type,
+            int format, PropertyMode mode, byte[] data, int nelements);
+        
         [DllImport(libX11)]
         public static extern int XChangeProperty(IntPtr display, IntPtr window, IntPtr property, IntPtr type,
             int format, PropertyMode mode, uint[] data, int nelements);
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs b/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs
index 9844cdc03b..0a101eec7a 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.LinuxFramebuffer.Input;
@@ -9,7 +10,7 @@ using Avalonia.Rendering;
 
 namespace Avalonia.LinuxFramebuffer
 {
-    class FramebufferToplevelImpl : IEmbeddableWindowImpl, IScreenInfoProvider
+    class FramebufferToplevelImpl : ITopLevelImpl, IScreenInfoProvider
     {
         private readonly IOutputBackend _outputBackend;
         private readonly IInputBackend _inputBackend;
@@ -64,19 +65,24 @@ namespace Avalonia.LinuxFramebuffer
         public IMouseDevice MouseDevice => new MouseDevice();
         public IPopupImpl CreatePopup() => null;
 
-        public double Scaling => _outputBackend.Scaling;
+        public double RenderScaling => _outputBackend.Scaling;
         public IEnumerable<object> Surfaces { get; }
         public Action<RawInputEventArgs> Input { get; set; }
         public Action<Rect> Paint { get; set; }
         public Action<Size> Resized { get; set; }
         public Action<double> ScalingChanged { get; set; }
+
+        public Action<WindowTransparencyLevel> TransparencyLevelChanged { get; set; }
+
         public Action Closed { get; set; }
-        public event Action LostFocus
-        {
-            add {}
-            remove {}
-        }
+        public Action LostFocus { get; set; }
+
+        public Size ScaledSize => _outputBackend.PixelSize.ToSize(RenderScaling);
+
+        public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel) { }
+
+        public WindowTransparencyLevel TransparencyLevel { get; private set; }
 
-        public Size ScaledSize => _outputBackend.PixelSize.ToSize(Scaling);
+        public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; } = new AcrylicPlatformCompensationLevels(1, 1, 1);
     }
 }
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
index db37e4af0b..8801f71f9a 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
@@ -32,8 +32,8 @@ namespace Avalonia.LinuxFramebuffer
         void Initialize()
         {
             Threading = new InternalPlatformThreadingInterface();
-            if (_fb is IWindowingPlatformGlFeature glFeature)
-                AvaloniaLocator.CurrentMutable.Bind<IWindowingPlatformGlFeature>().ToConstant(glFeature);
+            if (_fb is IGlOutputBackend gl)
+                AvaloniaLocator.CurrentMutable.Bind<IPlatformOpenGlInterface>().ToConstant(gl.PlatformOpenGlInterface);
             AvaloniaLocator.CurrentMutable
                 .Bind<IPlatformThreadingInterface>().ToConstant(Threading)
                 .Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(60))
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/Drm.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/Drm.cs
index e266c5ee54..9c476b1b63 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Output/Drm.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/Drm.cs
@@ -113,22 +113,22 @@ namespace Avalonia.LinuxFramebuffer.Output
         [StructLayout(LayoutKind.Sequential)]
         public struct drmModeConnector {
             public uint connector_id;
-            public uint encoder_id; /**< Encoder currently connected to */
+            public uint encoder_id; // Encoder currently connected to 
             public uint connector_type;
             public uint connector_type_id;
             public DrmModeConnection connection;
-            public uint mmWidth, mmHeight; /**< HxW in millimeters */
+            public uint mmWidth, mmHeight; //  HxW in millimeters 
             public DrmModeSubPixel subpixel;
 
             public int count_modes;
             public drmModeModeInfo* modes;
 
             public int count_props;
-            public uint *props; /**< List of property ids */
-            public ulong *prop_values; /**< List of property values */
+            public uint *props; // List of property ids 
+            public ulong *prop_values; // List of property values 
 
             public int count_encoders;
-            public uint *encoders; /**< List of encoder ids */
+            public uint *encoders; //List of encoder ids
         }
         
         [StructLayout(LayoutKind.Sequential)]
@@ -143,14 +143,14 @@ namespace Avalonia.LinuxFramebuffer.Output
         [StructLayout(LayoutKind.Sequential)]
         public struct drmModeCrtc {
             public uint crtc_id;
-            public uint buffer_id; /**< FB id to connect to 0 = disconnect */
+            public uint buffer_id; // FB id to connect to 0 = disconnect 
 
-            public uint x, y; /**< Position on the framebuffer */
+            public uint x, y; // Position on the framebuffer 
             public uint width, height;
             public int mode_valid;
             public drmModeModeInfo mode;
 
-            public int gamma_size; /**< Number of gamma stops */
+            public int gamma_size; // Number of gamma stops 
 
         }
         
@@ -176,7 +176,13 @@ namespace Avalonia.LinuxFramebuffer.Output
         [DllImport(libdrm, SetLastError = true)]
         public static extern int drmModeAddFB(int fd, uint width, uint height, byte depth,
             byte bpp, uint pitch, uint bo_handle,
-            out uint buf_id); 
+            out uint buf_id);
+
+        [DllImport(libdrm, SetLastError = true)]
+        public static extern int drmModeAddFB2(int fd, uint width, uint height,
+            uint pixel_format, uint[] bo_handles, uint[] pitches,
+            uint[] offsets, out uint buf_id, uint flags);
+
         [DllImport(libdrm, SetLastError = true)]
         public static extern int drmModeSetCrtc(int fd, uint crtcId, uint bufferId,
             uint x, uint y, uint *connectors, int count,
@@ -261,6 +267,8 @@ namespace Avalonia.LinuxFramebuffer.Output
         [DllImport(libgbm, SetLastError = true)]
         public static extern uint gbm_bo_get_stride(IntPtr bo);
 
+        [DllImport(libgbm, SetLastError = true)]
+        public static extern uint gbm_bo_get_format(IntPtr bo);
 
         [StructLayout(LayoutKind.Explicit)]
         public struct GbmBoHandle
@@ -278,7 +286,7 @@ namespace Avalonia.LinuxFramebuffer.Output
         }
         
         [DllImport(libgbm, SetLastError = true)]
-        public static extern ulong gbm_bo_get_handle(IntPtr bo);
+        public static extern GbmBoHandle gbm_bo_get_handle(IntPtr bo);
 
         public static  class GbmColorFormats
         {
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
index 273265a6dc..dc44d2d55f 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
@@ -4,17 +4,26 @@ using System.ComponentModel;
 using System.Linq;
 using System.Runtime.InteropServices;
 using Avalonia.OpenGL;
+using Avalonia.OpenGL.Egl;
+using Avalonia.OpenGL.Surfaces;
 using Avalonia.Platform.Interop;
 using static Avalonia.LinuxFramebuffer.NativeUnsafeMethods;
 using static Avalonia.LinuxFramebuffer.Output.LibDrm;
+using static Avalonia.LinuxFramebuffer.Output.LibDrm.GbmColorFormats;
+
 namespace Avalonia.LinuxFramebuffer.Output
 {
-    public unsafe class DrmOutput : IOutputBackend, IGlPlatformSurface, IWindowingPlatformGlFeature
+    public unsafe class DrmOutput : IGlOutputBackend, IGlPlatformSurface
     {
         private DrmCard _card;
         private readonly EglGlPlatformSurface _eglPlatformSurface;
         public PixelSize PixelSize => _mode.Resolution;
         public double Scaling { get; set; }
+        public IGlContext PrimaryContext => _deferredContext;
+
+        private EglPlatformOpenGlInterface _platformGl;
+        public IPlatformOpenGlInterface PlatformOpenGlInterface => _platformGl;
+
         public DrmOutput(string path = null)
         {
             var card = new DrmCard(path);
@@ -48,7 +57,6 @@ namespace Avalonia.LinuxFramebuffer.Output
         private drmModeModeInfo _mode;
         private EglDisplay _eglDisplay;
         private EglSurface _eglSurface;
-        private EglContext _immediateContext;
         private EglContext _deferredContext;
         private IntPtr _currentBo;
         private IntPtr _gbmTargetSurface;
@@ -70,11 +78,26 @@ namespace Avalonia.LinuxFramebuffer.Output
             var w = gbm_bo_get_width(bo); 
             var h = gbm_bo_get_height(bo);
             var stride = gbm_bo_get_stride(bo);
-            var handle = gbm_bo_get_handle(bo);
+            var handle = gbm_bo_get_handle(bo).u32;
+            var format = gbm_bo_get_format(bo);
+
+            // 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 ret = drmModeAddFB2(_card.Fd, w, h, format, handles, pitches,
+                                    offsets, out var fbHandle, 0);
 
-            var ret = drmModeAddFB(_card.Fd, w, h, 24, 32, stride, (uint)handle, out var fbHandle);
             if (ret != 0)
-                throw new Win32Exception(ret, "drmModeAddFb failed");
+            {
+                // legacy fallback
+                ret = drmModeAddFB(_card.Fd, w, h, 24, 32, stride, (uint)handle,
+                                   out fbHandle);
+
+                if (ret != 0)
+                    throw new Win32Exception(ret, $"drmModeAddFb failed {ret}");
+            }
 
             gbm_bo_set_user_data(bo, new IntPtr((int)fbHandle), FbDestroyDelegate);
             
@@ -114,28 +137,19 @@ namespace Avalonia.LinuxFramebuffer.Output
             if(_gbmTargetSurface == null)
                 throw new InvalidOperationException("Unable to create GBM surface");
 
-            
-            
-            _eglDisplay = new EglDisplay(new EglInterface(eglGetProcAddress), 0x31D7, device, null);
-            _eglSurface = _eglDisplay.CreateWindowSurface(_gbmTargetSurface);
+            _eglDisplay = new EglDisplay(new EglInterface(eglGetProcAddress), false, 0x31D7, device, null);
+            _platformGl = new EglPlatformOpenGlInterface(_eglDisplay);
+            _eglSurface =  _platformGl.CreateWindowSurface(_gbmTargetSurface);
 
+            _deferredContext = _platformGl.PrimaryEglContext;
 
-            EglContext CreateContext(EglContext share)
+            using (_deferredContext.MakeCurrent(_eglSurface))
             {
-                var offSurf = gbm_surface_create(device, 1, 1, GbmColorFormats.GBM_FORMAT_XRGB8888,
-                    GbmBoFlags.GBM_BO_USE_RENDERING);
-                if (offSurf == null)
-                    throw new InvalidOperationException("Unable to create 1x1 sized GBM surface");
-                return _eglDisplay.CreateContext(share, _eglDisplay.CreateWindowSurface(offSurf));
+                _deferredContext.GlInterface.ClearColor(0, 0, 0, 0);
+                _deferredContext.GlInterface.Clear(GlConsts.GL_COLOR_BUFFER_BIT | GlConsts.GL_STENCIL_BUFFER_BIT);
+                _eglSurface.SwapBuffers();
             }
-            
-            _immediateContext = CreateContext(null);
-            _deferredContext = CreateContext(_immediateContext);
-            
-            _immediateContext.MakeCurrent(_eglSurface);
-            _eglDisplay.GlInterface.ClearColor(0, 0, 0, 0);
-            _eglDisplay.GlInterface.Clear(GlConsts.GL_COLOR_BUFFER_BIT | GlConsts.GL_STENCIL_BUFFER_BIT);
-            _eglSurface.SwapBuffers();
+
             var bo = gbm_surface_lock_front_buffer(_gbmTargetSurface);
             var fbId = GetFbIdForBo(bo);
             var connectorId = connector.Id;
@@ -153,9 +167,10 @@ namespace Avalonia.LinuxFramebuffer.Output
             for(var c=0;c<2;c++)
                 using (CreateGlRenderTarget().BeginDraw())
                 {
-                    _eglDisplay.GlInterface.ClearColor(0, 0, 0, 0);
-                    _eglDisplay.GlInterface.Clear(GlConsts.GL_COLOR_BUFFER_BIT | GlConsts.GL_STENCIL_BUFFER_BIT);
+                    _deferredContext.GlInterface.ClearColor(0, 0, 0, 0);
+                    _deferredContext.GlInterface.Clear(GlConsts.GL_COLOR_BUFFER_BIT | GlConsts.GL_STENCIL_BUFFER_BIT);
                 }
+            
         }
 
         public IGlPlatformSurfaceRenderTarget CreateGlRenderTarget()
@@ -179,15 +194,17 @@ namespace Avalonia.LinuxFramebuffer.Output
             class RenderSession : IGlPlatformSurfaceRenderingSession
             {
                 private readonly DrmOutput _parent;
+                private readonly IDisposable _clearContext;
 
-                public RenderSession(DrmOutput parent)
+                public RenderSession(DrmOutput parent, IDisposable clearContext)
                 {
                     _parent = parent;
+                    _clearContext = clearContext;
                 }
 
                 public void Dispose()
                 {
-                    _parent._eglDisplay.GlInterface.Flush();
+                    _parent._deferredContext.GlInterface.Flush();
                     _parent._eglSurface.SwapBuffers();
                     
                     var nextBo = gbm_surface_lock_front_buffer(_parent._gbmTargetSurface);
@@ -225,27 +242,29 @@ namespace Avalonia.LinuxFramebuffer.Output
                         gbm_surface_release_buffer(_parent._gbmTargetSurface, _parent._currentBo);
                         _parent._currentBo = nextBo;
                     }
-                    _parent._eglDisplay.ClearContext();
+                    _clearContext.Dispose();
                 }
 
 
-                public IGlDisplay Display => _parent._eglDisplay;
+                public IGlContext Context => _parent._deferredContext;
 
                 public PixelSize Size => _parent._mode.Resolution;
 
                 public double Scaling => _parent.Scaling;
+
+                public bool IsYFlipped { get; }
             }
 
             public IGlPlatformSurfaceRenderingSession BeginDraw()
             {
-                _parent._deferredContext.MakeCurrent(_parent._eglSurface);
-                return new RenderSession(_parent);
+                return new RenderSession(_parent, _parent._deferredContext.MakeCurrent(_parent._eglSurface));
             }
-            
-            
         }
 
-        IGlContext IWindowingPlatformGlFeature.ImmediateContext => _immediateContext;
+        public IGlContext CreateContext()
+        {
+            throw new NotImplementedException();
+        }
     }
 
 
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/IGlOutputBackend.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/IGlOutputBackend.cs
new file mode 100644
index 0000000000..7bc73d590c
--- /dev/null
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/IGlOutputBackend.cs
@@ -0,0 +1,9 @@
+using Avalonia.OpenGL;
+
+namespace Avalonia.LinuxFramebuffer.Output
+{
+    public interface IGlOutputBackend : IOutputBackend
+    {
+        public IPlatformOpenGlInterface PlatformOpenGlInterface { get; }
+    }
+}
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
new file mode 100644
index 0000000000..db9c414840
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <IsPackable>true</IsPackable>
+    <PackageId>Avalonia.Markup.Xaml.Loader</PackageId>
+    <DefineConstants>$(DefineConstants);XAMLX_INTERNAL</DefineConstants>
+  </PropertyGroup>
+  <Import Project="IncludeXamlIlSre.props" />
+  <ItemGroup>
+    <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
+  </ItemGroup>  
+</Project>
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaRuntimeXamlLoader.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaRuntimeXamlLoader.cs
new file mode 100644
index 0000000000..4df07bcdd8
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaRuntimeXamlLoader.cs
@@ -0,0 +1,63 @@
+using System;
+using System.IO;
+using System.Reflection;
+using System.Text;
+using Avalonia.Markup.Xaml.XamlIl;
+
+namespace Avalonia.Markup.Xaml
+{
+    public static class AvaloniaRuntimeXamlLoader
+    {
+        /// <summary>
+        /// Loads XAML from a string.
+        /// </summary>
+        /// <param name="xaml">The string containing the XAML.</param>
+        /// <param name="localAssembly">Default assembly for clr-namespace:.</param>
+        /// <param name="rootInstance">The optional instance into which the XAML should be loaded.</param>
+        /// <param name="uri">The URI of the XAML being loaded.</param>
+        /// <param name="designMode">Indicates whether the XAML is being loaded in design mode.</param>
+        /// <returns>The loaded object.</returns>
+        public static object Load(string xaml, Assembly localAssembly = null, object rootInstance = null, Uri uri = null, bool designMode = false)
+        {
+            Contract.Requires<ArgumentNullException>(xaml != null);
+
+            using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(xaml)))
+            {
+                return Load(stream, localAssembly, rootInstance, uri, designMode);
+            }
+        }
+
+        /// <summary>
+        /// Loads XAML from a stream.
+        /// </summary>
+        /// <param name="stream">The stream containing the XAML.</param>
+        /// <param name="localAssembly">Default assembly for clr-namespace:</param>
+        /// <param name="rootInstance">The optional instance into which the XAML should be loaded.</param>
+        /// <param name="uri">The URI of the XAML being loaded.</param>
+        /// <param name="designMode">Indicates whether the XAML is being loaded in design mode.</param>
+        /// <returns>The loaded object.</returns>
+        public static object Load(Stream stream, Assembly localAssembly, object rootInstance = null, Uri uri = null,
+            bool designMode = false)
+            => AvaloniaXamlIlRuntimeCompiler.Load(stream, localAssembly, rootInstance, uri, designMode);
+
+        /// <summary>
+        /// Parse XAML from a string.
+        /// </summary>
+        /// <param name="xaml">The string containing the XAML.</param>
+        /// <param name="localAssembly">Default assembly for clr-namespace:.</param>
+        /// <returns>The loaded object.</returns>
+        public static object Parse(string xaml, Assembly localAssembly = null)
+            => Load(xaml, localAssembly);
+
+        /// <summary>
+        /// Parse XAML from a string.
+        /// </summary>
+        /// <typeparam name="T">The type of the returned object.</typeparam>
+        /// <param name="xaml">>The string containing the XAML.</param>
+        /// <param name="localAssembly">>Default assembly for clr-namespace:.</param>
+        /// <returns>The loaded object.</returns>
+        public static T Parse<T>(string xaml, Assembly localAssembly = null)
+            => (T)Parse(xaml, localAssembly);
+            
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/AvaloniaXamlIlRuntimeCompiler.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs
similarity index 69%
rename from src/Markup/Avalonia.Markup.Xaml/XamlIl/AvaloniaXamlIlRuntimeCompiler.cs
rename to src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs
index 5a5da518d0..ece90762cb 100644
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/AvaloniaXamlIlRuntimeCompiler.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs
@@ -10,12 +10,15 @@ using System.Runtime.InteropServices;
 using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions;
 using Avalonia.Markup.Xaml.XamlIl.Runtime;
 using Avalonia.Platform;
-using XamlIl.Transform;
-using XamlIl.TypeSystem;
+using XamlX.Transform;
+using XamlX.TypeSystem;
+using XamlX.IL;
+using XamlX.Emit;
 #if RUNTIME_XAML_CECIL
 using TypeAttributes = Mono.Cecil.TypeAttributes;
 using Mono.Cecil;
-using XamlIl.Ast;
+using XamlX.Ast;
+using XamlX.IL.Cecil;
 #endif
 namespace Avalonia.Markup.Xaml.XamlIl
 {
@@ -23,10 +26,12 @@ namespace Avalonia.Markup.Xaml.XamlIl
     {
 #if !RUNTIME_XAML_CECIL
         private static SreTypeSystem _sreTypeSystem;
+        private static Type _ignoresAccessChecksFromAttribute;
         private static ModuleBuilder _sreBuilder;
-        private static IXamlIlType _sreContextType; 
-        private static XamlIlLanguageTypeMappings _sreMappings;
-        private static XamlIlXmlnsMappings _sreXmlns;
+        private static IXamlType _sreContextType; 
+        private static XamlLanguageTypeMappings _sreMappings;
+        private static XamlLanguageEmitMappings<IXamlILEmitter, XamlILNodeEmitResult> _sreEmitMappings;
+        private static XamlXmlnsMappings _sreXmlns;
         private static AssemblyBuilder _sreAsm;
         private static bool _sreCanSave;
 
@@ -82,15 +87,68 @@ namespace Avalonia.Markup.Xaml.XamlIl
             }
 
             if (_sreMappings == null)
-                _sreMappings = AvaloniaXamlIlLanguage.Configure(_sreTypeSystem);
+                (_sreMappings, _sreEmitMappings) = AvaloniaXamlIlLanguage.Configure(_sreTypeSystem);
             if (_sreXmlns == null)
-                _sreXmlns = XamlIlXmlnsMappings.Resolve(_sreTypeSystem, _sreMappings);
+                _sreXmlns = XamlXmlnsMappings.Resolve(_sreTypeSystem, _sreMappings);
             if (_sreContextType == null)
-                _sreContextType = XamlIlContextDefinition.GenerateContextClass(
+                _sreContextType = XamlILContextDefinition.GenerateContextClass(
                     _sreTypeSystem.CreateTypeBuilder(
-                        _sreBuilder.DefineType("XamlIlContext")), _sreTypeSystem, _sreMappings);
+                        _sreBuilder.DefineType("XamlIlContext")), _sreTypeSystem, _sreMappings,
+                        _sreEmitMappings);
+            if (_ignoresAccessChecksFromAttribute == null)
+                _ignoresAccessChecksFromAttribute = EmitIgnoresAccessCheckAttributeDefinition(_sreBuilder);
         }
 
+        static Type EmitIgnoresAccessCheckAttributeDefinition(ModuleBuilder builder)
+        {
+            var tb = builder.DefineType("System.Runtime.CompilerServices.IgnoresAccessChecksToAttribute",
+                TypeAttributes.Class | TypeAttributes.Public, typeof(Attribute));
+            var field = tb.DefineField("_name", typeof(string), FieldAttributes.Private);
+            var propGet = tb.DefineMethod("get_AssemblyName", MethodAttributes.Public, typeof(string),
+                Array.Empty<Type>());
+            var propGetIl = propGet.GetILGenerator();
+            propGetIl.Emit(OpCodes.Ldarg_0);
+            propGetIl.Emit(OpCodes.Ldfld, field);
+            propGetIl.Emit(OpCodes.Ret);
+            var prop = tb.DefineProperty("AssemblyName", PropertyAttributes.None, typeof(string), Array.Empty<Type>());
+            prop.SetGetMethod(propGet);
+
+            
+            var ctor = tb.DefineConstructor(MethodAttributes.Public, CallingConventions.Standard,
+                new[] { typeof(string) });
+            var ctorIl = ctor.GetILGenerator();
+            ctorIl.Emit(OpCodes.Ldarg_0);
+            ctorIl.Emit(OpCodes.Ldarg_1);
+            ctorIl.Emit(OpCodes.Stfld, field);
+            ctorIl.Emit(OpCodes.Ldarg_0);
+            ctorIl.Emit(OpCodes.Call, typeof(Attribute)
+                .GetConstructors(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)
+                .First(x => x.GetParameters().Length == 0));
+
+            ctorIl.Emit(OpCodes.Ret);
+
+            tb.SetCustomAttribute(new CustomAttributeBuilder(
+                typeof(AttributeUsageAttribute).GetConstructor(new[] { typeof(AttributeTargets) }),
+                new object[] { AttributeTargets.Assembly },
+                new[] { typeof(AttributeUsageAttribute).GetProperty("AllowMultiple") },
+                new object[] { true }));
+            
+            return tb.CreateTypeInfo();
+        }
+
+        static void EmitIgnoresAccessCheckToAttribute(AssemblyName assemblyName)
+        {
+            var name = assemblyName.Name;
+            if(string.IsNullOrWhiteSpace(name))
+                return;
+            var key = assemblyName.GetPublicKey();
+            if (key != null && key.Length != 0)
+                name += ", PublicKey=" + BitConverter.ToString(key).Replace("-", "").ToUpperInvariant();
+            _sreAsm.SetCustomAttribute(new CustomAttributeBuilder(
+                _ignoresAccessChecksFromAttribute.GetConstructors()[0],
+                new object[] { name }));
+        }
+        
 
         static object LoadSre(string xaml, Assembly localAssembly, object rootInstance, Uri uri, bool isDesignMode)
         {
@@ -113,14 +171,22 @@ namespace Avalonia.Markup.Xaml.XamlIl
         {
 
             InitializeSre();
+            if (localAssembly?.GetName() != null)
+                EmitIgnoresAccessCheckToAttribute(localAssembly.GetName());
             var asm = localAssembly == null ? null : _sreTypeSystem.GetAssembly(localAssembly);
+            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 compiler = new AvaloniaXamlIlCompiler(new XamlIlTransformerConfiguration(_sreTypeSystem, asm,
-                    _sreMappings, _sreXmlns, AvaloniaXamlIlLanguage.CustomValueConverter),
+            var compiler = new AvaloniaXamlIlCompiler(new AvaloniaXamlIlCompilerConfiguration(_sreTypeSystem, asm,
+                _sreMappings, _sreXmlns, AvaloniaXamlIlLanguage.CustomValueConverter,
+                new XamlIlClrPropertyInfoEmitter(_sreTypeSystem.CreateTypeBuilder(clrPropertyBuilder)),
+                new XamlIlPropertyInfoAccessorFactoryEmitter(_sreTypeSystem.CreateTypeBuilder(indexerClosureType))), 
+                _sreEmitMappings,
                 _sreContextType) { EnableIlVerification = true };
-            var tb = _sreBuilder.DefineType("Builder_" + Guid.NewGuid().ToString("N") + "_" + uri);
+            
 
-            IXamlIlType overrideType = null;
+            IXamlType overrideType = null;
             if (rootInstance != null)
             {
                 overrideType = _sreTypeSystem.GetType(rootInstance.GetType());
@@ -129,6 +195,7 @@ namespace Avalonia.Markup.Xaml.XamlIl
             compiler.IsDesignMode = isDesignMode;
             compiler.ParseAndCompile(xaml, uri?.ToString(), null, _sreTypeSystem.CreateTypeBuilder(tb), overrideType);
             var created = tb.CreateTypeInfo();
+            clrPropertyBuilder.CreateTypeInfo();
 
             return LoadOrPopulate(created, rootInstance);
         }
@@ -203,6 +270,7 @@ namespace Avalonia.Markup.Xaml.XamlIl
         private static string _cecilEmitDir;
         private static CecilTypeSystem _cecilTypeSystem;
         private static XamlIlLanguageTypeMappings _cecilMappings;
+        private static XamlLanguageEmitMappings<IXamlILEmitter, XamlILNodeEmitResult> _cecilEmitMappings;
         private static XamlIlXmlnsMappings _cecilXmlns;
         private static bool _cecilInitialized;
 
@@ -215,7 +283,7 @@ namespace Avalonia.Markup.Xaml.XamlIl
             Directory.CreateDirectory(_cecilEmitDir);
             var refs = new[] {path}.Concat(File.ReadAllLines(path + ".refs"));
             _cecilTypeSystem = new CecilTypeSystem(refs);
-            _cecilMappings = AvaloniaXamlIlLanguage.Configure(_cecilTypeSystem);
+            (_cecilMappings, _cecilEmitMappings) = AvaloniaXamlIlLanguage.Configure(_cecilTypeSystem);
             _cecilXmlns = XamlIlXmlnsMappings.Resolve(_cecilTypeSystem, _cecilMappings);
             _cecilInitialized = true;
         }
@@ -226,7 +294,7 @@ namespace Avalonia.Markup.Xaml.XamlIl
             if (uri == null)
                 throw new InvalidOperationException("Please, go away");
             InitializeCecil();
-                        IXamlIlType overrideType = null;
+                        IXamlType overrideType = null;
             if (rootInstance != null)
             {
                 overrideType = _cecilTypeSystem.GetType(rootInstance.GetType().FullName);
@@ -261,6 +329,7 @@ namespace Avalonia.Markup.Xaml.XamlIl
                     localAssembly == null ? null : _cecilTypeSystem.FindAssembly(localAssembly.GetName().Name),
                     _cecilMappings, XamlIlXmlnsMappings.Resolve(_cecilTypeSystem, _cecilMappings),
                     AvaloniaXamlIlLanguage.CustomValueConverter),
+                _cecilEmitMappings,
                 _cecilTypeSystem.CreateTypeBuilder(contextDef));
             compiler.ParseAndCompile(xaml, uri.ToString(), tb, overrideType);
             var asmPath = Path.Combine(_cecilEmitDir, safeUri + ".dll");
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AstNodes/AvaloniaXamlIlAvaloniaListConstantAstNode.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AstNodes/AvaloniaXamlIlAvaloniaListConstantAstNode.cs
new file mode 100644
index 0000000000..0f4efc9f65
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AstNodes/AvaloniaXamlIlAvaloniaListConstantAstNode.cs
@@ -0,0 +1,54 @@
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers;
+using XamlX.Ast;
+using XamlX.Emit;
+using XamlX.IL;
+using XamlX.TypeSystem;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.AstNodes
+{
+    class AvaloniaXamlIlAvaloniaListConstantAstNode : XamlAstNode, IXamlAstValueNode, IXamlAstILEmitableNode
+    {
+        private readonly IXamlType _elementType;
+        private readonly IReadOnlyList<IXamlAstValueNode> _values;
+        private readonly IXamlConstructor _constructor;
+        private readonly IXamlMethod _listAddMethod;
+        private readonly IXamlMethod _listSetCapacityMethod;
+
+        public AvaloniaXamlIlAvaloniaListConstantAstNode(IXamlLineInfo lineInfo, AvaloniaXamlIlWellKnownTypes types, IXamlType listType, IXamlType elementType, IReadOnlyList<IXamlAstValueNode> values) : base(lineInfo)
+        {
+            _constructor = listType.GetConstructor();
+            _listAddMethod = listType.GetMethod(new FindMethodMethodSignature("Add", types.XamlIlTypes.Void, elementType));
+            _listSetCapacityMethod = listType.GetMethod(new FindMethodMethodSignature("set_Capacity", types.XamlIlTypes.Void, types.Int));
+
+            _elementType = elementType;
+            _values = values;
+
+            Type = new XamlAstClrTypeReference(lineInfo, listType, false);
+        }
+
+        public IXamlAstTypeReference Type { get; }
+        
+        public XamlILNodeEmitResult Emit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
+        {
+            codeGen.Newobj(_constructor);
+
+            codeGen
+                .Dup()
+                .Ldc_I4(_values.Count)
+                .EmitCall(_listSetCapacityMethod);
+            
+            foreach (var value in _values)
+            {
+                codeGen.Dup();
+                
+                context.Emit(value, codeGen, _elementType);
+            
+                codeGen.EmitCall(_listAddMethod);
+            }
+            
+            return XamlILNodeEmitResult.Type(0, Type.GetClrType());
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AstNodes/AvaloniaXamlIlFontFamilyAstNode.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AstNodes/AvaloniaXamlIlFontFamilyAstNode.cs
new file mode 100644
index 0000000000..1f50e661d8
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AstNodes/AvaloniaXamlIlFontFamilyAstNode.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers;
+using XamlX.Ast;
+using XamlX.Emit;
+using XamlX.IL;
+using XamlX.TypeSystem;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.AstNodes
+{
+    class AvaloniaXamlIlFontFamilyAstNode: XamlAstNode, IXamlAstValueNode, IXamlAstILEmitableNode
+    {
+        private readonly AvaloniaXamlIlWellKnownTypes _types;
+        private readonly string _text;
+
+        public IXamlAstTypeReference Type { get; }
+        
+        public AvaloniaXamlIlFontFamilyAstNode(AvaloniaXamlIlWellKnownTypes types,
+            string text,
+            IXamlLineInfo lineInfo) : base(lineInfo)
+        {
+            _types = types;
+            _text = text;
+            Type = new XamlAstClrTypeReference(lineInfo, types.FontFamily, false);
+        }
+        
+        public XamlILNodeEmitResult Emit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
+        {
+            codeGen
+                .Ldloc(context.ContextLocal)
+                .Castclass(context.Configuration.TypeMappings.UriContextProvider)
+                .EmitCall(context.Configuration.TypeMappings.UriContextProvider.FindMethod(
+                    "get_BaseUri", _types.Uri, false))
+                .Ldstr(_text)
+                .Newobj(_types.FontFamilyConstructorUriName);
+            return XamlILNodeEmitResult.Type(0, _types.FontFamily);
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AstNodes/AvaloniaXamlIlGridLengthAstNode.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AstNodes/AvaloniaXamlIlGridLengthAstNode.cs
new file mode 100644
index 0000000000..218c49512c
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AstNodes/AvaloniaXamlIlGridLengthAstNode.cs
@@ -0,0 +1,34 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers;
+using XamlX.Ast;
+using XamlX.Emit;
+using XamlX.IL;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.AstNodes
+{
+    class AvaloniaXamlIlGridLengthAstNode : XamlAstNode, IXamlAstValueNode, IXamlAstILEmitableNode
+    {
+        private readonly AvaloniaXamlIlWellKnownTypes _types;
+        private readonly GridLength _gridLength;
+
+        public AvaloniaXamlIlGridLengthAstNode(IXamlLineInfo lineInfo, AvaloniaXamlIlWellKnownTypes types, GridLength gridLength) : base(lineInfo)
+        {
+            _types = types;
+            _gridLength = gridLength;
+
+            Type = new XamlAstClrTypeReference(lineInfo, types.GridLength, false);
+        }
+        
+        public IXamlAstTypeReference Type { get; }
+        
+        public XamlILNodeEmitResult Emit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
+        {
+            codeGen
+                .Ldc_R8(_gridLength.Value)
+                .Ldc_I4((int)_gridLength.GridUnitType)
+                .Newobj(_types.GridLengthConstructorValueType);
+            
+            return XamlILNodeEmitResult.Type(0, Type.GetClrType());
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AstNodes/AvaloniaXamlIlVectorLikeConstantAstNode.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AstNodes/AvaloniaXamlIlVectorLikeConstantAstNode.cs
new file mode 100644
index 0000000000..35cc9b3cf2
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AstNodes/AvaloniaXamlIlVectorLikeConstantAstNode.cs
@@ -0,0 +1,54 @@
+using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Emit;
+using XamlX.IL;
+using XamlX.TypeSystem;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.AstNodes
+{
+    class AvaloniaXamlIlVectorLikeConstantAstNode : XamlAstNode, IXamlAstValueNode, IXamlAstILEmitableNode
+    {
+        private readonly IXamlConstructor _constructor;
+        private readonly double[] _values;
+
+        public AvaloniaXamlIlVectorLikeConstantAstNode(IXamlLineInfo lineInfo, AvaloniaXamlIlWellKnownTypes types, IXamlType type, IXamlConstructor constructor, double[] values) : base(lineInfo)
+        {
+            var parameters = constructor.Parameters;
+
+            if (parameters.Count != values.Length)
+            {
+                throw new XamlTypeSystemException($"Constructor that takes {values.Length} parameters is expected, got {parameters.Count} instead.");
+            }
+
+            var elementType = types.XamlIlTypes.Double;
+
+            foreach (var parameter in parameters)
+            {
+                if (parameter != elementType)
+                {
+                    throw new XamlTypeSystemException($"Expected parameter of type {elementType}, got {parameter} instead.");
+                }
+            }
+            
+            _constructor = constructor;
+            _values = values;
+            
+            Type = new XamlAstClrTypeReference(lineInfo, type, false);
+        }
+        
+        public IXamlAstTypeReference Type { get; }
+        
+        public XamlILNodeEmitResult Emit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
+        {
+            foreach (var value in _values)
+            {
+                codeGen.Ldc_R8(value);
+            }
+            
+            codeGen.Newobj(_constructor);
+            
+            return XamlILNodeEmitResult.Type(0, Type.GetClrType());
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs
new file mode 100644
index 0000000000..abff763bb1
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs
@@ -0,0 +1,163 @@
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Emit;
+using XamlX.IL;
+using XamlX.Parsers;
+using XamlX.Transform;
+using XamlX.Transform.Transformers;
+using XamlX.TypeSystem;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
+{
+    class AvaloniaXamlIlCompiler : XamlILCompiler
+    {
+        private readonly TransformerConfiguration _configuration;
+        private readonly IXamlType _contextType;
+        private readonly AvaloniaXamlIlDesignPropertiesTransformer _designTransformer;
+        private readonly AvaloniaBindingExtensionTransformer _bindingTransformer;
+
+        private AvaloniaXamlIlCompiler(TransformerConfiguration configuration, XamlLanguageEmitMappings<IXamlILEmitter, XamlILNodeEmitResult> emitMappings)
+            : base(configuration, emitMappings, true)
+        {
+            _configuration = configuration;
+
+            void InsertAfter<T>(params IXamlAstTransformer[] t) 
+                => Transformers.InsertRange(Transformers.FindIndex(x => x is T) + 1, 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 AvaloniaXamlIlTransformInstanceAttachedProperties(),
+                new AvaloniaXamlIlTransformSyntheticCompiledBindingMembers());
+            InsertAfter<PropertyReferenceResolver>(
+                new AvaloniaXamlIlAvaloniaPropertyResolver());
+
+            InsertBefore<ContentConvertTransformer>(                
+                new AvaloniaXamlIlBindingPathParser(),
+                new AvaloniaXamlIlSelectorTransformer(),
+                new AvaloniaXamlIlControlTemplateTargetTypeMetadataTransformer(),
+                new AvaloniaXamlIlPropertyPathTransformer(),
+                new AvaloniaXamlIlSetterTransformer(),
+                new AvaloniaXamlIlConstructorServiceProviderTransformer(),
+                new AvaloniaXamlIlTransitionsTypeMetadataTransformer(),
+                new AvaloniaXamlIlResolveByNameMarkupExtensionReplacer()
+            );
+
+            // After everything else
+            InsertBefore<NewObjectTransformer>(
+                new AddNameScopeRegistration(),
+                new AvaloniaXamlIlDataContextTypeTransformer(),
+                new AvaloniaXamlIlBindingPathTransformer(),
+                new AvaloniaXamlIlCompiledBindingsMetadataRemover()
+                );
+
+            Transformers.Add(new AvaloniaXamlIlMetadataRemover());
+            Transformers.Add(new AvaloniaXamlIlRootObjectScope());
+
+            Emitters.Add(new AvaloniaNameScopeRegistrationXamlIlNodeEmitter());
+            Emitters.Add(new AvaloniaXamlIlRootObjectScope.Emitter());
+        }
+        public AvaloniaXamlIlCompiler(TransformerConfiguration configuration,
+            XamlLanguageEmitMappings<IXamlILEmitter, XamlILNodeEmitResult> emitMappings,
+            IXamlTypeBuilder<IXamlILEmitter> contextTypeBuilder)
+            : this(configuration, emitMappings)
+        {
+            _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";
+
+        public bool IsDesignMode
+        {
+            get => _designTransformer.IsDesignMode;
+            set => _designTransformer.IsDesignMode = value;
+        }
+
+        public bool DefaultCompileBindings
+        {
+            get => _bindingTransformer.CompileBindingsByDefault;
+            set => _bindingTransformer.CompileBindingsByDefault = value;
+        }
+
+        public void ParseAndCompile(string xaml, string baseUri, IFileSource fileSource, IXamlTypeBuilder<IXamlILEmitter> tb, IXamlType overrideRootType)
+        {
+            var parsed = XDocumentXamlParser.Parse(xaml, new Dictionary<string, string>
+            {
+                {XamlNamespaces.Blend2008, XamlNamespaces.Blend2008}
+            });
+            
+            var rootObject = (XamlAstObjectNode)parsed.Root;
+
+            var classDirective = rootObject.Children
+                .OfType<XamlAstXmlDirective>().FirstOrDefault(x =>
+                    x.Namespace == XamlNamespaces.Xaml2006
+                    && x.Name == "Class");
+
+            var rootType =
+                classDirective != null ?
+                    new XamlAstClrTypeReference(classDirective,
+                        _configuration.TypeSystem.GetType(((XamlAstTextNode)classDirective.Values[0]).Text),
+                        false) :
+                    TypeReferenceResolver.ResolveType(CreateTransformationContext(parsed, true),
+                        (XamlAstXmlTypeReference)rootObject.Type, true);
+            
+            
+            if (overrideRootType != null)
+            {
+                if (!rootType.Type.IsAssignableFrom(overrideRootType))
+                    throw new XamlX.XamlLoadException(
+                        $"Unable to substitute {rootType.Type.GetFqn()} with {overrideRootType.GetFqn()}", rootObject);
+                rootType = new XamlAstClrTypeReference(rootObject, overrideRootType, false);
+            }
+
+            OverrideRootType(parsed, rootType);
+
+            Transform(parsed);
+            Compile(parsed, tb, _contextType, PopulateName, BuildName, "__AvaloniaXamlIlNsInfo", baseUri, fileSource);
+            
+        }
+
+        public void OverrideRootType(XamlDocument doc, IXamlAstTypeReference newType)
+        {
+            var root = (XamlAstObjectNode)doc.Root;
+            var oldType = root.Type;
+            if (oldType.Equals(newType))
+                return;
+
+            root.Type = newType;
+            foreach (var child in root.Children.OfType<XamlAstXamlPropertyValueNode>())
+            {
+                if (child.Property is XamlAstNamePropertyReference prop)
+                {
+                    if (prop.DeclaringType.Equals(oldType))
+                        prop.DeclaringType = newType;
+                    if (prop.TargetType.Equals(oldType))
+                        prop.TargetType = newType;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompilerConfiguration.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompilerConfiguration.cs
new file mode 100644
index 0000000000..0c0dcb1634
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompilerConfiguration.cs
@@ -0,0 +1,26 @@
+using XamlX.Transform;
+using XamlX.TypeSystem;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
+{
+    class AvaloniaXamlIlCompilerConfiguration : TransformerConfiguration
+    {
+        public XamlIlClrPropertyInfoEmitter ClrPropertyEmitter { get; }
+        public XamlIlPropertyInfoAccessorFactoryEmitter AccessorFactoryEmitter { get; }
+
+        public AvaloniaXamlIlCompilerConfiguration(IXamlTypeSystem typeSystem, 
+            IXamlAssembly defaultAssembly, 
+            XamlLanguageTypeMappings typeMappings,
+            XamlXmlnsMappings xmlnsMappings,
+            XamlValueConverter customValueConverter,
+            XamlIlClrPropertyInfoEmitter clrPropertyEmitter,
+            XamlIlPropertyInfoAccessorFactoryEmitter accessorFactoryEmitter)
+            : base(typeSystem, defaultAssembly, typeMappings, xmlnsMappings, customValueConverter)
+        {
+            ClrPropertyEmitter = clrPropertyEmitter;
+            AccessorFactoryEmitter = accessorFactoryEmitter;
+            AddExtra(ClrPropertyEmitter);
+            AddExtra(AccessorFactoryEmitter);
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/AvaloniaXamlIlLanguage.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguage.cs
similarity index 68%
rename from src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/AvaloniaXamlIlLanguage.cs
rename to src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguage.cs
index 63c8b1c074..a82f5b9e60 100644
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/AvaloniaXamlIlLanguage.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguage.cs
@@ -1,11 +1,17 @@
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.AstNodes;
 using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers;
-using XamlIl;
-using XamlIl.Ast;
-using XamlIl.Transform;
-using XamlIl.TypeSystem;
+using Avalonia.Media;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Emit;
+using XamlX.IL;
+using XamlX.Transform;
+using XamlX.TypeSystem;
 
 namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
 {
@@ -17,12 +23,12 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
     
     class AvaloniaXamlIlLanguage
     {
-        public static XamlIlLanguageTypeMappings Configure(IXamlIlTypeSystem typeSystem)
+        public static (XamlLanguageTypeMappings language, XamlLanguageEmitMappings<IXamlILEmitter, XamlILNodeEmitResult> emit) Configure(IXamlTypeSystem typeSystem)
         {
             var runtimeHelpers = typeSystem.GetType("Avalonia.Markup.Xaml.XamlIl.Runtime.XamlIlRuntimeHelpers");
             var assignBindingAttribute = typeSystem.GetType("Avalonia.Data.AssignBindingAttribute");
             var bindingType = typeSystem.GetType("Avalonia.Data.IBinding");
-            var rv = new XamlIlLanguageTypeMappings(typeSystem)
+            var rv = new XamlLanguageTypeMappings(typeSystem)
             {
                 SupportInitialize = typeSystem.GetType("System.ComponentModel.ISupportInitialize"),
                 XmlnsAttributes =
@@ -51,18 +57,22 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 },
                 InnerServiceProviderFactoryMethod =
                     runtimeHelpers.FindMethod(m => m.Name == "CreateInnerServiceProviderV1"),
-                ProvideValueTargetPropertyEmitter = XamlIlAvaloniaPropertyHelper.Emit,
             };
             rv.CustomAttributeResolver = new AttributeResolver(typeSystem, rv);
-            rv.ContextTypeBuilderCallback = (b, c) => EmitNameScopeField(rv, typeSystem, b, c);
-            return rv;
+
+            var emit = new XamlLanguageEmitMappings<IXamlILEmitter, XamlILNodeEmitResult>
+            {
+                ProvideValueTargetPropertyEmitter = XamlIlAvaloniaPropertyHelper.EmitProvideValueTarget,
+                ContextTypeBuilderCallback = (b, c) => EmitNameScopeField(rv, typeSystem, b, c)
+            };
+            return (rv, emit);
         }
 
         public const string ContextNameScopeFieldName = "AvaloniaNameScope";
 
-        private static void EmitNameScopeField(XamlIlLanguageTypeMappings mappings,
-            IXamlIlTypeSystem typeSystem,
-            IXamlIlTypeBuilder typebuilder, IXamlIlEmitter constructor)
+        private static void EmitNameScopeField(XamlLanguageTypeMappings mappings,
+            IXamlTypeSystem typeSystem,
+            IXamlTypeBuilder<IXamlILEmitter> typebuilder, IXamlILEmitter constructor)
         {
 
             var nameScopeType = typeSystem.FindType("Avalonia.Controls.INameScope");
@@ -78,27 +88,28 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
         }
         
 
-        class AttributeResolver : IXamlIlCustomAttributeResolver
+        class AttributeResolver : IXamlCustomAttributeResolver
         {
-            private readonly IXamlIlType _typeConverterAttribute;
+            private readonly IXamlType _typeConverterAttribute;
 
-            private readonly List<KeyValuePair<IXamlIlType, IXamlIlType>> _converters =
-                new List<KeyValuePair<IXamlIlType, IXamlIlType>>();
+            private readonly List<KeyValuePair<IXamlType, IXamlType>> _converters =
+                new List<KeyValuePair<IXamlType, IXamlType>>();
 
-            private readonly IXamlIlType _avaloniaList;
-            private readonly IXamlIlType _avaloniaListConverter;
+            private readonly IXamlType _avaloniaList;
+            private readonly IXamlType _avaloniaListConverter;
 
 
-            public AttributeResolver(IXamlIlTypeSystem typeSystem, XamlIlLanguageTypeMappings mappings)
+            public AttributeResolver(IXamlTypeSystem typeSystem, XamlLanguageTypeMappings mappings)
             {
                 _typeConverterAttribute = mappings.TypeConverterAttributes.First();
 
-                void AddType(IXamlIlType type, IXamlIlType conv) 
-                    => _converters.Add(new KeyValuePair<IXamlIlType, IXamlIlType>(type, conv));
+                void AddType(IXamlType type, IXamlType conv) 
+                    => _converters.Add(new KeyValuePair<IXamlType, IXamlType>(type, conv));
 
                 void Add(string type, string conv)
                     => AddType(typeSystem.GetType(type), typeSystem.GetType(conv));
                 
+                Add("Avalonia.Media.IImage","Avalonia.Markup.Xaml.Converters.BitmapTypeConverter");
                 Add("Avalonia.Media.Imaging.IBitmap","Avalonia.Markup.Xaml.Converters.BitmapTypeConverter");
                 var ilist = typeSystem.GetType("System.Collections.Generic.IList`1");
                 AddType(ilist.MakeGenericType(typeSystem.GetType("Avalonia.Point")),
@@ -112,7 +123,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 _avaloniaListConverter = typeSystem.GetType("Avalonia.Collections.AvaloniaListConverter`1");
             }
 
-            IXamlIlType LookupConverter(IXamlIlType type)
+            IXamlType LookupConverter(IXamlType type)
             {
                 foreach(var p in _converters)
                     if (p.Key.Equals(type))
@@ -122,15 +133,15 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 return null;
             }
 
-            class ConstructedAttribute : IXamlIlCustomAttribute
+            class ConstructedAttribute : IXamlCustomAttribute
             {
-                public bool Equals(IXamlIlCustomAttribute other) => false;
+                public bool Equals(IXamlCustomAttribute other) => false;
                 
-                public IXamlIlType Type { get; }
+                public IXamlType Type { get; }
                 public List<object> Parameters { get; }
                 public Dictionary<string, object> Properties { get; }
 
-                public ConstructedAttribute(IXamlIlType type, List<object> parameters, Dictionary<string, object> properties)
+                public ConstructedAttribute(IXamlType type, List<object> parameters, Dictionary<string, object> properties)
                 {
                     Type = type;
                     Parameters = parameters ?? new List<object>();
@@ -138,7 +149,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 }
             }
             
-            public IXamlIlCustomAttribute GetCustomAttribute(IXamlIlType type, IXamlIlType attributeType)
+            public IXamlCustomAttribute GetCustomAttribute(IXamlType type, IXamlType attributeType)
             {
                 if (attributeType.Equals(_typeConverterAttribute))
                 {
@@ -150,37 +161,36 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 return null;
             }
 
-            public IXamlIlCustomAttribute GetCustomAttribute(IXamlIlProperty property, IXamlIlType attributeType)
+            public IXamlCustomAttribute GetCustomAttribute(IXamlProperty property, IXamlType attributeType)
             {
                 return null;
             }
         }
 
-        public static bool CustomValueConverter(XamlIlAstTransformationContext context,
-            IXamlIlAstValueNode node, IXamlIlType type, out IXamlIlAstValueNode result)
+        public static bool CustomValueConverter(AstTransformationContext context,
+            IXamlAstValueNode node, IXamlType type, out IXamlAstValueNode result)
         {
-            if (type.FullName == "System.TimeSpan" 
-                && node is XamlIlAstTextNode tn
-                && !tn.Text.Contains(":"))
+            if (!(node is XamlAstTextNode textNode))
             {
-                var seconds = double.Parse(tn.Text, CultureInfo.InvariantCulture);
-                result = new XamlIlStaticOrTargetedReturnMethodCallNode(tn,
-                    type.FindMethod("FromSeconds", type, false, context.Configuration.WellKnownTypes.Double),
-                    new[]
-                    {
-                        new XamlIlConstantNode(tn, context.Configuration.WellKnownTypes.Double, seconds)
-                    });
-                return true;
+                result = null;
+                return false;
             }
 
+            var text = textNode.Text;
+            var types = context.GetAvaloniaTypes();
+
+            if (AvaloniaXamlIlLanguageParseIntrinsics.TryConvert(context, node, text, type, types, out result))
+            {
+                return true;
+            }
+            
             if (type.FullName == "Avalonia.AvaloniaProperty")
             {
                 var scope = context.ParentNodes().OfType<AvaloniaXamlIlTargetTypeMetadataNode>().FirstOrDefault();
                 if (scope == null)
-                    throw new XamlIlLoadException("Unable to find the parent scope for AvaloniaProperty lookup", node);
-                if (!(node is XamlIlAstTextNode text))
-                    throw new XamlIlLoadException("Property should be a text node", node);
-                result = XamlIlAvaloniaPropertyHelper.CreateNode(context, text.Text, scope.TargetType, text);
+                    throw new XamlX.XamlLoadException("Unable to find the parent scope for AvaloniaProperty lookup", node);
+
+                result = XamlIlAvaloniaPropertyHelper.CreateNode(context, text, scope.TargetType, node );
                 return true;
             }
 
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs
new file mode 100644
index 0000000000..7c4cc8d28b
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs
@@ -0,0 +1,243 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.AstNodes;
+using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers;
+using Avalonia.Media;
+using XamlX.Ast;
+using XamlX.Transform;
+using XamlX.TypeSystem;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
+{
+    class AvaloniaXamlIlLanguageParseIntrinsics
+    {
+        public static bool TryConvert(AstTransformationContext context, IXamlAstValueNode node, string text, IXamlType type, AvaloniaXamlIlWellKnownTypes types, out IXamlAstValueNode result)
+        {
+            if (type.FullName == "System.TimeSpan")
+            {
+                var tsText = text.Trim();
+
+                if (!TimeSpan.TryParse(tsText, CultureInfo.InvariantCulture, out var timeSpan))
+                {
+                    // // shorthand seconds format (ie. "0.25")
+                    if (!tsText.Contains(":") && double.TryParse(tsText,
+                        NumberStyles.Float | NumberStyles.AllowThousands,
+                        CultureInfo.InvariantCulture, out var seconds))
+                        timeSpan = TimeSpan.FromSeconds(seconds);
+                    else
+                        throw new XamlX.XamlLoadException($"Unable to parse {text} as a time span", node);
+                }
+
+                result = new XamlStaticOrTargetedReturnMethodCallNode(node,
+                    type.FindMethod("FromTicks", type, false, types.Long),
+                    new[] { new XamlConstantNode(node, types.Long, timeSpan.Ticks) });
+                return true;
+            }
+
+            if (type.Equals(types.FontFamily))
+            {
+                result = new AvaloniaXamlIlFontFamilyAstNode(types, text, node);
+                return true;
+            }
+
+            if (type.Equals(types.Thickness))
+            {
+                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
+                {
+                    throw new XamlX.XamlLoadException($"Unable to parse \"{text}\" as a thickness", node);
+                }
+            }
+
+            if (type.Equals(types.Point))
+            {
+                try
+                {
+                    var point = Point.Parse(text);
+            
+                    result = new AvaloniaXamlIlVectorLikeConstantAstNode(node, types, types.Point, types.PointFullConstructor,
+                        new[] { point.X, point.Y });
+                
+                    return true;
+                }
+                catch
+                {
+                    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
+                {
+                    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
+                {
+                    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
+                {
+                    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
+                {
+                    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))
+                {
+                    throw new XamlX.XamlLoadException($"Unable to parse \"{text}\" as a color", node);
+                }
+
+                result = new XamlStaticOrTargetedReturnMethodCallNode(node,
+                    type.GetMethod(
+                        new FindMethodMethodSignature("FromUInt32", type, types.UInt) { IsStatic = true }),
+                    new[] { new XamlConstantNode(node, types.UInt, color.ToUint32()) });
+
+                return true;
+            }
+
+            if (type.Equals(types.GridLength))
+            {
+                try
+                {
+                    var gridLength = GridLength.Parse(text);
+                
+                    result = new AvaloniaXamlIlGridLengthAstNode(node, types, gridLength);
+                    
+                    return true;
+                }
+                catch
+                {
+                    throw new XamlX.XamlLoadException($"Unable to parse \"{text}\" as a grid length", node);
+                }
+            }
+
+            if (type.Equals(types.Cursor))
+            {
+                if (TypeSystemHelpers.TryGetEnumValueNode(types.StandardCursorType, text, node, out var enumConstantNode))
+                {
+                    var cursorTypeRef = new XamlAstClrTypeReference(node, types.Cursor, false);
+
+                    result = new XamlAstNewClrObjectNode(node, cursorTypeRef, types.CursorTypeConstructor, new List<IXamlAstValueNode> { enumConstantNode });
+                    
+                    return true;
+                }
+            }
+
+            if (type.Equals(types.ColumnDefinitions))
+            {
+                return ConvertDefinitionList(node, text, types, types.ColumnDefinitions, types.ColumnDefinition, "column definitions", out result);
+            }
+
+            if (type.Equals(types.RowDefinitions))
+            {
+                return ConvertDefinitionList(node, text, types, types.RowDefinitions, types.RowDefinition, "row definitions", out result);
+            }
+
+            result = null;
+            return false;
+        }
+
+        private static bool ConvertDefinitionList(
+            IXamlAstValueNode node, 
+            string text,
+            AvaloniaXamlIlWellKnownTypes types,
+            IXamlType listType,
+            IXamlType elementType,
+            string errorDisplayName,
+            out IXamlAstValueNode result)
+        {
+            try
+            {
+                var lengths = GridLength.ParseLengths(text);
+
+                var definitionTypeRef = new XamlAstClrTypeReference(node, elementType, false);
+
+                var definitionConstructorGridLength = elementType.GetConstructor(new List<IXamlType> {types.GridLength});
+
+                IXamlAstValueNode CreateDefinitionNode(GridLength length)
+                {
+                    var lengthNode = new AvaloniaXamlIlGridLengthAstNode(node, types, length);
+
+                    return new XamlAstNewClrObjectNode(node, definitionTypeRef,
+                        definitionConstructorGridLength, new List<IXamlAstValueNode> {lengthNode});
+                }
+
+                var definitionNodes =
+                    new List<IXamlAstValueNode>(lengths.Select(CreateDefinitionNode));
+
+                result = new AvaloniaXamlIlAvaloniaListConstantAstNode(node, types, listType, elementType, definitionNodes);
+
+                return true;
+            }
+            catch
+            {
+                throw new XamlX.XamlLoadException($"Unable to parse \"{text}\" as a {errorDisplayName}", node);
+            }
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AddNameScopeRegistration.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AddNameScopeRegistration.cs
new file mode 100644
index 0000000000..cb36851bab
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AddNameScopeRegistration.cs
@@ -0,0 +1,120 @@
+using System;
+using System.Linq;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Transform;
+using XamlX.TypeSystem;
+using XamlX.Emit;
+using XamlX.IL;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
+{
+    class AddNameScopeRegistration : IXamlAstTransformer
+    {
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+        {
+            if (node is XamlPropertyAssignmentNode pa)
+            {
+                if (pa.Property.Name == "Name"
+                    && pa.Property.DeclaringType.FullName == "Avalonia.StyledElement")
+                {
+                    if (context.ParentNodes().FirstOrDefault() is XamlManipulationGroupNode mg
+                        && mg.Children.OfType<AvaloniaNameScopeRegistrationXamlIlNode>().Any())
+                        return node;
+
+                    IXamlAstValueNode value = null;
+                    for (var c = 0; c < pa.Values.Count; c++)
+                        if (pa.Values[c].Type.GetClrType().Equals(context.Configuration.WellKnownTypes.String))
+                        {
+                            value = pa.Values[c];
+                            if (!(value is XamlAstTextNode))
+                            {
+                                var local = new XamlAstCompilerLocalNode(value);
+                                // Wrap original in local initialization
+                                pa.Values[c] = new XamlAstLocalInitializationNodeEmitter(value, value, local);
+                                // Use local
+                                value = local;
+                            }
+
+                            break;
+                        }
+
+                    if (value != null)
+                    {
+                        var objectType = context.ParentNodes().OfType<XamlAstConstructableObjectNode>().FirstOrDefault()?.Type.GetClrType();
+                        return new XamlManipulationGroupNode(pa)
+                        {
+                            Children =
+                            {
+                                pa,
+                                new AvaloniaNameScopeRegistrationXamlIlNode(value, objectType)
+                            }
+                        };
+                    }
+                }
+                else if (pa.Property.CustomAttributes.Select(attr => attr.Type).Intersect(context.Configuration.TypeMappings.DeferredContentPropertyAttributes).Any())
+                {
+                    pa.Values[pa.Values.Count - 1] =
+                        new NestedScopeMetadataNode(pa.Values[pa.Values.Count - 1]);
+                }
+            }
+
+            return node;
+        }
+    }
+
+    class NestedScopeMetadataNode : XamlValueWithSideEffectNodeBase
+    {
+        public NestedScopeMetadataNode(IXamlAstValueNode value) : base(value, value)
+        {
+        }
+    }
+
+    class AvaloniaNameScopeRegistrationXamlIlNode : XamlAstNode, IXamlAstManipulationNode
+    {
+        public IXamlAstValueNode Name { get; set; }
+        public IXamlType TargetType { get; }
+
+        public AvaloniaNameScopeRegistrationXamlIlNode(IXamlAstValueNode name, IXamlType targetType) : base(name)
+        {
+            TargetType = targetType;
+            Name = name;
+        }
+
+        public override void VisitChildren(IXamlAstVisitor visitor)
+            => Name = (IXamlAstValueNode)Name.Visit(visitor);
+    }
+
+    class AvaloniaNameScopeRegistrationXamlIlNodeEmitter : IXamlAstLocalsNodeEmitter<IXamlILEmitter, XamlILNodeEmitResult>
+    {
+        public XamlILNodeEmitResult Emit(IXamlAstNode node, XamlEmitContextWithLocals<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
+        {
+            if (node is AvaloniaNameScopeRegistrationXamlIlNode registration)
+            {
+
+                var scopeField = context.RuntimeContext.ContextType.Fields.First(f =>
+                    f.Name == AvaloniaXamlIlLanguage.ContextNameScopeFieldName);
+
+                using (var targetLoc = context.GetLocalOfType(context.Configuration.WellKnownTypes.Object))
+                {
+
+                    codeGen
+                        // var target = {pop}
+                        .Stloc(targetLoc.Local)
+                        // _context.NameScope.Register(Name, target)
+                        .Ldloc(context.ContextLocal)
+                        .Ldfld(scopeField);
+
+                    context.Emit(registration.Name, codeGen, registration.Name.Type.GetClrType());
+
+                    codeGen
+                        .Ldloc(targetLoc.Local)
+                        .EmitCall(context.GetAvaloniaTypes().INameScopeRegister, true);
+                }
+
+                return XamlILNodeEmitResult.Void(1);
+            }
+            return default;
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaBindingExtensionTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaBindingExtensionTransformer.cs
new file mode 100644
index 0000000000..de2c0eab96
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaBindingExtensionTransformer.cs
@@ -0,0 +1,75 @@
+using System.Linq;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Transform;
+
+
+using XamlParseException = XamlX.XamlParseException;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
+{
+    class AvaloniaBindingExtensionTransformer : IXamlAstTransformer
+    {
+        public bool CompileBindingsByDefault { get; set; }
+
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+        {
+            if (context.ParentNodes().FirstOrDefault() is AvaloniaXamlIlCompileBindingsNode)
+            {
+                return node;
+            }
+
+            if (node is XamlAstObjectNode obj)
+            {
+                foreach (var item in obj.Children)
+                {
+                    if (item is XamlAstXmlDirective directive)
+                    {
+                        if (directive.Namespace == XamlNamespaces.Xaml2006
+                            && directive.Name == "CompileBindings"
+                            && directive.Values.Count == 1)
+                        {
+                            if (!(directive.Values[0] is XamlAstTextNode text
+                                && bool.TryParse(text.Text, out var compileBindings)))
+                            {
+                                throw new XamlParseException("The value of x:CompileBindings must be a literal boolean value.", directive.Values[0]);
+                            }
+
+                            obj.Children.Remove(directive);
+
+                            return new AvaloniaXamlIlCompileBindingsNode(obj, compileBindings);
+                        }
+                    }
+                }
+            }
+
+            // Convert the <Binding> tag to either a CompiledBinding or ReflectionBinding tag.
+
+            if (node is XamlAstXmlTypeReference tref
+                && tref.Name == "Binding"
+                && tref.XmlNamespace == "https://github.com/avaloniaui")
+            {
+                tref.IsMarkupExtension = true;
+
+                var compileBindings = context.ParentNodes()
+                    .OfType<AvaloniaXamlIlCompileBindingsNode>()
+                    .FirstOrDefault()
+                    ?.CompileBindings ?? CompileBindingsByDefault;
+
+                tref.Name = compileBindings ? "CompiledBinding" : "ReflectionBinding";
+            }
+            return node;
+        }
+    }
+
+    internal class AvaloniaXamlIlCompileBindingsNode : XamlValueWithSideEffectNodeBase
+    {
+        public AvaloniaXamlIlCompileBindingsNode(IXamlAstValueNode value, bool compileBindings)
+            : base(value, value)
+        {
+            CompileBindings = compileBindings;
+        }
+
+        public bool CompileBindings { get; }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlAvaloniaPropertyResolver.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlAvaloniaPropertyResolver.cs
similarity index 64%
rename from src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlAvaloniaPropertyResolver.cs
rename to src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlAvaloniaPropertyResolver.cs
index 74f5c29f6a..9219a39ddc 100644
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlAvaloniaPropertyResolver.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlAvaloniaPropertyResolver.cs
@@ -1,14 +1,14 @@
 using System.Linq;
-using XamlIl.Ast;
-using XamlIl.Transform;
+using XamlX.Ast;
+using XamlX.Transform;
 
 namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
 {
-    class AvaloniaXamlIlAvaloniaPropertyResolver : IXamlIlAstTransformer
+    class AvaloniaXamlIlAvaloniaPropertyResolver : IXamlAstTransformer
     {
-        public IXamlIlAstNode Transform(XamlIlAstTransformationContext context, IXamlIlAstNode node)
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
         {
-            if (node is XamlIlAstClrProperty prop)
+            if (node is XamlAstClrProperty prop)
             {
                 var n = prop.Name + "Property";
                 var field =
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathParser.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathParser.cs
new file mode 100644
index 0000000000..24cded1d22
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathParser.cs
@@ -0,0 +1,323 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Avalonia.Markup.Parsers;
+using Avalonia.Utilities;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Transform;
+using XamlX.Transform.Transformers;
+using XamlX.TypeSystem;
+
+using XamlParseException = XamlX.XamlParseException;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
+{
+    class AvaloniaXamlIlBindingPathParser : IXamlAstTransformer
+    {
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+        {
+            if (node is XamlAstObjectNode binding && binding.Type.GetClrType().Equals(context.GetAvaloniaTypes().CompiledBindingExtension))
+            {
+                var convertedNode = ConvertLongFormPropertiesToBindingExpressionNode(context, binding);
+
+                if (binding.Arguments.Count > 0 && binding.Arguments[0] is XamlAstTextNode bindingPathText)
+                {
+                    var reader = new CharacterReader(bindingPathText.Text.AsSpan());
+                    var (nodes, _) = BindingExpressionGrammar.Parse(ref reader);
+
+                    if (convertedNode != null)
+                    {
+                        nodes.Insert(nodes.TakeWhile(x => x is BindingExpressionGrammar.ITransformNode).Count(), convertedNode);
+                    }
+
+                    binding.Arguments[0] = new ParsedBindingPathNode(bindingPathText, context.GetAvaloniaTypes().CompiledBindingPath, nodes);
+                }
+                else
+                {
+                    var bindingPathAssignment = binding.Children.OfType<XamlAstXamlPropertyValueNode>()
+                        .FirstOrDefault(v => v.Property.GetClrProperty().Name == "Path");
+
+                    if (bindingPathAssignment != null && bindingPathAssignment.Values[0] is XamlAstTextNode pathValue)
+                    {
+                        var reader = new CharacterReader(pathValue.Text.AsSpan());
+                        var (nodes, _) = BindingExpressionGrammar.Parse(ref reader);
+
+                        if (convertedNode != null)
+                        {
+                            nodes.Insert(nodes.TakeWhile(x => x is BindingExpressionGrammar.ITransformNode).Count(), convertedNode);
+                        }
+
+                        bindingPathAssignment.Values[0] = new ParsedBindingPathNode(pathValue, context.GetAvaloniaTypes().CompiledBindingPath, nodes);
+                    }
+                }
+            }
+
+            return node;
+        }
+
+        private static BindingExpressionGrammar.INode ConvertLongFormPropertiesToBindingExpressionNode(
+            AstTransformationContext context,
+            XamlAstObjectNode binding)
+        {
+            BindingExpressionGrammar.INode convertedNode = null;
+
+            var syntheticCompiledBindingProperties = binding.Children.OfType<XamlAstXamlPropertyValueNode>()
+                .Where(v => v.Property is AvaloniaSyntheticCompiledBindingProperty)
+                .ToList();
+
+            var elementNameProperty = syntheticCompiledBindingProperties
+                .FirstOrDefault(v =>
+                    v.Property is AvaloniaSyntheticCompiledBindingProperty prop
+                    && prop.Name == SyntheticCompiledBindingPropertyName.ElementName);
+
+            var relativeSourceProperty = syntheticCompiledBindingProperties
+                .FirstOrDefault(v =>
+                    v.Property is AvaloniaSyntheticCompiledBindingProperty prop
+                    && prop.Name == SyntheticCompiledBindingPropertyName.RelativeSource);
+
+            var sourceProperty = binding.Children.OfType<XamlAstXamlPropertyValueNode>()
+                .FirstOrDefault(v =>
+                    v.Property is XamlAstClrProperty prop
+                    && prop.Name == "Source");
+
+            if (elementNameProperty?.Values[0] is XamlAstTextNode elementName)
+            {
+                convertedNode = new BindingExpressionGrammar.NameNode { Name = elementName.Text };
+            }
+            else if (elementNameProperty != null)
+            {
+                throw new XamlParseException($"Invalid ElementName '{elementNameProperty.Values[0]}'.", elementNameProperty.Values[0]);
+            }
+
+            if (sourceProperty != null && convertedNode != null)
+            {
+                throw new XamlParseException("Only one of ElementName, Source, or RelativeSource specified as a binding source. Only one property is allowed.", binding);
+            }
+
+            if (GetRelativeSourceObjectFromAssignment(
+                context,
+                relativeSourceProperty,
+                out var relativeSourceObject))
+            {
+                if (convertedNode != null)
+                {
+                    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
+                    .OfType<XamlAstXamlPropertyValueNode>()
+                    .FirstOrDefault(x => x.Property.GetClrProperty().Name == "Mode")
+                    ?.Values[0] is XamlAstTextNode modeAssignedValue ? modeAssignedValue.Text : null;
+                if (relativeSourceObject.Arguments.Count == 0 && mode == null)
+                {
+                    mode = "FindAncestor";
+                }
+
+                if (mode == "FindAncestor")
+                {
+                    var ancestorLevel = relativeSourceObject.Children
+                        .OfType<XamlAstXamlPropertyValueNode>()
+                        .FirstOrDefault(x => x.Property.GetClrProperty().Name == "FindAncestor")
+                        ?.Values[0] is XamlAstTextNode ancestorLevelText ? int.Parse(ancestorLevelText.Text) - 1 : 0;
+
+                    var treeType = relativeSourceObject.Children
+                        .OfType<XamlAstXamlPropertyValueNode>()
+                        .FirstOrDefault(x => x.Property.GetClrProperty().Name == "Tree")
+                        ?.Values[0] is XamlAstTextNode treeTypeValue ? treeTypeValue.Text : "Visual";
+
+                    var ancestorTypeName = relativeSourceObject.Children
+                        .OfType<XamlAstXamlPropertyValueNode>()
+                        .FirstOrDefault(x => x.Property.GetClrProperty().Name == "AncestorType")
+                        ?.Values[0] as XamlAstTextNode;
+
+                    IXamlType ancestorType = null;
+                    if (ancestorTypeName is null)
+                    {
+                        if (treeType == "Visual")
+                        {
+                            throw new XamlParseException("AncestorType must be set for RelativeSourceMode.FindAncestor when searching the visual tree.", relativeSourceObject);
+                        }
+                        else if (treeType == "Logical")
+                        {
+                            var styledElementType = context.GetAvaloniaTypes().StyledElement;
+                            ancestorType = context
+                                .ParentNodes()
+                                .OfType<XamlAstObjectNode>()
+                                .Where(x => styledElementType.IsAssignableFrom(x.Type.GetClrType()))
+                                .ElementAtOrDefault(ancestorLevel)
+                                ?.Type.GetClrType();
+
+                            if (ancestorType is null)
+                            {
+                                throw new XamlX.XamlParseException("Unable to resolve implicit ancestor type based on XAML tree.", relativeSourceObject);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        ancestorType = TypeReferenceResolver.ResolveType(
+                                            context,
+                                            ancestorTypeName.Text,
+                                            false,
+                                            ancestorTypeName,
+                                            true).GetClrType();
+                    }
+
+                    if (treeType == "Visual")
+                    {
+                        convertedNode = new VisualAncestorBindingExpressionNode
+                        {
+                            Type = ancestorType,
+                            Level = ancestorLevel
+                        };
+                    }
+                    else if (treeType == "Logical")
+                    {
+                        convertedNode = new LogicalAncestorBindingExpressionNode
+                        {
+                            Type = ancestorType,
+                            Level = ancestorLevel
+                        };
+                    }
+                    else
+                    {
+                        throw new XamlParseException($"Unknown tree type '{treeType}'.", binding);
+                    }
+                }
+                else if (mode == "DataContext")
+                {
+                    convertedNode = null;
+                }
+                else if (mode == "Self")
+                {
+                    convertedNode = new BindingExpressionGrammar.SelfNode();
+                }
+                else if (mode == "TemplatedParent")
+                {
+                    var parentType = context.ParentNodes().OfType<AvaloniaXamlIlTargetTypeMetadataNode>()
+                        .FirstOrDefault(x =>
+                            x.ScopeType == AvaloniaXamlIlTargetTypeMetadataNode.ScopeTypes.ControlTemplate)
+                        ?.TargetType.GetClrType();
+
+                    if (parentType is null)
+                    {
+                        throw new XamlParseException("A binding with a TemplatedParent RelativeSource has to be in a ControlTemplate.", binding);
+                    }
+
+                    convertedNode = new TemplatedParentBindingExpressionNode { Type = parentType };
+                }
+                else
+                {
+                    throw new XamlParseException($"Unknown RelativeSource mode '{mode}'.", binding);
+                }
+            }
+
+            if (elementNameProperty != null)
+            {
+                binding.Children.Remove(elementNameProperty);
+            }
+            if (relativeSourceProperty != null)
+            {
+                binding.Children.Remove(relativeSourceProperty);
+            }
+
+            return convertedNode;
+        }
+
+        private static bool GetRelativeSourceObjectFromAssignment(
+            AstTransformationContext context,
+            XamlAstXamlPropertyValueNode relativeSourceProperty,
+            out XamlAstObjectNode relativeSourceObject)
+        {
+            relativeSourceObject = null;
+            if (relativeSourceProperty is null)
+            {
+                return false;
+            }
+
+            if (relativeSourceProperty.Values[0] is XamlMarkupExtensionNode me)
+            {
+                if (me.Type.GetClrType() != context.GetAvaloniaTypes().RelativeSource)
+                {
+                    throw new XamlParseException($"Expected an object of type 'Avalonia.Data.RelativeSource'. Found a object of type '{me.Type.GetClrType().GetFqn()}'", me);
+                }
+
+                relativeSourceObject = (XamlAstObjectNode)me.Value;
+                return true;
+            }
+
+            if (relativeSourceProperty.Values[0] is XamlAstObjectNode on)
+            {
+                if (on.Type.GetClrType() != context.GetAvaloniaTypes().RelativeSource)
+                {
+                    throw new XamlParseException($"Expected an object of type 'Avalonia.Data.RelativeSource'. Found a object of type '{on.Type.GetClrType().GetFqn()}'", on);
+                }
+
+                relativeSourceObject = on;
+                return true;
+            }
+
+            return false;
+        }
+    }
+
+    class ParsedBindingPathNode : XamlAstNode, IXamlAstValueNode
+    {
+        public ParsedBindingPathNode(IXamlLineInfo lineInfo, IXamlType compiledBindingType, IList<BindingExpressionGrammar.INode> path)
+            : base(lineInfo)
+        {
+            Type = new XamlAstClrTypeReference(lineInfo, compiledBindingType, false);
+            Path = path;
+        }
+
+        public IXamlAstTypeReference Type { get; }
+
+        public IList<BindingExpressionGrammar.INode> Path { get; }
+
+        public override void VisitChildren(IXamlAstVisitor visitor)
+        {
+            for (int i = 0; i < Path.Count; i++)
+            {
+                if (Path[i] is IXamlAstNode ast)
+                {
+                    Path[i] = (BindingExpressionGrammar.INode)ast.Visit(visitor);
+                }
+            }
+        }
+    }
+
+    class VisualAncestorBindingExpressionNode : BindingExpressionGrammar.INode
+    {
+        public IXamlType Type { get; set; }
+        public int Level { get; set; }
+    }
+
+    class LogicalAncestorBindingExpressionNode : BindingExpressionGrammar.INode
+    {
+        public IXamlType Type { get; set; }
+        public int Level { get; set; }
+    }
+
+    class TemplatedParentBindingExpressionNode : BindingExpressionGrammar.INode
+    {
+        public IXamlType Type { get; set; }
+    }
+
+    class RawSourceBindingExpressionNode : XamlAstNode, BindingExpressionGrammar.INode
+    {
+        public RawSourceBindingExpressionNode(IXamlAstValueNode rawSource)
+            : base(rawSource)
+        {
+            RawSource = rawSource;
+        }
+
+        public IXamlAstValueNode RawSource { get; private set; }
+
+        public override void VisitChildren(IXamlAstVisitor visitor)
+        {
+            RawSource = (IXamlAstValueNode)RawSource.Visit(visitor);
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathTransformer.cs
new file mode 100644
index 0000000000..4d8c940bbc
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathTransformer.cs
@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using XamlX.Ast;
+using XamlX.Transform;
+using XamlX.TypeSystem;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
+{
+    class AvaloniaXamlIlBindingPathTransformer : IXamlAstTransformer
+    {
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+        {
+            if (node is XamlAstConstructableObjectNode binding && binding.Type.GetClrType().Equals(context.GetAvaloniaTypes().CompiledBindingExtension))
+            {
+                IXamlType startType = null;
+                var sourceProperty = binding.Children.OfType<XamlPropertyAssignmentNode>().FirstOrDefault(c => c.Property.Name == "Source");
+                if ((sourceProperty?.Values.Count ?? 0) == 1)
+                {
+                    var sourceValue = sourceProperty.Values[0];
+                    switch (sourceValue)
+                    {
+                        case XamlAstTextNode textNode:
+                            startType = textNode.Type?.GetClrType();
+                            break;
+
+                        case XamlMarkupExtensionNode extension:
+                            startType = extension.Type?.GetClrType();
+
+                            //let's try to infer StaticResource type from parent resources in xaml
+                            if (extension.Value.Type.GetClrType().FullName == "Avalonia.Markup.Xaml.MarkupExtensions.StaticResourceExtension" &&
+                                extension.Value is XamlAstConstructableObjectNode cn &&
+                                cn.Arguments.Count == 1 && cn.Arguments[0] is XamlAstTextNode keyNode)
+                            {
+                                bool matchProperty(IXamlAstNode node, IXamlType styledElementType, string propertyName)
+                                {
+                                    return (node is XamlPropertyAssignmentNode p &&
+                                            p.Property.DeclaringType == styledElementType && p.Property.Name == propertyName)
+                                           ||
+                                           (node is XamlManipulationGroupNode m && m.Children.Count > 0 &&
+                                            m.Children[0] is XamlPropertyAssignmentNode pm &&
+                                            pm.Property.DeclaringType == styledElementType && pm.Property.Name == propertyName);
+                                }
+
+                                string getResourceValue_xKey(XamlPropertyAssignmentNode node)
+                                    => node.Values.Count == 2 && node.Values[0] is XamlAstTextNode t ? t.Text : "";
+
+                                IXamlType getResourceValue_Type(XamlPropertyAssignmentNode node, IXamlType xamlType)
+                                    => node.Values.Count == 2 ? node.Values[1].Type.GetClrType() : xamlType;
+
+                                IEnumerable<XamlPropertyAssignmentNode> getResourceValues(IXamlAstNode node)
+                                {
+                                    if (node is XamlPropertyAssignmentNode propertyNode)
+                                    {
+                                        if (propertyNode.Values.Count == 1 &&
+                                            propertyNode.Values[0] is XamlAstConstructableObjectNode obj &&
+                                            obj.Type.GetClrType().FullName == "Avalonia.Controls.ResourceDictionary")
+                                        {
+                                            foreach (var r in obj.Children.SelectMany(c => getResourceValues(c)))
+                                            {
+                                                yield return r;
+                                            }
+                                        }
+                                        else
+                                        {
+                                            yield return propertyNode;
+                                        }
+                                    }
+                                    else if (node is XamlManipulationGroupNode m)
+                                    {
+                                        foreach (var r in m.Children.OfType<XamlPropertyAssignmentNode>())
+                                        {
+                                            yield return r;
+                                        }
+                                    }
+                                }
+
+                                string key = keyNode.Text;
+
+                                var styledElement = context.GetAvaloniaTypes().StyledElement;
+                                var resource = context.ParentNodes()
+                                                        .OfType<XamlAstConstructableObjectNode>()
+                                                        .Where(o => styledElement.IsAssignableFrom(o.Type.GetClrType()))
+                                                        .Select(o => o.Children.FirstOrDefault(p => matchProperty(p, styledElement, "Resources")))
+                                                        .Where(r => r != null)
+                                                        .SelectMany(r => getResourceValues(r))
+                                                        .FirstOrDefault(r => getResourceValue_xKey(r) == key);
+
+                                if (resource != null)
+                                {
+                                    startType = getResourceValue_Type(resource, startType);
+                                }
+                            }
+                            break;
+
+                        case XamlStaticExtensionNode staticExtension:
+                            startType = staticExtension.Type?.GetClrType();
+                            break;
+                    }
+                }
+
+                if (startType == null)
+                {
+                    var parentDataContextNode = context.ParentNodes().OfType<AvaloniaXamlIlDataContextTypeMetadataNode>().FirstOrDefault();
+                    if (parentDataContextNode is null)
+                    {
+                        throw new XamlX.XamlParseException("Cannot parse a compiled binding without an explicit x:DataType directive to give a starting data type for bindings.", binding);
+                    }
+
+                    startType = parentDataContextNode.DataContextType;
+                }
+
+                XamlIlBindingPathHelper.UpdateCompiledBindingExtension(context, binding, startType);
+            }
+
+            return node;
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlCompiledBindingsMetadataRemover.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlCompiledBindingsMetadataRemover.cs
new file mode 100644
index 0000000000..70bd15ea12
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlCompiledBindingsMetadataRemover.cs
@@ -0,0 +1,24 @@
+using System.Linq;
+using XamlX.Ast;
+using XamlX.Transform;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
+{
+    class AvaloniaXamlIlCompiledBindingsMetadataRemover : IXamlAstTransformer
+    {
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+        {
+            while (true)
+            {
+                if (node is NestedScopeMetadataNode nestedScope)
+                    node = nestedScope.Value;
+                else if (node is AvaloniaXamlIlDataContextTypeMetadataNode dataContextType)
+                    node = dataContextType.Value;
+                else if (node is AvaloniaXamlIlCompileBindingsNode compileBindings)
+                    node = compileBindings.Value;
+                else
+                    return node;
+            }
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlConstructorServiceProviderTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlConstructorServiceProviderTransformer.cs
similarity index 53%
rename from src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlConstructorServiceProviderTransformer.cs
rename to src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlConstructorServiceProviderTransformer.cs
index 7e8f296b44..35e2624ff9 100644
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlConstructorServiceProviderTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlConstructorServiceProviderTransformer.cs
@@ -1,15 +1,17 @@
 using System.Linq;
-using XamlIl.Ast;
-using XamlIl.Transform;
-using XamlIl.TypeSystem;
+using XamlX.Ast;
+using XamlX.Emit;
+using XamlX.IL;
+using XamlX.Transform;
+using XamlX.TypeSystem;
 
 namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
 {
-    class AvaloniaXamlIlConstructorServiceProviderTransformer : IXamlIlAstTransformer
+    class AvaloniaXamlIlConstructorServiceProviderTransformer : IXamlAstTransformer
     {
-        public IXamlIlAstNode Transform(XamlIlAstTransformationContext context, IXamlIlAstNode node)
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
         {
-            if (node is XamlIlAstObjectNode on && on.Arguments.Count == 0)
+            if (node is XamlAstObjectNode on && on.Arguments.Count == 0)
             {
                 var ctors = on.Type.GetClrType().Constructors;
                 if (!ctors.Any(c => c.IsPublic && !c.IsStatic && c.Parameters.Count == 0))
@@ -27,20 +29,20 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             return node;
         }
 
-        class InjectServiceProviderNode : XamlIlAstNode, IXamlIlAstValueNode,IXamlIlAstNodeNeedsParentStack,
-            IXamlIlAstEmitableNode
+        class InjectServiceProviderNode : XamlAstNode, IXamlAstValueNode,IXamlAstNodeNeedsParentStack,
+            IXamlAstEmitableNode<IXamlILEmitter, XamlILNodeEmitResult>
         {
-            public InjectServiceProviderNode(IXamlIlType type, IXamlIlLineInfo lineInfo) : base(lineInfo)
+            public InjectServiceProviderNode(IXamlType type, IXamlLineInfo lineInfo) : base(lineInfo)
             {
-                Type = new XamlIlAstClrTypeReference(lineInfo, type, false);
+                Type = new XamlAstClrTypeReference(lineInfo, type, false);
             }
 
-            public IXamlIlAstTypeReference Type { get; }
+            public IXamlAstTypeReference Type { get; }
             public bool NeedsParentStack => true;
-            public XamlIlNodeEmitResult Emit(XamlIlEmitContext context, IXamlIlEmitter codeGen)
+            public XamlILNodeEmitResult Emit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
             {
                 codeGen.Ldloc(context.ContextLocal);
-                return XamlIlNodeEmitResult.Type(0, Type.GetClrType());
+                return XamlILNodeEmitResult.Type(0, Type.GetClrType());
             }
         }
     }
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplateTargetTypeMetadataTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplateTargetTypeMetadataTransformer.cs
similarity index 68%
rename from src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplateTargetTypeMetadataTransformer.cs
rename to src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplateTargetTypeMetadataTransformer.cs
index aab43bbd6f..f95d086bf6 100644
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplateTargetTypeMetadataTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplateTargetTypeMetadataTransformer.cs
@@ -1,31 +1,31 @@
 using System.Linq;
-using XamlIl.Ast;
-using XamlIl.Transform;
-using XamlIl.TypeSystem;
+using XamlX.Ast;
+using XamlX.Transform;
+using XamlX.TypeSystem;
 
 namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
 {
-    class AvaloniaXamlIlControlTemplateTargetTypeMetadataTransformer : IXamlIlAstTransformer
+    class AvaloniaXamlIlControlTemplateTargetTypeMetadataTransformer : IXamlAstTransformer
     {
-        public IXamlIlAstNode Transform(XamlIlAstTransformationContext context, IXamlIlAstNode node)
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
         {
-            if (!(node is XamlIlAstObjectNode on
+            if (!(node is XamlAstObjectNode on
                   && on.Type.GetClrType().FullName == "Avalonia.Markup.Xaml.Templates.ControlTemplate"))
                 return node;
-            var tt = on.Children.OfType<XamlIlAstXamlPropertyValueNode>().FirstOrDefault(ch =>
+            var tt = on.Children.OfType<XamlAstXamlPropertyValueNode>().FirstOrDefault(ch =>
                                               ch.Property.GetClrProperty().Name == "TargetType");
 
             if (context.ParentNodes().FirstOrDefault() is AvaloniaXamlIlTargetTypeMetadataNode)
                 // Deja vu. I've just been in this place before
                 return node;
 
-            IXamlIlAstTypeReference targetType;
+            IXamlAstTypeReference targetType;
 
             var templatableBaseType = context.Configuration.TypeSystem.GetType("Avalonia.Controls.Control");
             
-            if ((tt?.Values.FirstOrDefault() is XamlIlTypeExtensionNode tn))
+            if ((tt?.Values.FirstOrDefault() is XamlTypeExtensionNode tn))
             {
-                targetType = tn.Type;
+                targetType = tn.Value;
             }
             else
             {
@@ -33,11 +33,11 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                     .FirstOrDefault();
                 if (parentScope?.ScopeType == AvaloniaXamlIlTargetTypeMetadataNode.ScopeTypes.Style)
                     targetType = parentScope.TargetType;
-                else if (context.ParentNodes().Skip(1).FirstOrDefault() is XamlIlAstObjectNode directParentNode
+                else if (context.ParentNodes().Skip(1).FirstOrDefault() is XamlAstObjectNode directParentNode
                          && templatableBaseType.IsAssignableFrom(directParentNode.Type.GetClrType()))
                     targetType = directParentNode.Type;
                 else
-                    targetType = new XamlIlAstClrTypeReference(node,
+                    targetType = new XamlAstClrTypeReference(node,
                         templatableBaseType, false);
             }
                 
@@ -48,9 +48,9 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
         }
     }
 
-    class AvaloniaXamlIlTargetTypeMetadataNode : XamlIlValueWithSideEffectNodeBase
+    class AvaloniaXamlIlTargetTypeMetadataNode : XamlValueWithSideEffectNodeBase
     {
-        public IXamlIlAstTypeReference TargetType { get; set; }
+        public IXamlAstTypeReference TargetType { get; set; }
         public ScopeTypes ScopeType { get; }
 
         public enum ScopeTypes
@@ -60,7 +60,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             Transitions
         }
         
-        public AvaloniaXamlIlTargetTypeMetadataNode(IXamlIlAstValueNode value, IXamlIlAstTypeReference targetType,
+        public AvaloniaXamlIlTargetTypeMetadataNode(IXamlAstValueNode value, IXamlAstTypeReference targetType,
             ScopeTypes type)
             : base(value, value)
         {
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDataContextTypeTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDataContextTypeTransformer.cs
new file mode 100644
index 0000000000..349143253e
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDataContextTypeTransformer.cs
@@ -0,0 +1,204 @@
+using System.Collections.Generic;
+using System.Diagnostics;
+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 AvaloniaXamlIlDataContextTypeTransformer : IXamlAstTransformer
+    {
+        private const string AvaloniaNs = "https://github.com/avaloniaui";
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+        {
+            if (context.ParentNodes().FirstOrDefault() is AvaloniaXamlIlDataContextTypeMetadataNode)
+            {
+                // We've already resolved the data context type for this node.
+                return node;
+            }
+
+            if (node is XamlAstConstructableObjectNode on)
+            {
+                AvaloniaXamlIlDataContextTypeMetadataNode inferredDataContextTypeNode = null;
+                AvaloniaXamlIlDataContextTypeMetadataNode directiveDataContextTypeNode = null;
+
+                for (int i = 0; i < on.Children.Count; ++i)
+                {
+                    var child = on.Children[i];
+                    if (child is XamlAstXmlDirective directive)
+                    {
+                        if (directive.Namespace == XamlNamespaces.Xaml2006
+                            && directive.Name == "DataType"
+                            && directive.Values.Count == 1)
+                        {
+                            on.Children.RemoveAt(i);
+                            i--;
+                            if (directive.Values[0] is XamlAstTextNode text)
+                            {
+                                directiveDataContextTypeNode = new AvaloniaXamlIlDataContextTypeMetadataNode(on,
+                                    TypeReferenceResolver.ResolveType(context, text.Text, isMarkupExtension: false, text, strict: true).Type);
+                            }
+                            else
+                            {
+                                throw new XamlX.XamlParseException("x:DataType should be set to a type name.", directive.Values[0]);
+                            }
+                        }
+                    }
+                    else if (child is XamlPropertyAssignmentNode pa)
+                    {
+                        if (pa.Property.Name == "DataContext"
+                            && pa.Property.DeclaringType.Equals(context.GetAvaloniaTypes().StyledElement)
+                            && pa.Values[0] is XamlMarkupExtensionNode ext
+                            && ext.Value is XamlAstConstructableObjectNode obj)
+                        {
+                            inferredDataContextTypeNode = ParseDataContext(context, on, obj);
+                        }
+                        else if(context.GetAvaloniaTypes().DataTemplate.IsAssignableFrom(on.Type.GetClrType())
+                            && pa.Property.Name == "DataType"
+                            && pa.Values[0] is XamlTypeExtensionNode dataTypeNode)
+                        {
+                            inferredDataContextTypeNode = new AvaloniaXamlIlDataContextTypeMetadataNode(on, dataTypeNode.Value.GetClrType());
+                        }
+                    }
+                }
+
+                // If there is no x:DataType directive,
+                // do more specialized inference
+                if (directiveDataContextTypeNode is null)
+                {
+                    if (context.GetAvaloniaTypes().IDataTemplate.IsAssignableFrom(on.Type.GetClrType())
+                        && inferredDataContextTypeNode is null)
+                    {
+                        // Infer data type from collection binding on a control that displays items.
+                        var parentObject = context.ParentNodes().OfType<XamlAstConstructableObjectNode>().FirstOrDefault();
+                        if (parentObject != null)
+                        {
+                            var parentType = parentObject.Type.GetClrType();
+
+                            if (context.GetAvaloniaTypes().IItemsPresenterHost.IsDirectlyAssignableFrom(parentType)
+                                || context.GetAvaloniaTypes().ItemsRepeater.IsDirectlyAssignableFrom(parentType))
+                            {
+                                inferredDataContextTypeNode = InferDataContextOfPresentedItem(context, on, parentObject);
+                            }
+                        }
+
+                        if (inferredDataContextTypeNode is null)
+                        {
+                            inferredDataContextTypeNode = new AvaloniaXamlIlUninferrableDataContextMetadataNode(on);
+                        }
+                    }
+                }
+
+                return directiveDataContextTypeNode ?? inferredDataContextTypeNode ?? node;
+            }
+
+            return node;
+        }
+
+        private static AvaloniaXamlIlDataContextTypeMetadataNode InferDataContextOfPresentedItem(AstTransformationContext context, XamlAstConstructableObjectNode on, XamlAstConstructableObjectNode parentObject)
+        {
+            var parentItemsValue = parentObject
+                                            .Children.OfType<XamlPropertyAssignmentNode>()
+                                            .FirstOrDefault(pa => pa.Property.Name == "Items")
+                                            ?.Values[0];
+            if (parentItemsValue is null)
+            {
+                // We can't infer the collection type and the currently calculated type is definitely wrong.
+                // Notify the user that we were unable to infer the data context type if they use a compiled binding.
+                return new AvaloniaXamlIlUninferrableDataContextMetadataNode(on);
+            }
+
+            IXamlType itemsCollectionType = null;
+            if (context.GetAvaloniaTypes().IBinding.IsAssignableFrom(parentItemsValue.Type.GetClrType()))
+            {
+                if (parentItemsValue.Type.GetClrType().Equals(context.GetAvaloniaTypes().CompiledBindingExtension)
+                    && parentItemsValue is XamlMarkupExtensionNode ext && ext.Value is XamlAstConstructableObjectNode parentItemsBinding)
+                {
+                    var parentItemsDataContext = context.ParentNodes().SkipWhile(n => n != parentObject).OfType<AvaloniaXamlIlDataContextTypeMetadataNode>().FirstOrDefault();
+                    if (parentItemsDataContext != null)
+                    {
+                        itemsCollectionType = XamlIlBindingPathHelper.UpdateCompiledBindingExtension(context, parentItemsBinding, parentItemsDataContext.DataContextType);
+                    }
+                }
+            }
+            else
+            {
+                itemsCollectionType = parentItemsValue.Type.GetClrType();
+            }
+
+            if (itemsCollectionType != null)
+            {
+                foreach (var i in GetAllInterfacesIncludingSelf(itemsCollectionType))
+                {
+                    if (i.GenericTypeDefinition?.Equals(context.Configuration.WellKnownTypes.IEnumerableT) == true)
+                    {
+                        return new AvaloniaXamlIlDataContextTypeMetadataNode(on, i.GenericArguments[0]);
+                    }
+                }
+            }
+            // We can't infer the collection type and the currently calculated type is definitely wrong.
+            // Notify the user that we were unable to infer the data context type if they use a compiled binding.
+            return new AvaloniaXamlIlUninferrableDataContextMetadataNode(on);
+        }
+
+        private static AvaloniaXamlIlDataContextTypeMetadataNode ParseDataContext(AstTransformationContext context, XamlAstConstructableObjectNode on, XamlAstConstructableObjectNode obj)
+        {
+            var bindingType = context.GetAvaloniaTypes().IBinding;
+            if (!bindingType.IsAssignableFrom(obj.Type.GetClrType()) && !obj.Type.GetClrType().Equals(context.GetAvaloniaTypes().ReflectionBindingExtension))
+            {
+                return new AvaloniaXamlIlDataContextTypeMetadataNode(on, obj.Type.GetClrType());
+            }
+            else if (obj.Type.GetClrType().Equals(context.GetAvaloniaTypes().CompiledBindingExtension))
+            {
+                IXamlType startType;
+                var parentDataContextNode = context.ParentNodes().OfType<AvaloniaXamlIlDataContextTypeMetadataNode>().FirstOrDefault();
+                if (parentDataContextNode is null)
+                {
+                    throw new XamlX.XamlParseException("Cannot parse a compiled binding without an explicit x:DataType directive to give a starting data type for bindings.", obj);
+                }
+
+                startType = parentDataContextNode.DataContextType;
+
+                var bindingResultType = XamlIlBindingPathHelper.UpdateCompiledBindingExtension(context, obj, startType);
+                return new AvaloniaXamlIlDataContextTypeMetadataNode(on, bindingResultType);
+            }
+
+            return new AvaloniaXamlIlUninferrableDataContextMetadataNode(on);
+        }
+
+        private static IEnumerable<IXamlType> GetAllInterfacesIncludingSelf(IXamlType type)
+        {
+            if (type.IsInterface)
+                yield return type;
+
+            foreach (var i in type.GetAllInterfaces())
+                yield return i;
+        }
+    }
+
+    [DebuggerDisplay("DataType = {DataContextType}")]
+    class AvaloniaXamlIlDataContextTypeMetadataNode : XamlValueWithSideEffectNodeBase
+    {
+        public virtual IXamlType DataContextType { get; }
+
+        public AvaloniaXamlIlDataContextTypeMetadataNode(IXamlAstValueNode value, IXamlType targetType)
+            : base(value, value)
+        {
+            DataContextType = targetType;
+        }
+    }
+
+    [DebuggerDisplay("DataType = Unknown")]
+    class AvaloniaXamlIlUninferrableDataContextMetadataNode : AvaloniaXamlIlDataContextTypeMetadataNode
+    {
+        public AvaloniaXamlIlUninferrableDataContextMetadataNode(IXamlAstValueNode value)
+            : base(value, null)
+        {
+        }
+
+        public override IXamlType DataContextType => throw new XamlTransformException("Unable to infer DataContext type for compiled bindings nested within this element.", Value);
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlDesignPropertiesTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDesignPropertiesTransformer.cs
similarity index 68%
rename from src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlDesignPropertiesTransformer.cs
rename to src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDesignPropertiesTransformer.cs
index 9cc4c5cf11..3096be522f 100644
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlDesignPropertiesTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDesignPropertiesTransformer.cs
@@ -1,12 +1,12 @@
 using System.Collections.Generic;
 using System.Linq;
-using XamlIl;
-using XamlIl.Ast;
-using XamlIl.Transform;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Transform;
 
 namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
 {
-    class AvaloniaXamlIlDesignPropertiesTransformer : IXamlIlAstTransformer
+    class AvaloniaXamlIlDesignPropertiesTransformer : IXamlAstTransformer
     {
         public bool IsDesignMode { get; set; }
 
@@ -17,14 +17,14 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
         };
 
         private const string AvaloniaNs = "https://github.com/avaloniaui";
-        public IXamlIlAstNode Transform(XamlIlAstTransformationContext context, IXamlIlAstNode node)
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
         {
-            if (node is XamlIlAstObjectNode on)
+            if (node is XamlAstObjectNode on)
             {
                 for (var c=0; c<on.Children.Count;)
                 {
                     var ch = on.Children[c];
-                    if (ch is XamlIlAstXmlDirective directive
+                    if (ch is XamlAstXmlDirective directive
                         && directive.Namespace == XamlNamespaces.Blend2008
                         && DesignDirectives.TryGetValue(directive.Name, out var mapTo))
                     {
@@ -34,9 +34,9 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                         else
                         {
                             // Map to an actual property in `Design` class
-                            on.Children[c] = new XamlIlAstXamlPropertyValueNode(ch,
-                                new XamlIlAstNamePropertyReference(ch,
-                                    new XamlIlAstXmlTypeReference(ch, AvaloniaNs, "Design"),
+                            on.Children[c] = new XamlAstXamlPropertyValueNode(ch,
+                                new XamlAstNamePropertyReference(ch,
+                                    new XamlAstXmlTypeReference(ch, AvaloniaNs, "Design"),
                                     mapTo, on.Type), directive.Values);
                             c++;
                         }
@@ -44,9 +44,9 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                     // Remove all "Design" attached properties in non-design mode
                     else if (
                         !IsDesignMode
-                        && ch is XamlIlAstXamlPropertyValueNode pv
-                        && pv.Property is XamlIlAstNamePropertyReference pref
-                        && pref.DeclaringType is XamlIlAstXmlTypeReference dref
+                        && ch is XamlAstXamlPropertyValueNode pv
+                        && pv.Property is XamlAstNamePropertyReference pref
+                        && pref.DeclaringType is XamlAstXmlTypeReference dref
                         && dref.XmlNamespace == AvaloniaNs && dref.Name == "Design"
                     )
                     {
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlMetadataRemover.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlMetadataRemover.cs
new file mode 100644
index 0000000000..a09e13389a
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlMetadataRemover.cs
@@ -0,0 +1,17 @@
+using System.Linq;
+using XamlX.Ast;
+using XamlX.Transform;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
+{
+    class AvaloniaXamlIlMetadataRemover : IXamlAstTransformer
+    {
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+        {
+            if (node is AvaloniaXamlIlTargetTypeMetadataNode targetType)
+                return targetType.Value;
+
+            return node;
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlPropertyPathTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlPropertyPathTransformer.cs
new file mode 100644
index 0000000000..44b469c34e
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlPropertyPathTransformer.cs
@@ -0,0 +1,253 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Markup.Parsers;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Transform;
+using XamlX.Transform.Transformers;
+using XamlX.TypeSystem;
+using XamlX.Emit;
+using XamlX.IL;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
+{
+    class AvaloniaXamlIlPropertyPathTransformer : IXamlAstTransformer
+    {
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+        {
+            if (node is XamlAstXamlPropertyValueNode pv
+                && pv.Values.Count == 1
+                && pv.Values[0] is XamlAstTextNode text
+                && pv.Property.GetClrProperty().Getter?.ReturnType
+                    .Equals(context.GetAvaloniaTypes().PropertyPath) == true
+            )
+            {
+                var parentScope = context.ParentNodes().OfType<AvaloniaXamlIlTargetTypeMetadataNode>()
+                    .FirstOrDefault();
+                if(parentScope == null)
+                    throw new XamlX.XamlParseException("No target type scope found for property path", text);
+                if (parentScope.ScopeType != AvaloniaXamlIlTargetTypeMetadataNode.ScopeTypes.Style)
+                    throw new XamlX.XamlParseException("PropertyPath is currently only valid for styles", pv);
+
+
+                IEnumerable<PropertyPathGrammar.ISyntax> parsed;
+                try
+                {
+                    parsed = PropertyPathGrammar.Parse(text.Text);
+                }
+                catch (Exception e)
+                {
+                    throw new XamlX.XamlParseException("Unable to parse PropertyPath: " + e.Message, text);
+                }
+
+                var elements = new List<IXamlIlPropertyPathElementNode>();
+                IXamlType currentType = parentScope.TargetType.GetClrType();
+                
+                
+                var expectProperty = true;
+                var expectCast = true;
+                var expectTraversal = false;
+                var types = context.GetAvaloniaTypes();
+                
+                IXamlType GetType(string ns, string name)
+                {
+                    return TypeReferenceResolver.ResolveType(context, $"{ns}:{name}", false,
+                        text, true).GetClrType();
+                }
+
+                void HandleProperty(string name, string typeNamespace, string typeName)
+                {
+                    if(!expectProperty || currentType == null)
+                        throw new XamlX.XamlParseException("Unexpected property node", text);
+
+                    var propertySearchType =
+                        typeName != null ? GetType(typeNamespace, typeName) : currentType;
+
+                    IXamlIlPropertyPathElementNode prop = null;
+                    var avaloniaPropertyFieldName = name + "Property";
+                    var avaloniaPropertyField = propertySearchType.GetAllFields().FirstOrDefault(f =>
+                        f.IsStatic && f.IsPublic && f.Name == avaloniaPropertyFieldName);
+                    if (avaloniaPropertyField != null)
+                    {
+                        prop = new XamlIlAvaloniaPropertyPropertyPathElementNode(avaloniaPropertyField,
+                            XamlIlAvaloniaPropertyHelper.GetAvaloniaPropertyType(avaloniaPropertyField, types, text));
+                    }
+                    else
+                    {
+                        var clrProperty = propertySearchType.GetAllProperties().FirstOrDefault(p => p.Name == name);
+                        prop = new XamlIClrPropertyPathElementNode(clrProperty);
+                    }
+
+                    if (prop == null)
+                        throw new XamlX.XamlParseException(
+                            $"Unable to resolve property {name} on type {propertySearchType.GetFqn()}",
+                            text);
+                    
+                    currentType = prop.Type;
+                    elements.Add(prop);
+                    expectProperty = false;
+                    expectTraversal = expectCast = true;
+                }
+                
+                foreach (var ge in parsed)
+                {
+                    if (ge is PropertyPathGrammar.ChildTraversalSyntax)
+                    {
+                        if (!expectTraversal)
+                            throw new XamlX.XamlParseException("Unexpected child traversal .", text);
+                        elements.Add(new XamlIlChildTraversalPropertyPathElementNode());
+                        expectTraversal = expectCast = false;
+                        expectProperty = true;
+                    }
+                    else if (ge is PropertyPathGrammar.EnsureTypeSyntax ets)
+                    {
+                        if(!expectCast)
+                            throw new XamlX.XamlParseException("Unexpected cast node", text);
+                        currentType = GetType(ets.TypeNamespace, ets.TypeName);
+                        elements.Add(new XamlIlCastPropertyPathElementNode(currentType, true));
+                        expectProperty = false;
+                        expectCast = expectTraversal = true;
+                    }
+                    else if (ge is PropertyPathGrammar.CastTypeSyntax cts)
+                    {
+                        if(!expectCast)
+                            throw new XamlX.XamlParseException("Unexpected cast node", text);
+                        //TODO: Check if cast can be done
+                        currentType = GetType(cts.TypeNamespace, cts.TypeName);
+                        elements.Add(new XamlIlCastPropertyPathElementNode(currentType, false));
+                        expectProperty = false;
+                        expectCast = expectTraversal = true;
+                    }
+                    else if (ge is PropertyPathGrammar.PropertySyntax ps)
+                    {
+                        HandleProperty(ps.Name, null, null);
+                    }
+                    else if (ge is PropertyPathGrammar.TypeQualifiedPropertySyntax tqps)
+                    {
+                        HandleProperty(tqps.Name, tqps.TypeNamespace, tqps.TypeName);
+                    }
+                    else
+                        throw new XamlX.XamlParseException("Unexpected node " + ge, text);
+                    
+                }
+                var propertyPathNode = new XamlIlPropertyPathNode(text, elements, types);
+                if (propertyPathNode.Type == null)
+                    throw new XamlX.XamlParseException("Unexpected end of the property path", text);
+                pv.Values[0] = propertyPathNode;
+            }
+
+            return node;
+        }
+
+        interface IXamlIlPropertyPathElementNode
+        {
+            void Emit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen);
+            IXamlType Type { get; }
+        }
+
+        class XamlIlChildTraversalPropertyPathElementNode : IXamlIlPropertyPathElementNode
+        {
+            public void Emit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
+                => codeGen.EmitCall(
+                    context.GetAvaloniaTypes()
+                        .PropertyPathBuilder.FindMethod(m => m.Name == "ChildTraversal"));
+
+            public IXamlType Type => null;
+        }
+        
+        class XamlIlAvaloniaPropertyPropertyPathElementNode : IXamlIlPropertyPathElementNode
+        {
+            private readonly IXamlField _field;
+
+            public XamlIlAvaloniaPropertyPropertyPathElementNode(IXamlField field, IXamlType propertyType)
+            {
+                _field = field;
+                Type = propertyType;
+            }
+
+            public void Emit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
+                => codeGen
+                    .Ldsfld(_field)
+                    .EmitCall(context.GetAvaloniaTypes()
+                        .PropertyPathBuilder.FindMethod(m => m.Name == "Property"));
+
+            public IXamlType Type { get; }
+        }
+        
+        class XamlIClrPropertyPathElementNode : IXamlIlPropertyPathElementNode
+        {
+            private readonly IXamlProperty _property;
+
+            public XamlIClrPropertyPathElementNode(IXamlProperty property)
+            {
+                _property = property;
+            }
+
+            public void Emit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
+            {
+                context.Configuration.GetExtra<XamlIlClrPropertyInfoEmitter>()
+                    .Emit(context, codeGen, _property);
+
+                codeGen.EmitCall(context.GetAvaloniaTypes()
+                    .PropertyPathBuilder.FindMethod(m => m.Name == "Property"));
+            }
+
+            public IXamlType Type => _property.Getter?.ReturnType ?? _property.Setter?.Parameters[0];
+        }
+
+        class XamlIlCastPropertyPathElementNode : IXamlIlPropertyPathElementNode
+        {
+            private readonly IXamlType _type;
+            private readonly bool _ensureType;
+
+            public XamlIlCastPropertyPathElementNode(IXamlType type, bool ensureType)
+            {
+                _type = type;
+                _ensureType = ensureType;
+            }
+            
+            public void Emit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
+            {
+                codeGen
+                    .Ldtype(_type)
+                    .EmitCall(context.GetAvaloniaTypes()
+                        .PropertyPathBuilder.FindMethod(m => m.Name == (_ensureType ? "EnsureType" : "Cast")));
+            }
+
+            public IXamlType Type => _type;
+        }
+
+        class XamlIlPropertyPathNode : XamlAstNode, IXamlIlPropertyPathNode, IXamlAstEmitableNode<IXamlILEmitter, XamlILNodeEmitResult>
+        {
+            private readonly List<IXamlIlPropertyPathElementNode> _elements;
+            private readonly AvaloniaXamlIlWellKnownTypes _types;
+
+            public XamlIlPropertyPathNode(IXamlLineInfo lineInfo,
+                List<IXamlIlPropertyPathElementNode> elements,
+                AvaloniaXamlIlWellKnownTypes types) : base(lineInfo)
+            {
+                _elements = elements;
+                _types = types;
+                Type = new XamlAstClrTypeReference(this, types.PropertyPath, false);
+            }
+
+            public IXamlAstTypeReference Type { get; }
+            public IXamlType PropertyType => _elements.LastOrDefault()?.Type;
+            public XamlILNodeEmitResult Emit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
+            {
+                codeGen
+                    .Newobj(_types.PropertyPathBuilder.FindConstructor());
+                foreach(var e in _elements)
+                    e.Emit(context, codeGen);
+                codeGen.EmitCall(_types.PropertyPathBuilder.FindMethod(m => m.Name == "Build"));
+                return XamlILNodeEmitResult.Type(0, _types.PropertyPath);
+            }
+        }
+    }
+
+    interface IXamlIlPropertyPathNode : IXamlAstValueNode
+    {
+        IXamlType PropertyType { get; }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlResolveByNameMarkupExtensionReplacer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlResolveByNameMarkupExtensionReplacer.cs
new file mode 100644
index 0000000000..c0ac841b7f
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlResolveByNameMarkupExtensionReplacer.cs
@@ -0,0 +1,49 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using XamlX.Ast;
+using XamlX.Transform;
+using XamlX.TypeSystem;
+
+#nullable  enable
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
+{
+    class AvaloniaXamlIlResolveByNameMarkupExtensionReplacer : IXamlAstTransformer
+    {
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+        {
+            if (!(node is XamlAstXamlPropertyValueNode propertyValueNode)) return node;
+
+            if (!(propertyValueNode.Property is XamlAstClrProperty clrProperty)) return node;
+
+            IEnumerable<IXamlCustomAttribute> attributes = propertyValueNode.Property.GetClrProperty().CustomAttributes;
+
+            if (propertyValueNode.Property is XamlAstClrProperty referenceNode &&
+                referenceNode.Getter != null)
+            {
+                attributes = attributes.Concat(referenceNode.Getter.CustomAttributes);
+            }
+
+            if (attributes.All(attribute => attribute.Type.FullName != "Avalonia.Controls.ResolveByNameAttribute"))
+                return node;
+
+            if (propertyValueNode.Values.Count != 1 || !(propertyValueNode.Values.First() is XamlAstTextNode))
+                return node;
+
+            var newNode = new XamlAstObjectNode(
+                propertyValueNode.Values[0],
+                new XamlAstClrTypeReference(propertyValueNode.Values[0],
+                    context.GetAvaloniaTypes().ResolveByNameExtension, true))
+            {
+                Arguments = new List<IXamlAstValueNode> { propertyValueNode.Values[0] }
+            };
+            
+            if (XamlTransformHelpers.TryConvertMarkupExtension(context, newNode, out var extensionNode))
+            {
+                propertyValueNode.Values[0] = extensionNode;
+            }
+
+            return node;
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlRootObjectScopeTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlRootObjectScopeTransformer.cs
new file mode 100644
index 0000000000..0513c78a7a
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlRootObjectScopeTransformer.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Linq;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Transform;
+using XamlX.TypeSystem;
+using XamlX.IL;
+using XamlX.Emit;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
+{
+    class AvaloniaXamlIlRootObjectScope : IXamlAstTransformer
+    {
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+        {
+            if (!context.ParentNodes().Any()
+                && node is XamlValueWithManipulationNode mnode)
+            {
+                mnode.Manipulation = new XamlManipulationGroupNode(mnode,
+                    new[]
+                    {
+                        mnode.Manipulation,
+                        new HandleRootObjectScopeNode(mnode, context.GetAvaloniaTypes())
+                    });
+            }
+            return node;
+        }
+        class HandleRootObjectScopeNode : XamlAstNode, IXamlAstManipulationNode
+        {
+            private readonly AvaloniaXamlIlWellKnownTypes _types;
+
+            public HandleRootObjectScopeNode(IXamlLineInfo lineInfo,
+                AvaloniaXamlIlWellKnownTypes types) : base(lineInfo)
+            {
+                _types = types;
+            }
+        }
+        internal class Emitter : IXamlILAstNodeEmitter
+        {
+            public XamlILNodeEmitResult Emit(IXamlAstNode node, XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
+            {
+                if (!(node is HandleRootObjectScopeNode))
+                {
+                    return null;
+                }
+                var types = context.GetAvaloniaTypes();
+                
+                var next = codeGen.DefineLabel();
+                var scopeField = context.RuntimeContext.ContextType.Fields.First(f =>
+                    f.Name == AvaloniaXamlIlLanguage.ContextNameScopeFieldName);
+                using (var local = codeGen.LocalsPool.GetLocal(types.StyledElement))
+                {
+                    codeGen
+                        .Isinst(types.StyledElement)
+                        .Dup()
+                        .Stloc(local.Local)
+                        .Brfalse(next)
+                        .Ldloc(local.Local)
+                        .Ldloc(context.ContextLocal)
+                        .Ldfld(scopeField)
+                        .EmitCall(types.NameScopeSetNameScope, true)
+                        .MarkLabel(next)
+                        .Ldloc(context.ContextLocal)
+                        .Ldfld(scopeField)
+                        .EmitCall(types.INameScopeComplete, true);
+                }
+
+                return XamlILNodeEmitResult.Void(1);
+            }
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
similarity index 63%
rename from src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
rename to src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
index aac07f5b6e..b81d25d613 100644
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
@@ -3,41 +3,45 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using Avalonia.Markup.Parsers;
-using XamlIl;
-using XamlIl.Ast;
-using XamlIl.Transform;
-using XamlIl.Transform.Transformers;
-using XamlIl.TypeSystem;
+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
 {
-    class AvaloniaXamlIlSelectorTransformer : IXamlIlAstTransformer
+    using XamlParseException = XamlX.XamlParseException;
+    using XamlLoadException = XamlX.XamlLoadException;
+    class AvaloniaXamlIlSelectorTransformer : IXamlAstTransformer
     {
-        public IXamlIlAstNode Transform(XamlIlAstTransformationContext context, IXamlIlAstNode node)
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
         {
-            if (!(node is XamlIlAstObjectNode on && on.Type.GetClrType().FullName == "Avalonia.Styling.Style"))
+            if (!(node is XamlAstObjectNode on && on.Type.GetClrType().FullName == "Avalonia.Styling.Style"))
                 return node;
 
-            var pn = on.Children.OfType<XamlIlAstXamlPropertyValueNode>()
+            var pn = on.Children.OfType<XamlAstXamlPropertyValueNode>()
                 .FirstOrDefault(p => p.Property.GetClrProperty().Name == "Selector");
 
             if (pn == null)
                 return node;
 
             if (pn.Values.Count != 1)
-                throw new XamlIlParseException("Selector property should should have exactly one value", node);
+                throw new XamlParseException("Selector property should should have exactly one value", node);
             
             if (pn.Values[0] is XamlIlSelectorNode)
                 //Deja vu. I've just been in this place before
                 return node;
             
-            if (!(pn.Values[0] is XamlIlAstTextNode tn))
-                throw new XamlIlParseException("Selector property should be a text node", node);
+            if (!(pn.Values[0] is XamlAstTextNode tn))
+                throw new XamlParseException("Selector property should be a text node", node);
 
             var selectorType = pn.Property.GetClrProperty().Getter.ReturnType;
             var initialNode = new XamlIlSelectorInitialNode(node, selectorType);
             XamlIlSelectorNode Create(IEnumerable<SelectorGrammar.ISyntax> syntax,
-                Func<string, string, XamlIlAstClrTypeReference> typeResolver)
+                Func<string, string, XamlAstClrTypeReference> typeResolver)
             {
                 XamlIlSelectorNode result = initialNode;
                 XamlIlOrSelectorNode results = null;
@@ -63,18 +67,18 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                             var type = result?.TargetType;
 
                             if (type == null)
-                                throw new XamlIlParseException("Property selectors must be applied to a type.", node);
+                                throw new XamlParseException("Property selectors must be applied to a type.", node);
 
                             var targetProperty =
                                 type.GetAllProperties().FirstOrDefault(p => p.Name == property.Property);
 
                             if (targetProperty == null)
-                                throw new XamlIlParseException($"Cannot find '{property.Property}' on '{type}", node);
+                                throw new XamlParseException($"Cannot find '{property.Property}' on '{type}", node);
 
-                            if (!XamlIlTransformHelpers.TryGetCorrectlyTypedValue(context,
-                                new XamlIlAstTextNode(node, property.Value, context.Configuration.WellKnownTypes.String),
+                            if (!XamlTransformHelpers.TryGetCorrectlyTypedValue(context,
+                                new XamlAstTextNode(node, property.Value, context.Configuration.WellKnownTypes.String),
                                 targetProperty.PropertyType, out var typedValue))
-                                throw new XamlIlParseException(
+                                throw new XamlParseException(
                                     $"Cannot convert '{property.Value}' to '{targetProperty.PropertyType.GetFqn()}",
                                     node);
 
@@ -100,10 +104,15 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                             result = initialNode;
                             break;
                         default:
-                            throw new XamlIlParseException($"Unsupported selector grammar '{i.GetType()}'.", node);
+                            throw new XamlParseException($"Unsupported selector grammar '{i.GetType()}'.", node);
                     }
                 }
 
+                if (results != null && result != null)
+                {
+                    results.Add(result);
+                }
+
                 return results ?? result;
             }
 
@@ -114,15 +123,15 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             }
             catch (Exception e)
             {
-                throw new XamlIlParseException("Unable to parse selector: " + e.Message, node);
+                throw new XamlParseException("Unable to parse selector: " + e.Message, node);
             }
 
             var selector = Create(parsed, (p, n) 
-                => XamlIlTypeReferenceResolver.ResolveType(context, $"{p}:{n}", true, node, true));
+                => TypeReferenceResolver.ResolveType(context, $"{p}:{n}", true, node, true));
             pn.Values[0] = selector;
 
             return new AvaloniaXamlIlTargetTypeMetadataNode(on,
-                new XamlIlAstClrTypeReference(selector, selector.TargetType, false),
+                new XamlAstClrTypeReference(selector, selector.TargetType, false),
                 AvaloniaXamlIlTargetTypeMetadataNode.ScopeTypes.Style);
         }
 
@@ -130,64 +139,62 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
 
 
     
-    abstract class XamlIlSelectorNode : XamlIlAstNode, IXamlIlAstValueNode, IXamlIlAstEmitableNode
+    abstract class XamlIlSelectorNode : XamlAstNode, IXamlAstValueNode, IXamlAstEmitableNode<IXamlILEmitter, XamlILNodeEmitResult>
     {
         protected XamlIlSelectorNode Previous { get; }
-        public abstract IXamlIlType TargetType { get; }
+        public abstract IXamlType TargetType { get; }
 
         public XamlIlSelectorNode(XamlIlSelectorNode previous,
-            IXamlIlLineInfo info = null,
-            IXamlIlType selectorType = null) : base(info ?? previous)
+            IXamlLineInfo info = null,
+            IXamlType selectorType = null) : base(info ?? previous)
         {
             Previous = previous;
-            Type = selectorType == null ? previous.Type : new XamlIlAstClrTypeReference(this, selectorType, false);
+            Type = selectorType == null ? previous.Type : new XamlAstClrTypeReference(this, selectorType, false);
         }
 
-        public IXamlIlAstTypeReference Type { get; }
+        public IXamlAstTypeReference Type { get; }
 
-        public virtual XamlIlNodeEmitResult Emit(XamlIlEmitContext context, IXamlIlEmitter codeGen)
+        public virtual XamlILNodeEmitResult Emit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
         {
             if (Previous != null)
                 context.Emit(Previous, codeGen, Type.GetClrType());
             DoEmit(context, codeGen);
-            return XamlIlNodeEmitResult.Type(0, Type.GetClrType());
+            return XamlILNodeEmitResult.Type(0, Type.GetClrType());
         }
         
-        protected abstract void DoEmit(XamlIlEmitContext context, IXamlIlEmitter codeGen);
+        protected abstract void DoEmit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen);
 
-        protected void EmitCall(XamlIlEmitContext context, IXamlIlEmitter codeGen, Func<IXamlIlMethod, bool> method)
+        protected void EmitCall(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen, Func<IXamlMethod, bool> method)
         {
             var selectors = context.Configuration.TypeSystem.GetType("Avalonia.Styling.Selectors");
-            var found = selectors.FindMethod(m => m.IsStatic && m.Parameters.Count > 0 &&
-                                      m.Parameters[0].FullName == "Avalonia.Styling.Selector"
-                                      && method(m));
+            var found = selectors.FindMethod(m => m.IsStatic && m.Parameters.Count > 0 && method(m));
             codeGen.EmitCall(found);
         }
     }
     
     class XamlIlSelectorInitialNode : XamlIlSelectorNode
     {
-        public XamlIlSelectorInitialNode(IXamlIlLineInfo info,
-            IXamlIlType selectorType) : base(null, info, selectorType)
+        public XamlIlSelectorInitialNode(IXamlLineInfo info,
+            IXamlType selectorType) : base(null, info, selectorType)
         {
         }
 
-        public override IXamlIlType TargetType => null;
-        protected override void DoEmit(XamlIlEmitContext context, IXamlIlEmitter codeGen) => codeGen.Ldnull();
+        public override IXamlType TargetType => null;
+        protected override void DoEmit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen) => codeGen.Ldnull();
     }
 
     class XamlIlTypeSelector : XamlIlSelectorNode
     {
         public bool Concrete { get; }
 
-        public XamlIlTypeSelector(XamlIlSelectorNode previous, IXamlIlType type, bool concrete) : base(previous)
+        public XamlIlTypeSelector(XamlIlSelectorNode previous, IXamlType type, bool concrete) : base(previous)
         {
             TargetType = type;
             Concrete = concrete;
         }
 
-        public override IXamlIlType TargetType { get; }
-        protected override void DoEmit(XamlIlEmitContext context, IXamlIlEmitter codeGen)
+        public override IXamlType TargetType { get; }
+        protected override void DoEmit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
         {
             var name = Concrete ? "OfType" : "Is";
             codeGen.Ldtype(TargetType);
@@ -214,8 +221,8 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
         }
 
 
-        public override IXamlIlType TargetType => Previous?.TargetType;
-        protected override void DoEmit(XamlIlEmitContext context, IXamlIlEmitter codeGen)
+        public override IXamlType TargetType => Previous?.TargetType;
+        protected override void DoEmit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
         {
             codeGen.Ldstr(String);
             var name = _type.ToString();
@@ -239,8 +246,8 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             _type = type;
         }
 
-        public override IXamlIlType TargetType => null;
-        protected override void DoEmit(XamlIlEmitContext context, IXamlIlEmitter codeGen)
+        public override IXamlType TargetType => null;
+        protected override void DoEmit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
         {
             var name = _type.ToString();
             EmitCall(context, codeGen,
@@ -257,8 +264,8 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             Argument = argument;
         }
 
-        public override IXamlIlType TargetType => Previous?.TargetType;
-        protected override void DoEmit(XamlIlEmitContext context, IXamlIlEmitter codeGen)
+        public override IXamlType TargetType => Previous?.TargetType;
+        protected override void DoEmit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
         {
             context.Emit(Argument, codeGen, Type.GetClrType());
             EmitCall(context, codeGen,
@@ -269,22 +276,22 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
     class XamlIlPropertyEqualsSelector : XamlIlSelectorNode
     {
         public XamlIlPropertyEqualsSelector(XamlIlSelectorNode previous,
-            IXamlIlProperty property,
-            IXamlIlAstValueNode value)
+            IXamlProperty property,
+            IXamlAstValueNode value)
             : base(previous)
         {
             Property = property;
             Value = value;
         }
 
-        public IXamlIlProperty Property { get; set; }
-        public IXamlIlAstValueNode Value { get; set; }
+        public IXamlProperty Property { get; set; }
+        public IXamlAstValueNode Value { get; set; }
         
-        public override IXamlIlType TargetType => Previous?.TargetType;
-        protected override void DoEmit(XamlIlEmitContext context, IXamlIlEmitter codeGen)
+        public override IXamlType TargetType => Previous?.TargetType;
+        protected override void DoEmit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
         {
             if (!XamlIlAvaloniaPropertyHelper.Emit(context, codeGen, Property))
-                throw new XamlIlLoadException(
+                throw new XamlLoadException(
                     $"{Property.Name} of {(Property.Setter ?? Property.Getter).DeclaringType.GetFqn()} doesn't seem to be an AvaloniaProperty",
                     this);
             context.Emit(Value, codeGen, context.Configuration.WellKnownTypes.Object);
@@ -299,7 +306,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
     class XamlIlOrSelectorNode : XamlIlSelectorNode
     {
         List<XamlIlSelectorNode> _selectors = new List<XamlIlSelectorNode>();
-        public XamlIlOrSelectorNode(IXamlIlLineInfo info, IXamlIlType selectorType) : base(null, info, selectorType)
+        public XamlIlOrSelectorNode(IXamlLineInfo info, IXamlType selectorType) : base(null, info, selectorType)
         {
         }
 
@@ -308,12 +315,39 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             _selectors.Add(node);
         }
         
-        //TODO: actually find the type
-        public override IXamlIlType TargetType => _selectors.FirstOrDefault()?.TargetType;
-        protected override void DoEmit(XamlIlEmitContext context, IXamlIlEmitter codeGen)
+        public override IXamlType TargetType
+        {
+            get
+            {
+                IXamlType result = null;
+
+                foreach (var selector in _selectors)
+                {
+                    if (selector.TargetType == null)
+                    {
+                        return null;
+                    }
+                    else if (result == null)
+                    {
+                        result = selector.TargetType;
+                    }
+                    else
+                    {
+                        while (!result.IsAssignableFrom(selector.TargetType))
+                        {
+                            result = result.BaseType;
+                        }
+                    }
+                }
+
+                return result;
+            }
+        }
+
+        protected override void DoEmit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
         {
             if (_selectors.Count == 0)
-                throw new XamlIlLoadException("Invalid selector count", this);
+                throw new XamlLoadException("Invalid selector count", this);
             if (_selectors.Count == 1)
             {
                 _selectors[0].Emit(context, codeGen);
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
new file mode 100644
index 0000000000..e816265422
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
@@ -0,0 +1,124 @@
+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)
+        {
+            if (!(node is XamlAstObjectNode on
+                  && 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 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]);
+                property.Values = new List<IXamlAstValueNode> {avaloniaPropertyNode};
+                propType = avaloniaPropertyNode.AvaloniaPropertyType;
+            }
+            else
+            {
+                var propertyPath = on.Children.OfType<XamlAstXamlPropertyValueNode>()
+                    .FirstOrDefault(x => x.Property.GetClrProperty().Name == "PropertyPath");
+                if (propertyPath == null)
+                    throw new XamlX.XamlParseException("Setter without a property or property path is not valid", node);
+                if (propertyPath.Values[0] is IXamlIlPropertyPathNode ppn
+                    && ppn.PropertyType != null)
+                    propType = ppn.PropertyType;
+                else
+                    throw new XamlX.XamlParseException("Unable to get the property path property type", node);
+            }
+
+            var valueProperty = on.Children
+                .OfType<XamlAstXamlPropertyValueNode>().FirstOrDefault(p => p.Property.GetClrProperty().Name == "Value");
+            if (valueProperty?.Values?.Count == 1 && valueProperty.Values[0] is XamlAstTextNode)
+            {
+                if (!XamlTransformHelpers.TryGetCorrectlyTypedValue(context, valueProperty.Values[0],
+                        propType, out var converted))
+                    throw new XamlParseException(
+                        $"Unable to convert property value to {propType.GetFqn()}",
+                        valueProperty.Values[0]);
+
+                valueProperty.Property = new SetterValueProperty(valueProperty.Property,
+                    on.Type.GetClrType(), propType, context.GetAvaloniaTypes());
+            }
+
+            return node;
+        }
+
+        class SetterValueProperty : XamlAstClrProperty
+        {
+            public SetterValueProperty(IXamlLineInfo line, IXamlType setterType, IXamlType targetType,
+                AvaloniaXamlIlWellKnownTypes types)
+                : base(line, "Value", setterType, null)
+            {
+                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));
+            }
+            
+            class XamlIlDirectCallPropertySetter : IXamlPropertySetter, IXamlEmitablePropertySetter<IXamlILEmitter>
+            {
+                private readonly IXamlMethod _method;
+                private readonly IXamlType _type;
+                public IXamlType TargetType { get; }
+                public PropertySetterBinderParameters BinderParameters { get; } = new PropertySetterBinderParameters();
+                public IReadOnlyList<IXamlType> Parameters { get; }
+                public void Emit(IXamlILEmitter codegen)
+                {
+                    if (_type.IsValueType)
+                        codegen.Box(_type);
+                    codegen.EmitCall(_method, true);
+                }
+
+                public XamlIlDirectCallPropertySetter(IXamlMethod method, IXamlType type)
+                {
+                    _method = method;
+                    _type = type;
+                    Parameters = new[] {type};
+                    TargetType = method.ThisOrFirstParameter();
+                }
+            }
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlTransformInstanceAttachedProperties.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlTransformInstanceAttachedProperties.cs
similarity index 75%
rename from src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlTransformInstanceAttachedProperties.cs
rename to src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlTransformInstanceAttachedProperties.cs
index 548f0161d6..f87e73a783 100644
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlTransformInstanceAttachedProperties.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlTransformInstanceAttachedProperties.cs
@@ -1,26 +1,28 @@
 using System.Collections.Generic;
 using System.Linq;
-using XamlIl;
-using XamlIl.Ast;
-using XamlIl.Transform;
-using XamlIl.TypeSystem;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Emit;
+using XamlX.IL;
+using XamlX.Transform;
+using XamlX.TypeSystem;
 
 namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
 {
-    class AvaloniaXamlIlTransformInstanceAttachedProperties : IXamlIlAstTransformer
+    class AvaloniaXamlIlTransformInstanceAttachedProperties : IXamlAstTransformer
     {
 
-        public IXamlIlAstNode Transform(XamlIlAstTransformationContext context, IXamlIlAstNode node)
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
         {
-            if (node is XamlIlAstNamePropertyReference prop 
-                && prop.TargetType is XamlIlAstClrTypeReference targetRef 
-                && prop.DeclaringType is XamlIlAstClrTypeReference declaringRef)
+            if (node is XamlAstNamePropertyReference prop 
+                && prop.TargetType is XamlAstClrTypeReference targetRef 
+                && prop.DeclaringType is XamlAstClrTypeReference declaringRef)
             {
                 // Target and declared type aren't assignable but both inherit from AvaloniaObject
                 var avaloniaObject = context.Configuration.TypeSystem.FindType("Avalonia.AvaloniaObject");
                 if (avaloniaObject.IsAssignableFrom(targetRef.Type)
                     && avaloniaObject.IsAssignableFrom(declaringRef.Type)
-                    && !targetRef.Type.IsAssignableFrom(declaringRef.Type))
+                    && !declaringRef.Type.IsAssignableFrom(targetRef.Type))
                 {
                     // Instance property
                     var clrProp = declaringRef.Type.GetAllProperties().FirstOrDefault(p => p.Name == prop.Name);
@@ -70,21 +72,21 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             return node;
         }
 
-        class AvaloniaAttachedInstanceProperty : XamlIlAstClrProperty, IXamlIlAvaloniaProperty
+        class AvaloniaAttachedInstanceProperty : XamlAstClrProperty, IXamlIlAvaloniaProperty
         {
-            private readonly XamlIlTransformerConfiguration _config;
-            private readonly IXamlIlType _declaringType;
-            private readonly IXamlIlType _avaloniaPropertyType;
-            private readonly IXamlIlType _avaloniaObject;
-            private readonly IXamlIlField _field;
-
-            public AvaloniaAttachedInstanceProperty(XamlIlAstNamePropertyReference prop,
-                XamlIlTransformerConfiguration config,
-                IXamlIlType declaringType,
-                IXamlIlType type,
-                IXamlIlType avaloniaPropertyType,
-                IXamlIlType avaloniaObject,
-                IXamlIlField field) : base(prop, prop.Name,
+            private readonly TransformerConfiguration _config;
+            private readonly IXamlType _declaringType;
+            private readonly IXamlType _avaloniaPropertyType;
+            private readonly IXamlType _avaloniaObject;
+            private readonly IXamlField _field;
+
+            public AvaloniaAttachedInstanceProperty(XamlAstNamePropertyReference prop,
+                TransformerConfiguration config,
+                IXamlType declaringType,
+                IXamlType type,
+                IXamlType avaloniaPropertyType,
+                IXamlType avaloniaObject,
+                IXamlField field) : base(prop, prop.Name,
                 declaringType, null)
             
             
@@ -104,11 +106,11 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                 Getter = new GetterMethod(this);
             }
 
-            public IXamlIlType PropertyType { get;  }
+            public IXamlType PropertyType { get;  }
 
-            public IXamlIlField AvaloniaProperty => _field;
+            public IXamlField AvaloniaProperty => _field;
             
-            class SetterMethod : IXamlIlPropertySetter
+            class SetterMethod : IXamlPropertySetter, IXamlEmitablePropertySetter<IXamlILEmitter>
             {
                 private readonly AvaloniaAttachedInstanceProperty _parent;
 
@@ -118,10 +120,10 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                     Parameters = new[] {_parent._avaloniaObject, _parent.PropertyType};
                 }
 
-                public IXamlIlType TargetType => _parent.DeclaringType;
+                public IXamlType TargetType => _parent.DeclaringType;
                 public PropertySetterBinderParameters BinderParameters { get; } = new PropertySetterBinderParameters();
-                public IReadOnlyList<IXamlIlType> Parameters { get; }
-                public void Emit(IXamlIlEmitter emitter)
+                public IReadOnlyList<IXamlType> Parameters { get; }
+                public void Emit(IXamlILEmitter emitter)
                 {
                     var so = _parent._config.WellKnownTypes.Object;
                     var method = _parent._avaloniaObject
@@ -133,7 +135,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                                          && m.Parameters[2].IsEnum
                         );
                     if (method == null)
-                        throw new XamlIlTypeSystemException(
+                        throw new XamlTypeSystemException(
                             "Unable to find SetValue(AvaloniaProperty, object, BindingPriority) on AvaloniaObject");
                     using (var loc = emitter.LocalsPool.GetLocal(_parent.PropertyType))
                         emitter
@@ -150,7 +152,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                 }
             }
 
-            class GetterMethod :  IXamlIlCustomEmitMethod
+            class GetterMethod :  IXamlCustomEmitMethod<IXamlILEmitter>
             {
                 public GetterMethod(AvaloniaAttachedInstanceProperty parent) 
                 {
@@ -163,16 +165,19 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                 public bool IsPublic => true;
                 public bool IsStatic => true;
                 public string Name { get; protected set; }
-                public IXamlIlType DeclaringType { get; }
-                public IXamlIlMethod MakeGenericMethod(IReadOnlyList<IXamlIlType> typeArguments) 
+                public IXamlType DeclaringType { get; }
+                public IXamlMethod MakeGenericMethod(IReadOnlyList<IXamlType> typeArguments) 
                     => throw new System.NotSupportedException();
 
 
-                public bool Equals(IXamlIlMethod other) =>
+                public bool Equals(IXamlMethod other) =>
                     other is GetterMethod m && m.Name == Name && m.DeclaringType.Equals(DeclaringType);
-                public IXamlIlType ReturnType => Parent.PropertyType;
-                public IReadOnlyList<IXamlIlType> Parameters { get; }
-                public void EmitCall(IXamlIlEmitter emitter)
+                public IXamlType ReturnType => Parent.PropertyType;
+                public IReadOnlyList<IXamlType> Parameters { get; }
+
+                public IReadOnlyList<IXamlCustomAttribute> CustomAttributes => DeclaringType.CustomAttributes;
+
+                public void EmitCall(IXamlILEmitter emitter)
                 {
                     var method = Parent._avaloniaObject
                         .FindMethod(m => m.IsPublic && !m.IsStatic && m.Name == "GetValue"
@@ -180,7 +185,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                                          m.Parameters.Count == 1
                                          && m.Parameters[0].Equals(Parent._avaloniaPropertyType));
                     if (method == null)
-                        throw new XamlIlTypeSystemException(
+                        throw new XamlTypeSystemException(
                             "Unable to find T GetValue<T>(AvaloniaProperty<T>) on AvaloniaObject");
                     emitter
                         .Ldsfld(Parent._field)
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlTransformSyntheticCompiledBindingMembers.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlTransformSyntheticCompiledBindingMembers.cs
new file mode 100644
index 0000000000..ba05347a52
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlTransformSyntheticCompiledBindingMembers.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Transform;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
+{
+    class AvaloniaXamlIlTransformSyntheticCompiledBindingMembers : IXamlAstTransformer
+    {
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+        {
+            if (node is XamlAstNamePropertyReference prop
+               && prop.TargetType is XamlAstClrTypeReference targetRef
+               && targetRef.GetClrType().Equals(context.GetAvaloniaTypes().CompiledBindingExtension))
+            {
+                if (prop.Name == "ElementName")
+                {
+                    return new AvaloniaSyntheticCompiledBindingProperty(node,
+                        SyntheticCompiledBindingPropertyName.ElementName);
+                }
+                else if (prop.Name == "RelativeSource")
+                {
+                    return new AvaloniaSyntheticCompiledBindingProperty(node,
+                        SyntheticCompiledBindingPropertyName.RelativeSource);
+                }
+            }
+
+            return node;
+        }
+    }
+
+    enum SyntheticCompiledBindingPropertyName
+    {
+        ElementName,
+        RelativeSource
+    }
+
+    class AvaloniaSyntheticCompiledBindingProperty : XamlAstNode, IXamlAstPropertyReference
+    {
+        public SyntheticCompiledBindingPropertyName Name { get; }
+
+        public AvaloniaSyntheticCompiledBindingProperty(
+            IXamlLineInfo lineInfo,
+            SyntheticCompiledBindingPropertyName name)
+            : base(lineInfo)
+        {
+            Name = name;
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlTransitionsTypeMetadataTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlTransitionsTypeMetadataTransformer.cs
similarity index 74%
rename from src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlTransitionsTypeMetadataTransformer.cs
rename to src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlTransitionsTypeMetadataTransformer.cs
index c4136f4824..4be2fc6f60 100644
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlTransitionsTypeMetadataTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlTransitionsTypeMetadataTransformer.cs
@@ -1,17 +1,17 @@
-using XamlIl.Ast;
-using XamlIl.Transform;
+using XamlX.Ast;
+using XamlX.Transform;
 
 namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
 {
-    class AvaloniaXamlIlTransitionsTypeMetadataTransformer : IXamlIlAstTransformer
+    class AvaloniaXamlIlTransitionsTypeMetadataTransformer : IXamlAstTransformer
     {
-        public IXamlIlAstNode Transform(XamlIlAstTransformationContext context, IXamlIlAstNode node)
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
         {
-            if (node is XamlIlAstObjectNode on)
+            if (node is XamlAstObjectNode on)
             {
                 foreach (var ch in on.Children)
                 {
-                    if (ch is XamlIlAstXamlPropertyValueNode pn
+                    if (ch is XamlAstXamlPropertyValueNode pn
                         && pn.Property.GetClrProperty().Getter?.ReturnType.Equals(context.GetAvaloniaTypes().Transitions) == true)
                     {
                         for (var c = 0; c < pn.Values.Count; c++)
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
new file mode 100644
index 0000000000..125701ca9e
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
@@ -0,0 +1,190 @@
+using System.Collections.Generic;
+using System.Linq;
+using XamlX.Emit;
+using XamlX.IL;
+using XamlX.Transform;
+using XamlX.TypeSystem;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
+{
+    class AvaloniaXamlIlWellKnownTypes
+    {
+        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 IBinding { get; }
+        public IXamlMethod AvaloniaObjectBindMethod { get; }
+        public IXamlMethod AvaloniaObjectSetValueMethod { get; }
+        public IXamlType IDisposable { get; }
+        public XamlTypeWellKnownTypes XamlIlTypes { get; }
+        public XamlLanguageTypeMappings XamlIlMappings { get; }
+        public IXamlType Transitions { get; }
+        public IXamlType AssignBindingAttribute { get; }
+        public IXamlType UnsetValueType { get; }
+        public IXamlType StyledElement { get; }
+        public IXamlType NameScope { get; }
+        public IXamlMethod NameScopeSetNameScope { get; }
+        public IXamlType INameScope { get; }
+        public IXamlMethod INameScopeRegister { get; }
+        public IXamlMethod INameScopeComplete { get; }
+        public IXamlType IPropertyInfo { get; }
+        public IXamlType ClrPropertyInfo { get; }
+        public IXamlType PropertyPath { get; }
+        public IXamlType PropertyPathBuilder { get; }
+        public IXamlType IPropertyAccessor { get; }
+        public IXamlType PropertyInfoAccessorFactory { get; }
+        public IXamlType CompiledBindingPathBuilder { get; }
+        public IXamlType CompiledBindingPath { get; }
+        public IXamlType CompiledBindingExtension { get; }
+
+        public IXamlType ResolveByNameExtension { get; }
+
+        public IXamlType DataTemplate { get; }
+        public IXamlType IDataTemplate { get; }
+        public IXamlType IItemsPresenterHost { get; }
+        public IXamlType ItemsRepeater { get; }
+        public IXamlType ReflectionBindingExtension { get; }
+
+        public IXamlType RelativeSource { get; }
+        public IXamlType UInt { get; }
+        public IXamlType Int { get; }
+        public IXamlType Long { get; }
+        public IXamlType Uri { get; }
+        public IXamlType FontFamily { get; }
+        public IXamlConstructor FontFamilyConstructorUriName { get; }
+        public IXamlType Thickness { get; }
+        public IXamlConstructor ThicknessFullConstructor { get; }
+        public IXamlType Point { get; }
+        public IXamlConstructor PointFullConstructor { get; }
+        public IXamlType Vector { get; }
+        public IXamlConstructor VectorFullConstructor { get; }
+        public IXamlType Size { get; }
+        public IXamlConstructor SizeFullConstructor { get; }
+        public IXamlType Matrix { get; }
+        public IXamlConstructor MatrixFullConstructor { get; }
+        public IXamlType CornerRadius { get; }
+        public IXamlConstructor CornerRadiusFullConstructor { get; }
+        public IXamlType GridLength { get; }
+        public IXamlConstructor GridLengthConstructorValueType { get; }
+        public IXamlType Color { get; }
+        public IXamlType StandardCursorType { get; }
+        public IXamlType Cursor { get; }
+        public IXamlConstructor CursorTypeConstructor { get; }
+        public IXamlType RowDefinition { get; }
+        public IXamlType RowDefinitions { get; }
+        public IXamlType ColumnDefinition { get; }
+        public IXamlType ColumnDefinitions { get; }
+
+        public AvaloniaXamlIlWellKnownTypes(TransformerConfiguration cfg)
+        {
+            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");
+            BindingPriority = cfg.TypeSystem.GetType("Avalonia.Data.BindingPriority");
+            IBinding = cfg.TypeSystem.GetType("Avalonia.Data.IBinding");
+            IDisposable = cfg.TypeSystem.GetType("System.IDisposable");
+            Transitions = cfg.TypeSystem.GetType("Avalonia.Animation.Transitions");
+            AssignBindingAttribute = cfg.TypeSystem.GetType("Avalonia.Data.AssignBindingAttribute");
+            AvaloniaObjectBindMethod = AvaloniaObjectExtensions.FindMethod("Bind", IDisposable, false, IAvaloniaObject,
+                AvaloniaProperty,
+                IBinding, cfg.WellKnownTypes.Object);
+            UnsetValueType = cfg.TypeSystem.GetType("Avalonia.UnsetValueType");
+            StyledElement = cfg.TypeSystem.GetType("Avalonia.StyledElement");
+            INameScope = cfg.TypeSystem.GetType("Avalonia.Controls.INameScope");
+            INameScopeRegister = INameScope.GetMethod(
+                new FindMethodMethodSignature("Register", XamlIlTypes.Void,
+                     XamlIlTypes.String, XamlIlTypes.Object)
+                {
+                    IsStatic = false,
+                    DeclaringOnly = true,
+                    IsExactMatch = true
+                });
+            INameScopeComplete = INameScope.GetMethod(
+                new FindMethodMethodSignature("Complete", XamlIlTypes.Void)
+                {
+                    IsStatic = false,
+                    DeclaringOnly = true,
+                    IsExactMatch = true
+                });
+            NameScope = cfg.TypeSystem.GetType("Avalonia.Controls.NameScope");
+            NameScopeSetNameScope = NameScope.GetMethod(new FindMethodMethodSignature("SetNameScope",
+                XamlIlTypes.Void, StyledElement, INameScope)
+            { IsStatic = true });
+            AvaloniaObjectSetValueMethod = AvaloniaObject.FindMethod("SetValue", XamlIlTypes.Void,
+                false, AvaloniaProperty, XamlIlTypes.Object, BindingPriority);
+            IPropertyInfo = cfg.TypeSystem.GetType("Avalonia.Data.Core.IPropertyInfo");
+            ClrPropertyInfo = cfg.TypeSystem.GetType("Avalonia.Data.Core.ClrPropertyInfo");
+            PropertyPath = cfg.TypeSystem.GetType("Avalonia.Data.Core.PropertyPath");
+            PropertyPathBuilder = cfg.TypeSystem.GetType("Avalonia.Data.Core.PropertyPathBuilder");
+            IPropertyAccessor = cfg.TypeSystem.GetType("Avalonia.Data.Core.Plugins.IPropertyAccessor");
+            PropertyInfoAccessorFactory = cfg.TypeSystem.GetType("Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings.PropertyInfoAccessorFactory");
+            CompiledBindingPathBuilder = cfg.TypeSystem.GetType("Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings.CompiledBindingPathBuilder");
+            CompiledBindingPath = cfg.TypeSystem.GetType("Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings.CompiledBindingPath");
+            CompiledBindingExtension = cfg.TypeSystem.GetType("Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindingExtension");
+            ResolveByNameExtension = cfg.TypeSystem.GetType("Avalonia.Markup.Xaml.MarkupExtensions.ResolveByNameExtension");
+            DataTemplate = cfg.TypeSystem.GetType("Avalonia.Markup.Xaml.Templates.DataTemplate");
+            IDataTemplate = cfg.TypeSystem.GetType("Avalonia.Controls.Templates.IDataTemplate");
+            IItemsPresenterHost = cfg.TypeSystem.GetType("Avalonia.Controls.Presenters.IItemsPresenterHost");
+            ItemsRepeater = cfg.TypeSystem.GetType("Avalonia.Controls.ItemsRepeater");
+            ReflectionBindingExtension = cfg.TypeSystem.GetType("Avalonia.Markup.Xaml.MarkupExtensions.ReflectionBindingExtension");
+            RelativeSource = cfg.TypeSystem.GetType("Avalonia.Data.RelativeSource");
+            UInt = cfg.TypeSystem.GetType("System.UInt32");
+            Int = cfg.TypeSystem.GetType("System.Int32");
+            Long = cfg.TypeSystem.GetType("System.Int64");
+            Uri = cfg.TypeSystem.GetType("System.Uri");
+            FontFamily = cfg.TypeSystem.GetType("Avalonia.Media.FontFamily");
+            FontFamilyConstructorUriName = FontFamily.GetConstructor(new List<IXamlType> { Uri, XamlIlTypes.String });
+
+            (IXamlType, IXamlConstructor) GetNumericTypeInfo(string name, IXamlType componentType, int componentCount)
+            {
+                var type = cfg.TypeSystem.GetType(name);
+                var ctor = type.GetConstructor(Enumerable.Range(0, componentCount).Select(_ => componentType).ToList());
+
+                return (type, ctor);
+            }
+
+            (Thickness, ThicknessFullConstructor) = GetNumericTypeInfo("Avalonia.Thickness", XamlIlTypes.Double, 4);
+            (Point, PointFullConstructor) = GetNumericTypeInfo("Avalonia.Point", XamlIlTypes.Double, 2);
+            (Vector, VectorFullConstructor) = GetNumericTypeInfo("Avalonia.Vector", XamlIlTypes.Double, 2);
+            (Size, SizeFullConstructor) = GetNumericTypeInfo("Avalonia.Size", XamlIlTypes.Double, 2);
+            (Matrix, MatrixFullConstructor) = GetNumericTypeInfo("Avalonia.Matrix", XamlIlTypes.Double, 6);
+            (CornerRadius, CornerRadiusFullConstructor) = GetNumericTypeInfo("Avalonia.CornerRadius", XamlIlTypes.Double, 4);
+
+            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");
+            StandardCursorType = cfg.TypeSystem.GetType("Avalonia.Input.StandardCursorType");
+            Cursor = cfg.TypeSystem.GetType("Avalonia.Input.Cursor");
+            CursorTypeConstructor = Cursor.GetConstructor(new List<IXamlType> { StandardCursorType });
+            ColumnDefinition = cfg.TypeSystem.GetType("Avalonia.Controls.ColumnDefinition");
+            ColumnDefinitions = cfg.TypeSystem.GetType("Avalonia.Controls.ColumnDefinitions");
+            RowDefinition = cfg.TypeSystem.GetType("Avalonia.Controls.RowDefinition");
+            RowDefinitions = cfg.TypeSystem.GetType("Avalonia.Controls.RowDefinitions");
+        }
+    }
+
+    static class AvaloniaXamlIlWellKnownTypesExtensions
+    {
+        public static AvaloniaXamlIlWellKnownTypes GetAvaloniaTypes(this AstTransformationContext ctx)
+        {
+            if (ctx.TryGetItem<AvaloniaXamlIlWellKnownTypes>(out var rv))
+                return rv;
+            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))
+                return rv;
+            ctx.SetItem(rv = new AvaloniaXamlIlWellKnownTypes(ctx.Configuration));
+            return rv;
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/IgnoredDirectivesTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/IgnoredDirectivesTransformer.cs
similarity index 55%
rename from src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/IgnoredDirectivesTransformer.cs
rename to src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/IgnoredDirectivesTransformer.cs
index a79a4977ef..1f2508715e 100644
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/IgnoredDirectivesTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/IgnoredDirectivesTransformer.cs
@@ -1,17 +1,17 @@
 using System.Linq;
-using XamlIl;
-using XamlIl.Ast;
-using XamlIl.Transform;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Transform;
 
 namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
 {
-    class IgnoredDirectivesTransformer : IXamlIlAstTransformer
+    class IgnoredDirectivesTransformer : IXamlAstTransformer
     {
-        public IXamlIlAstNode Transform(XamlIlAstTransformationContext context, IXamlIlAstNode node)
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
         {
-            if (node is XamlIlAstObjectNode no)
+            if (node is XamlAstObjectNode no)
             {
-                foreach (var d in no.Children.OfType<XamlIlAstXmlDirective>().ToList())
+                foreach (var d in no.Children.OfType<XamlAstXmlDirective>().ToList())
                 {
                     if (d.Namespace == XamlNamespaces.Xaml2006)
                     {
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/XNameTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/XNameTransformer.cs
similarity index 55%
rename from src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/XNameTransformer.cs
rename to src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/XNameTransformer.cs
index dd64ab542a..f4eb7cf5f9 100644
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/XNameTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/XNameTransformer.cs
@@ -1,30 +1,29 @@
-using XamlIl;
-using XamlIl.Ast;
-using XamlIl.Transform;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Transform;
 
 namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
 {
-    class XNameTransformer : IXamlIlAstTransformer
+    class XNameTransformer : IXamlAstTransformer
     {
-        
         /// <summary>
         /// Converts x:Name directives to regular Name assignments
         /// </summary>
         /// <returns></returns>
-        public IXamlIlAstNode Transform(XamlIlAstTransformationContext context, IXamlIlAstNode node)
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
         {
-            if (node is XamlIlAstObjectNode on)
+            if (node is XamlAstObjectNode on)
             {
                 for (var c =0; c< on.Children.Count;c++)
                 {
                     var ch = on.Children[c];
-                    if (ch is XamlIlAstXmlDirective d
+                    if (ch is XamlAstXmlDirective d
                         && d.Namespace == XamlNamespaces.Xaml2006
                         && d.Name == "Name")
 
 
-                        on.Children[c] = new XamlIlAstXamlPropertyValueNode(d,
-                            new XamlIlAstNamePropertyReference(d, on.Type, "Name", on.Type),
+                        on.Children[c] = new XamlAstXamlPropertyValueNode(d,
+                            new XamlAstNamePropertyReference(d, on.Type, "Name", on.Type),
                             d.Values);
                 }
             }
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
similarity index 57%
rename from src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
rename to src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
index 6fc83cb5a5..7f1b8caf0d 100644
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
@@ -5,17 +5,36 @@ using System.Xml;
 using Avalonia.Markup.Xaml.Parsers;
 using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers;
 using Avalonia.Utilities;
-using XamlIl;
-using XamlIl.Ast;
-using XamlIl.Transform;
-using XamlIl.Transform.Transformers;
-using XamlIl.TypeSystem;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Transform;
+using XamlX.Transform.Transformers;
+using XamlX.TypeSystem;
+using XamlX.Emit;
+using XamlX.IL;
+
+using XamlIlEmitContext = XamlX.Emit.XamlEmitContext<XamlX.IL.IXamlILEmitter, XamlX.IL.XamlILNodeEmitResult>;
+using IXamlIlAstEmitableNode = XamlX.Emit.IXamlAstEmitableNode<XamlX.IL.IXamlILEmitter, XamlX.IL.XamlILNodeEmitResult>;
 
 namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
 {
     class XamlIlAvaloniaPropertyHelper
     {
-        public static bool Emit(XamlIlEmitContext context, IXamlIlEmitter emitter, XamlIlAstClrProperty property)
+        public static bool EmitProvideValueTarget(XamlIlEmitContext context, IXamlILEmitter emitter,
+            XamlAstClrProperty property)
+        {
+            if (Emit(context, emitter, property))
+                return true;
+            var foundClr = property.DeclaringType.Properties.FirstOrDefault(p => p.Name == property.Name);
+            if (foundClr == null)
+                return false;
+            context
+                .Configuration.GetExtra<XamlIlClrPropertyInfoEmitter>()
+                .Emit(context, emitter, foundClr);
+            return true;
+        }
+        
+        public static bool Emit(XamlIlEmitContext context, IXamlILEmitter emitter, XamlAstClrProperty property)
         {
             if (property is IXamlIlAvaloniaProperty ap)
             {
@@ -32,7 +51,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             return true;
         }
         
-        public static bool Emit(XamlIlEmitContext context, IXamlIlEmitter emitter, IXamlIlProperty property)
+        public static bool Emit(XamlIlEmitContext context, IXamlILEmitter emitter, IXamlProperty property)
         {
             var type = (property.Getter ?? property.Setter).DeclaringType;
             var name = property.Name + "Property";
@@ -44,16 +63,16 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             return true;
         }
 
-        public static IXamlIlAvaloniaPropertyNode CreateNode(XamlIlAstTransformationContext context,
-            string propertyName, IXamlIlAstTypeReference selectorTypeReference, IXamlIlLineInfo lineInfo)
+        public static IXamlIlAvaloniaPropertyNode CreateNode(AstTransformationContext context,
+            string propertyName, IXamlAstTypeReference selectorTypeReference, IXamlLineInfo lineInfo)
         {
-            XamlIlAstNamePropertyReference forgedReference;
+            XamlAstNamePropertyReference forgedReference;
             
             var parser = new PropertyParser();
             
             var parsedPropertyName = parser.Parse(new CharacterReader(propertyName.AsSpan()));
             if(parsedPropertyName.owner == null)
-                forgedReference = new XamlIlAstNamePropertyReference(lineInfo, selectorTypeReference,
+                forgedReference = new XamlAstNamePropertyReference(lineInfo, selectorTypeReference,
                     propertyName, selectorTypeReference);
             else
             {
@@ -62,101 +81,107 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                     xmlOwner += ":";
                 xmlOwner += parsedPropertyName.owner;
                 
-                var tref = XamlIlTypeReferenceResolver.ResolveType(context, xmlOwner, false, lineInfo, true);
+                var tref = TypeReferenceResolver.ResolveType(context, xmlOwner, false, lineInfo, true);
 
                 var propertyFieldName = parsedPropertyName.name + "Property";
                 var found = tref.Type.GetAllFields()
                     .FirstOrDefault(f => f.IsStatic && f.IsPublic && f.Name == propertyFieldName);
                 if (found == null)
-                    throw new XamlIlParseException(
+                    throw new XamlX.XamlParseException(
                         $"Unable to find {propertyFieldName} field on type {tref.Type.GetFullName()}", lineInfo);
                 return new XamlIlAvaloniaPropertyFieldNode(context.GetAvaloniaTypes(), lineInfo, found);
             }
 
             var clrProperty =
-                ((XamlIlAstClrProperty)new XamlIlPropertyReferenceResolver().Transform(context,
+                ((XamlAstClrProperty)new PropertyReferenceResolver().Transform(context,
                     forgedReference));
             return new XamlIlAvaloniaPropertyNode(lineInfo,
                 context.Configuration.TypeSystem.GetType("Avalonia.AvaloniaProperty"),
                 clrProperty);
         }
+
+        public static IXamlType GetAvaloniaPropertyType(IXamlField field,
+            AvaloniaXamlIlWellKnownTypes types, IXamlLineInfo lineInfo)
+        {
+            var avaloniaPropertyType = field.FieldType;
+            while (avaloniaPropertyType != null)
+            {
+                if (avaloniaPropertyType.GenericTypeDefinition?.Equals(types.AvaloniaPropertyT) == true)
+                {
+                    return avaloniaPropertyType.GenericArguments[0];
+                }
+
+                avaloniaPropertyType = avaloniaPropertyType.BaseType;
+            }
+
+            throw new XamlX.XamlParseException(
+                $"{field.Name}'s type {field.FieldType} doesn't inherit from  AvaloniaProperty<T>, make sure to use typed properties",
+                lineInfo);
+
+        }
     }
 
-    interface IXamlIlAvaloniaPropertyNode : IXamlIlAstValueNode
+    interface IXamlIlAvaloniaPropertyNode : IXamlAstValueNode
     {
-        IXamlIlType AvaloniaPropertyType { get; }
+        IXamlType AvaloniaPropertyType { get; }
     }
     
-    class XamlIlAvaloniaPropertyNode : XamlIlAstNode, IXamlIlAstValueNode, IXamlIlAstEmitableNode, IXamlIlAvaloniaPropertyNode
+    class XamlIlAvaloniaPropertyNode : XamlAstNode, IXamlAstValueNode, IXamlIlAstEmitableNode, IXamlIlAvaloniaPropertyNode
     {
-        public XamlIlAvaloniaPropertyNode(IXamlIlLineInfo lineInfo, IXamlIlType type, XamlIlAstClrProperty property) : base(lineInfo)
+        public XamlIlAvaloniaPropertyNode(IXamlLineInfo lineInfo, IXamlType type, XamlAstClrProperty property) : base(lineInfo)
         {
-            Type = new XamlIlAstClrTypeReference(this, type, false);
+            Type = new XamlAstClrTypeReference(this, type, false);
             Property = property;
             AvaloniaPropertyType = Property.Getter?.ReturnType
                                    ?? Property.Setters.First().Parameters[0];
         }
 
-        public XamlIlAstClrProperty Property { get; }
+        public XamlAstClrProperty Property { get; }
 
-        public IXamlIlAstTypeReference Type { get; }
-        public XamlIlNodeEmitResult Emit(XamlIlEmitContext context, IXamlIlEmitter codeGen)
+        public IXamlAstTypeReference Type { get; }
+        public XamlILNodeEmitResult Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
         {
             if (!XamlIlAvaloniaPropertyHelper.Emit(context, codeGen, Property))
-                throw new XamlIlLoadException(Property.Name + " is not an AvaloniaProperty", this);
-            return XamlIlNodeEmitResult.Type(0, Type.GetClrType());
+                throw new XamlX.XamlLoadException(Property.Name + " is not an AvaloniaProperty", this);
+            return XamlILNodeEmitResult.Type(0, Type.GetClrType());
         }
 
-        public IXamlIlType AvaloniaPropertyType { get; }
+        public IXamlType AvaloniaPropertyType { get; }
     }
 
-    class XamlIlAvaloniaPropertyFieldNode : XamlIlAstNode, IXamlIlAstValueNode, IXamlIlAstEmitableNode, IXamlIlAvaloniaPropertyNode
+    class XamlIlAvaloniaPropertyFieldNode : XamlAstNode, IXamlAstValueNode, IXamlIlAstEmitableNode, IXamlIlAvaloniaPropertyNode
     {
-        private readonly IXamlIlField _field;
+        private readonly IXamlField _field;
 
         public XamlIlAvaloniaPropertyFieldNode(AvaloniaXamlIlWellKnownTypes types,
-            IXamlIlLineInfo lineInfo, IXamlIlField field) : base(lineInfo)
+            IXamlLineInfo lineInfo, IXamlField field) : base(lineInfo)
         {
             _field = field;
-            var avaloniaPropertyType = field.FieldType;
-            while (avaloniaPropertyType != null)
-            {
-                if (avaloniaPropertyType.GenericTypeDefinition?.Equals(types.AvaloniaPropertyT) == true)
-                {
-                    AvaloniaPropertyType = avaloniaPropertyType.GenericArguments[0];
-                    return;
-                }
-
-                avaloniaPropertyType = avaloniaPropertyType.BaseType;
-            }
-
-            throw new XamlIlParseException(
-                $"{field.Name}'s type {field.FieldType} doesn't inherit from AvaloniaProperty<T>, make sure to use typed properties",
-                lineInfo);
-
+            AvaloniaPropertyType = XamlIlAvaloniaPropertyHelper.GetAvaloniaPropertyType(field,
+                types, lineInfo);
         }
         
         
 
-        public IXamlIlAstTypeReference Type => new XamlIlAstClrTypeReference(this, _field.FieldType, false);
-        public XamlIlNodeEmitResult Emit(XamlIlEmitContext context, IXamlIlEmitter codeGen)
+        public IXamlAstTypeReference Type => new XamlAstClrTypeReference(this, _field.FieldType, false);
+        public XamlILNodeEmitResult Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
         {
             codeGen.Ldsfld(_field);
-            return XamlIlNodeEmitResult.Type(0, _field.FieldType);
+            return XamlILNodeEmitResult.Type(0, _field.FieldType);
         }
 
-        public IXamlIlType AvaloniaPropertyType { get; }
+        public IXamlType AvaloniaPropertyType { get; }
     }
 
     interface IXamlIlAvaloniaProperty
     {
-        IXamlIlField AvaloniaProperty { get; }
+        IXamlField AvaloniaProperty { get; }
     }
     
-    class XamlIlAvaloniaProperty : XamlIlAstClrProperty, IXamlIlAvaloniaProperty
+    class XamlIlAvaloniaProperty : XamlAstClrProperty, IXamlIlAvaloniaProperty
     {
-        public IXamlIlField AvaloniaProperty { get; }
-        public XamlIlAvaloniaProperty(XamlIlAstClrProperty original, IXamlIlField field,
+        public IXamlField AvaloniaProperty { get; }
+        public XamlIlAvaloniaProperty(XamlAstClrProperty original, IXamlField field,
             AvaloniaXamlIlWellKnownTypes types)
             :base(original, original.Name, original.DeclaringType, original.Getter, original.Setters)
         {
@@ -168,41 +193,41 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             Setters.Insert(0, new UnsetValueSetter(types, original.DeclaringType, field));
         }
 
-        abstract class AvaloniaPropertyCustomSetter : IXamlIlPropertySetter
+        abstract class AvaloniaPropertyCustomSetter : IXamlPropertySetter, IXamlEmitablePropertySetter<IXamlILEmitter>
         {
             protected AvaloniaXamlIlWellKnownTypes Types;
-            protected IXamlIlField AvaloniaProperty;
+            protected IXamlField AvaloniaProperty;
 
             public AvaloniaPropertyCustomSetter(AvaloniaXamlIlWellKnownTypes types,
-                IXamlIlType declaringType,
-                IXamlIlField avaloniaProperty)
+                IXamlType declaringType,
+                IXamlField avaloniaProperty)
             {
                 Types = types;
                 AvaloniaProperty = avaloniaProperty;
                 TargetType = declaringType;
             }
 
-            public IXamlIlType TargetType { get; }
+            public IXamlType TargetType { get; }
 
             public PropertySetterBinderParameters BinderParameters { get; } = new PropertySetterBinderParameters
             {
                 AllowXNull = false
             };
 
-            public IReadOnlyList<IXamlIlType> Parameters { get; set; }
-            public abstract void Emit(IXamlIlEmitter codegen);
+            public IReadOnlyList<IXamlType> Parameters { get; set; }
+            public abstract void Emit(IXamlILEmitter codegen);
         }
 
         class BindingSetter : AvaloniaPropertyCustomSetter
         {
             public BindingSetter(AvaloniaXamlIlWellKnownTypes types,
-                IXamlIlType declaringType,
-                IXamlIlField avaloniaProperty) : base(types, declaringType, avaloniaProperty)
+                IXamlType declaringType,
+                IXamlField avaloniaProperty) : base(types, declaringType, avaloniaProperty)
             {
                 Parameters = new[] {types.IBinding};
             }
 
-            public override void Emit(IXamlIlEmitter emitter)
+            public override void Emit(IXamlILEmitter emitter)
             {
                 using (var bloc = emitter.LocalsPool.GetLocal(Types.IBinding))
                     emitter
@@ -217,13 +242,13 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
 
         class UnsetValueSetter : AvaloniaPropertyCustomSetter
         {
-            public UnsetValueSetter(AvaloniaXamlIlWellKnownTypes types, IXamlIlType declaringType, IXamlIlField avaloniaProperty) 
+            public UnsetValueSetter(AvaloniaXamlIlWellKnownTypes types, IXamlType declaringType, IXamlField avaloniaProperty) 
                 : base(types, declaringType, avaloniaProperty)
             {
                 Parameters = new[] {types.UnsetValueType};
             }
 
-            public override void Emit(IXamlIlEmitter codegen)
+            public override void Emit(IXamlILEmitter codegen)
             {
                 var unsetValue = Types.AvaloniaProperty.Fields.First(f => f.Name == "UnsetValue");
                 codegen
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlBindingPathHelper.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlBindingPathHelper.cs
new file mode 100644
index 0000000000..1974dfe3bc
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlBindingPathHelper.cs
@@ -0,0 +1,719 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Linq;
+using System.Reflection.Emit;
+using Avalonia.Markup.Parsers;
+using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers;
+using XamlX.Ast;
+using XamlX.Transform;
+using XamlX.Transform.Transformers;
+using XamlX.TypeSystem;
+using XamlX;
+using XamlX.Emit;
+using XamlX.IL;
+using Avalonia.Utilities;
+
+using XamlIlEmitContext = XamlX.Emit.XamlEmitContext<XamlX.IL.IXamlILEmitter, XamlX.IL.XamlILNodeEmitResult>;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
+{
+    static class XamlIlBindingPathHelper
+    {
+        public static IXamlType UpdateCompiledBindingExtension(AstTransformationContext context, XamlAstConstructableObjectNode binding, IXamlType startType)
+        {
+            IXamlType bindingResultType = null;
+            if (binding.Arguments.Count > 0 && binding.Arguments[0] is ParsedBindingPathNode bindingPath)
+            {
+                var transformed = TransformBindingPath(
+                    context,
+                    bindingPath,
+                    startType,
+                    bindingPath.Path);
+
+                bindingResultType = transformed.BindingResultType;
+                binding.Arguments[0] = transformed;
+            }
+            else
+            {
+                var bindingPathAssignment = binding.Children.OfType<XamlPropertyAssignmentNode>()
+                    .FirstOrDefault(v => v.Property.Name == "Path");
+
+                if (bindingPathAssignment is null)
+                {
+                    return startType;
+                }
+
+                if (bindingPathAssignment.Values[0] is ParsedBindingPathNode bindingPathNode)
+                {
+                    var transformed = TransformBindingPath(
+                        context,
+                        bindingPathNode,
+                        startType,
+                        bindingPathNode.Path);
+
+                    bindingResultType = transformed.BindingResultType;
+                    bindingPathAssignment.Values[0] = transformed;
+                }
+                else
+                {
+                    throw new InvalidOperationException();
+                }
+            }
+
+            return bindingResultType;
+        }
+
+        private static IXamlIlBindingPathNode TransformBindingPath(AstTransformationContext context, IXamlLineInfo lineInfo, IXamlType startType, IEnumerable<BindingExpressionGrammar.INode> bindingExpression)
+        {
+            List<IXamlIlBindingPathElementNode> transformNodes = new List<IXamlIlBindingPathElementNode>();
+            List<IXamlIlBindingPathElementNode> nodes = new List<IXamlIlBindingPathElementNode>();
+            foreach (var astNode in bindingExpression)
+            {
+                var targetType = nodes.Count == 0 ? startType : nodes[nodes.Count - 1].Type;
+                switch (astNode)
+                {
+                    case BindingExpressionGrammar.EmptyExpressionNode _:
+                        break;
+                    case BindingExpressionGrammar.NotNode _:
+                        transformNodes.Add(new XamlIlNotPathElementNode(context.Configuration.WellKnownTypes.Boolean));
+                        break;
+                    case BindingExpressionGrammar.StreamNode _:
+                        IXamlType observableType;
+                        if (targetType.GenericTypeDefinition?.Equals(context.Configuration.TypeSystem.FindType("System.IObservable`1")) == true)
+                        {
+                            observableType = targetType;
+                        }
+                        else
+                        {
+                            observableType = targetType.GetAllInterfaces().FirstOrDefault(i => i.GenericTypeDefinition?.Equals(context.Configuration.TypeSystem.FindType("System.IObservable`1")) ?? false);
+                        }
+
+                        if (observableType != null)
+                        {
+                            nodes.Add(new XamlIlStreamObservablePathElementNode(observableType.GenericArguments[0]));
+                            break;
+                        }
+                        bool foundTask = false;
+                        for (var currentType = targetType; currentType != null; currentType = currentType.BaseType)
+                        {
+                            if (currentType.GenericTypeDefinition.Equals(context.Configuration.TypeSystem.GetType("System.Threading.Tasks.Task`1")))
+                            {
+                                foundTask = true;
+                                nodes.Add(new XamlIlStreamTaskPathElementNode(currentType.GenericArguments[0]));
+                                break;
+                            }
+                        }
+                        if (foundTask)
+                        {
+                            break;
+                        }
+                        throw new XamlX.XamlParseException($"Compiled bindings do not support stream bindings for objects of type {targetType.FullName}.", lineInfo);
+                    case BindingExpressionGrammar.PropertyNameNode propName:
+                        var avaloniaPropertyFieldNameMaybe = propName.PropertyName + "Property";
+                        var avaloniaPropertyFieldMaybe = targetType.GetAllFields().FirstOrDefault(f =>
+                            f.IsStatic && f.IsPublic && f.Name == avaloniaPropertyFieldNameMaybe);
+
+                        if (avaloniaPropertyFieldMaybe != null)
+                        {
+                            nodes.Add(new XamlIlAvaloniaPropertyPropertyPathElementNode(avaloniaPropertyFieldMaybe,
+                                XamlIlAvaloniaPropertyHelper.GetAvaloniaPropertyType(avaloniaPropertyFieldMaybe, context.GetAvaloniaTypes(), lineInfo)));
+                        }
+                        else
+                        {
+                            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));
+                        }
+                        break;
+                    case BindingExpressionGrammar.IndexerNode indexer:
+                        {
+                            if (targetType.IsArray)
+                            {
+                                nodes.Add(new XamlIlArrayIndexerPathElementNode(targetType, indexer.Arguments, lineInfo));
+                                break;
+                            }
+
+                            IXamlProperty property = null;
+                            foreach (var currentType in TraverseTypeHierarchy(targetType))
+                            {
+                                var defaultMemberAttribute = currentType.CustomAttributes.FirstOrDefault(x => x.Type.Namespace == "System.Reflection" && x.Type.Name == "DefaultMemberAttribute");
+                                if (defaultMemberAttribute != null)
+                                {
+                                    property = currentType.GetAllProperties().FirstOrDefault(x => x.Name == (string)defaultMemberAttribute.Parameters[0]);
+                                    break;
+                                }
+                            }
+                            if (property is null)
+                            {
+                                throw new XamlX.XamlParseException($"The type '${targetType}' does not have an indexer.", lineInfo);
+                            }
+
+                            IEnumerable<IXamlType> parameters = property.IndexerParameters;
+
+                            List<IXamlAstValueNode> values = new List<IXamlAstValueNode>();
+                            int currentParamIndex = 0;
+                            foreach (var param in parameters)
+                            {
+                                var textNode = new XamlAstTextNode(lineInfo, indexer.Arguments[currentParamIndex], type: context.Configuration.WellKnownTypes.String);
+                                if (!XamlTransformHelpers.TryGetCorrectlyTypedValue(context, textNode,
+                                        param, out var converted))
+                                    throw new XamlX.XamlParseException(
+                                        $"Unable to convert indexer parameter value of '{indexer.Arguments[currentParamIndex]}' to {param.GetFqn()}",
+                                        textNode);
+
+                                values.Add(converted);
+                                currentParamIndex++;
+                            }
+
+                            bool isNotifyingCollection = targetType.GetAllInterfaces().Any(i => i.FullName == "System.Collections.Specialized.INotifyCollectionChanged");
+
+                            nodes.Add(new XamlIlClrIndexerPathElementNode(property, values, string.Join(",", indexer.Arguments), isNotifyingCollection));
+                            break;
+                        }
+                    case BindingExpressionGrammar.AttachedPropertyNameNode attachedProp:
+                        var avaloniaPropertyFieldName = attachedProp.PropertyName + "Property";
+                        var avaloniaPropertyField = GetType(attachedProp.Namespace, attachedProp.TypeName).GetAllFields().FirstOrDefault(f =>
+                            f.IsStatic && f.IsPublic && f.Name == avaloniaPropertyFieldName);
+                        nodes.Add(new XamlIlAvaloniaPropertyPropertyPathElementNode(avaloniaPropertyField,
+                            XamlIlAvaloniaPropertyHelper.GetAvaloniaPropertyType(avaloniaPropertyField, context.GetAvaloniaTypes(), lineInfo)));
+                        break;
+                    case BindingExpressionGrammar.SelfNode _:
+                        nodes.Add(new SelfPathElementNode(targetType));
+                        break;
+                    case VisualAncestorBindingExpressionNode visualAncestor:
+                        nodes.Add(new FindVisualAncestorPathElementNode(visualAncestor.Type, visualAncestor.Level));
+                        break;
+                    case TemplatedParentBindingExpressionNode templatedParent:
+                        var templatedParentField = context.GetAvaloniaTypes().StyledElement.GetAllFields()
+                            .FirstOrDefault(f => f.IsStatic && f.IsPublic && f.Name == "TemplatedParentProperty");
+                        nodes.Add(new XamlIlAvaloniaPropertyPropertyPathElementNode(
+                            templatedParentField,
+                            templatedParent.Type));
+                        break;
+                    case BindingExpressionGrammar.AncestorNode ancestor:
+                        if (ancestor.Namespace is null && ancestor.TypeName is null)
+                        {
+                            var styledElementType = context.GetAvaloniaTypes().StyledElement;
+                            var ancestorType = context
+                                .ParentNodes()
+                                .OfType<XamlAstConstructableObjectNode>()
+                                .Where(x => styledElementType.IsAssignableFrom(x.Type.GetClrType()))
+                                .Skip(1)
+                                .ElementAtOrDefault(ancestor.Level)
+                                ?.Type.GetClrType();
+
+                            if (ancestorType is null)
+                            {
+                                throw new XamlX.XamlParseException("Unable to resolve implicit ancestor type based on XAML tree.", lineInfo);
+                            }
+
+                            nodes.Add(new FindAncestorPathElementNode(ancestorType, ancestor.Level));
+                        }
+                        else
+                        {
+                            nodes.Add(new FindAncestorPathElementNode(GetType(ancestor.Namespace, ancestor.TypeName), ancestor.Level));
+                        }
+                        break;
+                    case BindingExpressionGrammar.NameNode elementName:
+                        IXamlType elementType = null;
+                        foreach (var deferredContent in context.ParentNodes().OfType<NestedScopeMetadataNode>())
+                        {
+                            elementType = ScopeRegistrationFinder.GetTargetType(deferredContent, elementName.Name);
+                            if (!(elementType is null))
+                            {
+                                break;
+                            }
+                        }
+                        if (elementType is null)
+                        {
+                            elementType = ScopeRegistrationFinder.GetTargetType(context.ParentNodes().Last(), elementName.Name);
+                        }
+
+                        if (elementType is null)
+                        {
+                            throw new XamlX.XamlParseException($"Unable to find element '{elementName.Name}' in the current namescope. Unable to use a compiled binding with a name binding if the name cannot be found at compile time.", lineInfo);
+                        }
+                        nodes.Add(new ElementNamePathElementNode(elementName.Name, elementType));
+                        break;
+                    case RawSourceBindingExpressionNode rawSource:
+                        nodes.Add(new RawSourcePathElementNode(rawSource.RawSource));
+                        break;
+                    case BindingExpressionGrammar.TypeCastNode typeCastNode:
+                        var castType = GetType(typeCastNode.Namespace, typeCastNode.TypeName);
+
+                        if (castType is null)
+                        {
+                            throw new XamlX.XamlParseException($"Unable to resolve cast to type {typeCastNode.Namespace}:{typeCastNode.TypeName} based on XAML tree.", lineInfo);
+                        }
+
+                        nodes.Add(new TypeCastPathElementNode(castType));
+                        break;
+                }
+            }
+
+            return new XamlIlBindingPathNode(lineInfo, context.GetAvaloniaTypes().CompiledBindingPath, transformNodes, nodes);
+
+            IXamlType GetType(string ns, string name)
+            {
+                return TypeReferenceResolver.ResolveType(context, $"{ns}:{name}", false,
+                    lineInfo, true).GetClrType();
+            }
+
+            static IEnumerable<IXamlProperty> GetAllDefinedProperties(IXamlType type)
+            {
+                foreach (var t in TraverseTypeHierarchy(type))
+                {
+                    foreach (var p in t.Properties)
+                    {
+                        yield return p;
+                    }
+                }
+            }
+
+            static IEnumerable<IXamlType> TraverseTypeHierarchy(IXamlType type)
+            {
+                if (type.IsInterface)
+                {
+                    yield return type;
+                    foreach (var iface in type.Interfaces)
+                    {
+                        foreach (var h in TraverseTypeHierarchy(iface))
+                        {
+                            yield return h;
+                        }
+                    }
+                }
+                else
+                {
+                    for (var currentType = type; currentType != null; currentType = currentType.BaseType)
+                    {
+                        yield return currentType;
+                    }
+                }
+            }
+        }
+
+        class ScopeRegistrationFinder : IXamlAstVisitor
+        {
+            private Stack<IXamlAstNode> _stack = new Stack<IXamlAstNode>();
+            private Stack<IXamlAstNode> _childScopesStack = new Stack<IXamlAstNode>();
+
+            private ScopeRegistrationFinder(string name)
+            {
+                Name = name;
+            }
+
+            string Name { get; }
+
+            IXamlType TargetType { get; set; }
+
+            public static IXamlType GetTargetType(IXamlAstNode namescopeRoot, string name)
+            {
+                var finder = new ScopeRegistrationFinder(name);
+                namescopeRoot.Visit(finder);
+                return finder.TargetType;
+            }
+
+            void IXamlAstVisitor.Pop()
+            {
+                var node = _stack.Pop();
+                if (_childScopesStack.Count > 0 && node == _childScopesStack.Peek())
+                {
+                    _childScopesStack.Pop();
+                }
+            }
+
+            void IXamlAstVisitor.Push(IXamlAstNode node)
+            {
+                _stack.Push(node);
+                if (node is NestedScopeMetadataNode)
+                {
+                    _childScopesStack.Push(node);
+                }
+            }
+
+            IXamlAstNode IXamlAstVisitor.Visit(IXamlAstNode node)
+            {
+                if (_childScopesStack.Count == 0 && node is AvaloniaNameScopeRegistrationXamlIlNode registration)
+                {
+                    if (registration.Name is XamlAstTextNode text && text.Text == Name)
+                    {
+                        TargetType = registration.TargetType;
+                    }
+                }
+                return node;
+            }
+        }
+
+        interface IXamlIlBindingPathElementNode
+        {
+            IXamlType Type { get; }
+
+            void Emit(XamlIlEmitContext context, IXamlILEmitter codeGen);
+        }
+
+        class XamlIlNotPathElementNode : IXamlIlBindingPathElementNode
+        {
+            public XamlIlNotPathElementNode(IXamlType boolType)
+            {
+                Type = boolType;
+            }
+
+            public IXamlType Type { get; }
+
+            public void Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
+            {
+                codeGen.EmitCall(context.GetAvaloniaTypes().CompiledBindingPathBuilder.FindMethod(m => m.Name == "Not"));
+            }
+        }
+
+        class XamlIlStreamObservablePathElementNode : IXamlIlBindingPathElementNode
+        {
+            public XamlIlStreamObservablePathElementNode(IXamlType type)
+            {
+                Type = type;
+            }
+
+            public IXamlType Type { get; }
+
+            public void Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
+            {
+                codeGen.EmitCall(context.GetAvaloniaTypes().CompiledBindingPathBuilder.FindMethod(m => m.Name == "StreamObservable").MakeGenericMethod(new[] { Type }));
+            }
+        }
+
+        class XamlIlStreamTaskPathElementNode : IXamlIlBindingPathElementNode
+        {
+            public XamlIlStreamTaskPathElementNode(IXamlType type)
+            {
+                Type = type;
+            }
+
+            public IXamlType Type { get; }
+
+            public void Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
+            {
+                codeGen.EmitCall(context.GetAvaloniaTypes().CompiledBindingPathBuilder.FindMethod(m => m.Name == "StreamTask").MakeGenericMethod(new[] { Type }));
+            }
+        }
+
+        class SelfPathElementNode : IXamlIlBindingPathElementNode
+        {
+            public SelfPathElementNode(IXamlType type)
+            {
+                Type = type;
+            }
+
+            public IXamlType Type { get; }
+
+            public void Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
+            {
+                codeGen.EmitCall(context.GetAvaloniaTypes().CompiledBindingPathBuilder.FindMethod(m => m.Name == "Self"));
+            }
+        }
+
+        class FindAncestorPathElementNode : IXamlIlBindingPathElementNode
+        {
+            private readonly int _level;
+
+            public FindAncestorPathElementNode(IXamlType ancestorType, int level)
+            {
+                Type = ancestorType;
+                _level = level;
+            }
+
+            public IXamlType Type { get; }
+
+            public void Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
+            {
+                codeGen.Ldtype(Type)
+                    .Ldc_I4(_level)
+                    .EmitCall(context.GetAvaloniaTypes().CompiledBindingPathBuilder.FindMethod(m => m.Name == "Ancestor"));
+            }
+        }
+
+        class FindVisualAncestorPathElementNode : IXamlIlBindingPathElementNode
+        {
+            private readonly int _level;
+
+            public FindVisualAncestorPathElementNode(IXamlType ancestorType, int level)
+            {
+                Type = ancestorType;
+                _level = level;
+            }
+
+            public IXamlType Type { get; }
+
+            public void Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
+            {
+                codeGen.Ldtype(Type)
+                    .Ldc_I4(_level)
+                    .EmitCall(context.GetAvaloniaTypes().CompiledBindingPathBuilder.FindMethod(m => m.Name == "VisualAncestor"));
+            }
+        }
+
+        class ElementNamePathElementNode : IXamlIlBindingPathElementNode
+        {
+            private readonly string _name;
+
+            public ElementNamePathElementNode(string name, IXamlType elementType)
+            {
+                _name = name;
+                Type = elementType;
+            }
+
+            public IXamlType Type { get; }
+
+            public void Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
+            {
+                var scopeField = context.RuntimeContext.ContextType.Fields.First(f =>
+                    f.Name == AvaloniaXamlIlLanguage.ContextNameScopeFieldName);
+
+                codeGen
+                    .Ldloc(context.ContextLocal)
+                    .Ldfld(scopeField)
+                    .Ldstr(_name)
+                    .EmitCall(context.GetAvaloniaTypes().CompiledBindingPathBuilder.FindMethod(m => m.Name == "ElementName"));
+            }
+        }
+
+        class XamlIlAvaloniaPropertyPropertyPathElementNode : IXamlIlBindingPathElementNode
+        {
+            private readonly IXamlField _field;
+
+            public XamlIlAvaloniaPropertyPropertyPathElementNode(IXamlField field, IXamlType propertyType)
+            {
+                _field = field;
+                Type = propertyType;
+            }
+
+            public void Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
+            {
+                codeGen.Ldsfld(_field);
+                context.Configuration.GetExtra<XamlIlPropertyInfoAccessorFactoryEmitter>()
+                    .EmitLoadAvaloniaPropertyAccessorFactory(context, codeGen);
+                codeGen.EmitCall(context.GetAvaloniaTypes()
+                    .CompiledBindingPathBuilder.FindMethod(m => m.Name == "Property"));
+            }
+
+            public IXamlType Type { get; }
+        }
+
+        class XamlIlClrPropertyPathElementNode : IXamlIlBindingPathElementNode
+        {
+            private readonly IXamlProperty _property;
+
+            public XamlIlClrPropertyPathElementNode(IXamlProperty property)
+            {
+                _property = property;
+            }
+
+            public void Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
+            {
+                context.Configuration.GetExtra<XamlIlClrPropertyInfoEmitter>()
+                    .Emit(context, codeGen, _property);
+
+                context.Configuration.GetExtra<XamlIlPropertyInfoAccessorFactoryEmitter>()
+                    .EmitLoadInpcPropertyAccessorFactory(context, codeGen);
+
+                codeGen
+                    .EmitCall(context.GetAvaloniaTypes()
+                        .CompiledBindingPathBuilder.FindMethod(m => m.Name == "Property"));
+            }
+
+            public IXamlType Type => _property.Getter?.ReturnType ?? _property.Setter?.Parameters[0];
+        }
+
+        class XamlIlClrIndexerPathElementNode : IXamlIlBindingPathElementNode
+        {
+            private readonly IXamlProperty _property;
+            private readonly List<IXamlAstValueNode> _values;
+            private readonly string _indexerKey;
+            private readonly bool _isNotifyingCollection;
+
+            public XamlIlClrIndexerPathElementNode(IXamlProperty property, List<IXamlAstValueNode> values, string indexerKey, bool isNotifyingCollection)
+            {
+                _property = property;
+                _values = values;
+                _indexerKey = indexerKey;
+                _isNotifyingCollection = isNotifyingCollection;
+            }
+
+            public void Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
+            {
+                var intType = context.Configuration.TypeSystem.GetType("System.Int32");
+                context.Configuration.GetExtra<XamlIlClrPropertyInfoEmitter>()
+                    .Emit(context, codeGen, _property, _values, _indexerKey);
+
+                if (_isNotifyingCollection
+                    &&
+                    _values.Count == 1
+                    && _values[0].Type.GetClrType().Equals(intType))
+                {
+                    context.Configuration.GetExtra<XamlIlPropertyInfoAccessorFactoryEmitter>()
+                        .EmitLoadIndexerAccessorFactory(context, codeGen, _values[0]);
+                }
+                else
+                {
+                    context.Configuration.GetExtra<XamlIlPropertyInfoAccessorFactoryEmitter>()
+                        .EmitLoadInpcPropertyAccessorFactory(context, codeGen);
+                }
+
+                codeGen.EmitCall(context.GetAvaloniaTypes()
+                    .CompiledBindingPathBuilder.FindMethod(m => m.Name == "Property"));
+            }
+
+            public IXamlType Type => _property.Getter?.ReturnType ?? _property.Setter?.Parameters[0];
+        }
+
+        class XamlIlArrayIndexerPathElementNode : IXamlIlBindingPathElementNode
+        {
+            private readonly IXamlType _arrayType;
+            private readonly List<int> _values;
+
+            public XamlIlArrayIndexerPathElementNode(IXamlType arrayType, IList<string> values, IXamlLineInfo lineInfo)
+            {
+                _arrayType = arrayType;
+                _values = new List<int>(values.Count);
+                foreach (var item in values)
+                {
+                    if (!int.TryParse(item, out var index))
+                    {
+                        throw new XamlX.XamlParseException($"Unable to convert '{item}' to an integer.", lineInfo.Line, lineInfo.Position);
+                    }
+                    _values.Add(index);
+                }
+            }
+
+            public void Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
+            {
+                var intType = context.Configuration.TypeSystem.GetType("System.Int32");
+                var indices = codeGen.DefineLocal(intType.MakeArrayType(1));
+                codeGen.Ldc_I4(_values.Count)
+                    .Newarr(intType)
+                    .Stloc(indices);
+                for (int i = 0; i < _values.Count; i++)
+                {
+                    codeGen.Ldloc(indices)
+                        .Ldc_I4(i)
+                        .Ldc_I4(_values[i])
+                        .Emit(OpCodes.Stelem_I4);
+                }
+
+                codeGen.Ldloc(indices)
+                    .Ldtype(Type)
+                    .EmitCall(context.GetAvaloniaTypes()
+                    .CompiledBindingPathBuilder.FindMethod(m => m.Name == "ArrayElement"));
+            }
+
+            public IXamlType Type => _arrayType.ArrayElementType;
+        }
+
+        class RawSourcePathElementNode : XamlAstNode, IXamlIlBindingPathElementNode
+        {
+            private readonly IXamlAstValueNode _rawSource;
+
+            public RawSourcePathElementNode(IXamlAstValueNode rawSource)
+                : base(rawSource)
+            {
+                _rawSource = rawSource;
+
+            }
+
+            public IXamlType Type => _rawSource.Type.GetClrType();
+
+            public void Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
+            {
+                context.Emit(_rawSource, codeGen, Type);
+                codeGen
+                    .EmitCall(context.GetAvaloniaTypes()
+                    .CompiledBindingPathBuilder.FindMethod(m => m.Name == "SetRawSource"));
+            }
+        }
+
+        class TypeCastPathElementNode : IXamlIlBindingPathElementNode
+        {
+            public TypeCastPathElementNode(IXamlType ancestorType)
+            {
+                Type = ancestorType;
+            }
+
+            public IXamlType Type { get; }
+
+            public void Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
+            {
+                codeGen.EmitCall(context.GetAvaloniaTypes().CompiledBindingPathBuilder.FindMethod(m => m.Name == "TypeCast").MakeGenericMethod(new[] { Type }));
+            }
+        }
+
+        class XamlIlBindingPathNode : XamlAstNode, IXamlIlBindingPathNode, IXamlAstEmitableNode<IXamlILEmitter, XamlILNodeEmitResult>
+        {
+            private readonly List<IXamlIlBindingPathElementNode> _transformElements;
+            private readonly List<IXamlIlBindingPathElementNode> _elements;
+
+            public XamlIlBindingPathNode(IXamlLineInfo lineInfo,
+                IXamlType bindingPathType,
+                List<IXamlIlBindingPathElementNode> transformElements,
+                List<IXamlIlBindingPathElementNode> elements) : base(lineInfo)
+            {
+                Type = new XamlAstClrTypeReference(lineInfo, bindingPathType, false);
+                _transformElements = transformElements;
+                _elements = elements;
+            }
+
+            public IXamlType BindingResultType
+                => _transformElements.Count > 0
+                    ? _transformElements[0].Type
+                    : _elements[_elements.Count - 1].Type;
+
+            public IXamlAstTypeReference Type { get; }
+
+            public XamlILNodeEmitResult Emit(XamlIlEmitContext context, IXamlILEmitter codeGen)
+            {
+                var types = context.GetAvaloniaTypes();
+                codeGen.Newobj(types.CompiledBindingPathBuilder.FindConstructor());
+
+                foreach (var transform in _transformElements)
+                {
+                    transform.Emit(context, codeGen);
+                }
+
+                foreach (var element in _elements)
+                {
+                    element.Emit(context, codeGen);
+                }
+
+                codeGen.EmitCall(types.CompiledBindingPathBuilder.FindMethod(m => m.Name == "Build"));
+                return XamlILNodeEmitResult.Type(0, types.CompiledBindingPath);
+            }
+
+            public override void VisitChildren(IXamlAstVisitor visitor)
+            {
+                for (int i = 0; i < _transformElements.Count; i++)
+                {
+                    if (_transformElements[i] is IXamlAstNode ast)
+                    {
+                        _transformElements[i] = (IXamlIlBindingPathElementNode)ast.Visit(visitor);
+                    }
+                }
+                for (int i = 0; i < _elements.Count; i++)
+                {
+                    if (_elements[i] is IXamlAstNode ast)
+                    {
+                        _elements[i] = (IXamlIlBindingPathElementNode)ast.Visit(visitor);
+                    }
+                }
+            }
+        }
+    }
+
+    interface IXamlIlBindingPathNode : IXamlAstValueNode
+    {
+        IXamlType BindingResultType { get; }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlClrPropertyInfoHelper.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlClrPropertyInfoHelper.cs
new file mode 100644
index 0000000000..871a2a2045
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlClrPropertyInfoHelper.cs
@@ -0,0 +1,158 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers;
+using XamlX.Ast;
+using XamlX.Transform;
+using XamlX.TypeSystem;
+using XamlX.IL;
+using XamlX.Emit;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
+{
+    class XamlIlClrPropertyInfoEmitter
+    {
+        private readonly IXamlTypeBuilder<IXamlILEmitter> _builder;
+
+        private Dictionary<string, List<(IXamlProperty prop, IXamlMethod get)>> _fields
+            = new Dictionary<string, List<(IXamlProperty prop, IXamlMethod get)>>();
+        
+        public XamlIlClrPropertyInfoEmitter(IXamlTypeBuilder<IXamlILEmitter> builder)
+        {
+            _builder = builder;
+        }
+
+        static string GetKey(IXamlProperty property, string indexerArgumentsKey)
+        {
+            var baseKey = property.Getter.DeclaringType.GetFullName() + "." + property.Name;
+
+            if (indexerArgumentsKey is null)
+            {
+                return baseKey;
+            }
+
+            return baseKey + $"[{indexerArgumentsKey}]";
+        }
+
+        public IXamlType Emit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen, IXamlProperty property, IEnumerable<IXamlAstValueNode> indexerArguments = null, string indexerArgumentsKey = null)
+        {
+            indexerArguments = indexerArguments ?? Enumerable.Empty<IXamlAstValueNode>();
+            var types = context.GetAvaloniaTypes();
+            IXamlMethod Get()
+            {
+                var key = GetKey(property, indexerArgumentsKey);
+                if (!_fields.TryGetValue(key, out var lst))
+                    _fields[key] = lst = new List<(IXamlProperty prop, IXamlMethod get)>();
+
+                foreach (var cached in lst)
+                {
+                    if (
+                        ((cached.prop.Getter == null && property.Getter == null) ||
+                         cached.prop.Getter?.Equals(property.Getter) == true) &&
+                        ((cached.prop.Setter == null && property.Setter == null) ||
+                         cached.prop.Setter?.Equals(property.Setter) == true)
+                    )
+                        return cached.get;
+                }
+
+                var name = lst.Count == 0 ? key : key + "_" + Guid.NewGuid().ToString("N");
+                
+                var field = _builder.DefineField(types.IPropertyInfo, name + "!Field", false, true);
+
+                void Load(IXamlMethod m, IXamlILEmitter cg)
+                {
+                    cg
+                        .Ldarg_0();
+                    if (m.DeclaringType.IsValueType)
+                        cg.Unbox(m.DeclaringType);
+                    else
+                        cg.Castclass(m.DeclaringType);
+
+                    foreach (var indexerArg in indexerArguments)
+                    {
+                        context.Emit(indexerArg, cg, indexerArg.Type.GetClrType());
+                    }
+                }
+
+                var getter = property.Getter == null ?
+                    null :
+                    _builder.DefineMethod(types.XamlIlTypes.Object,
+                        new[] {types.XamlIlTypes.Object}, name + "!Getter", false, true, false);
+                if (getter != null)
+                {
+                    Load(property.Getter, getter.Generator);
+                    
+                    getter.Generator.EmitCall(property.Getter);
+                    if (property.Getter.ReturnType.IsValueType)
+                        getter.Generator.Box(property.Getter.ReturnType);
+                    getter.Generator.Ret();
+                }
+
+                var setter = property.Setter == null ?
+                    null :
+                    _builder.DefineMethod(types.XamlIlTypes.Void,
+                        new[] {types.XamlIlTypes.Object, types.XamlIlTypes.Object},
+                        name + "!Setter", false, true, false);
+                if (setter != null)
+                {
+                    Load(property.Setter, setter.Generator);
+                    
+                    setter.Generator.Ldarg(1);
+                    if (property.Setter.Parameters[0].IsValueType)
+                        setter.Generator.Unbox_Any(property.Setter.Parameters[0]);
+                    else
+                        setter.Generator.Castclass(property.Setter.Parameters[0]);
+                    setter.Generator
+                        .EmitCall(property.Setter, true)
+                        .Ret();
+                }
+
+                var get = _builder.DefineMethod(types.IPropertyInfo, Array.Empty<IXamlType>(),
+                    name + "!Property", true, true, false);
+
+
+                var ctor = types.ClrPropertyInfo.Constructors.First(c =>
+                    c.Parameters.Count == 4 && c.IsStatic == false);
+                
+                var cacheMiss = get.Generator.DefineLabel();
+                get.Generator
+                    .Ldsfld(field)
+                    .Brfalse(cacheMiss)
+                    .Ldsfld(field)
+                    .Ret()
+                    .MarkLabel(cacheMiss)
+                    .Ldstr(property.Name);
+
+                void EmitFunc(IXamlILEmitter emitter, IXamlMethod method, IXamlType del)
+                {
+                    if (method == null)
+                        emitter.Ldnull();
+                    else
+                    {
+                        emitter
+                            .Ldnull()
+                            .Ldftn(method)
+                            .Newobj(del.Constructors.First(c =>
+                                c.Parameters.Count == 2 &&
+                                c.Parameters[0].Equals(context.Configuration.WellKnownTypes.Object)));
+                    }
+                }
+
+                EmitFunc(get.Generator, getter, ctor.Parameters[1]);
+                EmitFunc(get.Generator, setter, ctor.Parameters[2]);
+                get.Generator
+                    .Ldtype(property.PropertyType)
+                    .Newobj(ctor)
+                    .Stsfld(field)
+                    .Ldsfld(field)
+                    .Ret();
+
+                lst.Add((property, get));
+                return get;
+            }
+
+            codeGen.EmitCall(Get());
+            return types.IPropertyInfo;
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlPropertyInfoAccessorFactoryEmitter.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlPropertyInfoAccessorFactoryEmitter.cs
new file mode 100644
index 0000000000..d24a43a84f
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlPropertyInfoAccessorFactoryEmitter.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers;
+using XamlX.Ast;
+using XamlX.Transform;
+using XamlX.TypeSystem;
+using XamlX.Emit;
+using XamlX.IL;
+
+using XamlIlEmitContext = XamlX.Emit.XamlEmitContext<XamlX.IL.IXamlILEmitter, XamlX.IL.XamlILNodeEmitResult>;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
+{
+    class XamlIlPropertyInfoAccessorFactoryEmitter
+    {
+        private const string IndexerClosureFactoryMethodName = "CreateAccessor";
+        private readonly IXamlTypeBuilder<IXamlILEmitter> _indexerClosureTypeBuilder;
+        private IXamlType _indexerClosureType;
+        public XamlIlPropertyInfoAccessorFactoryEmitter(IXamlTypeBuilder<IXamlILEmitter> indexerClosureType)
+        {
+            _indexerClosureTypeBuilder = indexerClosureType;
+        }
+
+        public IXamlType EmitLoadInpcPropertyAccessorFactory(XamlIlEmitContext context, IXamlILEmitter codeGen)
+        {
+            codeGen.Ldnull();
+            EmitLoadPropertyAccessorFactory(context, codeGen, context.GetAvaloniaTypes().PropertyInfoAccessorFactory, "CreateInpcPropertyAccessor");
+            return EmitCreateAccessorFactoryDelegate(context, codeGen);
+        }
+
+        public IXamlType EmitLoadAvaloniaPropertyAccessorFactory(XamlIlEmitContext context, IXamlILEmitter codeGen)
+        {
+            codeGen.Ldnull();
+            EmitLoadPropertyAccessorFactory(context, codeGen, context.GetAvaloniaTypes().PropertyInfoAccessorFactory, "CreateAvaloniaPropertyAccessor");
+            return EmitCreateAccessorFactoryDelegate(context, codeGen);
+        }
+
+        private void EmitLoadPropertyAccessorFactory(XamlIlEmitContext context, IXamlILEmitter codeGen, IXamlType type, string accessorFactoryName, bool isStatic = true)
+        {
+            var types = context.GetAvaloniaTypes();
+            var weakReferenceType = context.Configuration.TypeSystem.GetType("System.WeakReference`1").MakeGenericType(context.Configuration.WellKnownTypes.Object);
+            FindMethodMethodSignature accessorFactorySignature = new FindMethodMethodSignature(accessorFactoryName, types.IPropertyAccessor, weakReferenceType, types.IPropertyInfo)
+            {
+                IsStatic = isStatic
+            };
+            codeGen.Ldftn(type.GetMethod(accessorFactorySignature));
+        }
+
+        public IXamlType EmitLoadIndexerAccessorFactory(XamlIlEmitContext context, IXamlILEmitter codeGen, IXamlAstValueNode value)
+        {
+            var intType = context.Configuration.TypeSystem.GetType("System.Int32");
+            if (_indexerClosureType is null)
+            {
+                _indexerClosureType = InitializeClosureType(context);
+            }
+
+            context.Emit(value, codeGen, intType);
+            codeGen.Newobj(_indexerClosureType.FindConstructor(new List<IXamlType> { intType }));
+            EmitLoadPropertyAccessorFactory(context, codeGen, _indexerClosureType, IndexerClosureFactoryMethodName, isStatic: false);
+            return EmitCreateAccessorFactoryDelegate(context, codeGen);
+        }
+
+        private IXamlType InitializeClosureType(XamlIlEmitContext context)
+        {
+            var types = context.GetAvaloniaTypes();
+            var intType = context.Configuration.TypeSystem.GetType("System.Int32");
+            var weakReferenceType = context.Configuration.TypeSystem.GetType("System.WeakReference`1").MakeGenericType(context.Configuration.WellKnownTypes.Object);
+            var indexAccessorFactoryMethod = context.GetAvaloniaTypes().PropertyInfoAccessorFactory.GetMethod(
+                    new FindMethodMethodSignature(
+                        "CreateIndexerPropertyAccessor",
+                        types.IPropertyAccessor,
+                        weakReferenceType,
+                        types.IPropertyInfo,
+                        intType)
+                    {
+                        IsStatic = true
+                    });
+            var indexField = _indexerClosureTypeBuilder.DefineField(intType, "_index", false, false);
+            var ctor = _indexerClosureTypeBuilder.DefineConstructor(false, intType);
+            ctor.Generator
+                .Ldarg_0()
+                .Ldarg(1)
+                .Stfld(indexField)
+                .Ret();
+            _indexerClosureTypeBuilder.DefineMethod(
+                types.IPropertyAccessor,
+                new[] { weakReferenceType, types.IPropertyInfo },
+                IndexerClosureFactoryMethodName,
+                isPublic: true,
+                isStatic: false,
+                isInterfaceImpl: false)
+                .Generator
+                .Ldarg(1)
+                .Ldarg(2)
+                .LdThisFld(indexField)
+                .EmitCall(indexAccessorFactoryMethod)
+                .Ret();
+
+            return _indexerClosureTypeBuilder.CreateType();
+        }
+
+        private IXamlType EmitCreateAccessorFactoryDelegate(XamlIlEmitContext context, IXamlILEmitter codeGen)
+        {
+            var types = context.GetAvaloniaTypes();
+            var weakReferenceType = context.Configuration.TypeSystem.GetType("System.WeakReference`1").MakeGenericType(context.Configuration.WellKnownTypes.Object);
+            var funcType = context.Configuration.TypeSystem.GetType("System.Func`3").MakeGenericType(
+                            weakReferenceType,
+                            types.IPropertyInfo,
+                            types.IPropertyAccessor);
+            codeGen.Newobj(funcType.Constructors.First(c =>
+                                c.Parameters.Count == 2 &&
+                                c.Parameters[0].Equals(context.Configuration.WellKnownTypes.Object)));
+            return funcType;
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/IncludeXamlIlSre.props b/src/Markup/Avalonia.Markup.Xaml.Loader/IncludeXamlIlSre.props
new file mode 100644
index 0000000000..c902fa956a
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/IncludeXamlIlSre.props
@@ -0,0 +1,12 @@
+<Project>
+  <ItemGroup>
+    <None Remove="$(MSBuildThisFileDirectory)\xamlil.github\**\*.*" />
+    <Content Remove="$(MSBuildThisFileDirectory)\xamlil.github\**\*.*" />
+    <Compile Remove="$(MSBuildThisFileDirectory)\xamlil.github\**\*.*" />
+    <Compile Include="$(MSBuildThisFileDirectory)\xamlil.github\src\XamlX\**\*.cs" />
+    <Compile Remove="$(MSBuildThisFileDirectory)\xamlil.github\**\obj\**\*.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\..\Avalonia.Markup\Markup\Parsers\SelectorGrammar.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\..\Avalonia.Markup.Xaml\Parsers\PropertyParser.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\..\Avalonia.Markup\Markup\Parsers\BindingExpressionGrammar.cs" />
+  </ItemGroup>
+</Project>
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
new file mode 160000
index 0000000000..ea80a607c5
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
@@ -0,0 +1 @@
+Subproject commit ea80a607c5e9d8f000160dbbb48c27ed4cfafbc9
diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index 06c5375520..217da2d50d 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <DefineConstants>PCL;NETSTANDARD;NETSTANDARD2_0;HAS_TYPE_CONVERTER;HAS_CUSTOM_ATTRIBUTE_PROVIDER;XAMLIL_INTERNAL</DefineConstants>
+    <DefineConstants>$(DefineConstants);PCL;NETSTANDARD;NETSTANDARD2_0;HAS_TYPE_CONVERTER;HAS_CUSTOM_ATTRIBUTE_PROVIDER;XAMLX_INTERNAL</DefineConstants>
     <UseCecil>false</UseCecil>
     <DefineConstants Condition="$(UseCecil) == true">$(DefineConstants);RUNTIME_XAML_CECIL</DefineConstants>
     <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
@@ -11,11 +11,22 @@
     <ItemGroup>
         <Compile Include="AvaloniaXamlLoader.cs" />
         <Compile Include="Converters\AvaloniaUriTypeConverter.cs" />
+        <Compile Include="Converters\ColorToBrushConverter.cs" />
         <Compile Include="Converters\FontFamilyTypeConverter.cs" />
         <Compile Include="Converters\TimeSpanTypeConverter.cs" />
         <Compile Include="Extensions.cs" />
         <Compile Include="MarkupExtension.cs" />
+        <Compile Include="MarkupExtensions\CompiledBindingExtension.cs" />
+        <Compile Include="MarkupExtensions\CompiledBindings\ArrayElementPlugin.cs" />
+        <Compile Include="MarkupExtensions\CompiledBindings\CompiledBindingPath.cs" />
+        <Compile Include="MarkupExtensions\CompiledBindings\FindVisualAncestorNode.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\ResolveByNameExtension.cs" />
         <Compile Include="MarkupExtensions\ResourceInclude.cs" />
         <Compile Include="MarkupExtensions\StaticResourceExtension.cs" />
         <Compile Include="MarkupExtensions\StyleIncludeExtension.cs" />
@@ -24,7 +35,7 @@
         <Compile Include="Converters\IconTypeConverter.cs" />
         <Compile Include="Converters\AvaloniaPropertyTypeConverter.cs" />
         <Compile Include="Converters\PointsListTypeConverter.cs" />
-        <Compile Include="MarkupExtensions\BindingExtension.cs" />
+        <Compile Include="MarkupExtensions\ReflectionBindingExtension.cs" />
         <Compile Include="MarkupExtensions\RelativeSourceExtension.cs" />
         <Compile Include="Properties\AssemblyInfo.cs" />
         <Compile Include="Styling\StyleInclude.cs" />
@@ -35,32 +46,11 @@
         <Compile Include="Templates\Template.cs" />
         <Compile Include="Templates\TemplateContent.cs" />
         <Compile Include="Templates\TreeDataTemplate.cs" />
-        <Compile Include="XamlIl\AvaloniaXamlIlRuntimeCompiler.cs" />
-        <Compile Include="XamlIl\CompilerExtensions\Transformers\AvaloniaBindingExtensionHackTransformer.cs" />
-        <Compile Include="XamlIl\CompilerExtensions\Transformers\AvaloniaXamlIlAvaloniaPropertyResolver.cs" />
-        <Compile Include="XamlIl\CompilerExtensions\Transformers\AvaloniaXamlIlConstructorServiceProviderTransformer.cs" />
-        <Compile Include="XamlIl\CompilerExtensions\Transformers\AvaloniaXamlIlControlTemplateTargetTypeMetadataTransformer.cs" />
-        <Compile Include="XamlIl\CompilerExtensions\Transformers\AvaloniaXamlIlDesignPropertiesTransformer.cs" />
-        <Compile Include="XamlIl\CompilerExtensions\Transformers\AvaloniaXamlIlMetadataRemover.cs" />
-        <Compile Include="XamlIl\CompilerExtensions\Transformers\AvaloniaXamlIlTransformInstanceAttachedProperties.cs" />
-        <Compile Include="XamlIl\CompilerExtensions\Transformers\AvaloniaXamlIlTransitionsTypeMetadataTransformer.cs" />
-        <Compile Include="XamlIl\CompilerExtensions\Transformers\AvaloniaXamlIlWellKnownTypes.cs" />
-        <Compile Include="XamlIl\CompilerExtensions\XamlIlAvaloniaPropertyHelper.cs" />
-        <Compile Include="XamlIl\CompilerExtensions\AvaloniaXamlIlCompiler.cs" />
-        <Compile Include="XamlIl\CompilerExtensions\AvaloniaXamlIlLanguage.cs" />
-        <Compile Include="XamlIl\CompilerExtensions\Transformers\AddNameScopeRegistration.cs" />
-        <Compile Include="XamlIl\CompilerExtensions\Transformers\AvaloniaXamlIlSetterTransformer.cs" />
-        <Compile Include="XamlIl\CompilerExtensions\Transformers\IgnoredDirectivesTransformer.cs" />
-        <Compile Include="XamlIl\CompilerExtensions\Transformers\AvaloniaXamlIlSelectorTransformer.cs" />
-        <Compile Include="XamlIl\CompilerExtensions\Transformers\XNameTransformer.cs" />
         <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlParentStackProvider.cs" />
         <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlXmlNamespaceInfoProviderV1.cs" />
         <Compile Include="XamlIl\Runtime\XamlIlRuntimeHelpers.cs" />
         <Compile Include="XamlLoadException.cs" />
-        <Compile Include="XamlIl\xamlil.github\src\XamlIl\**\*.cs" />
-        <Compile Condition="$(UseCecil) == true" Include="XamlIl\xamlil.github\src\XamlIl.Cecil\**\*.cs" />
-        <Compile Remove="XamlIl\xamlil.github\**\obj\**\*.cs" />
-        <Compile Include="..\Avalonia.Markup\Markup\Parsers\SelectorGrammar.cs" />
+        <Compile Include="..\Avalonia.Markup\Markup\Parsers\BindingExpressionGrammar.cs" />
         <Compile Include="XamlTypes.cs" />
     </ItemGroup>
   <ItemGroup>
@@ -73,8 +63,7 @@
     <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
     <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\Avalonia.Markup\Avalonia.Markup.csproj" />
-    <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
-    <PackageReference Condition="$(UseCecil) == true" Include="Mono.Cecil" Version="0.10.3" />
   </ItemGroup>
   <Import Project="..\..\..\build\Rx.props" />
+  <Import Project="..\..\..\build\ApiDiff.props" />
 </Project>
diff --git a/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs b/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs
index db0b617bcd..e5c6b72d12 100644
--- a/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.IO;
 using System.Reflection;
@@ -13,10 +10,13 @@ namespace Avalonia.Markup.Xaml
     /// <summary>
     /// Loads XAML for a avalonia application.
     /// </summary>
-    public class AvaloniaXamlLoader
+    public static class AvaloniaXamlLoader
     {
-        public bool IsDesignMode { get; set; }
-
+        public interface IRuntimeXamlLoader
+        {
+            object Load(Stream stream, Assembly localAsm, object o, Uri baseUri, bool designMode);
+        }
+        
         /// <summary>
         /// Loads the XAML into a Avalonia component.
         /// </summary>
@@ -35,7 +35,7 @@ namespace Avalonia.Markup.Xaml
         /// A base URI to use if <paramref name="uri"/> is relative.
         /// </param>
         /// <returns>The loaded object.</returns>
-        public object Load(Uri uri, Uri baseUri = null)
+        public static object Load(Uri uri, Uri baseUri = null)
         {
             Contract.Requires<ArgumentNullException>(uri != null);
 
@@ -58,52 +58,22 @@ namespace Avalonia.Markup.Xaml
                 if (compiledResult != null)
                     return compiledResult;
             }
-            
-            
-            var asset = assetLocator.OpenAndGetAssembly(uri, baseUri);
-            using (var stream = asset.stream)
-            {
-                var absoluteUri = uri.IsAbsoluteUri ? uri : new Uri(baseUri, uri);
-                return Load(stream, asset.assembly, null, absoluteUri);
-            }
-        }
-        
-        /// <summary>
-        /// Loads XAML from a string.
-        /// </summary>
-        /// <param name="xaml">The string containing the XAML.</param>
-        /// <param name="localAssembly">Default assembly for clr-namespace:</param>
-        /// <param name="rootInstance">
-        /// The optional instance into which the XAML should be loaded.
-        /// </param>
-        /// <returns>The loaded object.</returns>
-        public object Load(string xaml, Assembly localAssembly = null, object rootInstance = null)
-        {
-            Contract.Requires<ArgumentNullException>(xaml != null);
 
-            using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(xaml)))
+            // This is intended for unit-tests only
+            var runtimeLoader = AvaloniaLocator.Current.GetService<IRuntimeXamlLoader>();
+            if (runtimeLoader != null)
             {
-                return Load(stream, localAssembly, rootInstance);
+                var asset = assetLocator.OpenAndGetAssembly(uri, baseUri);
+                using (var stream = asset.stream)
+                {
+                    var absoluteUri = uri.IsAbsoluteUri ? uri : new Uri(baseUri, uri);
+                    return runtimeLoader.Load(stream, asset.assembly, null, absoluteUri, false);
+                }
             }
-        }
-
-        /// <summary>
-        /// Loads XAML from a stream.
-        /// </summary>
-        /// <param name="stream">The stream containing the XAML.</param>
-        /// <param name="localAssembly">Default assembly for clr-namespace</param>
-        /// <param name="rootInstance">
-        /// The optional instance into which the XAML should be loaded.
-        /// </param>
-        /// <param name="uri">The URI of the XAML</param>
-        /// <returns>The loaded object.</returns>
-        public object Load(Stream stream, Assembly localAssembly, object rootInstance = null, Uri uri = null) 
-            => AvaloniaXamlIlRuntimeCompiler.Load(stream, localAssembly, rootInstance, uri, IsDesignMode);
-
-        public static object Parse(string xaml, Assembly localAssembly = null)
-            => new AvaloniaXamlLoader().Load(xaml, localAssembly);
 
-        public static T Parse<T>(string xaml, Assembly localAssembly = null)
-            => (T)Parse(xaml, localAssembly);
+            throw new XamlLoadException(
+                $"No precompiled XAML found for {uri} (baseUri: {baseUri}), make sure to specify x:Class and include your XAML file as AvaloniaResource");
+        }
+        
     }
 }
diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs
index 6000b71f9d..45ca1c4adc 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.ComponentModel;
 using System.Globalization;
@@ -42,8 +39,7 @@ namespace Avalonia.Markup.Xaml.Converters
                 !property.IsAttached &&
                 !registry.IsRegistered(targetType, property))
             {
-                Logger.TryGet(LogEventLevel.Warning)?.Log(
-                    LogArea.Property,
+                Logger.TryGet(LogEventLevel.Warning, LogArea.Property)?.Log(
                     this,
                     "Property '{Owner}.{Name}' is not registered on '{Type}'.",
                     effectiveOwner,
diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/BitmapTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/BitmapTypeConverter.cs
index c75c54554e..dcd60f7a79 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Converters/BitmapTypeConverter.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Converters/BitmapTypeConverter.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
 using Avalonia.Media.Imaging;
diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/ColorToBrushConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/ColorToBrushConverter.cs
new file mode 100644
index 0000000000..5b44e9eb50
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/Converters/ColorToBrushConverter.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+using Avalonia.Media;
+using Avalonia.Media.Immutable;
+
+namespace Avalonia.Markup.Xaml.Converters
+{
+    /// <summary>
+    /// Converts a <see cref="Color"/> to an <see cref="IBrush"/>.
+    /// </summary>
+    public class ColorToBrushConverter : IValueConverter
+    {
+        /// <summary>
+        /// Converts a <see cref="Color"/> to an <see cref="IBrush"/> if the arguments are of the
+        /// correct type.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <param name="targetType">The target type.</param>
+        /// <param name="parameter">Not used.</param>
+        /// <param name="culture">Not used.</param>
+        /// <returns>
+        /// If <paramref name="value"/> is a <see cref="Color"/> and <paramref name="targetType"/>
+        /// is <see cref="IBrush"/> then converts the color to a solid color brush.
+        /// </returns>
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return Convert(value, targetType);
+        }
+
+        /// <summary>
+        /// Converts an <see cref="ISolidColorBrush"/> to a <see cref="Color"/> if the arguments are of the
+        /// correct type.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <param name="targetType">The target type.</param>
+        /// <param name="parameter">Not used.</param>
+        /// <param name="culture">Not used.</param>
+        /// <returns>
+        /// If <paramref name="value"/> is an <see cref="ISolidColorBrush"/> and <paramref name="targetType"/>
+        /// is <see cref="Color"/> then converts the solid color brush to a color.
+        /// </returns>
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return ConvertBack(value, targetType);
+        }
+
+        /// <summary>
+        /// Converts a <see cref="Color"/> to an <see cref="IBrush"/> if the arguments are of the
+        /// correct type.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <param name="targetType">The target type.</param>
+        /// <returns>
+        /// If <paramref name="value"/> is a <see cref="Color"/> and <paramref name="targetType"/>
+        /// is <see cref="IBrush"/> then converts the color to a solid color brush.
+        /// </returns>
+        public static object Convert(object value, Type targetType)
+        {
+            if (targetType == typeof(IBrush) && value is Color c)
+            {
+                return new ImmutableSolidColorBrush(c);
+            }
+
+            return value;
+        }
+
+        /// <summary>
+        /// Converts an <see cref="ISolidColorBrush"/> to a <see cref="Color"/> if the arguments are of the
+        /// correct type.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <param name="targetType">The target type.</param>
+        /// <returns>
+        /// If <paramref name="value"/> is an <see cref="ISolidColorBrush"/> and <paramref name="targetType"/>
+        /// is <see cref="Color"/> then converts the solid color brush to a color.
+        /// </returns>
+        public static object ConvertBack(object value, Type targetType)
+        {
+            if (targetType == typeof(Color) && value is ISolidColorBrush brush)
+            {
+                return brush.Color;
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/FontFamilyTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/FontFamilyTypeConverter.cs
index e92c155773..b677cdfc22 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Converters/FontFamilyTypeConverter.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Converters/FontFamilyTypeConverter.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.ComponentModel;
 using System.Globalization;
 
diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/IconTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/IconTypeConverter.cs
index 3a2f41bd3d..9e15fb888e 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Converters/IconTypeConverter.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Converters/IconTypeConverter.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
 using System;
diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/PointsListTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/PointsListTypeConverter.cs
index 29c7dbfd39..099ffa8c8c 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Converters/PointsListTypeConverter.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Converters/PointsListTypeConverter.cs
@@ -1,13 +1,11 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 
 namespace Avalonia.Markup.Xaml.Converters
 {
-	using System.ComponentModel;
+    using System.ComponentModel;
+    using Avalonia.Utilities;
 
     public class PointsListTypeConverter : TypeConverter
     {
@@ -18,15 +16,17 @@ namespace Avalonia.Markup.Xaml.Converters
 
         public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
         {
-            string strValue = (string)value;
-            string[] pointStrs = strValue.Split(new[] { ' ', '\t', '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
-            var result = new List<Point>(pointStrs.Length);
-            foreach (var pointStr in pointStrs)
+            var points = new List<Point>();
+
+            using (var tokenizer = new StringTokenizer((string)value, CultureInfo.InvariantCulture, exceptionMessage: "Invalid PointsList."))
             {
-                result.Add(Point.Parse(pointStr));
+                while (tokenizer.TryReadDouble(out double x))
+                {
+                    points.Add(new Point(x, tokenizer.ReadDouble()));
+                }
             }
 
-            return result;
+            return points;
         }
     }
 }
diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/TimeSpanTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/TimeSpanTypeConverter.cs
index d416b14ac5..1e42a46875 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Converters/TimeSpanTypeConverter.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Converters/TimeSpanTypeConverter.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
 
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindingExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindingExtension.cs
new file mode 100644
index 0000000000..17d2ea7ae9
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindingExtension.cs
@@ -0,0 +1,91 @@
+using System;
+using Avalonia.Data;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings;
+using Avalonia.Data.Core;
+using Avalonia.Markup.Parsers;
+
+namespace Avalonia.Markup.Xaml.MarkupExtensions
+{
+    public class CompiledBindingExtension : BindingBase
+    {
+        public CompiledBindingExtension()
+        {
+            Path = new CompiledBindingPath();
+        }
+
+        public CompiledBindingExtension(CompiledBindingPath path)
+        {
+            Path = path;
+        }
+
+        public CompiledBindingExtension ProvideValue(IServiceProvider provider)
+        {
+            return new CompiledBindingExtension
+            {
+                Path = Path,
+                Converter = Converter,
+                ConverterParameter = ConverterParameter,
+                TargetNullValue = TargetNullValue,
+                FallbackValue = FallbackValue,
+                Mode = Mode,
+                Priority = Priority,
+                StringFormat = StringFormat,
+                Source = Source,
+                DefaultAnchor = new WeakReference(GetDefaultAnchor(provider))
+            };
+        }
+
+        private static object GetDefaultAnchor(IServiceProvider provider)
+        {
+            // If the target is not a control, so we need to find an anchor that will let us look
+            // up named controls and style resources. First look for the closest IControl in
+            // the context.
+            object anchor = provider.GetFirstParent<IControl>();
+
+            // If a control was not found, then try to find the highest-level style as the XAML
+            // file could be a XAML file containing only styles.
+            return anchor ??
+                    provider.GetService<IRootObjectProvider>()?.RootObject as IStyle ??
+                    provider.GetLastParent<IStyle>();
+        }
+
+        protected override ExpressionObserver CreateExpressionObserver(IAvaloniaObject target, AvaloniaProperty targetProperty, object anchor, bool enableDataValidation)
+        {
+            if (Source != null)
+            {
+                return CreateSourceObserver(
+                    Source,
+                    Path.BuildExpression(enableDataValidation));
+            }
+
+            if (Path.RawSource != null)
+            {
+                return CreateSourceObserver(
+                    Path.RawSource,
+                    Path.BuildExpression(enableDataValidation));
+            }
+
+            if (Path.SourceMode == SourceMode.Data)
+            {
+                return CreateDataContextObserver(
+                    target,
+                    Path.BuildExpression(enableDataValidation),
+                    targetProperty == StyledElement.DataContextProperty,
+                    anchor);
+            }
+            else
+            {
+                return CreateSourceObserver(
+                    (target as IStyledElement) ?? (anchor as IStyledElement),
+                    Path.BuildExpression(enableDataValidation));
+            }
+        }
+
+        [ConstructorArgument("path")]
+        public CompiledBindingPath Path { get; set; }
+
+        public object Source { get; set; }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/ArrayElementPlugin.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/ArrayElementPlugin.cs
new file mode 100644
index 0000000000..7cbe4942e5
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/ArrayElementPlugin.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Data;
+using Avalonia.Data.Core.Plugins;
+
+namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
+{
+    class ArrayElementPlugin : IPropertyAccessorPlugin
+    {
+        private readonly int[] _indices;
+        private readonly Type _elementType;
+
+        public ArrayElementPlugin(int[] indices, Type elementType)
+        {
+            _indices = indices;
+            _elementType = elementType;
+        }
+
+        public bool Match(object obj, string propertyName)
+        {
+            throw new InvalidOperationException("The ArrayElementPlugin does not support dynamic matching");
+        }
+
+        public IPropertyAccessor Start(WeakReference<object> reference, string propertyName)
+        {
+            if (reference.TryGetTarget(out var target) && target is Array arr)
+            {
+                return new Accessor(new WeakReference<Array>(arr), _indices, _elementType);
+            }
+            return null;
+        }
+
+        class Accessor : PropertyAccessorBase
+        {
+            private readonly int[] _indices;
+            private readonly WeakReference<Array> _reference;
+
+            public Accessor(WeakReference<Array> reference, int[] indices, Type elementType)
+            {
+                _reference = reference;
+                _indices = indices;
+                PropertyType = elementType;
+            }
+
+            public override Type PropertyType { get; }
+
+            public override object Value => _reference.TryGetTarget(out var arr) ? arr.GetValue(_indices) : null;
+
+            public override bool SetValue(object value, BindingPriority priority)
+            {
+                if (_reference.TryGetTarget(out var arr))
+                {
+                    arr.SetValue(value, _indices);
+                    return true;
+                }
+                return false;
+            }
+
+            protected override void SubscribeCore()
+            {
+                PublishValue(Value);
+            }
+
+            protected override void UnsubscribeCore()
+            {
+            }
+        }
+    }
+
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CompiledBindingPath.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CompiledBindingPath.cs
new file mode 100644
index 0000000000..f6636664c1
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CompiledBindingPath.cs
@@ -0,0 +1,284 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Data.Core;
+using Avalonia.Data.Core.Plugins;
+using Avalonia.Markup.Parsers;
+using Avalonia.Markup.Parsers.Nodes;
+
+namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
+{
+    public class CompiledBindingPath
+    {
+        private readonly List<ICompiledBindingPathElement> _elements = new List<ICompiledBindingPathElement>();
+
+        public CompiledBindingPath() { }
+
+        internal CompiledBindingPath(IEnumerable<ICompiledBindingPathElement> bindingPath, object rawSource)
+        {
+            _elements = new List<ICompiledBindingPathElement>(bindingPath);
+            RawSource = rawSource;
+        }
+
+        public ExpressionNode BuildExpression(bool enableValidation)
+        {
+            ExpressionNode pathRoot = null;
+            ExpressionNode path = null;
+            foreach (var element in _elements)
+            {
+                ExpressionNode node = null;
+                switch (element)
+                {
+                    case NotExpressionPathElement _:
+                        node = new LogicalNotNode();
+                        break;
+                    case PropertyElement prop:
+                        node = new PropertyAccessorNode(prop.Property.Name, enableValidation, new PropertyInfoAccessorPlugin(prop.Property, prop.AccessorFactory));
+                        break;
+                    case ArrayElementPathElement arr:
+                        node = new PropertyAccessorNode(CommonPropertyNames.IndexerName, enableValidation, new ArrayElementPlugin(arr.Indices, arr.ElementType));
+                        break;
+                    case VisualAncestorPathElement visualAncestor:
+                        node = new FindVisualAncestorNode(visualAncestor.AncestorType, visualAncestor.Level);
+                        break;
+                    case AncestorPathElement ancestor:
+                        node = new FindAncestorNode(ancestor.AncestorType, ancestor.Level);
+                        break;
+                    case SelfPathElement _:
+                        node = new SelfNode();
+                        break;
+                    case ElementNameElement name:
+                        node = new ElementNameNode(name.NameScope, name.Name);
+                        break;
+                    case IStronglyTypedStreamElement stream:
+                        node = new StreamNode(stream.CreatePlugin());
+                        break;
+                    case ITypeCastElement typeCast:
+                        node = new StrongTypeCastNode(typeCast.Type, typeCast.Cast);
+                        break;
+                    default:
+                        throw new InvalidOperationException($"Unknown binding path element type {element.GetType().FullName}");
+                }
+
+                path = pathRoot is null ? (pathRoot = node) : path.Next = node;
+            }
+
+            return pathRoot ?? new EmptyExpressionNode();
+        }
+
+        internal SourceMode SourceMode => _elements.Count > 0 && _elements[0] is IControlSourceBindingPathElement ? SourceMode.Control : SourceMode.Data;
+
+        internal object RawSource { get; }
+
+        public override string ToString()
+            => string.Concat(_elements.Select(e => e.ToString()));
+    }
+
+    public class CompiledBindingPathBuilder
+    {
+        private object _rawSource;
+        private List<ICompiledBindingPathElement> _elements = new List<ICompiledBindingPathElement>();
+
+        public CompiledBindingPathBuilder Not()
+        {
+            _elements.Add(new NotExpressionPathElement());
+            return this;
+        }
+
+        public CompiledBindingPathBuilder Property(IPropertyInfo info, Func<WeakReference<object>, IPropertyInfo, IPropertyAccessor> accessorFactory)
+        {
+            _elements.Add(new PropertyElement(info, accessorFactory));
+            return this;
+        }
+
+        public CompiledBindingPathBuilder StreamTask<T>()
+        {
+            _elements.Add(new TaskStreamPathElement<T>());
+            return this;
+        }
+
+        public CompiledBindingPathBuilder StreamObservable<T>()
+        {
+            _elements.Add(new ObservableStreamPathElement<T>());
+            return this;
+        }
+
+        public CompiledBindingPathBuilder Self()
+        {
+            _elements.Add(new SelfPathElement());
+            return this;
+        }
+
+        public CompiledBindingPathBuilder Ancestor(Type ancestorType, int level)
+        {
+            _elements.Add(new AncestorPathElement(ancestorType, level));
+            return this;
+        }
+        public CompiledBindingPathBuilder VisualAncestor(Type ancestorType, int level)
+        {
+            _elements.Add(new VisualAncestorPathElement(ancestorType, level));
+            return this;
+        }
+
+        public CompiledBindingPathBuilder ElementName(INameScope nameScope, string name)
+        {
+            _elements.Add(new ElementNameElement(nameScope, name));
+            return this;
+        }
+
+        public CompiledBindingPathBuilder ArrayElement(int[] indices, Type elementType)
+        {
+            _elements.Add(new ArrayElementPathElement(indices, elementType));
+            return this;
+        }
+
+        public CompiledBindingPathBuilder TypeCast<T>()
+        {
+            _elements.Add(new TypeCastPathElement<T>());
+            return this;
+        }
+
+        public CompiledBindingPathBuilder SetRawSource(object rawSource)
+        {
+            _rawSource = rawSource;
+            return this;
+        }
+
+        public CompiledBindingPath Build() => new CompiledBindingPath(_elements, _rawSource);
+    }
+
+    public interface ICompiledBindingPathElement
+    {
+    }
+
+    internal interface IControlSourceBindingPathElement { }
+
+    internal class NotExpressionPathElement : ICompiledBindingPathElement
+    {
+        public static readonly NotExpressionPathElement Instance = new NotExpressionPathElement();
+    }
+
+    internal class PropertyElement : ICompiledBindingPathElement
+    {
+        public PropertyElement(IPropertyInfo property, Func<WeakReference<object>, IPropertyInfo, IPropertyAccessor> accessorFactory)
+        {
+            Property = property;
+            AccessorFactory = accessorFactory;
+        }
+
+        public IPropertyInfo Property { get; }
+
+        public Func<WeakReference<object>, IPropertyInfo, IPropertyAccessor> AccessorFactory { get; }
+
+        public override string ToString()
+            => $".{Property.Name}";
+    }
+
+    internal interface IStronglyTypedStreamElement : ICompiledBindingPathElement
+    {
+        IStreamPlugin CreatePlugin();
+    }
+
+    internal interface ITypeCastElement : ICompiledBindingPathElement
+    {
+        Type Type { get; }
+
+        Func<object, object> Cast { get; }
+    }
+
+    internal class TaskStreamPathElement<T> : IStronglyTypedStreamElement
+    {
+        public static readonly TaskStreamPathElement<T> Instance = new TaskStreamPathElement<T>();
+
+        public IStreamPlugin CreatePlugin() => new TaskStreamPlugin<T>();
+    }
+
+    internal class ObservableStreamPathElement<T> : IStronglyTypedStreamElement
+    {
+        public static readonly ObservableStreamPathElement<T> Instance = new ObservableStreamPathElement<T>();
+
+        public IStreamPlugin CreatePlugin() => new ObservableStreamPlugin<T>();
+    }
+
+    internal class SelfPathElement : ICompiledBindingPathElement, IControlSourceBindingPathElement
+    {
+        public static readonly SelfPathElement Instance = new SelfPathElement();
+
+        public override string ToString()
+            => "$self";
+    }
+
+    internal class AncestorPathElement : ICompiledBindingPathElement, IControlSourceBindingPathElement
+    {
+        public AncestorPathElement(Type ancestorType, int level)
+        {
+            AncestorType = ancestorType;
+            Level = level;
+        }
+
+        public Type AncestorType { get; }
+        public int Level { get; }
+
+        public override string ToString()
+           => $"$parent[{AncestorType?.Name},{Level}]";
+    }
+
+    internal class VisualAncestorPathElement : ICompiledBindingPathElement, IControlSourceBindingPathElement
+    {
+        public VisualAncestorPathElement(Type ancestorType, int level)
+        {
+            AncestorType = ancestorType;
+            Level = level;
+        }
+
+        public Type AncestorType { get; }
+        public int Level { get; }
+    }
+
+    internal class ElementNameElement : ICompiledBindingPathElement, IControlSourceBindingPathElement
+    {
+        public ElementNameElement(INameScope nameScope, string name)
+        {
+            NameScope = nameScope;
+            Name = name;
+        }
+
+        public INameScope NameScope { get; }
+        public string Name { get; }
+
+        public override string ToString()
+            => $"#{Name}";
+    }
+
+    internal class ArrayElementPathElement : ICompiledBindingPathElement
+    {
+        public ArrayElementPathElement(int[] indices, Type elementType)
+        {
+            Indices = indices;
+            ElementType = elementType;
+        }
+
+        public int[] Indices { get; }
+        public Type ElementType { get; }
+        public override string ToString()
+            => $"[{string.Join(",", Indices)}]";
+    }
+
+    internal class TypeCastPathElement<T> : ITypeCastElement
+    {
+        private static object TryCast(object obj)
+        {
+            if (obj is T result)
+                return result;
+            return null;
+        }
+
+        public Type Type => typeof(T);
+
+        public Func<object, object> Cast => TryCast;
+
+        public override string ToString()
+            => $"({Type.FullName})";
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/FindVisualAncestorNode.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/FindVisualAncestorNode.cs
new file mode 100644
index 0000000000..5820f47fbb
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/FindVisualAncestorNode.cs
@@ -0,0 +1,52 @@
+using System;
+using Avalonia.Data.Core;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
+{
+    class FindVisualAncestorNode : ExpressionNode
+    {
+        private readonly int _level;
+        private readonly Type _ancestorType;
+        private IDisposable _subscription;
+
+        public FindVisualAncestorNode(Type ancestorType, int level)
+        {
+            _level = level;
+            _ancestorType = ancestorType;
+        }
+
+        public override string Description
+        {
+            get
+            {
+                if (_ancestorType == null)
+                {
+                    return $"$visualparent[{_level}]";
+                }
+                else
+                {
+                    return $"$visualparent[{_ancestorType.Name}, {_level}]";
+                }
+            }
+        }
+
+        protected override void StartListeningCore(WeakReference<object> reference)
+        {
+            if (reference.TryGetTarget(out object target) && target is IVisual visual)
+            {
+                _subscription = VisualLocator.Track(visual, _level, _ancestorType).Subscribe(ValueChanged);
+            }
+            else
+            {
+                _subscription = null;
+            }
+        }
+
+        protected override void StopListeningCore()
+        {
+            _subscription?.Dispose();
+            _subscription = null;
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/ObservableStreamPlugin.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/ObservableStreamPlugin.cs
new file mode 100644
index 0000000000..3e3174123a
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/ObservableStreamPlugin.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Reactive.Linq;
+using System.Text;
+using Avalonia.Data.Core.Plugins;
+
+namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
+{
+    class ObservableStreamPlugin<T> : IStreamPlugin
+    {
+        public bool Match(WeakReference<object> reference)
+        {
+            return reference.TryGetTarget(out var target) && target is IObservable<T>;
+        }
+
+        public IObservable<object> Start(WeakReference<object> reference)
+        {
+            if (!(reference.TryGetTarget(out var target) && target is IObservable<T> obs))
+            {
+                return Observable.Empty<object>();
+            }
+            else if (target is IObservable<object> obj)
+            {
+                return obj;
+            }
+
+            return obs.Select(x => (object)x);
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorFactory.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorFactory.cs
new file mode 100644
index 0000000000..b3f78bfbe3
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorFactory.cs
@@ -0,0 +1,225 @@
+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;
+using Avalonia.Utilities;
+
+namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
+{
+    public static class PropertyInfoAccessorFactory
+    {
+        public static IPropertyAccessor CreateInpcPropertyAccessor(WeakReference<object> target, IPropertyInfo property)
+            => new InpcPropertyAccessor(target, property);
+
+        public static IPropertyAccessor CreateAvaloniaPropertyAccessor(WeakReference<object> target, IPropertyInfo property)
+            => new AvaloniaPropertyAccessor(new WeakReference<AvaloniaObject>((AvaloniaObject)(target.TryGetTarget(out var o) ? o : null)), (AvaloniaProperty)property);
+
+        public static IPropertyAccessor CreateIndexerPropertyAccessor(WeakReference<object> target, IPropertyInfo property, int argument)
+            => new IndexerAccessor(target, property, argument);
+    }
+
+    internal class AvaloniaPropertyAccessor : PropertyAccessorBase
+    {
+        private readonly WeakReference<AvaloniaObject> _reference;
+        private readonly AvaloniaProperty _property;
+        private IDisposable _subscription;
+
+        public AvaloniaPropertyAccessor(WeakReference<AvaloniaObject> reference, AvaloniaProperty property)
+        {
+            Contract.Requires<ArgumentNullException>(reference != null);
+            Contract.Requires<ArgumentNullException>(property != null);
+
+            _reference = reference;
+            _property = property;
+        }
+
+        public AvaloniaObject Instance
+        {
+            get
+            {
+                _reference.TryGetTarget(out var result);
+                return result;
+            }
+        }
+
+        public override Type PropertyType => _property.PropertyType;
+        public override object Value => Instance?.GetValue(_property);
+
+        public override bool SetValue(object value, BindingPriority priority)
+        {
+            if (!_property.IsReadOnly)
+            {
+                Instance.SetValue(_property, value, priority);
+                return true;
+            }
+
+            return false;
+        }
+
+        protected override void SubscribeCore()
+        {
+            _subscription = Instance?.GetObservable(_property).Subscribe(PublishValue);
+        }
+
+        protected override void UnsubscribeCore()
+        {
+            _subscription?.Dispose();
+            _subscription = null;
+        }
+    }
+
+    internal class InpcPropertyAccessor : PropertyAccessorBase
+    {
+        protected readonly WeakReference<object> _reference;
+        private readonly IPropertyInfo _property;
+
+        public InpcPropertyAccessor(WeakReference<object> reference, IPropertyInfo property)
+        {
+            Contract.Requires<ArgumentNullException>(reference != null);
+            Contract.Requires<ArgumentNullException>(property != null);
+
+            _reference = reference;
+            _property = property;
+        }
+
+        public override Type PropertyType => _property.PropertyType;
+
+        public override object Value
+        {
+            get
+            {
+                return _reference.TryGetTarget(out var o) ? _property.Get(o) : null;
+            }
+        }
+
+        public override bool SetValue(object value, BindingPriority priority)
+        {
+            if (_property.CanSet && _reference.TryGetTarget(out var o))
+            {
+                _property.Set(o, value);
+
+                SendCurrentValue();
+
+                return true;
+            }
+
+            return false;
+        }
+
+        void OnNotifyPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == _property.Name || string.IsNullOrEmpty(e.PropertyName))
+            {
+                SendCurrentValue();
+            }
+        }
+
+        protected override void SubscribeCore()
+        {
+            SendCurrentValue();
+            SubscribeToChanges();
+        }
+
+        protected override void UnsubscribeCore()
+        {
+            if (_reference.TryGetTarget(out var o) && o is INotifyPropertyChanged inpc)
+            {
+                WeakEventHandlerManager.Unsubscribe<PropertyChangedEventArgs, InpcPropertyAccessor>(
+                    inpc,
+                    nameof(INotifyPropertyChanged.PropertyChanged),
+                    OnNotifyPropertyChanged);
+            }
+        }
+
+        protected void SendCurrentValue()
+        {
+            try
+            {
+                var value = Value;
+                PublishValue(value);
+            }
+            catch { }
+        }
+
+        private void SubscribeToChanges()
+        {
+            if (_reference.TryGetTarget(out var o) && o is INotifyPropertyChanged inpc)
+            {
+                WeakEventHandlerManager.Subscribe<INotifyPropertyChanged, PropertyChangedEventArgs, InpcPropertyAccessor>(
+                    inpc,
+                    nameof(INotifyPropertyChanged.PropertyChanged),
+                    OnNotifyPropertyChanged);
+            }
+        }
+    }
+
+    internal class IndexerAccessor : InpcPropertyAccessor
+    {
+        private int _index;
+
+        public IndexerAccessor(WeakReference<object> target, IPropertyInfo basePropertyInfo, int argument)
+            :base(target, basePropertyInfo)
+        {
+            _index = argument;
+        }
+
+
+        protected override void SubscribeCore()
+        {
+            base.SubscribeCore();
+            if (_reference.TryGetTarget(out var o) && o is INotifyCollectionChanged incc)
+            {
+                WeakEventHandlerManager.Subscribe<INotifyCollectionChanged, NotifyCollectionChangedEventArgs, IndexerAccessor>(
+                  incc,
+                  nameof(INotifyCollectionChanged.CollectionChanged),
+                  OnNotifyCollectionChanged);
+            }
+        }
+
+        protected override void UnsubscribeCore()
+        {
+            base.UnsubscribeCore();
+            if (_reference.TryGetTarget(out var o) && o is INotifyCollectionChanged incc)
+            {
+                WeakEventHandlerManager.Unsubscribe<NotifyCollectionChangedEventArgs, IndexerAccessor>(
+                  incc,
+                  nameof(INotifyCollectionChanged.CollectionChanged),
+                  OnNotifyCollectionChanged);
+            }
+        }
+
+        void OnNotifyCollectionChanged(object sender, NotifyCollectionChangedEventArgs args)
+        {
+            if (ShouldNotifyListeners(args))
+            {
+                SendCurrentValue();
+            }
+        }
+
+        bool ShouldNotifyListeners(NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    return _index >= e.NewStartingIndex;
+                case NotifyCollectionChangedAction.Remove:
+                    return _index >= e.OldStartingIndex;
+                case NotifyCollectionChangedAction.Replace:
+                    return _index >= e.NewStartingIndex &&
+                           _index < e.NewStartingIndex + e.NewItems.Count;
+                case NotifyCollectionChangedAction.Move:
+                    return (_index >= e.NewStartingIndex &&
+                            _index < e.NewStartingIndex + e.NewItems.Count) ||
+                           (_index >= e.OldStartingIndex &&
+                            _index < e.OldStartingIndex + e.OldItems.Count);
+                case NotifyCollectionChangedAction.Reset:
+                    return true;
+            }
+            return false;
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorPlugin.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorPlugin.cs
new file mode 100644
index 0000000000..6e7463776b
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorPlugin.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+using Avalonia.Data;
+using Avalonia.Data.Core;
+using Avalonia.Data.Core.Plugins;
+
+namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
+{
+    class PropertyInfoAccessorPlugin : IPropertyAccessorPlugin
+    {
+        private readonly IPropertyInfo _propertyInfo;
+        private readonly Func<WeakReference<object>, IPropertyInfo, IPropertyAccessor> _accessorFactory;
+
+        public PropertyInfoAccessorPlugin(IPropertyInfo propertyInfo, Func<WeakReference<object>, IPropertyInfo, IPropertyAccessor> accessorFactory)
+        {
+            _propertyInfo = propertyInfo;
+            _accessorFactory = accessorFactory;
+        }
+
+        public bool Match(object obj, string propertyName)
+        {
+            throw new InvalidOperationException("The PropertyInfoAccessorPlugin does not support dynamic matching");
+        }
+
+        public IPropertyAccessor Start(WeakReference<object> reference, string propertyName)
+        {
+            Debug.Assert(_propertyInfo.Name == propertyName);
+            return _accessorFactory(reference, _propertyInfo);
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/StrongTypeCastNode.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/StrongTypeCastNode.cs
new file mode 100644
index 0000000000..1252ec7eca
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/StrongTypeCastNode.cs
@@ -0,0 +1,18 @@
+using System;
+using Avalonia.Data.Core;
+
+namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
+{
+    public class StrongTypeCastNode : TypeCastNode
+    {
+        private Func<object, object> _cast;
+
+        public StrongTypeCastNode(Type type, Func<object, object> cast) : base(type)
+        {
+            _cast = cast;
+        }
+
+        protected override object Cast(object value)
+            => _cast(value);
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/TaskStreamPlugin.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/TaskStreamPlugin.cs
new file mode 100644
index 0000000000..164d38e3ae
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/TaskStreamPlugin.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Reactive.Linq;
+using System.Reactive.Subjects;
+using System.Threading.Tasks;
+using Avalonia.Data;
+using Avalonia.Data.Core.Plugins;
+
+namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
+{
+    class TaskStreamPlugin<T> : IStreamPlugin
+    {
+        public bool Match(WeakReference<object> reference)
+        {
+            return reference.TryGetTarget(out var target) && target is Task<T>;
+        }
+
+        public IObservable<object> Start(WeakReference<object> reference)
+        {
+            if(!(reference.TryGetTarget(out var target) && target is Task<T> task))
+            {
+                return Observable.Empty<object>();
+            }
+
+            switch (task.Status)
+            {
+                case TaskStatus.RanToCompletion:
+                case TaskStatus.Faulted:
+                    return HandleCompleted(task);
+                default:
+                    var subject = new Subject<object>();
+                    task.ContinueWith(
+                            x => HandleCompleted(task).Subscribe(subject),
+                            TaskScheduler.FromCurrentSynchronizationContext())
+                        .ConfigureAwait(false);
+                    return subject;
+            }
+        }
+        
+        
+        private static IObservable<object> HandleCompleted(Task<T> task)
+        {
+            switch (task.Status)
+            {
+                case TaskStatus.RanToCompletion:
+                    return Observable.Return((object)task.Result);
+                case TaskStatus.Faulted:
+                    return Observable.Return(new BindingNotification(task.Exception, BindingErrorType.Error));
+                default:
+                    throw new AvaloniaInternalException("HandleCompleted called for non-completed Task.");
+            }
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
index 5bdb0cc235..95380be65f 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
@@ -1,18 +1,16 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.ComponentModel;
-using System.Linq;
-using System.Reactive.Linq;
+using System;
 using Avalonia.Controls;
 using Avalonia.Data;
+using Avalonia.Markup.Xaml.Converters;
+using Avalonia.Media;
+
+#nullable enable
 
 namespace Avalonia.Markup.Xaml.MarkupExtensions
 {
     public class DynamicResourceExtension : IBinding
     {
-        private IResourceNode _anchor;
+        private object? _anchor;
 
         public DynamicResourceExtension()
         {
@@ -23,31 +21,54 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
             ResourceKey = resourceKey;
         }
 
-        public object ResourceKey { get; set; }
+        public object? ResourceKey { get; set; }
 
         public IBinding ProvideValue(IServiceProvider serviceProvider)
         {
             var provideTarget = serviceProvider.GetService<IProvideValueTarget>();
 
-            if (!(provideTarget.TargetObject is IResourceNode))
+            if (!(provideTarget.TargetObject is IStyledElement))
             {
-                _anchor = serviceProvider.GetFirstParent<IResourceNode>();
+                _anchor = serviceProvider.GetFirstParent<IStyledElement>() ??
+                    serviceProvider.GetFirstParent<IResourceProvider>() ??
+                    (object?)serviceProvider.GetFirstParent<IResourceHost>();
             }
 
             return this;
         }
 
-        InstancedBinding IBinding.Initiate(
+        InstancedBinding? IBinding.Initiate(
             IAvaloniaObject target,
             AvaloniaProperty targetProperty,
             object anchor,
             bool enableDataValidation)
         {
-            var control = target as IResourceNode ?? _anchor;
+            if (ResourceKey is null)
+            {
+                return null;
+            }
+
+            var control = target as IResourceHost ?? _anchor as IResourceHost;
 
             if (control != null)
             {
-                return InstancedBinding.OneWay(control.GetResourceObservable(ResourceKey));
+                var source = control.GetResourceObservable(ResourceKey, GetConverter(targetProperty));
+                return InstancedBinding.OneWay(source);
+            }
+            else if (_anchor is IResourceProvider resourceProvider)
+            {
+                var source = resourceProvider.GetResourceObservable(ResourceKey, GetConverter(targetProperty));
+                return InstancedBinding.OneWay(source);
+            }
+
+            return null;
+        }
+
+        private Func<object?, object?>? GetConverter(AvaloniaProperty targetProperty)
+        {
+            if (targetProperty?.PropertyType == typeof(IBrush))
+            {
+                return x => ColorToBrushConverter.Convert(x, typeof(IBrush));
             }
 
             return null;
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ReflectionBindingExtension.cs
similarity index 81%
rename from src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
rename to src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ReflectionBindingExtension.cs
index a466714136..10770365a3 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ReflectionBindingExtension.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Data;
 using System;
 
@@ -12,13 +9,13 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
     using Avalonia.Styling;
     using System.ComponentModel;
 
-    public class BindingExtension
+    public class ReflectionBindingExtension
     {
-        public BindingExtension()
+        public ReflectionBindingExtension()
         {
         }
 
-        public BindingExtension(string path)
+        public ReflectionBindingExtension(string path)
         {
             Path = path;
         }
@@ -41,6 +38,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
                 StringFormat = StringFormat,
                 RelativeSource = RelativeSource,
                 DefaultAnchor = new WeakReference(GetDefaultAnchor(descriptorContext)),
+                TargetNullValue = TargetNullValue,
                 NameScope = new WeakReference<INameScope>(serviceProvider.GetService<INameScope>())
             };
         }
@@ -52,6 +50,13 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
             // the context.
             object anchor = context.GetFirstParent<IControl>();
 
+            if(anchor is null)
+            {
+                // Try to find IDataContextProvider, this was added to allow us to find
+                // a datacontext for Application class when using NativeMenuItems.
+                anchor = context.GetFirstParent<IDataContextProvider>();
+            }
+
             // If a control was not found, then try to find the highest-level style as the XAML
             // file could be a XAML file containing only styles.
             return anchor ??
@@ -79,5 +84,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
         public string StringFormat { get; set; }
 
         public RelativeSource RelativeSource { get; set; }
+
+        public object TargetNullValue { get; set; } = AvaloniaProperty.UnsetValue;
     }
 }
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs
index f690a5ff0e..f06644758f 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Data;
 
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResolveByNameExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResolveByNameExtension.cs
new file mode 100644
index 0000000000..909462392c
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResolveByNameExtension.cs
@@ -0,0 +1,36 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Data.Core;
+
+#nullable  enable
+
+namespace Avalonia.Markup.Xaml.MarkupExtensions
+{
+    public class ResolveByNameExtension
+    {
+        public ResolveByNameExtension(string name)
+        {
+            Name = name;
+        }
+
+        public string Name { get; }
+
+        public object? ProvideValue(IServiceProvider serviceProvider)
+        {
+            var nameScope = serviceProvider.GetService<INameScope>();
+            
+            var value = nameScope.FindAsync(Name);
+
+            if(value.IsCompleted)
+                return value.GetResult();
+
+            var provideValueTarget = serviceProvider.GetService<IProvideValueTarget>();
+            var target = provideValueTarget.TargetObject;
+
+            if (provideValueTarget.TargetProperty is IPropertyInfo property) 
+                value.OnCompleted(() => property.Set(target, value.GetResult()));
+
+            return AvaloniaProperty.UnsetValue;
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs
index 3525628a79..b6137aa89f 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs
@@ -2,17 +2,18 @@
 using System.ComponentModel;
 using Avalonia.Controls;
 
+#nullable enable
+
 namespace Avalonia.Markup.Xaml.MarkupExtensions
 {
     /// <summary>
     /// Loads a resource dictionary from a specified URL.
     /// </summary>
-    public class ResourceInclude :IResourceProvider
+    public class ResourceInclude : IResourceProvider
     {
-        private Uri _baseUri;
-        private IResourceDictionary _loaded;
-
-        public event EventHandler<ResourcesChangedEventArgs> ResourcesChanged;
+        private Uri? _baseUri;
+        private IResourceDictionary? _loaded;
+        private bool _isLoading;
 
         /// <summary>
         /// Gets the loaded resource dictionary.
@@ -23,33 +24,44 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
             {
                 if (_loaded == null)
                 {
-                    var loader = new AvaloniaXamlLoader();
-                    _loaded = (IResourceDictionary)loader.Load(Source, _baseUri);
-
-                    if (_loaded.HasResources)
-                    {
-                        ResourcesChanged?.Invoke(this, new ResourcesChangedEventArgs());
-                    }
+                    _isLoading = true;
+                    _loaded = (IResourceDictionary)AvaloniaXamlLoader.Load(Source, _baseUri);
+                    _isLoading = false;
                 }
 
                 return _loaded;
             }
         }
 
+        public IResourceHost? Owner => Loaded.Owner;
+
         /// <summary>
         /// Gets or sets the source URL.
         /// </summary>
-        public Uri Source { get; set; }
+        public Uri? Source { get; set; }
 
-        /// <inhertidoc/>
-        bool IResourceProvider.HasResources => Loaded.HasResources;
+        bool IResourceNode.HasResources => Loaded.HasResources;
 
-        /// <inhertidoc/>
-        bool IResourceProvider.TryGetResource(object key, out object value)
+        public event EventHandler OwnerChanged
         {
-            return Loaded.TryGetResource(key, out value);
+            add => Loaded.OwnerChanged += value;
+            remove => Loaded.OwnerChanged -= value;
         }
 
+        bool IResourceNode.TryGetResource(object key, out object? value)
+        {
+            if (!_isLoading)
+            {
+                return Loaded.TryGetResource(key, out value);                
+            }
+
+            value = null;
+            return false;
+        }
+
+        void IResourceProvider.AddOwner(IResourceHost owner) => Loaded.AddOwner(owner);
+        void IResourceProvider.RemoveOwner(IResourceHost owner) => Loaded.RemoveOwner(owner);
+
         public ResourceInclude ProvideValue(IServiceProvider serviceProvider)
         {
             var tdc = (ITypeDescriptorContext)serviceProvider;
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
index 6d055e033f..4ad68fc63e 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
@@ -1,12 +1,10 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Reflection;
 using Avalonia.Controls;
 using Avalonia.Markup.Data;
+using Avalonia.Markup.Xaml.Converters;
+using Avalonia.Markup.Xaml.XamlIl.Runtime;
 
 namespace Avalonia.Markup.Xaml.MarkupExtensions
 {
@@ -25,33 +23,45 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
 
         public object ProvideValue(IServiceProvider serviceProvider)
         {
-            // Look upwards though the ambient context for IResourceProviders which might be able
-            // to give us the resource.
-            foreach (var resourceProvider in serviceProvider.GetParents<IResourceNode>())
+            var stack = serviceProvider.GetService<IAvaloniaXamlIlParentStackProvider>();
+            var provideTarget = serviceProvider.GetService<IProvideValueTarget>();
+
+            var targetType = provideTarget.TargetProperty switch
             {
-                if (resourceProvider.TryGetResource(ResourceKey, out var value))
+                AvaloniaProperty ap => ap.PropertyType,
+                PropertyInfo pi => pi.PropertyType,
+                _ => null,
+            };
+
+            // Look upwards though the ambient context for IResourceHosts and IResourceProviders
+            // which might be able to give us the resource.
+            foreach (var e in stack.Parents)
+            {
+                object value;
+
+                if (e is IResourceHost host && host.TryGetResource(ResourceKey, out value))
                 {
-                    return value;
+                    return ColorToBrushConverter.Convert(value, targetType);
+                }
+                else if (e is IResourceProvider provider && provider.TryGetResource(ResourceKey, out value))
+                {
+                    return ColorToBrushConverter.Convert(value, targetType);
                 }
-
             }
 
-            // The resource still hasn't been found, so add a delayed one-time binding.
-            var provideTarget = serviceProvider.GetService<IProvideValueTarget>();
-
             if (provideTarget.TargetObject is IControl target &&
                 provideTarget.TargetProperty is PropertyInfo property)
             {
-                DelayedBinding.Add(target, property, GetValue);
+                DelayedBinding.Add(target, property, x => GetValue(x, targetType));
                 return AvaloniaProperty.UnsetValue;
             }
 
             throw new KeyNotFoundException($"Static resource '{ResourceKey}' not found.");
         }
 
-        private object GetValue(IStyledElement control)
+        private object GetValue(IStyledElement control, Type targetType)
         {
-            return control.FindResource(ResourceKey);
+            return ColorToBrushConverter.Convert(control.FindResource(ResourceKey), targetType);
         }
     }
 }
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StyleIncludeExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StyleIncludeExtension.cs
index a323050c31..129fa66912 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StyleIncludeExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StyleIncludeExtension.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Markup.Xaml.Styling;
 using Avalonia.Styling;
 using System.ComponentModel;
diff --git a/src/Markup/Avalonia.Markup.Xaml/Properties/AssemblyInfo.cs b/src/Markup/Avalonia.Markup.Xaml/Properties/AssemblyInfo.cs
index e67e994123..706729a5ac 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Properties/AssemblyInfo.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Properties/AssemblyInfo.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reflection;
 using Avalonia.Metadata;
 using System.Runtime.CompilerServices;
@@ -8,5 +5,8 @@ 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")]
+#if SIGNED_BUILD
+[assembly: InternalsVisibleTo("Avalonia.Markup.Xaml.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+#else
 [assembly: InternalsVisibleTo("Avalonia.Markup.Xaml.UnitTests")]
-
+#endif
diff --git a/src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs b/src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs
index 7acee50d80..607b552c28 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs
@@ -1,46 +1,45 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Styling;
 using System;
 using Avalonia.Controls;
+using System.Collections.Generic;
+
+#nullable enable
 
 namespace Avalonia.Markup.Xaml.Styling
 {
     /// <summary>
     /// Includes a style from a URL.
     /// </summary>
-    public class StyleInclude : IStyle, ISetStyleParent
+    public class StyleInclude : IStyle, IResourceProvider
     {
-        private Uri _baseUri;
-        private IStyle _loaded;
-        private IResourceNode _parent;
+        private readonly Uri _baseUri;
+        private IStyle[]? _loaded;
+        private bool _isLoading;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="StyleInclude"/> class.
         /// </summary>
-        /// <param name="baseUri"></param>
+        /// <param name="baseUri">The base URL for the XAML context.</param>
         public StyleInclude(Uri baseUri)
         {
             _baseUri = baseUri;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StyleInclude"/> class.
+        /// </summary>
+        /// <param name="serviceProvider">The XAML service provider.</param>
         public StyleInclude(IServiceProvider serviceProvider)
         {
             _baseUri = serviceProvider.GetContextBaseUri();
         }
-        
-        /// <inheritdoc/>
-        public event EventHandler<ResourcesChangedEventArgs> ResourcesChanged
-        {
-            add {}
-            remove {}
-        }
+
+        public IResourceHost? Owner => (Loaded as IResourceProvider)?.Owner;
 
         /// <summary>
         /// Gets or sets the source URL.
         /// </summary>
-        public Uri Source { get; set; }
+        public Uri? Source { get; set; }
 
         /// <summary>
         /// Gets the loaded style.
@@ -51,58 +50,52 @@ namespace Avalonia.Markup.Xaml.Styling
             {
                 if (_loaded == null)
                 {
-                    var loader = new AvaloniaXamlLoader();
-                    _loaded = (IStyle)loader.Load(Source, _baseUri);
-                    (_loaded as ISetStyleParent)?.SetParent(this);
+                    _isLoading = true;
+                    var loaded = (IStyle)AvaloniaXamlLoader.Load(Source, _baseUri);
+                    _loaded = new[] { loaded };
+                    _isLoading = false;
                 }
 
-                return _loaded;
+                return _loaded?[0]!;
             }
         }
 
-        /// <inheritdoc/>
-        bool IResourceProvider.HasResources => Loaded.HasResources;
+        bool IResourceNode.HasResources => (Loaded as IResourceProvider)?.HasResources ?? false;
 
-        /// <inheritdoc/>
-        IResourceNode IResourceNode.ResourceParent => _parent;
+        IReadOnlyList<IStyle> IStyle.Children => _loaded ?? Array.Empty<IStyle>();
 
-        /// <inheritdoc/>
-        public bool Attach(IStyleable control, IStyleHost container)
+        public event EventHandler OwnerChanged
         {
-            if (Source != null)
+            add
             {
-                return Loaded.Attach(control, container);
+                if (Loaded is IResourceProvider rp)
+                {
+                    rp.OwnerChanged += value;
+                }
             }
-
-            return false;
-        }
-
-        public void Detach()
-        {
-            if (Source != null)
+            remove
             {
-                Loaded.Detach();
+                if (Loaded is IResourceProvider rp)
+                {
+                    rp.OwnerChanged -= value;
+                }
             }
         }
 
-        /// <inheritdoc/>
-        public bool TryGetResource(object key, out object value) => Loaded.TryGetResource(key, out value);
+        public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host) => Loaded.TryAttach(target, host);
 
-        /// <inheritdoc/>
-        void ISetStyleParent.NotifyResourcesChanged(ResourcesChangedEventArgs e)
+        public bool TryGetResource(object key, out object? value)
         {
-            (Loaded as ISetStyleParent)?.NotifyResourcesChanged(e);
-        }
-
-        /// <inheritdoc/>
-        void ISetStyleParent.SetParent(IResourceNode parent)
-        {
-            if (_parent != null && parent != null)
+            if (!_isLoading && Loaded is IResourceProvider p)
             {
-                throw new InvalidOperationException("The Style already has a parent.");
+                return p.TryGetResource(key, out value);
             }
 
-            _parent = parent;
+            value = null;
+            return false;
         }
+
+        void IResourceProvider.AddOwner(IResourceHost owner) => (Loaded as IResourceProvider)?.AddOwner(owner);
+        void IResourceProvider.RemoveOwner(IResourceHost owner) => (Loaded as IResourceProvider)?.RemoveOwner(owner);
     }
 }
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/ControlTemplate.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/ControlTemplate.cs
index f46ee8787b..30c7c75992 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/ControlTemplate.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/ControlTemplate.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs
index c81a3718a7..07c5451135 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs
@@ -1,15 +1,11 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Reflection;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Avalonia.Metadata;
 
 namespace Avalonia.Markup.Xaml.Templates
 {
-    public class DataTemplate : IDataTemplate
+    public class DataTemplate : IRecyclingDataTemplate
     {
         public Type DataType { get; set; }
 
@@ -18,8 +14,6 @@ namespace Avalonia.Markup.Xaml.Templates
         [TemplateContent]
         public object Content { get; set; }
 
-        public bool SupportsRecycling { get; set; } = true;
-
         public bool Match(object data)
         {
             if (DataType == null)
@@ -28,10 +22,15 @@ namespace Avalonia.Markup.Xaml.Templates
             }
             else
             {
-                return DataType.GetTypeInfo().IsAssignableFrom(data.GetType().GetTypeInfo());
+                return DataType.IsInstanceOfType(data);
             }
         }
 
-        public IControl Build(object data) => TemplateContent.Load(Content).Control;
+        public IControl Build(object data) => Build(data, null);
+
+        public IControl Build(object data, IControl existing)
+        {
+            return existing ?? TemplateContent.Load(Content).Control;
+        }
     }
 }
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/FocusAdornerTemplate.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/FocusAdornerTemplate.cs
index 48309570cf..23e01f699f 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/FocusAdornerTemplate.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/FocusAdornerTemplate.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls;
 using Avalonia.Metadata;
 using Avalonia.Styling;
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/ItemsPanelTemplate.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/ItemsPanelTemplate.cs
index 0dd4e57a7f..c8843a3176 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/ItemsPanelTemplate.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/ItemsPanelTemplate.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls;
 using Avalonia.Metadata;
 using Avalonia.Styling;
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/Template.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/Template.cs
index 5f36cfe0ac..65323ae665 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/Template.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/Template.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls;
 using Avalonia.Metadata;
 using Avalonia.Styling;
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/TemplateContent.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/TemplateContent.cs
index 6a30c3861a..96f25668fb 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/TemplateContent.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/TemplateContent.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Controls;
 using System.Collections.Generic;
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
index 0e2a131afd..d785ac4ac0 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
@@ -1,14 +1,10 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Reflection;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Data.Core;
-using Avalonia.Markup.Data;
 using Avalonia.Markup.Parsers;
+using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Metadata;
 
 namespace Avalonia.Markup.Xaml.Templates
@@ -22,9 +18,7 @@ namespace Avalonia.Markup.Xaml.Templates
         public object Content { get; set; }
 
         [AssignBinding]
-        public Binding ItemsSource { get; set; }
-
-        public bool SupportsRecycling { get; set; } = true;
+        public BindingBase ItemsSource { get; set; }
 
         public bool Match(object data)
         {
@@ -34,7 +28,7 @@ namespace Avalonia.Markup.Xaml.Templates
             }
             else
             {
-                return DataType.GetTypeInfo().IsAssignableFrom(data.GetType().GetTypeInfo());
+                return DataType.IsInstanceOfType(data);
             }
         }
 
@@ -42,7 +36,13 @@ namespace Avalonia.Markup.Xaml.Templates
         {
             if (ItemsSource != null)
             {
-                var obs = ExpressionObserverBuilder.Build(item, ItemsSource.Path);
+                var obs = ItemsSource switch
+                {
+                    Binding reflection => ExpressionObserverBuilder.Build(item, reflection.Path),
+                    CompiledBindingExtension compiled => new ExpressionObserver(item, compiled.Path.BuildExpression(false)),
+                    _ => throw new InvalidOperationException("TreeDataTemplate currently only supports Binding and CompiledBindingExtension!")
+                };
+
                 return InstancedBinding.OneWay(obs, BindingPriority.Style);
             }
 
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/AvaloniaXamlIlCompiler.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/AvaloniaXamlIlCompiler.cs
deleted file mode 100644
index b84f50fa8d..0000000000
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/AvaloniaXamlIlCompiler.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers;
-using XamlIl;
-using XamlIl.Ast;
-using XamlIl.Parsers;
-using XamlIl.Transform;
-using XamlIl.Transform.Transformers;
-using XamlIl.TypeSystem;
-
-namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
-{
-    class AvaloniaXamlIlCompiler : XamlIlCompiler
-    {
-        private readonly XamlIlTransformerConfiguration _configuration;
-        private readonly IXamlIlType _contextType;
-        private readonly AvaloniaXamlIlDesignPropertiesTransformer _designTransformer;
-
-        private AvaloniaXamlIlCompiler(XamlIlTransformerConfiguration configuration) : base(configuration, true)
-        {
-            _configuration = configuration;
-
-            void InsertAfter<T>(params IXamlIlAstTransformer[] t) 
-                => Transformers.InsertRange(Transformers.FindIndex(x => x is T) + 1, t);
-
-            void InsertBefore<T>(params IXamlIlAstTransformer[] 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, new AvaloniaBindingExtensionHackTransformer());
-            
-            
-            // Targeted
-
-            InsertBefore<XamlIlPropertyReferenceResolver>(new AvaloniaXamlIlTransformInstanceAttachedProperties());
-            InsertAfter<XamlIlPropertyReferenceResolver>(new AvaloniaXamlIlAvaloniaPropertyResolver());
-            
-
-
-            InsertBefore<XamlIlContentConvertTransformer>(
-                new AvaloniaXamlIlSelectorTransformer(),
-                new AvaloniaXamlIlSetterTransformer(),
-                new AvaloniaXamlIlControlTemplateTargetTypeMetadataTransformer(),
-                new AvaloniaXamlIlConstructorServiceProviderTransformer(),
-                new AvaloniaXamlIlTransitionsTypeMetadataTransformer()
-            );
-            
-            // After everything else
-            
-            Transformers.Add(new AddNameScopeRegistration());
-            Transformers.Add(new AvaloniaXamlIlMetadataRemover());
-
-        }
-
-        public AvaloniaXamlIlCompiler(XamlIlTransformerConfiguration configuration,
-            IXamlIlTypeBuilder contextTypeBuilder) : this(configuration)
-        {
-            _contextType = CreateContextType(contextTypeBuilder);
-        }
-
-        
-        public AvaloniaXamlIlCompiler(XamlIlTransformerConfiguration configuration,
-            IXamlIlType contextType) : this(configuration)
-        {
-            _contextType = contextType;
-        }
-        
-        public const string PopulateName = "__AvaloniaXamlIlPopulate";
-        public const string BuildName = "__AvaloniaXamlIlBuild";
-
-        public bool IsDesignMode
-        {
-            get => _designTransformer.IsDesignMode;
-            set => _designTransformer.IsDesignMode = value;
-        }
-
-        public void ParseAndCompile(string xaml, string baseUri, IFileSource fileSource, IXamlIlTypeBuilder tb, IXamlIlType overrideRootType)
-        {
-            var parsed = XDocumentXamlIlParser.Parse(xaml, new Dictionary<string, string>
-            {
-                {XamlNamespaces.Blend2008, XamlNamespaces.Blend2008}
-            });
-            
-            var rootObject = (XamlIlAstObjectNode)parsed.Root;
-
-            var classDirective = rootObject.Children
-                .OfType<XamlIlAstXmlDirective>().FirstOrDefault(x =>
-                    x.Namespace == XamlNamespaces.Xaml2006
-                    && x.Name == "Class");
-
-            var rootType =
-                classDirective != null ?
-                    new XamlIlAstClrTypeReference(classDirective,
-                        _configuration.TypeSystem.GetType(((XamlIlAstTextNode)classDirective.Values[0]).Text),
-                        false) :
-                    XamlIlTypeReferenceResolver.ResolveType(CreateTransformationContext(parsed, true),
-                        (XamlIlAstXmlTypeReference)rootObject.Type, true);
-            
-            
-            if (overrideRootType != null)
-            {
-                
-
-                if (!rootType.Type.IsAssignableFrom(overrideRootType))
-                    throw new XamlIlLoadException(
-                        $"Unable to substitute {rootType.Type.GetFqn()} with {overrideRootType.GetFqn()}", rootObject);
-                rootType = new XamlIlAstClrTypeReference(rootObject, overrideRootType, false);
-            }
-
-            OverrideRootType(parsed, rootType);
-
-            Transform(parsed);
-            Compile(parsed, tb, _contextType, PopulateName, BuildName, "__AvaloniaXamlIlNsInfo", baseUri, fileSource);
-            
-        }
-
-        public void OverrideRootType(XamlIlDocument doc, IXamlIlAstTypeReference newType)
-        {
-            var root = (XamlIlAstObjectNode)doc.Root;
-            var oldType = root.Type;
-            if (oldType.Equals(newType))
-                return;
-
-            root.Type = newType;
-            foreach (var child in root.Children.OfType<XamlIlAstXamlPropertyValueNode>())
-            {
-                if (child.Property is XamlIlAstNamePropertyReference prop)
-                {
-                    if (prop.DeclaringType.Equals(oldType))
-                        prop.DeclaringType = newType;
-                    if (prop.TargetType.Equals(oldType))
-                        prop.TargetType = newType;
-                }
-            }
-        }
-    }
-}
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AddNameScopeRegistration.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AddNameScopeRegistration.cs
deleted file mode 100644
index 805b733feb..0000000000
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AddNameScopeRegistration.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using System;
-using System.Linq;
-using XamlIl.Ast;
-using XamlIl.Transform;
-using XamlIl.TypeSystem;
-
-namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
-{
-    class AddNameScopeRegistration : IXamlIlAstTransformer
-    {
-        public IXamlIlAstNode Transform(XamlIlAstTransformationContext context, IXamlIlAstNode node)
-        {
-            if (node is XamlIlPropertyAssignmentNode pa
-                && pa.Property.Name == "Name"
-                && pa.Property.DeclaringType.FullName == "Avalonia.StyledElement")
-            {
-                if (context.ParentNodes().FirstOrDefault() is XamlIlManipulationGroupNode mg
-                    && mg.Children.OfType<AvaloniaNameScopeRegistrationXamlIlNode>().Any())
-                    return node;
-                
-                IXamlIlAstValueNode value = null;
-                for (var c = 0; c < pa.Values.Count; c++)
-                    if (pa.Values[c].Type.GetClrType().Equals(context.Configuration.WellKnownTypes.String))
-                    {
-                        value = pa.Values[c];
-                        if (!(value is XamlIlAstTextNode))
-                        {
-                            var local = new XamlIlAstCompilerLocalNode(value);
-                            // Wrap original in local initialization
-                            pa.Values[c] = new XamlIlAstLocalInitializationNodeEmitter(value, value, local);
-                            // Use local
-                            value = local;
-                        }
-
-                        break;
-                    }
-
-                if (value != null)
-                    return new XamlIlManipulationGroupNode(pa)
-                    {
-                        Children =
-                        {
-                            pa,
-                            new AvaloniaNameScopeRegistrationXamlIlNode(value, context.GetAvaloniaTypes())
-                        }
-                    };
-            }
-
-            if (!context.ParentNodes().Any()
-                && node is XamlIlValueWithManipulationNode mnode)
-            {
-                mnode.Manipulation = new XamlIlManipulationGroupNode(mnode,
-                    new[]
-                    {
-                        mnode.Manipulation,
-                        new HandleRootObjectScopeNode(mnode, context.GetAvaloniaTypes())
-                    });
-            }
-            return node;
-        }
-
-        class HandleRootObjectScopeNode : XamlIlAstNode, IXamlIlAstManipulationNode, IXamlIlAstEmitableNode
-        {
-            private readonly AvaloniaXamlIlWellKnownTypes _types;
-
-            public HandleRootObjectScopeNode(IXamlIlLineInfo lineInfo,
-                AvaloniaXamlIlWellKnownTypes types) : base(lineInfo)
-            {
-                _types = types;
-            }
-
-            public XamlIlNodeEmitResult Emit(XamlIlEmitContext context, IXamlIlEmitter codeGen)
-            {
-                var next = codeGen.DefineLabel();
-                var scopeField = context.RuntimeContext.ContextType.Fields.First(f =>
-                    f.Name == AvaloniaXamlIlLanguage.ContextNameScopeFieldName);
-                using (var local = codeGen.LocalsPool.GetLocal(_types.StyledElement))
-                {
-                    codeGen
-                        .Isinst(_types.StyledElement)
-                        .Dup()
-                        .Stloc(local.Local)
-                        .Brfalse(next)
-                        .Ldloc(local.Local)
-                        .Ldloc(context.ContextLocal)
-                        .Ldfld(scopeField)
-                        .EmitCall(_types.NameScopeSetNameScope, true)
-                        .MarkLabel(next)
-                        .Ldloc(context.ContextLocal)
-                        .Ldfld(scopeField)
-                        .EmitCall(_types.INameScopeComplete, true);
-                }
-
-                return XamlIlNodeEmitResult.Void(1);
-
-            }
-        }
-    }
-
-    class AvaloniaNameScopeRegistrationXamlIlNode : XamlIlAstNode, IXamlIlAstManipulationNode, IXamlIlAstEmitableNode
-    {
-        private readonly AvaloniaXamlIlWellKnownTypes _types;
-        public IXamlIlAstValueNode Name { get; set; }
-
-        public AvaloniaNameScopeRegistrationXamlIlNode(IXamlIlAstValueNode name, AvaloniaXamlIlWellKnownTypes types) : base(name)
-        {
-            _types = types;
-            Name = name;
-        }
-
-        public override void VisitChildren(IXamlIlAstVisitor visitor)
-            => Name = (IXamlIlAstValueNode)Name.Visit(visitor);
-
-        public XamlIlNodeEmitResult Emit(XamlIlEmitContext context, IXamlIlEmitter codeGen)
-        {
-            var scopeField = context.RuntimeContext.ContextType.Fields.First(f =>
-                f.Name == AvaloniaXamlIlLanguage.ContextNameScopeFieldName);
-            
-            using (var targetLoc = context.GetLocal(context.Configuration.WellKnownTypes.Object))
-            {
-
-                codeGen
-                    // var target = {pop}
-                    .Stloc(targetLoc.Local)
-                    // _context.NameScope.Register(Name, target)
-                    .Ldloc(context.ContextLocal)
-                    .Ldfld(scopeField);
-                    
-                context.Emit(Name, codeGen, Name.Type.GetClrType());
-                
-                codeGen
-                    .Ldloc(targetLoc.Local)
-                    .EmitCall(_types.INameScopeRegister, true);
-            }
-
-            return XamlIlNodeEmitResult.Void(1);
-        }
-    }
-}
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaBindingExtensionHackTransformer.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaBindingExtensionHackTransformer.cs
deleted file mode 100644
index c89106312f..0000000000
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaBindingExtensionHackTransformer.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using XamlIl.Ast;
-using XamlIl.Transform;
-
-namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
-{
-    class AvaloniaBindingExtensionHackTransformer : IXamlIlAstTransformer
-    {
-        public IXamlIlAstNode Transform(XamlIlAstTransformationContext context, IXamlIlAstNode node)
-        {
-            // Our code base expects XAML parser to prefer `FooExtension` to `Foo` even with `<Foo>` syntax
-            // This is the legacy of Portable.Xaml, so we emulate that behavior here
-
-            if (node is XamlIlAstXmlTypeReference tref
-                && tref.Name == "Binding"
-                && tref.XmlNamespace == "https://github.com/avaloniaui")
-                tref.IsMarkupExtension = true;
-            return node;
-        }
-    }
-}
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlMetadataRemover.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlMetadataRemover.cs
deleted file mode 100644
index 994928b7fe..0000000000
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlMetadataRemover.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Linq;
-using XamlIl.Ast;
-using XamlIl.Transform;
-
-namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
-{
-    class AvaloniaXamlIlMetadataRemover : IXamlIlAstTransformer
-    {
-        public IXamlIlAstNode Transform(XamlIlAstTransformationContext context, IXamlIlAstNode node)
-        {
-            if (node is AvaloniaXamlIlTargetTypeMetadataNode md)
-                return md.Value;
-
-            return node;
-        }
-    }
-}
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
deleted file mode 100644
index 629e2562d3..0000000000
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using XamlIl;
-using XamlIl.Ast;
-using XamlIl.Transform;
-using XamlIl.Transform.Transformers;
-using XamlIl.TypeSystem;
-
-namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
-{
-    class AvaloniaXamlIlSetterTransformer : IXamlIlAstTransformer
-    {
-        public IXamlIlAstNode Transform(XamlIlAstTransformationContext context, IXamlIlAstNode node)
-        {
-            if (!(node is XamlIlAstObjectNode on
-                  && on.Type.GetClrType().FullName == "Avalonia.Styling.Setter"))
-                return node;
-
-            var parent = context.ParentNodes().OfType<XamlIlAstObjectNode>()
-                .FirstOrDefault(p => p.Type.GetClrType().FullName == "Avalonia.Styling.Style");
-            
-            if (parent == null)
-                throw new XamlIlParseException(
-                    "Avalonia.Styling.Setter is only valid inside Avalonia.Styling.Style", node);
-            var selectorProperty = parent.Children.OfType<XamlIlAstXamlPropertyValueNode>()
-                .FirstOrDefault(p => p.Property.GetClrProperty().Name == "Selector");
-            if (selectorProperty == null)
-                throw new XamlIlParseException(
-                    "Can not find parent Style Selector", node);
-            var selector = selectorProperty.Values.FirstOrDefault() as XamlIlSelectorNode;
-            if (selector?.TargetType == null)
-                throw new XamlIlParseException(
-                    "Can not resolve parent Style Selector type", node);
-
-
-            var property = @on.Children.OfType<XamlIlAstXamlPropertyValueNode>()
-                .FirstOrDefault(x => x.Property.GetClrProperty().Name == "Property");
-            if (property == null)
-                throw new XamlIlParseException("Setter without a property is not valid", node);
-
-            var propertyName = property.Values.OfType<XamlIlAstTextNode>().FirstOrDefault()?.Text;
-            if (propertyName == null)
-                throw new XamlIlParseException("Setter.Property must be a string", node);
-
-
-            var avaloniaPropertyNode = XamlIlAvaloniaPropertyHelper.CreateNode(context, propertyName,
-                new XamlIlAstClrTypeReference(selector, selector.TargetType, false), property.Values[0]);
-            property.Values = new List<IXamlIlAstValueNode>
-            {
-                avaloniaPropertyNode
-            };
-
-            var valueProperty = on.Children
-                .OfType<XamlIlAstXamlPropertyValueNode>().FirstOrDefault(p => p.Property.GetClrProperty().Name == "Value");
-            if (valueProperty?.Values?.Count == 1 && valueProperty.Values[0] is XamlIlAstTextNode)
-            {
-                var propType = avaloniaPropertyNode.AvaloniaPropertyType;
-                if (!XamlIlTransformHelpers.TryGetCorrectlyTypedValue(context, valueProperty.Values[0],
-                        propType, out var converted))
-                    throw new XamlIlParseException(
-                        $"Unable to convert property value to {propType.GetFqn()}",
-                        valueProperty.Values[0]);
-
-                valueProperty.Property = new SetterValueProperty(valueProperty.Property,
-                    on.Type.GetClrType(), propType, context.GetAvaloniaTypes());
-            }
-
-            return node;
-        }
-
-        class SetterValueProperty : XamlIlAstClrProperty
-        {
-            public SetterValueProperty(IXamlIlLineInfo line, IXamlIlType setterType, IXamlIlType targetType,
-                AvaloniaXamlIlWellKnownTypes types)
-                : base(line, "Value", setterType, null)
-            {
-                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));
-            }
-            
-            class XamlIlDirectCallPropertySetter : IXamlIlPropertySetter
-            {
-                private readonly IXamlIlMethod _method;
-                private readonly IXamlIlType _type;
-                public IXamlIlType TargetType { get; }
-                public PropertySetterBinderParameters BinderParameters { get; } = new PropertySetterBinderParameters();
-                public IReadOnlyList<IXamlIlType> Parameters { get; }
-                public void Emit(IXamlIlEmitter codegen)
-                {
-                    if (_type.IsValueType)
-                        codegen.Box(_type);
-                    codegen.EmitCall(_method, true);
-                }
-
-                public XamlIlDirectCallPropertySetter(IXamlIlMethod method, IXamlIlType type)
-                {
-                    _method = method;
-                    _type = type;
-                    Parameters = new[] {type};
-                    TargetType = method.ThisOrFirstParameter();
-                }
-            }
-        }
-    }
-}
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
deleted file mode 100644
index 1efae902c6..0000000000
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using XamlIl.Transform;
-using XamlIl.TypeSystem;
-
-namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
-{
-    class AvaloniaXamlIlWellKnownTypes
-    {
-        public IXamlIlType AvaloniaObject { get; }
-        public IXamlIlType IAvaloniaObject { get; }
-        public IXamlIlType BindingPriority { get; }
-        public IXamlIlType AvaloniaObjectExtensions { get; }
-        public IXamlIlType AvaloniaProperty { get; }
-        public IXamlIlType AvaloniaPropertyT { get; }
-        public IXamlIlType IBinding { get; }
-        public IXamlIlMethod AvaloniaObjectBindMethod { get; }
-        public IXamlIlMethod AvaloniaObjectSetValueMethod { get; }
-        public IXamlIlType IDisposable { get; }
-        public XamlIlTypeWellKnownTypes XamlIlTypes { get; }
-        public XamlIlLanguageTypeMappings XamlIlMappings { get; }
-        public IXamlIlType Transitions { get; }
-        public IXamlIlType AssignBindingAttribute { get; }
-        public IXamlIlType UnsetValueType { get; }
-        public IXamlIlType StyledElement { get; }
-        public IXamlIlType NameScope { get; }
-        public IXamlIlMethod NameScopeSetNameScope { get; }
-        public IXamlIlType INameScope { get; }
-        public IXamlIlMethod INameScopeRegister { get; }
-        public IXamlIlMethod INameScopeComplete { get; }
-        
-        public AvaloniaXamlIlWellKnownTypes(XamlIlAstTransformationContext ctx)
-        {
-            XamlIlTypes = ctx.Configuration.WellKnownTypes;
-            XamlIlMappings = ctx.Configuration.TypeMappings;
-            AvaloniaObject = ctx.Configuration.TypeSystem.GetType("Avalonia.AvaloniaObject");
-            IAvaloniaObject = ctx.Configuration.TypeSystem.GetType("Avalonia.IAvaloniaObject");
-            AvaloniaObjectExtensions = ctx.Configuration.TypeSystem.GetType("Avalonia.AvaloniaObjectExtensions");
-            AvaloniaProperty = ctx.Configuration.TypeSystem.GetType("Avalonia.AvaloniaProperty");
-            AvaloniaPropertyT = ctx.Configuration.TypeSystem.GetType("Avalonia.AvaloniaProperty`1");
-            BindingPriority = ctx.Configuration.TypeSystem.GetType("Avalonia.Data.BindingPriority");
-            IBinding = ctx.Configuration.TypeSystem.GetType("Avalonia.Data.IBinding");
-            IDisposable = ctx.Configuration.TypeSystem.GetType("System.IDisposable");
-            Transitions = ctx.Configuration.TypeSystem.GetType("Avalonia.Animation.Transitions");
-            AssignBindingAttribute = ctx.Configuration.TypeSystem.GetType("Avalonia.Data.AssignBindingAttribute");
-            AvaloniaObjectBindMethod = AvaloniaObjectExtensions.FindMethod("Bind", IDisposable, false, IAvaloniaObject,
-                AvaloniaProperty,
-                IBinding, ctx.Configuration.WellKnownTypes.Object);
-            UnsetValueType = ctx.Configuration.TypeSystem.GetType("Avalonia.UnsetValueType");
-            StyledElement = ctx.Configuration.TypeSystem.GetType("Avalonia.StyledElement");
-            INameScope = ctx.Configuration.TypeSystem.GetType("Avalonia.Controls.INameScope");
-            INameScopeRegister = INameScope.GetMethod(
-                new FindMethodMethodSignature("Register", XamlIlTypes.Void,
-                     XamlIlTypes.String, XamlIlTypes.Object)
-                {
-                    IsStatic = false, DeclaringOnly = true, IsExactMatch = true
-                });
-            INameScopeComplete = INameScope.GetMethod(
-                new FindMethodMethodSignature("Complete", XamlIlTypes.Void)
-                {
-                    IsStatic = false, DeclaringOnly = true, IsExactMatch = true
-                });
-            NameScope = ctx.Configuration.TypeSystem.GetType("Avalonia.Controls.NameScope");
-            NameScopeSetNameScope = NameScope.GetMethod(new FindMethodMethodSignature("SetNameScope",
-                XamlIlTypes.Void, StyledElement, INameScope) {IsStatic = true});
-
-            AvaloniaObjectSetValueMethod = AvaloniaObject.FindMethod("SetValue", XamlIlTypes.Void,
-                false, AvaloniaProperty, XamlIlTypes.Object, BindingPriority);
-            
-        }
-    }
-
-    static class AvaloniaXamlIlWellKnownTypesExtensions
-    {
-        public static AvaloniaXamlIlWellKnownTypes GetAvaloniaTypes(this XamlIlAstTransformationContext ctx)
-        {
-            if (ctx.TryGetItem<AvaloniaXamlIlWellKnownTypes>(out var rv))
-                return rv;
-            ctx.SetItem(rv = new AvaloniaXamlIlWellKnownTypes(ctx));
-            return rv;
-        }
-    }
-}
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/xamlil.github b/src/Markup/Avalonia.Markup.Xaml/XamlIl/xamlil.github
deleted file mode 160000
index ad9915e193..0000000000
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/xamlil.github
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ad9915e19398a49c5a11b66000c361659ca692b3
diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
index 673eb51901..89e2c096ee 100644
--- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
+++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
@@ -3,6 +3,12 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>Avalonia</RootNamespace>
   </PropertyGroup>
+  <ItemGroup>
+    <None Remove="Markup\Parsers\Nodes\ExpressionGrammer" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Markup\Parsers\BindingExpressionGrammar.cs" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
@@ -10,4 +16,5 @@
   </ItemGroup>
   <Import Project="..\..\..\build\Rx.props" />
   <Import Project="..\..\..\build\System.Memory.props" />
+  <Import Project="..\..\..\build\ApiDiff.props" />
 </Project>
diff --git a/src/Markup/Avalonia.Markup/Data/Binding.cs b/src/Markup/Avalonia.Markup/Data/Binding.cs
index dbe5800e55..bf43730481 100644
--- a/src/Markup/Avalonia.Markup/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup/Data/Binding.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Linq;
 using System.Reactive;
@@ -18,14 +15,14 @@ namespace Avalonia.Data
     /// <summary>
     /// A XAML binding.
     /// </summary>
-    public class Binding : IBinding
+    public class Binding : BindingBase
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Binding"/> class.
         /// </summary>
         public Binding()
+            :base()
         {
-            FallbackValue = AvaloniaProperty.UnsetValue;
         }
 
         /// <summary>
@@ -34,47 +31,16 @@ namespace Avalonia.Data
         /// <param name="path">The binding path.</param>
         /// <param name="mode">The binding mode.</param>
         public Binding(string path, BindingMode mode = BindingMode.Default)
-            : this()
+            : base(mode)
         {
             Path = path;
-            Mode = mode;
         }
 
-        /// <summary>
-        /// Gets or sets the <see cref="IValueConverter"/> to use.
-        /// </summary>
-        public IValueConverter Converter { get; set; }
-
-        /// <summary>
-        /// Gets or sets a parameter to pass to <see cref="Converter"/>.
-        /// </summary>
-        public object ConverterParameter { get; set; }
-
         /// <summary>
         /// Gets or sets the name of the element to use as the binding source.
         /// </summary>
         public string ElementName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the value to use when the binding is unable to produce a value.
-        /// </summary>
-        public object FallbackValue { get; set; }
-
-        /// <summary>
-        /// Gets or sets the binding mode.
-        /// </summary>
-        public BindingMode Mode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the binding path.
-        /// </summary>
-        public string Path { get; set; } = "";
-
-        /// <summary>
-        /// Gets or sets the binding priority.
-        /// </summary>
-        public BindingPriority Priority { get; set; }
-
         /// <summary>
         /// Gets or sets the relative source for the binding.
         /// </summary>
@@ -86,68 +52,58 @@ namespace Avalonia.Data
         public object Source { get; set; }
 
         /// <summary>
-        /// Gets or sets the string format.
+        /// Gets or sets the binding path.
         /// </summary>
-        public string StringFormat { get; set; }
-
-        public WeakReference DefaultAnchor { get; set; }
-        
-        public WeakReference<INameScope> NameScope { get; set; }
+        public string Path { get; set; } = "";
 
         /// <summary>
         /// Gets or sets a function used to resolve types from names in the binding path.
         /// </summary>
         public Func<string, string, Type> TypeResolver { get; set; }
 
-        /// <inheritdoc/>
-        public InstancedBinding Initiate(
-            IAvaloniaObject target,
-            AvaloniaProperty targetProperty,
-            object anchor = null,
-            bool enableDataValidation = false)
+        protected override ExpressionObserver CreateExpressionObserver(IAvaloniaObject target, AvaloniaProperty targetProperty, object anchor, bool enableDataValidation)
         {
             Contract.Requires<ArgumentNullException>(target != null);
             anchor = anchor ?? DefaultAnchor?.Target;
             
             enableDataValidation = enableDataValidation && Priority == BindingPriority.LocalValue;
-            
-            ExpressionObserver observer;
 
             INameScope nameScope = null;
             NameScope?.TryGetTarget(out nameScope);
+
             var (node, mode) = ExpressionObserverBuilder.Parse(Path, enableDataValidation, TypeResolver, nameScope);
 
             if (ElementName != null)
             {
-                observer = CreateElementObserver(
+                return CreateElementObserver(
                     (target as IStyledElement) ?? (anchor as IStyledElement),
                     ElementName,
                     node);
             }
             else if (Source != null)
             {
-                observer = CreateSourceObserver(Source, node);
+                return CreateSourceObserver(Source, node);
             }
             else if (RelativeSource == null)
             {
                 if (mode == SourceMode.Data)
                 {
-                    observer = CreateDataContextObserver(
+                    return CreateDataContextObserver(
                         target,
                         node,
                         targetProperty == StyledElement.DataContextProperty,
-                        anchor); 
+                        anchor);
                 }
                 else
                 {
-                    observer = new ExpressionObserver(
+                    return CreateSourceObserver(
                         (target as IStyledElement) ?? (anchor as IStyledElement),
                         node);
                 }
             }
             else if (RelativeSource.Mode == RelativeSourceMode.DataContext)
             {
-                observer = CreateDataContextObserver(
+                return CreateDataContextObserver(
                     target,
                     node,
                     targetProperty == StyledElement.DataContextProperty,
@@ -155,13 +111,13 @@ namespace Avalonia.Data
             }
             else if (RelativeSource.Mode == RelativeSourceMode.Self)
             {
-                observer = CreateSourceObserver(
+                return CreateSourceObserver(
                     (target as IStyledElement) ?? (anchor as IStyledElement),
                     node);
             }
             else if (RelativeSource.Mode == RelativeSourceMode.TemplatedParent)
             {
-                observer = CreateTemplatedParentObserver(
+                return CreateTemplatedParentObserver(
                     (target as IStyledElement) ?? (anchor as IStyledElement),
                     node);
             }
@@ -172,7 +128,7 @@ namespace Avalonia.Data
                     throw new InvalidOperationException("AncestorType must be set for RelativeSourceMode.FindAncestor when searching the visual tree.");
                 }
 
-                observer = CreateFindAncestorObserver(
+                return CreateFindAncestorObserver(
                     (target as IStyledElement) ?? (anchor as IStyledElement),
                     RelativeSource,
                     node);
@@ -181,196 +137,6 @@ namespace Avalonia.Data
             {
                 throw new NotSupportedException();
             }
-
-            var fallback = FallbackValue;
-
-            // If we're binding to DataContext and our fallback is UnsetValue then override
-            // the fallback value to null, as broken bindings to DataContext must reset the
-            // DataContext in order to not propagate incorrect DataContexts to child controls.
-            // See Avalonia.Markup.UnitTests.Data.DataContext_Binding_Should_Produce_Correct_Results.
-            if (targetProperty == StyledElement.DataContextProperty && fallback == AvaloniaProperty.UnsetValue)
-            {
-                fallback = null;
-            }
-
-            var converter = Converter;
-            var targetType = targetProperty?.PropertyType ?? typeof(object);
-
-            // We only respect `StringFormat` if the type of the property we're assigning to will
-            // accept a string. Note that this is slightly different to WPF in that WPF only applies
-            // `StringFormat` for target type `string` (not `object`).
-            if (!string.IsNullOrWhiteSpace(StringFormat) && 
-                (targetType == typeof(string) || targetType == typeof(object)))
-            {
-                converter = new StringFormatValueConverter(StringFormat, converter);
-            }
-
-            var subject = new BindingExpression(
-                observer,
-                targetType,
-                fallback,
-                converter ?? DefaultValueConverter.Instance,
-                ConverterParameter,
-                Priority);
-
-            return new InstancedBinding(subject, Mode, Priority);
-        }
-
-        private ExpressionObserver CreateDataContextObserver(
-            IAvaloniaObject target,
-            ExpressionNode node,
-            bool targetIsDataContext,
-            object anchor)
-        {
-            Contract.Requires<ArgumentNullException>(target != null);
-
-            if (!(target is IStyledElement))
-            {
-                target = anchor as IStyledElement;
-
-                if (target == null)
-                {
-                    throw new InvalidOperationException("Cannot find a DataContext to bind to.");
-                }
-            }
-
-            if (!targetIsDataContext)
-            {
-                var result = new ExpressionObserver(
-                    () => target.GetValue(StyledElement.DataContextProperty),
-                    node,
-                    new UpdateSignal(target, StyledElement.DataContextProperty),
-                    null);
-
-                return result;
-            }
-            else
-            {
-                return new ExpressionObserver(
-                    GetParentDataContext(target),
-                    node,
-                    null);
-            }
-        }
-
-        private ExpressionObserver CreateElementObserver(
-            IStyledElement target,
-            string elementName,
-            ExpressionNode node)
-        {
-            Contract.Requires<ArgumentNullException>(target != null);
-
-            NameScope.TryGetTarget(out var scope);
-            if (scope == null)
-                throw new InvalidOperationException("Name scope is null or was already collected");
-            var result = new ExpressionObserver(
-                NameScopeLocator.Track(scope, elementName),
-                node,
-                null);
-            return result;
-        }
-
-        private ExpressionObserver CreateFindAncestorObserver(
-            IStyledElement target,
-            RelativeSource relativeSource,
-            ExpressionNode node)
-        {
-            Contract.Requires<ArgumentNullException>(target != null);
-
-            IObservable<object> controlLocator;
-
-            switch (relativeSource.Tree)
-            {
-                case TreeType.Logical:
-                    controlLocator = ControlLocator.Track(
-                        (ILogical)target,
-                        relativeSource.AncestorLevel - 1,
-                        relativeSource.AncestorType);
-                    break;
-                case TreeType.Visual:
-                    controlLocator = VisualLocator.Track(
-                        (IVisual)target,
-                        relativeSource.AncestorLevel - 1,
-                        relativeSource.AncestorType);
-                    break;
-                default:
-                    throw new InvalidOperationException("Invalid tree to traverse.");
-            }
-
-            return new ExpressionObserver(
-                controlLocator,
-                node,
-                null);
-        }
-
-        private ExpressionObserver CreateSourceObserver(
-            object source,
-            ExpressionNode node)
-        {
-            Contract.Requires<ArgumentNullException>(source != null);
-
-            return new ExpressionObserver(source, node);
-        }
-
-        private ExpressionObserver CreateTemplatedParentObserver(
-            IAvaloniaObject target,
-            ExpressionNode node)
-        {
-            Contract.Requires<ArgumentNullException>(target != null);
-            
-            var result = new ExpressionObserver(
-                () => target.GetValue(StyledElement.TemplatedParentProperty),
-                node,
-                new UpdateSignal(target, StyledElement.TemplatedParentProperty),
-                null);
-
-            return result;
-        }
-
-        private IObservable<object> GetParentDataContext(IAvaloniaObject target)
-        {
-            // The DataContext is based on the visual parent and not the logical parent: this may
-            // seem counter intuitive considering the fact that property inheritance works on the logical
-            // tree, but consider a ContentControl with a ContentPresenter. The ContentControl's
-            // Content property is bound to a value which becomes the ContentPresenter's 
-            // DataContext - it is from this that the child hosted by the ContentPresenter needs to
-            // inherit its DataContext.
-            return target.GetObservable(Visual.VisualParentProperty)
-                .Select(x =>
-                {
-                    return (x as IAvaloniaObject)?.GetObservable(StyledElement.DataContextProperty) ?? 
-                           Observable.Return((object)null);
-                }).Switch();
-        }
-
-        private class UpdateSignal : SingleSubscriberObservableBase<Unit>
-        {
-            private readonly IAvaloniaObject _target;
-            private readonly AvaloniaProperty _property;
-
-            public UpdateSignal(IAvaloniaObject target, AvaloniaProperty property)
-            {
-                _target = target;
-                _property = property;
-            }
-
-            protected override void Subscribed()
-            {
-                _target.PropertyChanged += PropertyChanged;
-            }
-
-            protected override void Unsubscribed()
-            {
-                _target.PropertyChanged -= PropertyChanged;
-            }
-
-            private void PropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
-            {
-                if (e.Property == _property)
-                {
-                    PublishNext(Unit.Default);
-                }
-            }
         }
     }
 }
diff --git a/src/Markup/Avalonia.Markup/Data/BindingBase.cs b/src/Markup/Avalonia.Markup/Data/BindingBase.cs
new file mode 100644
index 0000000000..3dbc83a7df
--- /dev/null
+++ b/src/Markup/Avalonia.Markup/Data/BindingBase.cs
@@ -0,0 +1,289 @@
+
+using System;
+using System.Linq;
+using System.Reactive;
+using System.Reactive.Linq;
+using Avalonia.Controls;
+using Avalonia.Data.Converters;
+using Avalonia.Data.Core;
+using Avalonia.LogicalTree;
+using Avalonia.Markup.Parsers;
+using Avalonia.Reactive;
+using Avalonia.VisualTree;
+
+
+namespace Avalonia.Data
+{
+    public abstract class BindingBase : IBinding
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Binding"/> class.
+        /// </summary>
+        public BindingBase()
+        {
+            FallbackValue = AvaloniaProperty.UnsetValue;
+            TargetNullValue = AvaloniaProperty.UnsetValue;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Binding"/> class.
+        /// </summary>
+        /// <param name="mode">The binding mode.</param>
+        public BindingBase(BindingMode mode = BindingMode.Default)
+            :this()
+        {
+            Mode = mode;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IValueConverter"/> to use.
+        /// </summary>
+        public IValueConverter Converter { get; set; }
+
+        /// <summary>
+        /// Gets or sets a parameter to pass to <see cref="Converter"/>.
+        /// </summary>
+        public object ConverterParameter { get; set; }
+
+        /// <summary>
+        /// Gets or sets the value to use when the binding is unable to produce a value.
+        /// </summary>
+        public object FallbackValue { get; set; }
+
+        /// <summary>
+        /// Gets or sets the value to use when the binding result is null.
+        /// </summary>
+        public object TargetNullValue { get; set; }
+
+        /// <summary>
+        /// Gets or sets the binding mode.
+        /// </summary>
+        public BindingMode Mode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the binding priority.
+        /// </summary>
+        public BindingPriority Priority { get; set; }
+
+        /// <summary>
+        /// Gets or sets the string format.
+        /// </summary>
+        public string StringFormat { get; set; }
+
+        public WeakReference DefaultAnchor { get; set; }
+
+        public WeakReference<INameScope> NameScope { get; set; }
+
+        protected abstract ExpressionObserver CreateExpressionObserver(
+            IAvaloniaObject target,
+            AvaloniaProperty targetProperty,
+            object anchor,
+            bool enableDataValidation);
+
+        /// <inheritdoc/>
+        public InstancedBinding Initiate(
+            IAvaloniaObject target,
+            AvaloniaProperty targetProperty,
+            object anchor = null,
+            bool enableDataValidation = false)
+        {
+            Contract.Requires<ArgumentNullException>(target != null);
+            anchor = anchor ?? DefaultAnchor?.Target;
+
+            enableDataValidation = enableDataValidation && Priority == BindingPriority.LocalValue;
+
+            var observer = CreateExpressionObserver(target, targetProperty, anchor, enableDataValidation);
+
+            var fallback = FallbackValue;
+
+            // If we're binding to DataContext and our fallback is UnsetValue then override
+            // the fallback value to null, as broken bindings to DataContext must reset the
+            // DataContext in order to not propagate incorrect DataContexts to child controls.
+            // See Avalonia.Markup.UnitTests.Data.DataContext_Binding_Should_Produce_Correct_Results.
+            if (targetProperty == StyledElement.DataContextProperty && fallback == AvaloniaProperty.UnsetValue)
+            {
+                fallback = null;
+            }
+
+            var converter = Converter;
+            var targetType = targetProperty?.PropertyType ?? typeof(object);
+
+            // We only respect `StringFormat` if the type of the property we're assigning to will
+            // accept a string. Note that this is slightly different to WPF in that WPF only applies
+            // `StringFormat` for target type `string` (not `object`).
+            if (!string.IsNullOrWhiteSpace(StringFormat) &&
+                (targetType == typeof(string) || targetType == typeof(object)))
+            {
+                converter = new StringFormatValueConverter(StringFormat, converter);
+            }
+
+            var subject = new BindingExpression(
+                observer,
+                targetType,
+                fallback,
+                TargetNullValue,
+                converter ?? DefaultValueConverter.Instance,
+                ConverterParameter,
+                Priority);
+
+            return new InstancedBinding(subject, Mode, Priority);
+        }
+
+        protected ExpressionObserver CreateDataContextObserver(
+            IAvaloniaObject target,
+            ExpressionNode node,
+            bool targetIsDataContext,
+            object anchor)
+        {
+            Contract.Requires<ArgumentNullException>(target != null);
+
+            if (!(target is IDataContextProvider))
+            {
+                target = anchor as IDataContextProvider;
+
+                if (target == null)
+                {
+                    throw new InvalidOperationException("Cannot find a DataContext to bind to.");
+                }
+            }
+
+            if (!targetIsDataContext)
+            {
+                var result = new ExpressionObserver(
+                    () => target.GetValue(StyledElement.DataContextProperty),
+                    node,
+                    new UpdateSignal(target, StyledElement.DataContextProperty),
+                    null);
+
+                return result;
+            }
+            else
+            {
+                return new ExpressionObserver(
+                    GetParentDataContext(target),
+                    node,
+                    null);
+            }
+        }
+
+        protected ExpressionObserver CreateElementObserver(
+            IStyledElement target,
+            string elementName,
+            ExpressionNode node)
+        {
+            Contract.Requires<ArgumentNullException>(target != null);
+
+            NameScope.TryGetTarget(out var scope);
+            if (scope == null)
+                throw new InvalidOperationException("Name scope is null or was already collected");
+            var result = new ExpressionObserver(
+                NameScopeLocator.Track(scope, elementName),
+                node,
+                null);
+            return result;
+        }
+
+        protected ExpressionObserver CreateFindAncestorObserver(
+            IStyledElement target,
+            RelativeSource relativeSource,
+            ExpressionNode node)
+        {
+            Contract.Requires<ArgumentNullException>(target != null);
+
+            IObservable<object> controlLocator;
+
+            switch (relativeSource.Tree)
+            {
+                case TreeType.Logical:
+                    controlLocator = ControlLocator.Track(
+                        (ILogical)target,
+                        relativeSource.AncestorLevel - 1,
+                        relativeSource.AncestorType);
+                    break;
+                case TreeType.Visual:
+                    controlLocator = VisualLocator.Track(
+                        (IVisual)target,
+                        relativeSource.AncestorLevel - 1,
+                        relativeSource.AncestorType);
+                    break;
+                default:
+                    throw new InvalidOperationException("Invalid tree to traverse.");
+            }
+
+            return new ExpressionObserver(
+                controlLocator,
+                node,
+                null);
+        }
+
+        protected ExpressionObserver CreateSourceObserver(
+            object source,
+            ExpressionNode node)
+        {
+            Contract.Requires<ArgumentNullException>(source != null);
+
+            return new ExpressionObserver(source, node);
+        }
+
+        protected ExpressionObserver CreateTemplatedParentObserver(
+            IAvaloniaObject target,
+            ExpressionNode node)
+        {
+            Contract.Requires<ArgumentNullException>(target != null);
+
+            var result = new ExpressionObserver(
+                () => target.GetValue(StyledElement.TemplatedParentProperty),
+                node,
+                new UpdateSignal(target, StyledElement.TemplatedParentProperty),
+                null);
+
+            return result;
+        }
+
+        protected IObservable<object> GetParentDataContext(IAvaloniaObject target)
+        {
+            // The DataContext is based on the visual parent and not the logical parent: this may
+            // seem counter intuitive considering the fact that property inheritance works on the logical
+            // tree, but consider a ContentControl with a ContentPresenter. The ContentControl's
+            // Content property is bound to a value which becomes the ContentPresenter's 
+            // DataContext - it is from this that the child hosted by the ContentPresenter needs to
+            // inherit its DataContext.
+            return target.GetObservable(Visual.VisualParentProperty)
+                .Select(x =>
+                {
+                    return (x as IAvaloniaObject)?.GetObservable(StyledElement.DataContextProperty) ??
+                           Observable.Return((object)null);
+                }).Switch();
+        }
+
+        private class UpdateSignal : SingleSubscriberObservableBase<Unit>
+        {
+            private readonly IAvaloniaObject _target;
+            private readonly AvaloniaProperty _property;
+
+            public UpdateSignal(IAvaloniaObject target, AvaloniaProperty property)
+            {
+                _target = target;
+                _property = property;
+            }
+
+            protected override void Subscribed()
+            {
+                _target.PropertyChanged += PropertyChanged;
+            }
+
+            protected override void Unsubscribed()
+            {
+                _target.PropertyChanged -= PropertyChanged;
+            }
+
+            private void PropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
+            {
+                if (e.Property == _property)
+                {
+                    PublishNext(Unit.Default);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup/Data/MultiBinding.cs b/src/Markup/Avalonia.Markup/Data/MultiBinding.cs
index 29945e25c3..cbc5f414f2 100644
--- a/src/Markup/Avalonia.Markup/Data/MultiBinding.cs
+++ b/src/Markup/Avalonia.Markup/Data/MultiBinding.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -37,6 +34,11 @@ namespace Avalonia.Data
         /// </summary>
         public object FallbackValue { get; set; }
 
+        /// <summary>
+        /// Gets or sets the value to use when the binding result is null.
+        /// </summary>
+        public object TargetNullValue { get; set; }
+
         /// <summary>
         /// Gets or sets the binding mode.
         /// </summary>
@@ -46,7 +48,7 @@ namespace Avalonia.Data
         /// Gets or sets the binding priority.
         /// </summary>
         public BindingPriority Priority { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the relative source for the binding.
         /// </summary>
@@ -57,6 +59,12 @@ namespace Avalonia.Data
         /// </summary>
         public string StringFormat { get; set; }
 
+        public MultiBinding()
+        {
+            FallbackValue = AvaloniaProperty.UnsetValue;
+            TargetNullValue = AvaloniaProperty.UnsetValue;
+        }
+
         /// <inheritdoc/>
         public InstancedBinding Initiate(
             IAvaloniaObject target,
@@ -69,12 +77,12 @@ namespace Avalonia.Data
             // We only respect `StringFormat` if the type of the property we're assigning to will
             // accept a string. Note that this is slightly different to WPF in that WPF only applies
             // `StringFormat` for target type `string` (not `object`).
-            if (!string.IsNullOrWhiteSpace(StringFormat) && 
+            if (!string.IsNullOrWhiteSpace(StringFormat) &&
                 (targetType == typeof(string) || targetType == typeof(object)))
             {
                 converter = new StringFormatMultiValueConverter(StringFormat, converter);
             }
-            
+
             var children = Bindings.Select(x => x.Initiate(target, null));
 
             var input = children.Select(x => x.Observable)
@@ -99,8 +107,30 @@ namespace Avalonia.Data
 
         private object ConvertValue(IList<object> values, Type targetType, IMultiValueConverter converter)
         {
+            for (var i = 0; i < values.Count; ++i)
+            {
+                if (values[i] is BindingNotification notification)
+                {
+                    values[i] = notification.Value;
+                }
+            }
+
             var culture = CultureInfo.CurrentCulture;
-            var converted = converter.Convert(values, targetType, ConverterParameter, culture);
+            values = new System.Collections.ObjectModel.ReadOnlyCollection<object>(values);
+            object converted;
+            if (converter != null)
+            {
+                converted = converter.Convert(values, targetType, ConverterParameter, culture);
+            }
+            else
+            {
+                converted = values;
+            }
+
+            if (converted == null)
+            {
+                converted = TargetNullValue;
+            }
 
             if (converted == AvaloniaProperty.UnsetValue)
             {
diff --git a/src/Markup/Avalonia.Markup/Data/RelativeSource.cs b/src/Markup/Avalonia.Markup/Data/RelativeSource.cs
index ac974e3bda..e3d2dd4aaa 100644
--- a/src/Markup/Avalonia.Markup/Data/RelativeSource.cs
+++ b/src/Markup/Avalonia.Markup/Data/RelativeSource.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Data
diff --git a/src/Markup/Avalonia.Markup/Markup/Data/DelayedBinding.cs b/src/Markup/Avalonia.Markup/Markup/Data/DelayedBinding.cs
index f7d228609d..0b0ed7b06a 100644
--- a/src/Markup/Avalonia.Markup/Markup/Data/DelayedBinding.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Data/DelayedBinding.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -150,8 +147,7 @@ namespace Avalonia.Markup.Data
                 }
                 catch (Exception e)
                 {
-                    Logger.TryGet(LogEventLevel.Error)?.Log(
-                        LogArea.Property,
+                    Logger.TryGet(LogEventLevel.Error, LogArea.Property)?.Log(
                         control,
                         "Error setting {Property} on {Target}: {Exception}",
                         Property.Name,
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/ArgumentListParser.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/ArgumentListParser.cs
index cb9c81caa1..e858bacb74 100644
--- a/src/Markup/Avalonia.Markup/Markup/Parsers/ArgumentListParser.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/ArgumentListParser.cs
@@ -1,13 +1,13 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Generic;
 using Avalonia.Data.Core;
 using Avalonia.Utilities;
 
 namespace Avalonia.Markup.Parsers
 {
-    internal static class ArgumentListParser
+#if !BUILDTASK
+    public
+#endif
+    static class ArgumentListParser
     {
         public static IList<string> ParseArguments(this ref CharacterReader r, char open, char close, char delimiter = ',')
         {
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/BindingExpressionGrammar.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/BindingExpressionGrammar.cs
new file mode 100644
index 0000000000..7c362e24cc
--- /dev/null
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/BindingExpressionGrammar.cs
@@ -0,0 +1,466 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Avalonia.Data.Core;
+using Avalonia.Utilities;
+using System;
+using System.Collections.Generic;
+
+namespace Avalonia.Markup.Parsers
+{
+    internal enum SourceMode
+    {
+        Data,
+        Control
+    }
+
+    internal static class BindingExpressionGrammar
+    {
+        public static (List<INode> Nodes, SourceMode Mode) Parse(ref CharacterReader r)
+        {
+            var nodes = new List<INode>();
+            var state = State.Start;
+            var mode = SourceMode.Data;
+
+            while (!r.End && state != State.End)
+            {
+                switch (state)
+                {
+                    case State.Start:
+                        state = ParseStart(ref r, nodes);
+                        break;
+
+                    case State.AfterMember:
+                        state = ParseAfterMember(ref r, nodes);
+                        break;
+
+                    case State.BeforeMember:
+                        state = ParseBeforeMember(ref r, nodes);
+                        break;
+
+                    case State.AttachedProperty:
+                        state = ParseAttachedProperty(ref r, nodes);
+                        break;
+
+                    case State.Indexer:
+                        state = ParseIndexer(ref r, nodes);
+                        break;
+
+                    case State.TypeCast:
+                        state = ParseTypeCast(ref r, nodes);
+                        break;
+
+                    case State.ElementName:
+                        state = ParseElementName(ref r, nodes);
+                        mode = SourceMode.Control;
+                        break;
+
+                    case State.RelativeSource:
+                        state = ParseRelativeSource(ref r, nodes);
+                        mode = SourceMode.Control;
+                        break;
+                }
+            }
+
+            if (state == State.BeforeMember)
+            {
+                throw new ExpressionParseException(r.Position, "Unexpected end of expression.");
+            }
+
+            return (nodes, mode);
+        }
+
+        private static State ParseStart(ref CharacterReader r, IList<INode> nodes)
+        {
+            if (ParseNot(ref r))
+            {
+                nodes.Add(new NotNode());
+                return State.Start;
+            }
+
+            else if (ParseSharp(ref r))
+            {
+                return State.ElementName;
+            }
+            else if (ParseDollarSign(ref r))
+            {
+                return State.RelativeSource;
+            }
+            else if (ParseOpenBrace(ref r))
+            {
+                if (PeekOpenBrace(ref r))
+                {
+                    return State.TypeCast;
+                }
+
+                return State.AttachedProperty;
+            }
+            else if (PeekOpenBracket(ref r))
+            {
+                return State.Indexer;
+            }
+            else if (ParseDot(ref r))
+            {
+                nodes.Add(new EmptyExpressionNode());
+                return State.End;
+            }
+            else
+            {
+                var identifier = r.ParseIdentifier();
+
+                if (!identifier.IsEmpty)
+                {
+                    nodes.Add(new PropertyNameNode { PropertyName = identifier.ToString() });
+                    return State.AfterMember;
+                }
+            }
+
+            return State.End;
+        }
+
+        private static State ParseAfterMember(ref CharacterReader r, IList<INode> nodes)
+        {
+            if (ParseMemberAccessor(ref r))
+            {
+                return State.BeforeMember;
+            }
+            else if (ParseStreamOperator(ref r))
+            {
+                nodes.Add(new StreamNode());
+                return State.AfterMember;
+            }
+            else if (PeekOpenBracket(ref r))
+            {
+                return State.Indexer;
+            }
+            else if (ParseOpenBrace(ref r))
+            {
+                return State.TypeCast;
+            }
+
+            return State.End;
+        }
+
+        private static State ParseBeforeMember(ref CharacterReader r, IList<INode> nodes)
+        {
+            if (ParseOpenBrace(ref r))
+            {
+                if (PeekOpenBrace(ref r))
+                {
+                    return State.TypeCast;
+                }
+
+                return State.AttachedProperty;
+            }
+            else
+            {
+                var identifier = r.ParseIdentifier();
+
+                if (!identifier.IsEmpty)
+                {
+                    nodes.Add(new PropertyNameNode { PropertyName = identifier.ToString() });
+                    return State.AfterMember;
+                }
+
+                return State.End;
+            }
+        }
+
+        private static State ParseAttachedProperty(ref CharacterReader r, List<INode> nodes)
+        {
+            var (ns, owner) = ParseTypeName(ref r);
+
+            if(!r.End && r.TakeIf(')'))
+            {
+                nodes.Add(new TypeCastNode() { Namespace = ns, TypeName = owner });
+                return State.AfterMember;
+            }
+
+            if (r.End || !r.TakeIf('.'))
+            {
+                throw new ExpressionParseException(r.Position, "Invalid attached property name.");
+            }
+
+            var name = r.ParseIdentifier();
+
+            if (name.Length == 0)
+            {
+                throw new ExpressionParseException(r.Position, "Attached Property name expected after '.'.");
+            }
+
+            if (r.End || !r.TakeIf(')'))
+            {
+                throw new ExpressionParseException(r.Position, "Expected ')'.");
+            }
+
+            nodes.Add(new AttachedPropertyNameNode
+            {
+                Namespace = ns.ToString(),
+                TypeName = owner.ToString(),
+                PropertyName = name.ToString()
+            });
+            return State.AfterMember;
+        }
+
+        private static State ParseIndexer(ref CharacterReader r, List<INode> nodes)
+        {
+            var args = r.ParseArguments('[', ']');
+
+            if (args.Count == 0)
+            {
+                throw new ExpressionParseException(r.Position, "Indexer may not be empty.");
+            }
+
+            nodes.Add(new IndexerNode { Arguments = args });
+            return State.AfterMember;
+        }
+
+        private static State ParseTypeCast(ref CharacterReader r, List<INode> nodes)
+        {
+            bool parseMemberBeforeAddCast = ParseOpenBrace(ref r);
+
+            var (ns, typeName) = ParseTypeName(ref r);
+
+            var result = State.AfterMember;
+
+            if (parseMemberBeforeAddCast)
+            {
+                if (!ParseCloseBrace(ref r))
+                {
+                    throw new ExpressionParseException(r.Position, "Expected ')'.");
+                }
+
+                result = ParseBeforeMember(ref r, nodes);
+
+                if(r.Peek == '[')
+                {
+                    result = ParseIndexer(ref r, nodes);
+                }
+            }
+
+            nodes.Add(new TypeCastNode { Namespace = ns, TypeName = typeName });
+
+            if (r.End || !r.TakeIf(')'))
+            {
+                throw new ExpressionParseException(r.Position, "Expected ')'.");
+            }
+
+            return result;
+        }
+
+        private static State ParseElementName(ref CharacterReader r, List<INode> nodes)
+        {
+            var name = r.ParseIdentifier();
+
+            if (name.IsEmpty)
+            {
+                throw new ExpressionParseException(r.Position, "Element name expected after '#'.");
+            }
+
+            nodes.Add(new NameNode { Name = name.ToString() });
+            return State.AfterMember;
+        }
+
+        private static State ParseRelativeSource(ref CharacterReader r, List<INode> nodes)
+        {
+            var mode = r.ParseIdentifier();
+
+            if (mode.SequenceEqual("self".AsSpan()))
+            {
+                nodes.Add(new SelfNode());
+            }
+            else if (mode.SequenceEqual("parent".AsSpan()))
+            {
+                string ancestorNamespace = null;
+                string ancestorType = null;
+                var ancestorLevel = 0;
+                if (PeekOpenBracket(ref r))
+                {
+                    var args = r.ParseArguments('[', ']', ';');
+                    if (args.Count > 2 || args.Count == 0)
+                    {
+                        throw new ExpressionParseException(r.Position, "Too many arguments in RelativeSource syntax sugar");
+                    }
+                    else if (args.Count == 1)
+                    {
+                        if (int.TryParse(args[0], out int level))
+                        {
+                            ancestorType = null;
+                            ancestorLevel = level;
+                        }
+                        else
+                        {
+                            var reader = new CharacterReader(args[0].AsSpan());
+                            (ancestorNamespace, ancestorType) = ParseTypeName(ref reader);
+                        }
+                    }
+                    else
+                    {
+                        var reader = new CharacterReader(args[0].AsSpan());
+                        (ancestorNamespace, ancestorType) = ParseTypeName(ref reader);
+                        ancestorLevel = int.Parse(args[1]);
+                    }
+                }
+                nodes.Add(new AncestorNode
+                {
+                    Namespace = ancestorNamespace,
+                    TypeName = ancestorType,
+                    Level = ancestorLevel
+                });
+            }
+            else
+            {
+                throw new ExpressionParseException(r.Position, "Unknown RelativeSource mode.");
+            }
+
+            return State.AfterMember;
+        }
+
+        private static TypeName ParseTypeName(ref CharacterReader r)
+        {
+            ReadOnlySpan<char> ns, typeName;
+            ns = ReadOnlySpan<char>.Empty;
+            var typeNameOrNamespace = r.ParseIdentifier();
+
+            if (!r.End && r.TakeIf(':'))
+            {
+                ns = typeNameOrNamespace;
+                typeName = r.ParseIdentifier();
+            }
+            else
+            {
+                typeName = typeNameOrNamespace;
+            }
+
+            return new TypeName(ns, typeName);
+        }
+
+        private static bool ParseNot(ref CharacterReader r)
+        {
+            return !r.End && r.TakeIf('!');
+        }
+
+        private static bool ParseMemberAccessor(ref CharacterReader r)
+        {
+            return !r.End && r.TakeIf('.');
+        }
+
+        private static bool ParseOpenBrace(ref CharacterReader r)
+        {
+            return !r.End && r.TakeIf('(');
+        }
+
+        private static bool ParseCloseBrace(ref CharacterReader r)
+        {
+            return !r.End && r.TakeIf(')');
+        }
+
+        private static bool PeekOpenBracket(ref CharacterReader r)
+        {
+            return !r.End && r.Peek == '[';
+        }
+
+        private static bool PeekOpenBrace(ref CharacterReader r)
+        {
+            return !r.End && r.Peek == '(';
+        }
+
+        private static bool ParseStreamOperator(ref CharacterReader r)
+        {
+            return !r.End && r.TakeIf('^');
+        }
+
+        private static bool ParseDollarSign(ref CharacterReader r)
+        {
+            return !r.End && r.TakeIf('$');
+        }
+
+        private static bool ParseSharp(ref CharacterReader r)
+        {
+            return !r.End && r.TakeIf('#');
+        }
+
+        private static bool ParseDot(ref CharacterReader r)
+        {
+            return !r.End && r.TakeIf('.');
+        }
+
+        private enum State
+        {
+            Start,
+            RelativeSource,
+            ElementName,
+            AfterMember,
+            BeforeMember,
+            AttachedProperty,
+            Indexer,
+            TypeCast,
+            End,
+        }
+
+        private readonly ref struct TypeName
+        {
+            public TypeName(ReadOnlySpan<char> ns, ReadOnlySpan<char> typeName)
+            {
+                Namespace = ns;
+                Type = typeName;
+            }
+
+            public readonly ReadOnlySpan<char> Namespace;
+            public readonly ReadOnlySpan<char> Type;
+
+            public void Deconstruct(out string ns, out string typeName)
+            {
+                ns = Namespace.ToString();
+                typeName = Type.ToString();
+            }
+        }
+
+        public interface INode { }
+
+        public interface ITransformNode { }
+
+        public class EmptyExpressionNode : INode { }
+
+        public class PropertyNameNode : INode
+        {
+            public string PropertyName { get; set; }
+        }
+
+        public class AttachedPropertyNameNode : INode
+        {
+            public string Namespace { get; set; }
+            public string TypeName { get; set; }
+            public string PropertyName { get; set; }
+        }
+
+        public class IndexerNode : INode
+        {
+            public IList<string> Arguments { get; set; }
+        }
+
+        public class NotNode : INode, ITransformNode { }
+
+        public class StreamNode : INode { }
+
+        public class SelfNode : INode { }
+
+        public class NameNode : INode
+        {
+            public string Name { get; set; }
+        }
+
+        public class AncestorNode : INode
+        {
+            public string Namespace { get; set; }
+            public string TypeName { get; set; }
+            public int Level { get; set; }
+        }
+
+        public class TypeCastNode : INode
+        {
+            public string Namespace { get; set; }
+            public string TypeName { get; set; }
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionParser.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionParser.cs
index ed3e65feda..558130e23f 100644
--- a/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionParser.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionParser.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Data.Core;
 using Avalonia.Markup.Parsers.Nodes;
 using Avalonia.Utilities;
@@ -11,12 +8,6 @@ using Avalonia.Controls;
 
 namespace Avalonia.Markup.Parsers
 {
-    internal enum SourceMode
-    {
-        Data,
-        Control
-    }
-
     internal class ExpressionParser
     {
         private readonly bool _enableValidation;
@@ -32,332 +23,104 @@ namespace Avalonia.Markup.Parsers
 
         public (ExpressionNode Node, SourceMode Mode) Parse(ref CharacterReader r)
         {
-            var nodes = new List<ExpressionNode>();
-            var state = State.Start;
-            var mode = SourceMode.Data;
+            ExpressionNode rootNode = null;
+            ExpressionNode node = null;
+            var (astNodes, mode) = BindingExpressionGrammar.Parse(ref r);
 
-            while (!r.End && state != State.End)
+            foreach (var astNode in astNodes)
             {
-                switch (state)
+                ExpressionNode nextNode = null;
+                switch (astNode)
                 {
-                    case State.Start:
-                        state = ParseStart(ref r, nodes);
+                    case BindingExpressionGrammar.EmptyExpressionNode _:
+                        nextNode = new EmptyExpressionNode();
                         break;
-
-                    case State.AfterMember:
-                        state = ParseAfterMember(ref r, nodes);
+                    case BindingExpressionGrammar.NotNode _:
+                        nextNode = new LogicalNotNode();
                         break;
-
-                    case State.BeforeMember:
-                        state = ParseBeforeMember(ref r, nodes);
+                    case BindingExpressionGrammar.StreamNode _:
+                        nextNode = new StreamNode();
                         break;
-
-                    case State.AttachedProperty:
-                        state = ParseAttachedProperty(ref r, nodes);
+                    case BindingExpressionGrammar.PropertyNameNode propName:
+                        nextNode = new PropertyAccessorNode(propName.PropertyName, _enableValidation);
                         break;
-
-                    case State.Indexer:
-                        state = ParseIndexer(ref r, nodes);
+                    case BindingExpressionGrammar.IndexerNode indexer:
+                        nextNode = new StringIndexerNode(indexer.Arguments);
                         break;
-
-                    case State.ElementName:
-                        state = ParseElementName(ref r, nodes);
-                        mode = SourceMode.Control;
+                    case BindingExpressionGrammar.AttachedPropertyNameNode attachedProp:
+                        nextNode = ParseAttachedProperty(attachedProp);
                         break;
-
-                    case State.RelativeSource:
-                        state = ParseRelativeSource(ref r, nodes);
-                        mode = SourceMode.Control;
+                    case BindingExpressionGrammar.SelfNode _:
+                        nextNode = new SelfNode();
+                        break;
+                    case BindingExpressionGrammar.AncestorNode ancestor:
+                        nextNode = ParseFindAncestor(ancestor);
+                        break;
+                    case BindingExpressionGrammar.NameNode elementName:
+                        nextNode = new ElementNameNode(_nameScope, elementName.Name);
+                        break;
+                    case BindingExpressionGrammar.TypeCastNode typeCast:
+                        nextNode = ParseTypeCastNode(typeCast);
                         break;
                 }
-            }
-
-            if (state == State.BeforeMember)
-            {
-                throw new ExpressionParseException(r.Position, "Unexpected end of expression.");
-            }
-
-            for (int n = 0; n < nodes.Count - 1; ++n)
-            {
-                nodes[n].Next = nodes[n + 1];
-            }
-
-            return (nodes.FirstOrDefault(), mode);
-        }
-
-        private State ParseStart(ref CharacterReader r, IList<ExpressionNode> nodes)
-        {
-            if (ParseNot(ref r))
-            {
-                nodes.Add(new LogicalNotNode());
-                return State.Start;
-            }
-
-            else if (ParseSharp(ref r))
-            {
-                return State.ElementName;
-            }
-            else if (ParseDollarSign(ref r))
-            {
-                return State.RelativeSource;
-            }
-            else if (ParseOpenBrace(ref r))
-            {
-                return State.AttachedProperty;
-            }
-            else if (PeekOpenBracket(ref r))
-            {
-                return State.Indexer;
-            }
-            else if (ParseDot(ref r))
-            {
-                nodes.Add(new EmptyExpressionNode());
-                return State.End;
-            }
-            else
-            {
-                var identifier = r.ParseIdentifier();
-
-                if (!identifier.IsEmpty)
+                if (rootNode is null)
                 {
-                    nodes.Add(new PropertyAccessorNode(identifier.ToString(), _enableValidation));
-                    return State.AfterMember;
+                    rootNode = node = nextNode;
                 }
-            }
-
-            return State.End;
-        }
-
-        private static State ParseAfterMember(ref CharacterReader r, IList<ExpressionNode> nodes)
-        {
-            if (ParseMemberAccessor(ref r))
-            {
-                return State.BeforeMember;
-            }
-            else if (ParseStreamOperator(ref r))
-            {
-                nodes.Add(new StreamNode());
-                return State.AfterMember;
-            }
-            else if (PeekOpenBracket(ref r))
-            {
-                return State.Indexer;
-            }
-
-            return State.End;
-        }
-
-        private State ParseBeforeMember(ref CharacterReader r, IList<ExpressionNode> nodes)
-        {
-            if (ParseOpenBrace(ref r))
-            {
-                return State.AttachedProperty;
-            }
-            else
-            {
-                var identifier = r.ParseIdentifier();
-
-                if (!identifier.IsEmpty)
+                else
                 {
-                    nodes.Add(new PropertyAccessorNode(identifier.ToString(), _enableValidation));
-                    return State.AfterMember;
+                    node.Next = nextNode;
+                    node = nextNode;
                 }
-
-                return State.End;
             }
-        }
 
-        private State ParseAttachedProperty(ref CharacterReader r, List<ExpressionNode> nodes)
-        {
-            var (ns, owner) = ParseTypeName(ref r);
-
-            if (r.End || !r.TakeIf('.'))
-            {
-                throw new ExpressionParseException(r.Position, "Invalid attached property name.");
-            }
-
-            var name = r.ParseIdentifier();
-
-            if (r.End || !r.TakeIf(')'))
-            {
-                throw new ExpressionParseException(r.Position, "Expected ')'.");
-            }
-
-            if (_typeResolver == null)
-            {
-                throw new InvalidOperationException("Cannot parse a binding path with an attached property without a type resolver. Maybe you can use a LINQ Expression binding path instead?");
-            }
-
-            var property = AvaloniaPropertyRegistry.Instance.FindRegistered(_typeResolver(ns.ToString(), owner.ToString()), name.ToString());
-
-            nodes.Add(new AvaloniaPropertyAccessorNode(property, _enableValidation));
-            return State.AfterMember;
+            return (rootNode, mode);
         }
 
-        private State ParseIndexer(ref CharacterReader r, List<ExpressionNode> nodes)
+        private FindAncestorNode ParseFindAncestor(BindingExpressionGrammar.AncestorNode node)
         {
-            var args = r.ParseArguments('[', ']');
+            Type ancestorType = null;
+            var ancestorLevel = node.Level;
 
-            if (args.Count == 0)
+            if (!(node.Namespace is null) && !(node.TypeName is null))
             {
-                throw new ExpressionParseException(r.Position, "Indexer may not be empty.");
-            }
-
-            nodes.Add(new StringIndexerNode(args));
-            return State.AfterMember;
-        }
-
-        private State ParseElementName(ref CharacterReader r, List<ExpressionNode> nodes)
-        {
-            var name = r.ParseIdentifier();
+                if (_typeResolver == null)
+                {
+                    throw new InvalidOperationException("Cannot parse a binding path with a typed FindAncestor without a type resolver. Maybe you can use a LINQ Expression binding path instead?");
+                }
 
-            if (name == null)
-            {
-                throw new ExpressionParseException(r.Position, "Element name expected after '#'.");
+                ancestorType = _typeResolver(node.Namespace, node.TypeName);
             }
 
-            nodes.Add(new ElementNameNode(_nameScope, name.ToString()));
-            return State.AfterMember;
+            return new FindAncestorNode(ancestorType, ancestorLevel);
         }
 
-        private State ParseRelativeSource(ref CharacterReader r, List<ExpressionNode> nodes)
+        private TypeCastNode ParseTypeCastNode(BindingExpressionGrammar.TypeCastNode node)
         {
-            var mode = r.ParseIdentifier();
-
-            if (mode.Equals("self".AsSpan(), StringComparison.InvariantCulture))
-            {
-                nodes.Add(new SelfNode());
-            }
-            else if (mode.Equals("parent".AsSpan(), StringComparison.InvariantCulture))
+            Type castType = null;
+            if (!(node.Namespace is null) && !(node.TypeName is null))
             {
-                Type ancestorType = null;
-                var ancestorLevel = 0;
-                if (PeekOpenBracket(ref r))
+                if (_typeResolver == null)
                 {
-                    var args = r.ParseArguments('[', ']', ';');
-                    if (args.Count > 2 || args.Count == 0)
-                    {
-                        throw new ExpressionParseException(r.Position, "Too many arguments in RelativeSource syntax sugar");
-                    }
-                    else if (args.Count == 1)
-                    {
-                        if (int.TryParse(args[0], out int level))
-                        {
-                            ancestorType = null;
-                            ancestorLevel = level;
-                        }
-                        else
-                        {
-                            var reader = new CharacterReader(args[0].AsSpan());
-                            var typeName = ParseTypeName(ref reader);
-                            ancestorType = _typeResolver(typeName.Namespace.ToString(), typeName.Type.ToString());
-                        }
-                    }
-                    else
-                    {
-                        var reader = new CharacterReader(args[0].AsSpan());
-                        var typeName = ParseTypeName(ref reader);
-                        ancestorType = _typeResolver(typeName.Namespace.ToString(), typeName.Type.ToString());
-                        ancestorLevel = int.Parse(args[1]);
-                    }
+                    throw new InvalidOperationException("Cannot parse a binding path with a typed Cast without a type resolver. Maybe you can use a LINQ Expression binding path instead?");
                 }
-                nodes.Add(new FindAncestorNode(ancestorType, ancestorLevel));
-            }
-            else
-            {
-                throw new ExpressionParseException(r.Position, "Unknown RelativeSource mode.");
-            }
 
-            return State.AfterMember;
-        }
-        
-        private static TypeName ParseTypeName(ref CharacterReader r)
-        {
-            ReadOnlySpan<char> ns, typeName;
-            ns = ReadOnlySpan<char>.Empty;
-            var typeNameOrNamespace = r.ParseIdentifier();
-
-            if (!r.End && r.TakeIf(':'))
-            {
-                ns = typeNameOrNamespace;
-                typeName = r.ParseIdentifier();
-            }
-            else
-            {
-                typeName = typeNameOrNamespace;
+                castType = _typeResolver(node.Namespace, node.TypeName);
             }
 
-            return new TypeName(ns, typeName);
-        }
-      
-        private static bool ParseNot(ref CharacterReader r)
-        {
-            return !r.End && r.TakeIf('!');
-        }
-
-        private static bool ParseMemberAccessor(ref CharacterReader r)
-        {
-            return !r.End && r.TakeIf('.');
-        }
-
-        private static bool ParseOpenBrace(ref CharacterReader r)
-        {
-            return !r.End && r.TakeIf('(');
-        }
-
-        private static bool PeekOpenBracket(ref CharacterReader r)
-        {
-            return !r.End && r.Peek == '[';
+            return new TypeCastNode(castType);
         }
 
-        private static bool ParseStreamOperator(ref CharacterReader r)
+        private AvaloniaPropertyAccessorNode ParseAttachedProperty(BindingExpressionGrammar.AttachedPropertyNameNode node)
         {
-            return !r.End && r.TakeIf('^');
-        }
-
-        private static bool ParseDollarSign(ref CharacterReader r)
-        {
-            return !r.End && r.TakeIf('$');
-        }
-
-        private static bool ParseSharp(ref CharacterReader r)
-        {
-            return !r.End && r.TakeIf('#');
-        }
-
-        private static bool ParseDot(ref CharacterReader r)
-        {
-            return !r.End && r.TakeIf('.');
-        }
-
-        private enum State
-        {
-            Start,
-            RelativeSource,
-            ElementName,
-            AfterMember,
-            BeforeMember,
-            AttachedProperty,
-            Indexer,
-            End,
-        }
-
-        private readonly ref struct TypeName
-        {
-            public TypeName(ReadOnlySpan<char> ns, ReadOnlySpan<char> typeName)
+            if (_typeResolver == null)
             {
-                Namespace = ns;
-                Type = typeName;
+                throw new InvalidOperationException("Cannot parse a binding path with an attached property without a type resolver. Maybe you can use a LINQ Expression binding path instead?");
             }
 
-            public readonly ReadOnlySpan<char> Namespace;
-            public readonly ReadOnlySpan<char> Type;
+            var property = AvaloniaPropertyRegistry.Instance.FindRegistered(_typeResolver(node.Namespace, node.TypeName), node.PropertyName);
 
-            public void Deconstruct(out ReadOnlySpan<char> ns, out ReadOnlySpan<char> typeName)
-            {
-                ns = Namespace;
-                typeName = Type;
-            }
+            return new AvaloniaPropertyAccessorNode(property, _enableValidation);
         }
     }
 }
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/ElementNameNode.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/ElementNameNode.cs
index 7eec80fc00..97198145a8 100644
--- a/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/ElementNameNode.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/ElementNameNode.cs
@@ -5,7 +5,7 @@ using Avalonia.LogicalTree;
 
 namespace Avalonia.Markup.Parsers.Nodes
 {
-    internal class ElementNameNode : ExpressionNode
+    public class ElementNameNode : ExpressionNode
     {
         private readonly WeakReference<INameScope> _nameScope;
         private readonly string _name;
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/FindAncestorNode.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/FindAncestorNode.cs
index 321a85c1d7..f304d1e9a2 100644
--- a/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/FindAncestorNode.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/FindAncestorNode.cs
@@ -4,7 +4,7 @@ using Avalonia.LogicalTree;
 
 namespace Avalonia.Markup.Parsers.Nodes
 {
-    internal class FindAncestorNode : ExpressionNode
+    public class FindAncestorNode : ExpressionNode
     {
         private readonly int _level;
         private readonly Type _ancestorType;
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/SelfNode.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/SelfNode.cs
index 2cb87efa65..1cd233c68a 100644
--- a/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/SelfNode.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/SelfNode.cs
@@ -2,7 +2,7 @@
 
 namespace Avalonia.Markup.Parsers.Nodes
 {
-    internal class SelfNode : ExpressionNode
+    public class SelfNode : ExpressionNode
     {
         public override string Description => "$self";
     }
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/StringIndexerNode.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/StringIndexerNode.cs
index a11879238b..76fbc9a982 100644
--- a/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/StringIndexerNode.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/StringIndexerNode.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/PropertyPathGrammar.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/PropertyPathGrammar.cs
new file mode 100644
index 0000000000..c5953b514c
--- /dev/null
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/PropertyPathGrammar.cs
@@ -0,0 +1,233 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Data.Core;
+using Avalonia.Utilities;
+
+namespace Avalonia.Markup.Parsers
+{
+#if !BUILDTASK
+    public
+#endif
+    class PropertyPathGrammar
+    {
+        private enum State
+        {
+            Start,
+            Next,
+            AfterProperty,
+            End
+        }
+
+        public static IEnumerable<ISyntax> Parse(string s)
+        {
+            var r = new CharacterReader(s.AsSpan());
+            return Parse(ref r);
+        }
+
+        private static IEnumerable<ISyntax> Parse(ref CharacterReader r)
+        {
+            var state = State.Start;
+            var parsed = new List<ISyntax>();
+            while (state != State.End)
+            {
+                ISyntax syntax = null;
+                if (state == State.Start)
+                    (state, syntax) = ParseStart(ref r);
+                else if (state == State.Next)
+                    (state, syntax) = ParseNext(ref r);
+                else if (state == State.AfterProperty)
+                    (state, syntax) = ParseAfterProperty(ref r);
+                
+                
+                if (syntax != null)
+                {
+                    parsed.Add(syntax);
+                }
+            }
+
+            if (state != State.End && r.End)
+            {
+                throw new ExpressionParseException(r.Position, "Unexpected end of property path");
+            }
+
+            return parsed;
+        }
+        
+        private static (State, ISyntax) ParseNext(ref CharacterReader r)
+        {
+            r.SkipWhitespace();
+            if (r.End)
+                return (State.End, null);
+            
+            return ParseStart(ref r);
+        }
+        
+        private static (State, ISyntax) ParseStart(ref CharacterReader r)
+        {
+            if (TryParseCasts(ref r, out var rv))
+                return rv;
+            r.SkipWhitespace();
+
+            if (r.TakeIf('('))
+                return ParseTypeQualifiedProperty(ref r);
+
+            return ParseProperty(ref r);
+        }
+
+        private static (State, ISyntax) ParseTypeQualifiedProperty(ref CharacterReader r)
+        {
+            r.SkipWhitespace();
+            const string error =
+                "Unable to parse qualified property name, expected `(ns:TypeName.PropertyName)` or `(TypeName.PropertyName)` after `(`";
+
+            var typeName = ParseXamlIdentifier(ref r);
+            
+            
+            if (!r.TakeIf('.'))
+                throw new ExpressionParseException(r.Position, error);
+
+            var propertyName = r.ParseIdentifier();
+            if (propertyName.IsEmpty)
+                throw new ExpressionParseException(r.Position, error);
+
+            r.SkipWhitespace();
+            if (!r.TakeIf(')'))
+                throw new ExpressionParseException(r.Position,
+                    "Expected ')' after qualified property name "
+                    + typeName.ns + ':' + typeName.name +
+                    "." + propertyName.ToString());
+
+            return (State.AfterProperty,
+                new TypeQualifiedPropertySyntax
+                {
+                    Name = propertyName.ToString(),
+                    TypeName = typeName.name,
+                    TypeNamespace = typeName.ns
+                });
+        }
+
+        static (string ns, string name) ParseXamlIdentifier(ref CharacterReader r)
+        {
+            var ident = r.ParseIdentifier();
+            if (ident.IsEmpty)
+                throw new ExpressionParseException(r.Position, "Expected identifier");
+            if (r.TakeIf(':'))
+            {
+                var part2 = r.ParseIdentifier();
+                if (part2.IsEmpty)
+                    throw new ExpressionParseException(r.Position,
+                        "Expected the rest of the identifier after " + ident.ToString() + ":");
+                return (ident.ToString(), part2.ToString());
+            }
+
+            return (null, ident.ToString());
+        }
+        
+        private static (State, ISyntax) ParseProperty(ref CharacterReader r)
+        {
+            r.SkipWhitespace();
+            var prop = r.ParseIdentifier();
+            if (prop.IsEmpty)
+                throw new ExpressionParseException(r.Position, "Unable to parse property name");
+            return (State.AfterProperty, new PropertySyntax {Name = prop.ToString()});
+        }
+
+        private static bool TryParseCasts(ref CharacterReader r, out (State, ISyntax) rv)
+        {
+            if (r.TakeIfKeyword(":="))
+                rv = ParseEnsureType(ref r);
+            else if (r.TakeIfKeyword(":>") || r.TakeIfKeyword("as "))
+                rv = ParseCastType(ref r);
+            else
+            {
+                rv = default;
+                return false;
+            }
+
+            return true;
+        }
+        
+        private static (State, ISyntax) ParseAfterProperty(ref CharacterReader r)
+        {
+            if (TryParseCasts(ref r, out var rv))
+                return rv;
+            
+            r.SkipWhitespace();
+            if (r.End)
+                return (State.End, null);
+            if (r.TakeIf('.'))
+                return (State.Next, ChildTraversalSyntax.Instance);
+            
+
+            
+            throw new ExpressionParseException(r.Position, "Unexpected character " + r.Peek + " after property name");
+        }
+
+        private static (State, ISyntax) ParseEnsureType(ref CharacterReader r)
+        {
+            r.SkipWhitespace();
+            var type = ParseXamlIdentifier(ref r);
+            return (State.AfterProperty, new EnsureTypeSyntax {TypeName = type.name, TypeNamespace = type.ns});
+        }
+        
+        private static (State, ISyntax) ParseCastType(ref CharacterReader r)
+        {
+            r.SkipWhitespace();
+            var type = ParseXamlIdentifier(ref r);
+            return (State.AfterProperty, new CastTypeSyntax {TypeName = type.name, TypeNamespace = type.ns});
+        }
+
+        public interface ISyntax
+        {
+            
+        }
+
+        public class PropertySyntax : ISyntax
+        {
+            public string Name { get; set; }
+
+            public override bool Equals(object obj)
+                => obj is PropertySyntax other
+                   && other.Name == Name;
+        }
+        
+        public class TypeQualifiedPropertySyntax : ISyntax
+        {
+            public string Name { get; set; }
+            public string TypeName { get; set; }
+            public string TypeNamespace { get; set; }
+
+            public override bool Equals(object obj)
+                => obj is TypeQualifiedPropertySyntax other
+                   && other.Name == Name
+                   && other.TypeName == TypeName
+                   && other.TypeNamespace == TypeNamespace;
+        }
+        
+        public class ChildTraversalSyntax : ISyntax
+        {
+            public static ChildTraversalSyntax Instance { get;  } = new ChildTraversalSyntax();
+            public override bool Equals(object obj) => obj is ChildTraversalSyntax;
+        }
+        
+        public class EnsureTypeSyntax : ISyntax
+        {
+            public string TypeName { get; set; }
+            public string TypeNamespace { get; set; }
+            public override bool Equals(object obj)
+                => obj is EnsureTypeSyntax other
+                   && other.TypeName == TypeName
+                   && other.TypeNamespace == TypeNamespace;
+        }
+        
+        public class CastTypeSyntax : ISyntax
+        {
+            public string TypeName { get; set; }
+            public string TypeNamespace { get; set; }
+            public override bool Equals(object obj)
+                => obj is CastTypeSyntax other
+                   && other.TypeName == TypeName
+                   && other.TypeNamespace == TypeNamespace;
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorGrammar.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorGrammar.cs
index c57b8c4cf6..b25e9490cd 100644
--- a/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorGrammar.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorGrammar.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -157,7 +154,7 @@ namespace Avalonia.Markup.Parsers
 
         private static (State, ISyntax) ParseColon(ref CharacterReader r)
         {
-            var identifier = r.ParseIdentifier();
+            var identifier = r.ParseStyleClass();
 
             if (identifier.IsEmpty)
             {
@@ -217,7 +214,7 @@ namespace Avalonia.Markup.Parsers
 
         private static (State, ISyntax) ParseClass(ref CharacterReader r)
         {
-            var @class = r.ParseIdentifier();
+            var @class = r.ParseStyleClass();
             if (@class.IsEmpty)
             {
                 throw new ExpressionParseException(r.Position, $"Expected a class name after '.'.");
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorParser.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorParser.cs
index 493579d676..04519bf2bb 100644
--- a/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorParser.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorParser.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Globalization;
diff --git a/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs b/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs
index 4651dbab8d..ac055af98b 100644
--- a/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs
+++ b/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs
@@ -1,10 +1,11 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reflection;
 using Avalonia.Metadata;
 using System.Runtime.CompilerServices;
 
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Data")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup.Data")]
+#if SIGNED_BUILD
+[assembly: InternalsVisibleTo("Avalonia.Markup.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+#else
 [assembly: InternalsVisibleTo("Avalonia.Markup.UnitTests")]
+#endif
diff --git a/src/Shared/PlatformSupport/AssetLoader.cs b/src/Shared/PlatformSupport/AssetLoader.cs
index dd72934560..90b341297c 100644
--- a/src/Shared/PlatformSupport/AssetLoader.cs
+++ b/src/Shared/PlatformSupport/AssetLoader.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
index 8a5a725594..d574732e3d 100644
--- a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
+++ b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -75,7 +72,7 @@ namespace Avalonia.Shared.PlatformSupport
                         lock (_btlock)
                             Backtraces.Remove(_backtrace);
 #endif
-                        _plat.Free(_address, Size);
+                        _plat?.Free(_address, Size);
                         GC.RemoveMemoryPressure(Size);
                         IsDisposed = true;
                         _address = IntPtr.Zero;
@@ -89,11 +86,15 @@ namespace Avalonia.Shared.PlatformSupport
 #if DEBUG
                 if (Thread.CurrentThread.ManagedThreadId == GCThread?.ManagedThreadId)
                 {
-                    lock(_lock)
+                    lock (_lock)
+                    {
                         if (!IsDisposed)
+                        {
                             Console.Error.WriteLine("Native blob disposal from finalizer thread\nBacktrace: "
-                                                    + Environment.StackTrace
-                                                    + "\n\nBlob created by " + _backtrace);
+                                                 + Environment.StackTrace
+                                                 + "\n\nBlob created by " + _backtrace);
+                        }
+                    }
                 }
 #endif
                 DoDispose();
diff --git a/src/Shared/RenderHelpers/ArcToHelper.cs b/src/Shared/RenderHelpers/ArcToHelper.cs
index 8445da8dd5..0bbf451970 100644
--- a/src/Shared/RenderHelpers/ArcToHelper.cs
+++ b/src/Shared/RenderHelpers/ArcToHelper.cs
@@ -45,6 +45,8 @@
 // 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;
 using Avalonia.Media;
diff --git a/src/Skia/Avalonia.Skia/Assets/NoiseAsset_256X256_PNG.png b/src/Skia/Avalonia.Skia/Assets/NoiseAsset_256X256_PNG.png
new file mode 100644
index 0000000000..41de173d90
Binary files /dev/null and b/src/Skia/Avalonia.Skia/Assets/NoiseAsset_256X256_PNG.png differ
diff --git a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
index 68da513528..ac029f1062 100644
--- a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
+++ b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
@@ -7,11 +7,14 @@
     <IncludeLinuxSkia>true</IncludeLinuxSkia>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Assets\NoiseAsset_256X256_PNG.png" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
   </ItemGroup>
   
   <Import Project="..\..\..\build\SkiaSharp.props" />
   <Import Project="..\..\..\build\HarfBuzzSharp.props" />
-  <Import Project="..\..\Shared\RenderHelpers\RenderHelpers.projitems" Label="Shared" />
+  <Import Project="..\..\Shared\RenderHelpers\RenderHelpers.projitems" Label="Shared" />  
 </Project>
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index 47e651ce91..2a79a4bb50 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -20,7 +17,7 @@ namespace Avalonia.Skia
     /// <summary>
     /// Skia based drawing context.
     /// </summary>
-    internal class DrawingContextImpl : IDrawingContextImpl, ISkiaDrawingContextImpl
+    internal class DrawingContextImpl : IDrawingContextImpl, ISkiaDrawingContextImpl, IDrawingContextWithAcrylicLikeSupport
     {
         private IDisposable[] _disposables;
         private readonly Vector _dpi;
@@ -31,8 +28,16 @@ namespace Avalonia.Skia
         private double _currentOpacity = 1.0f;
         private readonly bool _canTextUseLcdRendering;
         private Matrix _currentTransform;
-        private GRContext _grContext;
         private bool _disposed;
+        private GRContext _grContext;
+        public GRContext GrContext => _grContext;
+        private ISkiaGpu _gpu;
+        private readonly SKPaint _strokePaint = new SKPaint();
+        private readonly SKPaint _fillPaint = new SKPaint();
+        private readonly SKPaint _boxShadowPaint = new SKPaint();
+        private static SKShader s_acrylicNoiseShader;
+        private readonly ISkiaGpuRenderSession _session; 
+
         /// <summary>
         /// Context create info.
         /// </summary>
@@ -43,6 +48,11 @@ namespace Avalonia.Skia
             /// </summary>
             public SKCanvas Canvas;
 
+            /// <summary>
+            /// Surface to draw to.
+            /// </summary>
+            public SKSurface Surface;
+
             /// <summary>
             /// Dpi of drawings.
             /// </summary>
@@ -62,6 +72,13 @@ namespace Avalonia.Skia
             /// GPU-accelerated context (optional)
             /// </summary>
             public GRContext GrContext;
+
+            /// <summary>
+            /// Skia GPU provider context (optional)
+            /// </summary>
+            public ISkiaGpu Gpu;
+
+            public ISkiaGpuRenderSession CurrentSession;
         }
 
         /// <summary>
@@ -76,10 +93,13 @@ namespace Avalonia.Skia
             _disposables = disposables;
             _canTextUseLcdRendering = !createInfo.DisableTextLcdRendering;
             _grContext = createInfo.GrContext;
+            _gpu = createInfo.Gpu;
             if (_grContext != null)
                 Monitor.Enter(_grContext);
-            
-            Canvas = createInfo.Canvas;
+            Surface = createInfo.Surface;
+            Canvas = createInfo.Canvas ?? createInfo.Surface?.Canvas;
+
+            _session = createInfo.CurrentSession;
 
             if (Canvas == null)
             {
@@ -99,8 +119,10 @@ namespace Avalonia.Skia
         /// Skia canvas.
         /// </summary>
         public SKCanvas Canvas { get; }
+        public SKSurface Surface { get; }
 
         SKCanvas ISkiaDrawingContextImpl.SkCanvas => Canvas;
+        SKSurface ISkiaDrawingContextImpl.SkSurface => Surface;
         GRContext ISkiaDrawingContextImpl.GrContext => _grContext;
 
         /// <inheritdoc />
@@ -110,7 +132,7 @@ namespace Avalonia.Skia
         }
 
         /// <inheritdoc />
-        public void DrawImage(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
+        public void DrawBitmap(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
         {
             var drawableImage = (IDrawableBitmapImpl)source.Item;
             var s = sourceRect.ToSKRect();
@@ -122,41 +144,24 @@ namespace Avalonia.Skia
                     Color = new SKColor(255, 255, 255, (byte)(255 * opacity * _currentOpacity))
                 })
             {
-                paint.FilterQuality = GetInterpolationMode(bitmapInterpolationMode);
+                paint.FilterQuality = bitmapInterpolationMode.ToSKFilterQuality();
 
                 drawableImage.Draw(this, s, d, paint);
             }
         }
 
-        private static SKFilterQuality GetInterpolationMode(BitmapInterpolationMode interpolationMode)
-        {
-            switch (interpolationMode)
-            {
-                case BitmapInterpolationMode.LowQuality:
-                    return SKFilterQuality.Low;
-                case BitmapInterpolationMode.MediumQuality:
-                    return SKFilterQuality.Medium;
-                case BitmapInterpolationMode.HighQuality:
-                    return SKFilterQuality.High;
-                case BitmapInterpolationMode.Default:
-                    return SKFilterQuality.None;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(interpolationMode), interpolationMode, null);
-            }
-        }
-
         /// <inheritdoc />
-        public void DrawImage(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect)
+        public void DrawBitmap(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect)
         {
             PushOpacityMask(opacityMask, opacityMaskRect);
-            DrawImage(source, 1, new Rect(0, 0, source.Item.PixelSize.Width, source.Item.PixelSize.Height), destRect, BitmapInterpolationMode.Default);
+            DrawBitmap(source, 1, new Rect(0, 0, source.Item.PixelSize.Width, source.Item.PixelSize.Height), destRect, BitmapInterpolationMode.Default);
             PopOpacityMask();
         }
 
         /// <inheritdoc />
         public void DrawLine(IPen pen, Point p1, Point p2)
         {
-            using (var paint = CreatePaint(pen, new Size(Math.Abs(p2.X - p1.X), Math.Abs(p2.Y - p1.Y))))
+            using (var paint = CreatePaint(_strokePaint, pen, new Size(Math.Abs(p2.X - p1.X), Math.Abs(p2.Y - p1.Y))))
             {
                 Canvas.DrawLine((float) p1.X, (float) p1.Y, (float) p2.X, (float) p2.Y, paint.Paint);
             }
@@ -168,8 +173,8 @@ namespace Avalonia.Skia
             var impl = (GeometryImpl) geometry;
             var size = geometry.Bounds.Size;
 
-            using (var fill = brush != null ? CreatePaint(brush, size) : default(PaintWrapper))
-            using (var stroke = pen?.Brush != null ? CreatePaint(pen, size) : default(PaintWrapper))
+            using (var fill = brush != null ? CreatePaint(_fillPaint, brush, size) : default(PaintWrapper))
+            using (var stroke = pen?.Brush != null ? CreatePaint(_strokePaint, pen, size) : default(PaintWrapper))
             {
                 if (fill.Paint != null)
                 {
@@ -183,38 +188,221 @@ namespace Avalonia.Skia
             }
         }
 
-        /// <inheritdoc />
-        public void DrawRectangle(IPen pen, Rect rect, float cornerRadius = 0)
+        struct BoxShadowFilter : IDisposable
         {
-            using (var paint = CreatePaint(pen, rect.Size))
+            public SKPaint Paint;
+            private SKImageFilter _filter;
+            public SKClipOperation ClipOperation;
+
+            static float SkBlurRadiusToSigma(double radius) {
+                if (radius <= 0)
+                    return 0.0f;
+                return 0.288675f * (float)radius + 0.5f;
+            }
+            public static BoxShadowFilter Create(SKPaint paint, BoxShadow shadow, double opacity)
             {
-                var rc = rect.ToSKRect();
-
-                if (Math.Abs(cornerRadius) < float.Epsilon)
+                var ac = shadow.Color;
+
+                SKImageFilter filter = null;
+                filter = SKImageFilter.CreateBlur(SkBlurRadiusToSigma(shadow.Blur), SkBlurRadiusToSigma(shadow.Blur));
+                var color = new SKColor(ac.R, ac.G, ac.B, (byte)(ac.A * opacity));
+
+                paint.Reset();
+                paint.IsAntialias = true;
+                paint.Color = color;
+                paint.ImageFilter = filter;
+                
+                return new BoxShadowFilter
                 {
-                    Canvas.DrawRect(rc, paint.Paint);
-                }
-                else
+                    Paint = paint, _filter = filter,
+                    ClipOperation = shadow.IsInset ? SKClipOperation.Intersect : SKClipOperation.Difference
+                };
+            }
+
+            public void Dispose()
+            {
+                Paint.Reset();
+                Paint = null;
+                _filter?.Dispose();
+            }
+        }
+
+        SKRect AreaCastingShadowInHole(
+            SKRect hole_rect,
+            float shadow_blur,
+            float shadow_spread,
+            float offsetX, float offsetY)
+        {
+            // Adapted from Chromium
+            var bounds = hole_rect;
+
+            bounds.Inflate(shadow_blur, shadow_blur);
+
+            if (shadow_spread < 0)
+                bounds.Inflate(-shadow_spread, -shadow_spread);
+
+            var offset_bounds = bounds;
+            offset_bounds.Offset(-offsetX, -offsetY);
+            bounds.Union(offset_bounds);
+            return bounds;
+        }
+
+        /// <inheritdoc />
+        public void DrawRectangle(IExperimentalAcrylicMaterial material, RoundedRect rect)
+        {
+            if (rect.Rect.Height <= 0 || rect.Rect.Width <= 0)
+                return;
+            
+            var rc = rect.Rect.ToSKRect();
+            var isRounded = rect.IsRounded;
+            var needRoundRect = rect.IsRounded;
+            using var skRoundRect = needRoundRect ? new SKRoundRect() : null;
+
+            if (needRoundRect)
+                skRoundRect.SetRectRadii(rc,
+                    new[]
+                    {
+                        rect.RadiiTopLeft.ToSKPoint(), rect.RadiiTopRight.ToSKPoint(),
+                        rect.RadiiBottomRight.ToSKPoint(), rect.RadiiBottomLeft.ToSKPoint(),
+                    });
+
+            if (material != null)
+            {
+                using (var paint = CreateAcrylicPaint(_fillPaint, material))
                 {
-                    Canvas.DrawRoundRect(rc, cornerRadius, cornerRadius, paint.Paint);
+                    if (isRounded)
+                    {
+                        Canvas.DrawRoundRect(skRoundRect, paint.Paint);
+                    }
+                    else
+                    {
+                        Canvas.DrawRect(rc, paint.Paint);
+                    }
+
                 }
             }
         }
 
         /// <inheritdoc />
-        public void FillRectangle(IBrush brush, Rect rect, float cornerRadius = 0)
+        public void DrawRectangle(IBrush brush, IPen pen, RoundedRect rect, BoxShadows boxShadows = default)
         {
-            using (var paint = CreatePaint(brush, rect.Size))
+            if (rect.Rect.Height <= 0 || rect.Rect.Width <= 0)
+                return;
+            // 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)
+                boxShadows = default;
+
+            var rc = rect.Rect.ToSKRect();
+            var isRounded = rect.IsRounded;
+            var needRoundRect = rect.IsRounded || (boxShadows.HasInsetShadows);
+            using var skRoundRect = needRoundRect ? new SKRoundRect() : null;
+            if (needRoundRect)
+                skRoundRect.SetRectRadii(rc,
+                    new[]
+                    {
+                        rect.RadiiTopLeft.ToSKPoint(), rect.RadiiTopRight.ToSKPoint(),
+                        rect.RadiiBottomRight.ToSKPoint(), rect.RadiiBottomLeft.ToSKPoint(),
+                    });
+
+            foreach (var boxShadow in boxShadows)
             {
-                var rc = rect.ToSKRect();
+                if (!boxShadow.IsEmpty && !boxShadow.IsInset)
+                {
+                    using (var shadow = BoxShadowFilter.Create(_boxShadowPaint, boxShadow, _currentOpacity))
+                    {
+                        var spread = (float)boxShadow.Spread;
+                        if (boxShadow.IsInset)
+                            spread = -spread;
+
+                        Canvas.Save();
+                        if (isRounded)
+                        {
+                            using var shadowRect = new SKRoundRect(skRoundRect);
+                            if (spread != 0)
+                                shadowRect.Inflate(spread, spread);
+                            Canvas.ClipRoundRect(skRoundRect,
+                                shadow.ClipOperation, true);
+                            
+                            var oldTransform = Transform;
+                            Transform = oldTransform * Matrix.CreateTranslation(boxShadow.OffsetX, boxShadow.OffsetY);
+                            Canvas.DrawRoundRect(shadowRect, shadow.Paint);
+                            Transform = oldTransform;
+                        }
+                        else
+                        {
+                            var shadowRect = rc;
+                            if (spread != 0)
+                                shadowRect.Inflate(spread, spread);
+                            Canvas.ClipRect(rc, shadow.ClipOperation);
+                            var oldTransform = Transform;
+                            Transform = oldTransform * Matrix.CreateTranslation(boxShadow.OffsetX, boxShadow.OffsetY);
+                            Canvas.DrawRect(shadowRect, shadow.Paint);
+                            Transform = oldTransform;
+                        }
+
+                        Canvas.Restore();
+                    }
+                }
+            }
 
-                if (Math.Abs(cornerRadius) < float.Epsilon)
+            if (brush != null)
+            {
+                using (var paint = CreatePaint(_fillPaint, brush, rect.Rect.Size))
                 {
-                    Canvas.DrawRect(rc, paint.Paint);
+                    if (isRounded)
+                    {
+                        Canvas.DrawRoundRect(skRoundRect, paint.Paint);
+                    }
+                    else
+                    {
+                        Canvas.DrawRect(rc, paint.Paint);
+                    }
+                  
                 }
-                else
+            }
+
+            foreach (var boxShadow in boxShadows)
+            {
+                if (!boxShadow.IsEmpty && boxShadow.IsInset)
                 {
-                    Canvas.DrawRoundRect(rc, cornerRadius, cornerRadius, paint.Paint);
+                    using (var shadow = BoxShadowFilter.Create(_boxShadowPaint, boxShadow, _currentOpacity))
+                    {
+                        var spread = (float)boxShadow.Spread;
+                        var offsetX = (float)boxShadow.OffsetX;
+                        var offsetY = (float)boxShadow.OffsetY;
+                        var outerRect = AreaCastingShadowInHole(rc, (float)boxShadow.Blur, spread, offsetX, offsetY);
+
+                        Canvas.Save();
+                        using var shadowRect = new SKRoundRect(skRoundRect);
+                        if (spread != 0)
+                            shadowRect.Deflate(spread, spread);
+                        Canvas.ClipRoundRect(skRoundRect,
+                            shadow.ClipOperation, true);
+                        
+                        var oldTransform = Transform;
+                        Transform = oldTransform * Matrix.CreateTranslation(boxShadow.OffsetX, boxShadow.OffsetY);
+                        using (var outerRRect = new SKRoundRect(outerRect))
+                            Canvas.DrawRoundRectDifference(outerRRect, shadowRect, shadow.Paint);
+                        Transform = oldTransform;
+                        Canvas.Restore();
+                    }
+                }
+            }
+
+            if (pen?.Brush != null)
+            {
+                using (var paint = CreatePaint(_strokePaint, pen, rect.Rect.Size))
+                {
+                    if (isRounded)
+                    {
+                        Canvas.DrawRoundRect(skRoundRect, paint.Paint);
+                    }
+                    else
+                    {
+                        Canvas.DrawRect(rc, paint.Paint);
+                    }
+                   
                 }
             }
         }
@@ -222,7 +410,7 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void DrawText(IBrush foreground, Point origin, IFormattedTextImpl text)
         {
-            using (var paint = CreatePaint(foreground, text.Bounds.Size))
+            using (var paint = CreatePaint(_fillPaint, foreground, text.Bounds.Size))
             {
                 var textImpl = (FormattedTextImpl) text;
                 textImpl.Draw(this, Canvas, origin.ToSKPoint(), paint, _canTextUseLcdRendering);
@@ -230,9 +418,23 @@ namespace Avalonia.Skia
         }
 
         /// <inheritdoc />
-        public IRenderTargetBitmapImpl CreateLayer(Size size)
+        public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
         {
-            return CreateRenderTarget(size);
+            using (var paintWrapper = CreatePaint(_fillPaint, foreground, glyphRun.Size))
+            {
+                var glyphRunImpl = (GlyphRunImpl)glyphRun.GlyphRunImpl;
+
+                ConfigureTextRendering(paintWrapper);
+
+                Canvas.DrawText(glyphRunImpl.TextBlob, (float)glyphRun.BaselineOrigin.X,
+                    (float)glyphRun.BaselineOrigin.Y, paintWrapper.Paint);
+            }
+        }
+
+        /// <inheritdoc />
+        public IDrawingContextLayerImpl CreateLayer(Size size)
+        {
+            return CreateRenderTarget(size, true);
         }
 
         /// <inheritdoc />
@@ -242,6 +444,12 @@ namespace Avalonia.Skia
             Canvas.ClipRect(clip.ToSKRect());
         }
 
+        public void PushClip(RoundedRect clip)
+        {
+            Canvas.Save();
+            Canvas.ClipRoundRect(clip.ToSKRoundRect());
+        }
+
         /// <inheritdoc />
         public void PopClip()
         {
@@ -309,7 +517,7 @@ namespace Avalonia.Skia
             var paint = new SKPaint();
 
             Canvas.SaveLayer(paint);
-            _maskStack.Push(CreatePaint(mask, bounds.Size));
+            _maskStack.Push(CreatePaint(paint, mask, bounds.Size, true));
         }
 
         /// <inheritdoc />
@@ -350,6 +558,15 @@ namespace Avalonia.Skia
             }
         }
 
+        internal void ConfigureTextRendering(PaintWrapper wrapper)
+        {
+            var paint = wrapper.Paint;
+
+            paint.IsEmbeddedBitmapText = true;
+            paint.SubpixelText = true;
+            paint.LcdRenderText = _canTextUseLcdRendering;
+        }
+
         /// <summary>
         /// Configure paint wrapper for using gradient brush.
         /// </summary>
@@ -383,12 +600,60 @@ namespace Avalonia.Skia
                     var center = radialGradient.Center.ToPixels(targetSize).ToSKPoint();
                     var radius = (float)(radialGradient.Radius * targetSize.Width);
 
-                    // TODO: There is no SetAlpha in SkiaSharp
-                    //paint.setAlpha(128);
+                    var origin = radialGradient.GradientOrigin.ToPixels(targetSize).ToSKPoint();
 
-                    // would be nice to cache these shaders possibly?
-                    using (var shader =
-                        SKShader.CreateRadialGradient(center, radius, stopColors, stopOffsets, tileMode))
+                    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))
+                        {
+                            paintWrapper.Paint.Shader = shader;
+                        }
+                    }
+                    else
+                    {
+                        // when the origin is different to the center use a two point ConicalGradient to match the behaviour of D2D
+
+                        // reverse the order of the stops to match D2D
+                        var reversedColors = new SKColor[stopColors.Length];
+                        Array.Copy(stopColors, reversedColors, stopColors.Length);
+                        Array.Reverse(reversedColors);
+
+                        // and then reverse the reference point of the stops
+                        var reversedStops = new float[stopOffsets.Length];
+                        for (var i = 0; i < stopOffsets.Length; i++)
+                        {
+                            reversedStops[i] = stopOffsets[i];
+                            if (reversedStops[i] > 0 && reversedStops[i] < 1)
+                            {
+                                reversedStops[i] = Math.Abs(1 - stopOffsets[i]);
+                            }
+                        }
+                            
+                        // 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)
+                        ))
+                        {
+                            paintWrapper.Paint.Shader = shader;
+                        }
+                    }
+
+                    break;
+                }
+                case IConicGradientBrush conicGradient:
+                {
+                    var center = conicGradient.Center.ToPixels(targetSize).ToSKPoint();
+
+                    // Skia's default is that angle 0 is from the right hand side of the center point
+                    // but we are matching CSS where the vertical point above the center is 0.
+                    var angle = (float)(conicGradient.Angle - 90);
+                    var rotation = SKMatrix.CreateRotationDegrees(angle, center.X, center.Y);
+
+                    using (var shader = 
+                        SKShader.CreateSweepGradient(center, stopColors, stopOffsets, rotation))
                     {
                         paintWrapper.Paint.Shader = shader;
                     }
@@ -408,7 +673,7 @@ namespace Avalonia.Skia
         private void ConfigureTileBrush(ref PaintWrapper paintWrapper, Size targetSize, ITileBrush tileBrush, IDrawableBitmapImpl tileBrushImage)
         {
             var calc = new TileBrushCalculator(tileBrush, tileBrushImage.PixelSize.ToSizeWithDpi(_dpi), targetSize);
-            var intermediate = CreateRenderTarget(calc.IntermediateSize);
+            var intermediate = CreateRenderTarget(calc.IntermediateSize, false);
 
             paintWrapper.AddDisposable(intermediate);
 
@@ -420,7 +685,7 @@ namespace Avalonia.Skia
                 context.Clear(Colors.Transparent);
                 context.PushClip(calc.IntermediateClip);
                 context.Transform = calc.IntermediateTransform;
-                context.DrawImage(
+                context.DrawBitmap(
                     RefCountable.CreateUnownedNotClonable(tileBrushImage),
                     1,
                     sourceRect,
@@ -431,8 +696,8 @@ namespace Avalonia.Skia
 
             var tileTransform =
                 tileBrush.TileMode != TileMode.None
-                    ? SKMatrix.MakeTranslation(-(float)calc.DestinationRect.X, -(float)calc.DestinationRect.Y)
-                    : SKMatrix.MakeIdentity();
+                    ? SKMatrix.CreateTranslation(-(float)calc.DestinationRect.X, -(float)calc.DestinationRect.Y)
+                    : SKMatrix.CreateIdentity();
 
             SKShaderTileMode tileX =
                 tileBrush.TileMode == TileMode.None
@@ -457,7 +722,7 @@ namespace Avalonia.Skia
             SKMatrix.Concat(
                 ref paintTransform,
                 tileTransform,
-                SKMatrix.MakeScale((float)(96.0 / _dpi.X), (float)(96.0 / _dpi.Y)));
+                SKMatrix.CreateScale((float)(96.0 / _dpi.X), (float)(96.0 / _dpi.Y)));
 
             using (var shader = image.ToShader(tileX, tileY, paintTransform))
             {
@@ -483,7 +748,7 @@ namespace Avalonia.Skia
 
             if (intermediateSize.Width >= 1 && intermediateSize.Height >= 1)
             {
-                var intermediate = CreateRenderTarget(intermediateSize);
+                var intermediate = CreateRenderTarget(intermediateSize, false);
 
                 using (var ctx = intermediate.CreateDrawingContext(visualBrushRenderer))
                 {
@@ -497,20 +762,99 @@ namespace Avalonia.Skia
             }
         }
 
+        static SKColorFilter CreateAlphaColorFilter(double opacity)
+        {
+            if (opacity > 1)
+                opacity = 1;
+            var c = new byte[256];
+            var a = new byte[256];
+            for (var i = 0; i < 256; i++)
+            {
+                c[i] = (byte)i;
+                a[i] = (byte)(i * opacity);
+            }
+
+            return SKColorFilter.CreateTable(a, c, c, c);
+        }
+
+        static byte Blend(byte leftColor, byte leftAlpha, byte rightColor, byte rightAlpha)
+        {
+            var ca = leftColor / 255d;
+            var aa = leftAlpha / 255d;
+            var cb = rightColor / 255d;
+            var ab = rightAlpha / 255d;
+            var r = (ca * aa + cb * ab * (1 - aa)) / (aa + ab * (1 - aa));
+            return (byte)(r * 255);
+        }
+
+        static Color Blend(Color left, Color right)
+        {
+            var aa = left.A / 255d;
+            var ab = right.A / 255d;
+            return new Color(
+                (byte)((aa + ab * (1 - aa)) * 255),
+                Blend(left.R, left.A, right.R, right.A),
+                Blend(left.G, left.A, right.G, right.A),
+                Blend(left.B, left.A, right.B, right.A)                
+            );
+        }
+
+        internal PaintWrapper CreateAcrylicPaint (SKPaint paint, IExperimentalAcrylicMaterial material, bool disposePaint = false)
+        {
+            var paintWrapper = new PaintWrapper(paint, disposePaint);
+
+            paint.IsAntialias = true;
+
+            double opacity = _currentOpacity;
+
+            var tintOpacity =
+                material.BackgroundSource == AcrylicBackgroundSource.Digger ?
+                material.TintOpacity : 1;
+
+            const double noiseOpcity = 0.0225;
+
+            var tintColor = material.TintColor;
+            var tint = new SKColor(tintColor.R, tintColor.G, tintColor.B, tintColor.A);
+
+            if (s_acrylicNoiseShader == null)
+            {
+                using (var stream = typeof(DrawingContextImpl).Assembly.GetManifestResourceStream("Avalonia.Skia.Assets.NoiseAsset_256X256_PNG.png"))
+                using (var bitmap = SKBitmap.Decode(stream))
+                {
+                    s_acrylicNoiseShader = SKShader.CreateBitmap(bitmap, SKShaderTileMode.Repeat, SKShaderTileMode.Repeat)
+                        .WithColorFilter(CreateAlphaColorFilter(noiseOpcity));
+                }
+            }
+
+            using (var backdrop = SKShader.CreateColor(new SKColor(material.MaterialColor.R, material.MaterialColor.G, material.MaterialColor.B, material.MaterialColor.A)))
+            using (var tintShader = SKShader.CreateColor(tint))
+            using (var effectiveTint = SKShader.CreateCompose(backdrop, tintShader))
+            using (var compose = SKShader.CreateCompose(effectiveTint, s_acrylicNoiseShader))
+            {
+                paint.Shader = compose;
+
+                if (material.BackgroundSource == AcrylicBackgroundSource.Digger)
+                {
+                    paint.BlendMode = SKBlendMode.Src;
+                }
+
+                return paintWrapper;
+            }
+        }
+
         /// <summary>
         /// Creates paint wrapper for given brush.
         /// </summary>
+        /// <param name="paint">The paint to wrap.</param>
         /// <param name="brush">Source brush.</param>
         /// <param name="targetSize">Target size.</param>
+        /// <param name="disposePaint">Optional dispose of the supplied paint.</param>
         /// <returns>Paint wrapper for given brush.</returns>
-        internal PaintWrapper CreatePaint(IBrush brush, Size targetSize)
+        internal PaintWrapper CreatePaint(SKPaint paint, IBrush brush, Size targetSize, bool disposePaint = false)
         {
-            var paint = new SKPaint
-            {
-                IsAntialias = true
-            };
+            var paintWrapper = new PaintWrapper(paint, disposePaint);
 
-            var paintWrapper = new PaintWrapper(paint);
+            paint.IsAntialias = true;
 
             double opacity = brush.Opacity * _currentOpacity;
 
@@ -558,10 +902,12 @@ namespace Avalonia.Skia
         /// <summary>
         /// Creates paint wrapper for given pen.
         /// </summary>
+        /// <param name="paint">The paint to wrap.</param>
         /// <param name="pen">Source pen.</param>
         /// <param name="targetSize">Target size.</param>
+        /// <param name="disposePaint">Optional dispose of the supplied paint.</param>
         /// <returns></returns>
-        private PaintWrapper CreatePaint(IPen pen, Size targetSize)
+        private PaintWrapper CreatePaint(SKPaint paint, IPen pen, Size targetSize, bool disposePaint = false)
         {
             // In Skia 0 thickness means - use hairline rendering
             // and for us it means - there is nothing rendered.
@@ -570,8 +916,7 @@ namespace Avalonia.Skia
                 return default;
             }
 
-            var rv = CreatePaint(pen.Brush, targetSize);
-            var paint = rv.Paint;
+            var rv = CreatePaint(paint, pen.Brush, targetSize, disposePaint);
 
             paint.IsStroke = true;
             paint.StrokeWidth = (float) pen.Thickness;
@@ -633,9 +978,10 @@ namespace Avalonia.Skia
         /// Create new render target compatible with this drawing context.
         /// </summary>
         /// <param name="size">The size of the render target in DIPs.</param>
+        /// <param name="isLayer">Whether the render target is being created for a layer.</param>
         /// <param name="format">Pixel format.</param>
         /// <returns></returns>
-        private SurfaceRenderTarget CreateRenderTarget(Size size, PixelFormat? format = null)
+        private SurfaceRenderTarget CreateRenderTarget(Size size, bool isLayer, PixelFormat? format = null)
         {
             var pixelSize = PixelSize.FromSizeWithDpi(size, _dpi);
             var createInfo = new SurfaceRenderTarget.CreateInfo
@@ -645,16 +991,19 @@ namespace Avalonia.Skia
                 Dpi = _dpi,
                 Format = format,
                 DisableTextLcdRendering = !_canTextUseLcdRendering,
-                GrContext = _grContext
+                GrContext = _grContext,
+                Gpu = _gpu,
+                Session = _session,
+                DisableManualFbo = !isLayer,
             };
 
             return new SurfaceRenderTarget(createInfo);
-        }
+        }        
 
         /// <summary>
         /// Skia cached paint state.
         /// </summary>
-        private struct PaintState : IDisposable
+        private readonly struct PaintState : IDisposable
         {
             private readonly SKColor _color;
             private readonly SKShader _shader;
@@ -682,14 +1031,16 @@ namespace Avalonia.Skia
         {
             //We are saving memory allocations there
             public readonly SKPaint Paint;
+            private readonly bool _disposePaint;
 
             private IDisposable _disposable1;
             private IDisposable _disposable2;
             private IDisposable _disposable3;
 
-            public PaintWrapper(SKPaint paint)
+            public PaintWrapper(SKPaint paint, bool disposePaint)
             {
                 Paint = paint;
+                _disposePaint = disposePaint;
 
                 _disposable1 = null;
                 _disposable2 = null;
@@ -737,7 +1088,15 @@ namespace Avalonia.Skia
             /// <inheritdoc />
             public void Dispose()
             {
-                Paint?.Dispose();
+                if (_disposePaint)
+                {
+                    Paint?.Dispose();
+                }
+                else
+                {
+                    Paint?.Reset();
+                }
+
                 _disposable1?.Dispose();
                 _disposable2?.Dispose();
                 _disposable3?.Dispose();
diff --git a/src/Skia/Avalonia.Skia/EllipseGeometryImpl.cs b/src/Skia/Avalonia.Skia/EllipseGeometryImpl.cs
index aae1dd8cef..ac05691c67 100644
--- a/src/Skia/Avalonia.Skia/EllipseGeometryImpl.cs
+++ b/src/Skia/Avalonia.Skia/EllipseGeometryImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using SkiaSharp;
 
 namespace Avalonia.Skia
diff --git a/src/Skia/Avalonia.Skia/FontKey.cs b/src/Skia/Avalonia.Skia/FontKey.cs
deleted file mode 100644
index bb3fe230c1..0000000000
--- a/src/Skia/Avalonia.Skia/FontKey.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using Avalonia.Media;
-
-namespace Avalonia.Skia
-{
-    internal readonly struct FontKey : IEquatable<FontKey>
-    {
-        public readonly FontStyle Style;
-        public readonly FontWeight Weight;
-
-        public FontKey(FontWeight weight, FontStyle style)
-        {
-            Style = style;
-            Weight = weight;
-        }
-
-        public override int GetHashCode()
-        {
-            var hash = 17;
-            hash = hash * 31 + (int)Style;
-            hash = hash * 31 + (int)Weight;
-
-            return hash;
-        }
-
-        public override bool Equals(object other)
-        {
-            return other is FontKey key && Equals(key);
-        }
-
-        public bool Equals(FontKey other)
-        {
-            return Style == other.Style &&
-                   Weight == other.Weight;
-        }
-    }
-}
diff --git a/src/Skia/Avalonia.Skia/FontManagerImpl.cs b/src/Skia/Avalonia.Skia/FontManagerImpl.cs
index 03de82178a..62ec39346a 100644
--- a/src/Skia/Avalonia.Skia/FontManagerImpl.cs
+++ b/src/Skia/Avalonia.Skia/FontManagerImpl.cs
@@ -1,6 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using Avalonia.Media;
@@ -13,13 +11,11 @@ namespace Avalonia.Skia
     {
         private SKFontManager _skFontManager = SKFontManager.Default;
 
-        public FontManagerImpl()
+        public string GetDefaultFontFamilyName()
         {
-            DefaultFontFamilyName = SKTypeface.Default.FamilyName;
+            return SKTypeface.Default.FamilyName;
         }
 
-        public string DefaultFontFamilyName { get; }
-
         public IEnumerable<string> GetInstalledFontFamilyNames(bool checkForUpdates = false)
         {
             if (checkForUpdates)
@@ -30,53 +26,118 @@ namespace Avalonia.Skia
             return _skFontManager.FontFamilies;
         }
 
-        public Typeface GetTypeface(FontFamily fontFamily, FontWeight fontWeight, FontStyle fontStyle)
-        {
-            return TypefaceCache.Get(fontFamily.Name, fontWeight, fontStyle).Typeface;
-        }
+        [ThreadStatic] private static string[] t_languageTagBuffer;
 
-        public Typeface MatchCharacter(int codepoint, FontWeight fontWeight = default, FontStyle fontStyle = default,
-            FontFamily fontFamily = null, CultureInfo culture = null)
+        public bool TryMatchCharacter(int codepoint, FontStyle fontStyle,
+            FontWeight fontWeight,
+            FontFamily fontFamily, CultureInfo culture, out Typeface fontKey)
         {
-            var fontFamilyName = FontFamily.Default.Name;
+            SKFontStyle skFontStyle;
+
+            switch (fontWeight)
+            {
+                case FontWeight.Normal when fontStyle == FontStyle.Normal:
+                    skFontStyle = SKFontStyle.Normal;
+                    break;
+                case FontWeight.Normal when fontStyle == FontStyle.Italic:
+                    skFontStyle = SKFontStyle.Italic;
+                    break;
+                case FontWeight.Bold when fontStyle == FontStyle.Normal:
+                    skFontStyle = SKFontStyle.Bold;
+                    break;
+                case FontWeight.Bold when fontStyle == FontStyle.Italic:
+                    skFontStyle = SKFontStyle.BoldItalic;
+                    break;
+                default:
+                    skFontStyle = new SKFontStyle((SKFontStyleWeight)fontWeight, SKFontStyleWidth.Normal, (SKFontStyleSlant)fontStyle);
+                    break;
+            }
 
             if (culture == null)
             {
                 culture = CultureInfo.CurrentUICulture;
             }
 
-            if (fontFamily != null)
+            if (t_languageTagBuffer == null)
+            {
+                t_languageTagBuffer = new string[2];
+            }
+
+            t_languageTagBuffer[0] = culture.TwoLetterISOLanguageName;
+            t_languageTagBuffer[1] = culture.ThreeLetterISOLanguageName;
+
+            if (fontFamily != null && fontFamily.FamilyNames.HasFallbacks)
             {
-                foreach (var familyName in fontFamily.FamilyNames)
+                var familyNames = fontFamily.FamilyNames;
+
+                for (var i = 1; i < familyNames.Count; i++)
                 {
-                    var skTypeface = _skFontManager.MatchCharacter(familyName, (SKFontStyleWeight)fontWeight,
-                        SKFontStyleWidth.Normal,
-                        (SKFontStyleSlant)fontStyle,
-                        new[] { culture.TwoLetterISOLanguageName, culture.ThreeLetterISOLanguageName }, codepoint);
+                    var skTypeface =
+                        _skFontManager.MatchCharacter(familyNames[i], skFontStyle, t_languageTagBuffer, codepoint);
 
                     if (skTypeface == null)
                     {
                         continue;
                     }
 
-                    fontFamilyName = familyName;
+                    fontKey = new Typeface(skTypeface.FamilyName, fontStyle, fontWeight);
 
-                    break;
+                    return true;
                 }
             }
             else
             {
-                var skTypeface = _skFontManager.MatchCharacter(null, (SKFontStyleWeight)fontWeight, SKFontStyleWidth.Normal,
-                    (SKFontStyleSlant)fontStyle,
-                    new[] { culture.TwoLetterISOLanguageName, culture.ThreeLetterISOLanguageName }, codepoint);
+                var skTypeface = _skFontManager.MatchCharacter(null, skFontStyle, t_languageTagBuffer, codepoint);
 
                 if (skTypeface != null)
                 {
-                    fontFamilyName = skTypeface.FamilyName;
+                    fontKey = new Typeface(skTypeface.FamilyName, fontStyle, fontWeight);
+
+                    return true;
                 }
             }
 
-            return GetTypeface(fontFamilyName, fontWeight, fontStyle);
+            fontKey = default;
+
+            return false;
+        }
+
+        public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)
+        {
+            SKTypeface skTypeface = null;
+
+            if (typeface.FontFamily.Key == null)
+            {
+                var defaultName = SKTypeface.Default.FamilyName;
+
+                foreach (var familyName in typeface.FontFamily.FamilyNames)
+                {
+                    skTypeface = SKTypeface.FromFamilyName(familyName, (SKFontStyleWeight)typeface.Weight,
+                        SKFontStyleWidth.Normal, (SKFontStyleSlant)typeface.Style);
+
+                    if (!skTypeface.FamilyName.Equals(familyName, StringComparison.Ordinal) &&
+                        defaultName.Equals(skTypeface.FamilyName, StringComparison.Ordinal))
+                    {
+                        continue;
+                    }
+
+                    break;
+                }
+            }
+            else
+            {
+                var fontCollection = SKTypefaceCollectionCache.GetOrAddTypefaceCollection(typeface.FontFamily);
+
+                skTypeface = fontCollection.Get(typeface);
+            }
+
+            if (skTypeface == null)
+            {
+                throw new InvalidOperationException(
+                    $"Could not create glyph typeface for: {typeface.FontFamily.Name}.");
+            }
+
+            return new GlyphTypefaceImpl(skTypeface);
         }
     }
 }
diff --git a/src/Skia/Avalonia.Skia/FormattedTextImpl.cs b/src/Skia/Avalonia.Skia/FormattedTextImpl.cs
index a9358cb458..5e630e54a6 100644
--- a/src/Skia/Avalonia.Skia/FormattedTextImpl.cs
+++ b/src/Skia/Avalonia.Skia/FormattedTextImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -29,7 +26,7 @@ namespace Avalonia.Skia
             // Replace 0 characters with zero-width spaces (200B)
             Text = Text.Replace((char)0, (char)0x200B);
 
-            var entry = TypefaceCache.Get(typeface.FontFamily, typeface.Weight, typeface.Style);
+            var glyphTypeface = (GlyphTypefaceImpl)typeface.GlyphTypeface.PlatformImpl;
 
             _paint = new SKPaint
             {
@@ -38,7 +35,8 @@ namespace Avalonia.Skia
                 IsAntialias = true,
                 LcdRenderText = true,
                 SubpixelText = true,
-                Typeface = entry.SKTypeface,
+                IsLinearText = true,
+                Typeface = glyphTypeface.Typeface,
                 TextSize = (float)fontSize,
                 TextAlign = textAlignment.ToSKTextAlign()
             };
@@ -143,25 +141,27 @@ namespace Avalonia.Skia
 
         public Rect HitTestTextPosition(int index)
         {
+            if (string.IsNullOrEmpty(Text))
+            {
+                var alignmentOffset = TransformX(0, 0, _paint.TextAlign);
+                return new Rect(alignmentOffset, 0, 0, _lineHeight);
+            }
             var rects = GetRects();
-
-            if (index < 0 || index >= rects.Count)
+            if (index >= Text.Length || index < 0)
             {
                 var r = rects.LastOrDefault();
-                return new Rect(r.X + r.Width, r.Y, 0, _lineHeight);
-            }
 
-            if (rects.Count == 0)
-            {
-                return new Rect(0, 0, 1, _lineHeight);
-            }
+                var c = Text[Text.Length - 1];
 
-            if (index == rects.Count)
-            {
-                var lr = rects[rects.Count - 1];
-                return new Rect(new Point(lr.X + lr.Width, lr.Y), rects[index - 1].Size);
+                switch (c)
+                {
+                    case '\n':
+                    case '\r':
+                        return new Rect(r.X, r.Y, 0, _lineHeight);
+                    default:
+                        return new Rect(r.X + r.Width, r.Y, 0, _lineHeight);
+                }
             }
-
             return rects[index];
         }
 
@@ -277,7 +277,8 @@ namespace Avalonia.Skia
                                 if (fb != null)
                                 {
                                     //TODO: figure out how to get the brush size
-                                    currentWrapper = context.CreatePaint(fb, new Size());
+                                    currentWrapper = context.CreatePaint(new SKPaint { IsAntialias = true }, fb,
+                                        new Size());
                                 }
                                 else
                                 {
@@ -642,6 +643,11 @@ namespace Avalonia.Skia
                 var lastLine = _skiaLines[_skiaLines.Count - 1];
                 _bounds = new Rect(0, 0, maxX, lastLine.Top + lastLine.Height);
 
+                if (double.IsPositiveInfinity(Constraint.Width))
+                {
+                    return;
+                }
+
                 switch (_paint.TextAlign)
                 {
                     case SKTextAlign.Center:
diff --git a/src/Skia/Avalonia.Skia/FramebufferRenderTarget.cs b/src/Skia/Avalonia.Skia/FramebufferRenderTarget.cs
index 1af3d2968c..8d35d27a81 100644
--- a/src/Skia/Avalonia.Skia/FramebufferRenderTarget.cs
+++ b/src/Skia/Avalonia.Skia/FramebufferRenderTarget.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Reactive.Disposables;
 using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Platform;
@@ -55,7 +52,7 @@ namespace Avalonia.Skia
 
             var createInfo = new DrawingContextImpl.CreateInfo
             {
-                Canvas = canvas,
+                Surface = _framebufferSurface,
                 Dpi = framebuffer.Dpi,
                 VisualBrushRenderer = visualBrushRenderer,
                 DisableTextLcdRendering = true
diff --git a/src/Skia/Avalonia.Skia/GeometryImpl.cs b/src/Skia/Avalonia.Skia/GeometryImpl.cs
index 23980fb913..879b18742e 100644
--- a/src/Skia/Avalonia.Skia/GeometryImpl.cs
+++ b/src/Skia/Avalonia.Skia/GeometryImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Media;
 using Avalonia.Platform;
@@ -98,7 +95,7 @@ namespace Avalonia.Skia
                 UpdatePathCache(strokeWidth);
             }
             
-            return _pathCache.CachedGeometryRenderBounds.Inflate(strokeWidth / 2.0);
+            return _pathCache.CachedGeometryRenderBounds;
         }
         
         /// <inheritdoc />
diff --git a/src/Skia/Avalonia.Skia/GlRenderTarget.cs b/src/Skia/Avalonia.Skia/GlRenderTarget.cs
deleted file mode 100644
index 61ccf09e52..0000000000
--- a/src/Skia/Avalonia.Skia/GlRenderTarget.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using System.Reactive.Disposables;
-using Avalonia.OpenGL;
-using Avalonia.Platform;
-using Avalonia.Rendering;
-using SkiaSharp;
-using static Avalonia.OpenGL.GlConsts;
-
-namespace Avalonia.Skia
-{
-    internal class GlRenderTarget : IRenderTargetWithCorruptionInfo
-    {
-        private readonly GRContext _grContext;
-        private IGlPlatformSurfaceRenderTarget _surface;
-
-        public GlRenderTarget(GRContext grContext, IGlPlatformSurface glSurface)
-        {
-            _grContext = grContext;
-            _surface = glSurface.CreateGlRenderTarget();
-        }
-
-        public void Dispose() => _surface.Dispose();
-
-        public bool IsCorrupted => (_surface as IGlPlatformSurfaceRenderTargetWithCorruptionInfo)?.IsCorrupted == true;
-        
-        public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
-        {
-            var session = _surface.BeginDraw();
-            bool success = false;
-            try
-            {
-                var disp = session.Display;
-                var gl = disp.GlInterface;
-                gl.GetIntegerv(GL_FRAMEBUFFER_BINDING, out var fb);
-
-                var size = session.Size;
-                var scaling = session.Scaling;
-                if (size.Width <= 0 || size.Height <= 0 || scaling < 0)
-                {
-                    session.Dispose();
-                    throw new InvalidOperationException(
-                        $"Can't create drawing context for surface with {size} size and {scaling} scaling");
-                }
-
-                gl.Viewport(0, 0, size.Width, size.Height);
-                gl.ClearStencil(0);
-                gl.ClearColor(0, 0, 0, 0);
-                gl.Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-                lock (_grContext)
-                {
-                    _grContext.ResetContext();
-
-                    GRBackendRenderTarget renderTarget =
-                        new GRBackendRenderTarget(size.Width, size.Height, disp.SampleCount, disp.StencilSize,
-                            new GRGlFramebufferInfo((uint)fb, GRPixelConfig.Rgba8888.ToGlSizedFormat()));
-                    var surface = SKSurface.Create(_grContext, renderTarget,
-                        GRSurfaceOrigin.BottomLeft,
-                        GRPixelConfig.Rgba8888.ToColorType());
-
-                    var nfo = new DrawingContextImpl.CreateInfo
-                    {
-                        GrContext = _grContext,
-                        Canvas = surface.Canvas,
-                        Dpi = SkiaPlatform.DefaultDpi * scaling,
-                        VisualBrushRenderer = visualBrushRenderer,
-                        DisableTextLcdRendering = true
-                    };
-
-                    
-                    var ctx = new DrawingContextImpl(nfo, Disposable.Create(() =>
-                    {
-
-                        surface.Canvas.Flush();
-                        surface.Dispose();
-                        renderTarget.Dispose();
-                        _grContext.Flush();
-                        session.Dispose();
-                    }));
-                    success = true;
-                    return ctx;
-                }
-            }
-            finally
-            {
-                if(!success)
-                    session.Dispose();
-            }
-        }
-    }
-}
diff --git a/src/Skia/Avalonia.Skia/GlyphRunImpl.cs b/src/Skia/Avalonia.Skia/GlyphRunImpl.cs
new file mode 100644
index 0000000000..f59a0a32c2
--- /dev/null
+++ b/src/Skia/Avalonia.Skia/GlyphRunImpl.cs
@@ -0,0 +1,26 @@
+using System;
+using Avalonia.Platform;
+using JetBrains.Annotations;
+using SkiaSharp;
+
+namespace Avalonia.Skia
+{
+    /// <inheritdoc />
+    public class GlyphRunImpl : IGlyphRunImpl
+    {
+        public GlyphRunImpl([NotNull] SKTextBlob textBlob)
+        {
+            TextBlob = textBlob ?? throw new ArgumentNullException (nameof (textBlob));
+        }
+
+        /// <summary>
+        ///     Gets the text blob to draw.
+        /// </summary>
+        public SKTextBlob TextBlob { get; }
+
+        void IDisposable.Dispose()
+        {
+            TextBlob.Dispose();
+        }
+    }
+}
diff --git a/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs b/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs
index e46f766255..ceccc481f9 100644
--- a/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs
+++ b/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs
@@ -1,9 +1,5 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Runtime.InteropServices;
-using Avalonia.Media;
 using Avalonia.Platform;
 using HarfBuzzSharp;
 using SkiaSharp;
@@ -14,9 +10,9 @@ namespace Avalonia.Skia
     {
         private bool _isDisposed;
 
-        public GlyphTypefaceImpl(Typeface typeface)
+        public GlyphTypefaceImpl(SKTypeface typeface)
         {
-            Typeface = TypefaceCache.Get(typeface.FontFamily, typeface.Weight, typeface.Style).SKTypeface;
+            Typeface = typeface ?? throw new ArgumentNullException(nameof(typeface));
 
             Face = new Face(GetTable)
             {
@@ -27,40 +23,35 @@ namespace Avalonia.Skia
 
             Font.SetFunctionsOpenType();
 
-            Font.GetScale(out var xScale, out _);
+            DesignEmHeight = (short)Typeface.UnitsPerEm;
 
-            DesignEmHeight = (short)xScale;
+            var metrics = Typeface.ToFont().Metrics;
 
-            if (!Font.TryGetHorizontalFontExtents(out var fontExtents))
-            {
-                Font.TryGetVerticalFontExtents(out fontExtents);
-            }
+            const double defaultFontRenderingEmSize = 12.0;
 
-            Ascent = -fontExtents.Ascender;
+            Ascent = (int)(metrics.Ascent / defaultFontRenderingEmSize * Typeface.UnitsPerEm);
 
-            Descent = -fontExtents.Descender;
+            Descent = (int)(metrics.Descent / defaultFontRenderingEmSize * Typeface.UnitsPerEm);
 
-            LineGap = fontExtents.LineGap;
+            LineGap = (int)(metrics.Leading / defaultFontRenderingEmSize * Typeface.UnitsPerEm);
 
-            if (Font.OpenTypeMetrics.TryGetPosition(OpenTypeMetricsTag.UnderlineOffset, out var underlinePosition))
-            {
-                UnderlinePosition = underlinePosition;
-            }
+            UnderlinePosition = metrics.UnderlinePosition != null ?
+                (int)(metrics.UnderlinePosition / defaultFontRenderingEmSize * Typeface.UnitsPerEm) :
+                0;
 
-            if (Font.OpenTypeMetrics.TryGetPosition(OpenTypeMetricsTag.UnderlineSize, out var underlineThickness))
-            {
-                UnderlineThickness = underlineThickness;
-            }
+            UnderlineThickness = metrics.UnderlineThickness != null ?
+                (int)(metrics.UnderlineThickness / defaultFontRenderingEmSize * Typeface.UnitsPerEm) :
+                0;
 
-            if (Font.OpenTypeMetrics.TryGetPosition(OpenTypeMetricsTag.StrikeoutOffset, out var strikethroughPosition))
-            {
-                StrikethroughPosition = strikethroughPosition;
-            }
+            StrikethroughPosition = metrics.StrikeoutPosition != null ?
+                (int)(metrics.StrikeoutPosition / defaultFontRenderingEmSize * Typeface.UnitsPerEm) :
+                0;
 
-            if (Font.OpenTypeMetrics.TryGetPosition(OpenTypeMetricsTag.StrikeoutSize, out var strikethroughThickness))
-            {
-                StrikethroughThickness = strikethroughThickness;
-            }
+            StrikethroughThickness = metrics.StrikeoutThickness != null ?
+                (int)(metrics.StrikeoutThickness / defaultFontRenderingEmSize * Typeface.UnitsPerEm) :
+                0;
+
+            IsFixedPitch = Typeface.IsFixedPitch;
         }
 
         public Face Face { get; }
@@ -81,7 +72,6 @@ namespace Avalonia.Skia
         /// <inheritdoc cref="IGlyphTypefaceImpl"/>
         public int LineGap { get; }
 
-        //ToDo: Get these values from HarfBuzz
         /// <inheritdoc cref="IGlyphTypefaceImpl"/>
         public int UnderlinePosition { get; }
 
@@ -94,6 +84,9 @@ namespace Avalonia.Skia
         /// <inheritdoc cref="IGlyphTypefaceImpl"/>
         public int StrikethroughThickness { get; }
 
+        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
+        public bool IsFixedPitch { get; }
+
         /// <inheritdoc cref="IGlyphTypefaceImpl"/>
         public ushort GetGlyph(uint codepoint)
         {
diff --git a/src/Skia/Avalonia.Skia/Gpu/ISkiaGpu.cs b/src/Skia/Avalonia.Skia/Gpu/ISkiaGpu.cs
new file mode 100644
index 0000000000..aa86df7c23
--- /dev/null
+++ b/src/Skia/Avalonia.Skia/Gpu/ISkiaGpu.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.OpenGL.Imaging;
+using SkiaSharp;
+
+namespace Avalonia.Skia
+{
+    /// <summary>
+    /// Custom Skia gpu instance.
+    /// </summary>
+    public interface ISkiaGpu
+    {
+        /// <summary>
+        /// Attempts to create custom render target from given surfaces.
+        /// </summary>
+        /// <param name="surfaces">Surfaces.</param>
+        /// <returns>Created render target or <see langword="null"/> if it fails.</returns>
+        ISkiaGpuRenderTarget TryCreateRenderTarget(IEnumerable<object> surfaces);
+        
+        /// <summary>
+        /// Creates an offscreen render target surface
+        /// </summary>
+        /// <param name="size">size in pixels</param>
+        ISkiaSurface TryCreateSurface(PixelSize size, ISkiaGpuRenderSession session);
+    }
+    
+    public interface ISkiaSurface : IDisposable
+    {
+        SKSurface Surface { get; }
+        bool CanBlit { get; }
+        void Blit(SKCanvas canvas);
+    }
+
+    public interface IOpenGlAwareSkiaGpu : ISkiaGpu
+    {
+        IOpenGlBitmapImpl CreateOpenGlBitmap(PixelSize size, Vector dpi);
+    }
+}
diff --git a/src/Skia/Avalonia.Skia/ICustomSkiaRenderSession.cs b/src/Skia/Avalonia.Skia/Gpu/ISkiaGpuRenderSession.cs
similarity index 65%
rename from src/Skia/Avalonia.Skia/ICustomSkiaRenderSession.cs
rename to src/Skia/Avalonia.Skia/Gpu/ISkiaGpuRenderSession.cs
index 6a4591921e..5faa6a41ec 100644
--- a/src/Skia/Avalonia.Skia/ICustomSkiaRenderSession.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/ISkiaGpuRenderSession.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using SkiaSharp;
 
@@ -9,7 +6,7 @@ namespace Avalonia.Skia
     /// <summary>
     /// Custom render session for Skia render target.
     /// </summary>
-    public interface ICustomSkiaRenderSession : IDisposable
+    public interface ISkiaGpuRenderSession : IDisposable
     {
         /// <summary>
         /// GrContext used by this session.
@@ -19,11 +16,13 @@ namespace Avalonia.Skia
         /// <summary>
         /// Canvas that will be used to render.
         /// </summary>
-        SKCanvas Canvas { get; }
+        SKSurface SkSurface { get; }
 
         /// <summary>
         /// Scaling factor.
         /// </summary>
         double ScaleFactor { get; }
+        
+        GRSurfaceOrigin SurfaceOrigin { get; }
     }
 }
diff --git a/src/Skia/Avalonia.Skia/Gpu/ISkiaGpuRenderTarget.cs b/src/Skia/Avalonia.Skia/Gpu/ISkiaGpuRenderTarget.cs
new file mode 100644
index 0000000000..bd5b170a68
--- /dev/null
+++ b/src/Skia/Avalonia.Skia/Gpu/ISkiaGpuRenderTarget.cs
@@ -0,0 +1,19 @@
+using System;
+using SkiaSharp;
+
+namespace Avalonia.Skia
+{
+    /// <summary>
+    /// Custom Skia render target.
+    /// </summary>
+    public interface ISkiaGpuRenderTarget : IDisposable
+    {
+        /// <summary>
+        /// Start rendering to this render target.
+        /// </summary>
+        /// <returns></returns>
+        ISkiaGpuRenderSession BeginRenderingSession();
+        
+        bool IsCorrupted { get; }
+    }
+}
diff --git a/src/Skia/Avalonia.Skia/Gpu/OpenGl/FboSkiaSurface.cs b/src/Skia/Avalonia.Skia/Gpu/OpenGl/FboSkiaSurface.cs
new file mode 100644
index 0000000000..8ab275df63
--- /dev/null
+++ b/src/Skia/Avalonia.Skia/Gpu/OpenGl/FboSkiaSurface.cs
@@ -0,0 +1,134 @@
+using System;
+using Avalonia.OpenGL;
+using SkiaSharp;
+using static Avalonia.OpenGL.GlConsts;
+namespace Avalonia.Skia
+{
+    public class FboSkiaSurface : ISkiaSurface
+    {
+        private readonly GRContext _grContext;
+        private readonly IGlContext _glContext;
+        private readonly PixelSize _pixelSize;
+        private int _fbo;
+        private int _depthStencil;
+        private int _texture;
+
+        private static readonly bool[] TrueFalse = new[] { true, false };
+        public FboSkiaSurface(GRContext grContext, IGlContext glContext, PixelSize pixelSize, GRSurfaceOrigin surfaceOrigin)
+        {
+            _grContext = grContext;
+            _glContext = glContext;
+            _pixelSize = pixelSize;
+            var InternalFormat = glContext.Version.Type == GlProfileType.OpenGLES ? GL_RGBA : GL_RGBA8;
+            var gl = glContext.GlInterface;
+            
+            // Save old bindings
+            gl.GetIntegerv(GL_FRAMEBUFFER_BINDING, out var oldFbo);
+            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];
+            gl.BindFramebuffer(GL_FRAMEBUFFER, _fbo);
+
+            // Create a texture to render into
+            gl.GenTextures(1, arr);
+            _texture = arr[0];
+            gl.BindTexture(GL_TEXTURE_2D, _texture);
+            gl.TexImage2D(GL_TEXTURE_2D, 0,
+                InternalFormat, pixelSize.Width, pixelSize.Height,
+                0, GL_RGBA, GL_UNSIGNED_BYTE, IntPtr.Zero);
+            gl.TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+            gl.TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+            gl.FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, _texture, 0);
+
+            var success = false;
+            foreach (var useStencil8 in TrueFalse)
+            {
+                gl.GenRenderbuffers(1, arr);
+                _depthStencil = arr[0];
+                gl.BindRenderbuffer(GL_RENDERBUFFER, _depthStencil);
+
+                if (useStencil8)
+                {
+                    gl.RenderbufferStorage(GL_RENDERBUFFER, GL_STENCIL_INDEX8, pixelSize.Width, pixelSize.Height);
+                    gl.FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, _depthStencil);
+                }
+                else
+                {
+                    gl.RenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, pixelSize.Width, pixelSize.Height);
+                    gl.FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, _depthStencil);
+                    gl.FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, _depthStencil);
+                }
+
+                var status = gl.CheckFramebufferStatus(GL_FRAMEBUFFER);
+                if (status == GL_FRAMEBUFFER_COMPLETE)
+                {
+                    success = true;
+                    break;
+                }
+                else
+                {
+                    gl.BindRenderbuffer(GL_RENDERBUFFER, oldRenderbuffer);
+                    gl.DeleteRenderbuffers(1, arr);
+                }
+            }
+            
+            gl.BindRenderbuffer(GL_RENDERBUFFER, oldRenderbuffer);
+            gl.BindTexture(GL_TEXTURE_2D, oldTexture);
+            gl.BindFramebuffer(GL_FRAMEBUFFER, oldFbo);
+
+            if (!success)
+            {
+                arr[0] = _fbo;
+                gl.DeleteFramebuffers(1, arr);
+                arr[0] = _texture;
+                gl.DeleteTextures(1, arr);
+                throw new OpenGlException("Unable to create FBO with stencil");
+            }
+
+            var target = new GRBackendRenderTarget(pixelSize.Width, pixelSize.Height, 0, 8,
+                new GRGlFramebufferInfo((uint)_fbo, SKColorType.Rgba8888.ToGlSizedFormat()));
+            Surface = SKSurface.Create(_grContext, target,
+                surfaceOrigin, SKColorType.Rgba8888);
+            CanBlit = gl.BlitFramebuffer != null;
+        }
+        
+        public void Dispose()
+        {
+            using (_glContext.EnsureCurrent())
+            {
+                Surface?.Dispose();
+                Surface = null;
+                var gl = _glContext.GlInterface;
+                if (_fbo != 0)
+                {
+                    gl.DeleteFramebuffers(1, new[] { _fbo });
+                    gl.DeleteTextures(1, new[] { _texture });
+                    gl.DeleteRenderbuffers(1, new[] { _depthStencil });
+                    _fbo = _texture = _depthStencil = 0;
+                }
+            }
+        }
+
+        public SKSurface Surface { get; private set; }
+        public bool CanBlit { get; }
+        public void Blit(SKCanvas canvas)
+        {
+            // This should set the render target as the current FBO
+            // which is definitely not the best method, but it works
+            canvas.Clear();
+            canvas.Flush();
+            
+            var gl = _glContext.GlInterface;
+            gl.GetIntegerv(GL_READ_FRAMEBUFFER_BINDING, out var oldRead);
+            gl.BindFramebuffer(GL_READ_FRAMEBUFFER, _fbo);
+            gl.BlitFramebuffer(0, 0, _pixelSize.Width, _pixelSize.Height, 0, 0, _pixelSize.Width, _pixelSize.Height,
+                GL_COLOR_BUFFER_BIT, GL_LINEAR);
+            gl.BindFramebuffer(GL_READ_FRAMEBUFFER, oldRead);
+        }
+    }
+}
diff --git a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlRenderTarget.cs b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlRenderTarget.cs
new file mode 100644
index 0000000000..b4c5619c85
--- /dev/null
+++ b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlRenderTarget.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Reactive.Disposables;
+using Avalonia.OpenGL;
+using Avalonia.OpenGL.Surfaces;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using SkiaSharp;
+using static Avalonia.OpenGL.GlConsts;
+
+namespace Avalonia.Skia
+{
+    internal class GlRenderTarget : ISkiaGpuRenderTarget
+    {
+        private readonly GRContext _grContext;
+        private IGlPlatformSurfaceRenderTarget _surface;
+
+        public GlRenderTarget(GRContext grContext, IGlPlatformSurface glSurface)
+        {
+            _grContext = grContext;
+            _surface = glSurface.CreateGlRenderTarget();
+        }
+
+        public void Dispose() => _surface.Dispose();
+
+        public bool IsCorrupted => (_surface as IGlPlatformSurfaceRenderTargetWithCorruptionInfo)?.IsCorrupted == true;
+
+        class GlGpuSession : ISkiaGpuRenderSession
+        {
+            private readonly GRBackendRenderTarget _backendRenderTarget;
+            private readonly SKSurface _surface;
+            private readonly IGlPlatformSurfaceRenderingSession _glSession;
+
+            public GlGpuSession(GRContext grContext,
+                GRBackendRenderTarget backendRenderTarget,
+                SKSurface surface,
+                IGlPlatformSurfaceRenderingSession glSession)
+            {
+                GrContext = grContext;
+                _backendRenderTarget = backendRenderTarget;
+                _surface = surface;
+                _glSession = glSession;
+                
+                SurfaceOrigin = glSession.IsYFlipped ? GRSurfaceOrigin.TopLeft : GRSurfaceOrigin.BottomLeft;
+            }
+            public void Dispose()
+            {
+                _surface.Canvas.Flush();
+                _surface.Dispose();
+                _backendRenderTarget.Dispose();
+                GrContext.Flush();
+                _glSession.Dispose();
+            }
+            
+            public GRSurfaceOrigin SurfaceOrigin { get; }
+
+            public GRContext GrContext { get; }
+            public SKSurface SkSurface => _surface;
+            public double ScaleFactor => _glSession.Scaling;
+        }
+
+        public ISkiaGpuRenderSession BeginRenderingSession()
+        {
+            var glSession = _surface.BeginDraw();
+            bool success = false;
+            try
+            {
+                var disp = glSession.Context;
+                var gl = disp.GlInterface;
+                gl.GetIntegerv(GL_FRAMEBUFFER_BINDING, out var fb);
+
+                var size = glSession.Size;
+                var scaling = glSession.Scaling;
+                if (size.Width <= 0 || size.Height <= 0 || scaling < 0)
+                {
+                    glSession.Dispose();
+                    throw new InvalidOperationException(
+                        $"Can't create drawing context for surface with {size} size and {scaling} scaling");
+                }
+
+                lock (_grContext)
+                {
+                    _grContext.ResetContext();
+
+                    var renderTarget =
+                        new GRBackendRenderTarget(size.Width, size.Height, disp.SampleCount, disp.StencilSize,
+                            new GRGlFramebufferInfo((uint)fb, SKColorType.Rgba8888.ToGlSizedFormat()));
+                    var surface = SKSurface.Create(_grContext, renderTarget,
+                        glSession.IsYFlipped ? GRSurfaceOrigin.TopLeft : GRSurfaceOrigin.BottomLeft,
+                        SKColorType.Rgba8888);
+
+                    success = true;
+
+                    return new GlGpuSession(_grContext, renderTarget, surface, glSession);
+                }
+            }
+            finally
+            {
+                if (!success)
+                    glSession.Dispose();
+            }
+        }
+    }
+}
diff --git a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
new file mode 100644
index 0000000000..a393f0b64d
--- /dev/null
+++ b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using Avalonia.Logging;
+using Avalonia.OpenGL;
+using Avalonia.OpenGL.Imaging;
+using Avalonia.OpenGL.Surfaces;
+using SkiaSharp;
+
+namespace Avalonia.Skia
+{
+    class GlSkiaGpu : IOpenGlAwareSkiaGpu
+    {
+        private GRContext _grContext;
+        private IGlContext _glContext;
+        private bool? _canCreateSurfaces;
+
+        public GlSkiaGpu(IPlatformOpenGlInterface openGl, long? maxResourceBytes)
+        {
+            var context = openGl.PrimaryContext;
+            _glContext = context;
+            using (context.MakeCurrent())
+            {
+                using (var iface = context.Version.Type == GlProfileType.OpenGL ?
+                    GRGlInterface.CreateOpenGl(proc => context.GlInterface.GetProcAddress(proc)) :
+                    GRGlInterface.CreateGles(proc => context.GlInterface.GetProcAddress(proc)))
+                {
+                    _grContext = GRContext.CreateGl(iface);
+                    if (maxResourceBytes.HasValue)
+                    {
+                        _grContext.SetResourceCacheLimit(maxResourceBytes.Value);
+                    }
+                }
+            }
+        }
+
+        public ISkiaGpuRenderTarget TryCreateRenderTarget(IEnumerable<object> surfaces)
+        {
+            foreach (var surface in surfaces)
+            {
+                if (surface is IGlPlatformSurface glSurface)
+                {
+                    return new GlRenderTarget(_grContext, glSurface);
+                }
+            }
+
+            return null;
+        }
+
+        public ISkiaSurface TryCreateSurface(PixelSize size, ISkiaGpuRenderSession session)
+        {
+            // Only windows platform needs our FBO trickery
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                return null;
+
+            // Blit feature requires glBlitFramebuffer
+            if (_glContext.GlInterface.BlitFramebuffer == null)
+                return null;
+            
+            size = new PixelSize(Math.Max(size.Width, 1), Math.Max(size.Height, 1));
+            if (_canCreateSurfaces == false)
+                return null;
+            try
+            {
+                var surface = new FboSkiaSurface(_grContext, _glContext, size, session?.SurfaceOrigin ?? GRSurfaceOrigin.TopLeft);
+                _canCreateSurfaces = true;
+                return surface;
+            }
+            catch (Exception e)
+            {
+                Logger.TryGet(LogEventLevel.Error, "OpenGL")
+                    ?.Log(this, "Unable to create a Skia-compatible FBO manually");
+                _canCreateSurfaces ??= false;
+                return null;
+            }
+        }
+
+        public IOpenGlBitmapImpl CreateOpenGlBitmap(PixelSize size, Vector dpi) => new GlOpenGlBitmapImpl(_glContext, size, dpi);
+    }
+}
diff --git a/src/Skia/Avalonia.Skia/Gpu/OpenGl/OpenGlBitmapImpl.cs b/src/Skia/Avalonia.Skia/Gpu/OpenGl/OpenGlBitmapImpl.cs
new file mode 100644
index 0000000000..2ebf7c680b
--- /dev/null
+++ b/src/Skia/Avalonia.Skia/Gpu/OpenGl/OpenGlBitmapImpl.cs
@@ -0,0 +1,207 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Avalonia.OpenGL;
+using Avalonia.OpenGL.Imaging;
+using Avalonia.Utilities;
+using SkiaSharp;
+using static Avalonia.OpenGL.GlConsts;
+
+namespace Avalonia.Skia
+{
+    class GlOpenGlBitmapImpl : IOpenGlBitmapImpl, IDrawableBitmapImpl
+    {
+        private readonly IGlContext _context;
+        private readonly object _lock = new object();
+        private IGlPresentableOpenGlSurface _surface;
+
+        public GlOpenGlBitmapImpl(IGlContext context, PixelSize pixelSize, Vector dpi)
+        {
+            _context = context;
+            PixelSize = pixelSize;
+            Dpi = dpi;
+        }
+
+        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(Stream stream) => throw new NotSupportedException();
+
+        public void Draw(DrawingContextImpl context, SKRect sourceRect, SKRect destRect, SKPaint paint)
+        {
+            lock (_lock)
+            {
+                if (_surface == null)
+                    return;
+                using (_surface.Lock())
+                {
+                    using (var backendTexture = new GRBackendTexture(PixelSize.Width, PixelSize.Height, false,
+                        new GRGlTextureInfo(
+                            GlConsts.GL_TEXTURE_2D, (uint)_surface.GetTextureId(),
+                            (uint)_surface.InternalFormat)))
+                    using (var surface = SKSurface.Create(context.GrContext, backendTexture, GRSurfaceOrigin.TopLeft,
+                        SKColorType.Rgba8888))
+                    {
+                        // Again, silently ignore, if something went wrong it's not our fault
+                        if (surface == null)
+                            return;
+
+                        using (var snapshot = surface.Snapshot())
+                            context.Canvas.DrawImage(snapshot, sourceRect, destRect, paint);
+                    }
+
+                }
+            }
+        }
+
+        public IOpenGlBitmapAttachment CreateFramebufferAttachment(IGlContext context, Action presentCallback)
+        {
+            if (!SupportsContext(context))
+                throw new OpenGlException("Context is not supported for texture sharing");
+            return new SharedOpenGlBitmapAttachment(this, context, presentCallback);
+        }
+
+        public bool SupportsContext(IGlContext context)
+        {
+            // TODO: negotiated platform surface sharing
+            return _context.IsSharedWith(context);
+        }
+
+        public void Dispose()
+        {
+
+        }
+
+        internal void Present(IGlPresentableOpenGlSurface surface)
+        {
+            lock (_lock)
+            {
+                _surface = surface;
+            }
+        }
+    }
+
+    interface IGlPresentableOpenGlSurface : IDisposable
+    {
+        int GetTextureId();
+        int InternalFormat { get; }
+        IDisposable Lock();
+    }
+
+    class SharedOpenGlBitmapAttachment : IOpenGlBitmapAttachment, IGlPresentableOpenGlSurface
+    {
+        private readonly GlOpenGlBitmapImpl _bitmap;
+        private readonly IGlContext _context;
+        private readonly Action _presentCallback;
+        private readonly int _fbo;
+        private readonly int _texture;
+        private readonly int _frontBuffer;
+        private bool _disposed;
+        private readonly DisposableLock _lock = new DisposableLock();
+
+        public SharedOpenGlBitmapAttachment(GlOpenGlBitmapImpl bitmap, IGlContext context, Action presentCallback)
+        {
+            _bitmap = bitmap;
+            _context = context;
+            _presentCallback = presentCallback;
+            using (_context.EnsureCurrent())
+            {
+                var glVersion = _context.Version;
+                InternalFormat = glVersion.Type == GlProfileType.OpenGLES ? GL_RGBA : GL_RGBA8;
+                
+                _context.GlInterface.GetIntegerv(GL_FRAMEBUFFER_BINDING, out _fbo);
+                if (_fbo == 0)
+                    throw new OpenGlException("Current FBO is 0");
+
+                {
+                    var gl = _context.GlInterface;
+                    
+                    var textures = new int[2];
+                    gl.GenTextures(2, textures);
+                    _texture = textures[0];
+                    _frontBuffer = textures[1];
+
+                    gl.GetIntegerv(GL_TEXTURE_BINDING_2D, out var oldTexture);
+                    foreach (var t in textures)
+                    {
+                        gl.BindTexture(GL_TEXTURE_2D, t);
+                        gl.TexImage2D(GL_TEXTURE_2D, 0,
+                            InternalFormat,
+                            _bitmap.PixelSize.Width, _bitmap.PixelSize.Height,
+                            0, GL_RGBA, GL_UNSIGNED_BYTE, IntPtr.Zero);
+
+                        gl.TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+                        gl.TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+                    }
+
+                    gl.FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, _texture, 0);
+                    gl.BindTexture(GL_TEXTURE_2D, oldTexture);
+                    
+                }
+            }
+        }
+
+        public void Present()
+        {
+            using (_context.MakeCurrent())
+            {
+                if (_disposed)
+                    throw new ObjectDisposedException(nameof(SharedOpenGlBitmapAttachment));
+                
+                var gl = _context.GlInterface;
+               
+                gl.Finish();
+                using (Lock())
+                {
+                    gl.GetIntegerv(GL_FRAMEBUFFER_BINDING, out var oldFbo);
+                    gl.GetIntegerv(GL_TEXTURE_BINDING_2D, out var oldTexture);
+                    gl.GetIntegerv(GL_ACTIVE_TEXTURE, out var oldActive);
+                    
+                    gl.BindFramebuffer(GL_FRAMEBUFFER, _fbo);
+                    gl.BindTexture(GL_TEXTURE_2D, _frontBuffer);
+                    gl.ActiveTexture(GL_TEXTURE0);
+
+                    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.Finish();
+                }
+            }
+            
+            _bitmap.Present(this);
+            _presentCallback();
+        }
+
+        public void Dispose()
+        {
+            var gl = _context.GlInterface;
+            _bitmap.Present(null);
+            
+            if(_disposed)
+                return;
+            using (_context.MakeCurrent())
+            using (Lock())
+            {
+                if(_disposed)
+                    return;
+                _disposed = true;
+                gl.DeleteTextures(2, new[] { _texture, _frontBuffer });
+            }
+        }
+
+        int IGlPresentableOpenGlSurface.GetTextureId()
+        {
+            return _frontBuffer;
+        }
+
+        public int InternalFormat { get; }
+
+        public IDisposable Lock() => _lock.Lock();
+    }
+}
diff --git a/src/Skia/Avalonia.Skia/CustomRenderTarget.cs b/src/Skia/Avalonia.Skia/Gpu/SkiaGpuRenderTarget.cs
similarity index 51%
rename from src/Skia/Avalonia.Skia/CustomRenderTarget.cs
rename to src/Skia/Avalonia.Skia/Gpu/SkiaGpuRenderTarget.cs
index 23a509a2a4..6626546c0c 100644
--- a/src/Skia/Avalonia.Skia/CustomRenderTarget.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/SkiaGpuRenderTarget.cs
@@ -1,20 +1,19 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Platform;
 using Avalonia.Rendering;
 
 namespace Avalonia.Skia
 {
     /// <summary>
-    /// Adapts <see cref="ICustomSkiaRenderTarget"/> to be used within Skia rendering pipeline.
+    /// Adapts <see cref="ISkiaGpuRenderTarget"/> to be used within our rendering pipeline.
     /// </summary>
-    internal class CustomRenderTarget : IRenderTarget
+    internal class SkiaGpuRenderTarget : IRenderTargetWithCorruptionInfo
     {
-        private readonly ICustomSkiaRenderTarget _renderTarget;
+        private readonly ISkiaGpu _skiaGpu;
+        private readonly ISkiaGpuRenderTarget _renderTarget;
 
-        public CustomRenderTarget(ICustomSkiaRenderTarget renderTarget)
+        public SkiaGpuRenderTarget(ISkiaGpu skiaGpu, ISkiaGpuRenderTarget renderTarget)
         {
+            _skiaGpu = skiaGpu;
             _renderTarget = renderTarget;
         }
 
@@ -25,18 +24,22 @@ namespace Avalonia.Skia
 
         public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer)
         {
-            ICustomSkiaRenderSession session = _renderTarget.BeginRendering();
+            var session = _renderTarget.BeginRenderingSession();
 
             var nfo = new DrawingContextImpl.CreateInfo
             {
                 GrContext = session.GrContext,
-                Canvas = session.Canvas,
+                Surface = session.SkSurface,
                 Dpi = SkiaPlatform.DefaultDpi * session.ScaleFactor,
                 VisualBrushRenderer = visualBrushRenderer,
-                DisableTextLcdRendering = true
+                DisableTextLcdRendering = true,
+                Gpu = _skiaGpu,
+                CurrentSession =  session
             };
 
             return new DrawingContextImpl(nfo, session);
         }
+
+        public bool IsCorrupted => _renderTarget.IsCorrupted;
     }
 }
diff --git a/src/Skia/Avalonia.Skia/Helpers/DrawingContextHelper.cs b/src/Skia/Avalonia.Skia/Helpers/DrawingContextHelper.cs
new file mode 100644
index 0000000000..72438609d5
--- /dev/null
+++ b/src/Skia/Avalonia.Skia/Helpers/DrawingContextHelper.cs
@@ -0,0 +1,31 @@
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using SkiaSharp;
+
+namespace Avalonia.Skia.Helpers
+{
+    public class DrawingContextHelper
+    {
+        /// <summary>
+        /// Wrap Skia canvas in drawing context so we can use Avalonia api to render to external skia canvas
+        /// this is useful in scenarios where canvas is not controlled by application, but received from another non avalonia api
+        /// like: SKCanvas canvas = SKDocument.BeginPage(...);
+        /// </summary>
+        /// <param name="canvas"></param>
+        /// <param name="dpi"></param>
+        /// <param name="visualBrushRenderer"></param>
+        /// <returns>DrawingContext</returns>
+        public static IDrawingContextImpl WrapSkiaCanvas(SKCanvas canvas, Vector dpi, IVisualBrushRenderer visualBrushRenderer = null)
+        {
+            var createInfo = new DrawingContextImpl.CreateInfo
+            {
+                Canvas = canvas,
+                Dpi = dpi,
+                VisualBrushRenderer = visualBrushRenderer,
+                DisableTextLcdRendering = true,
+            };
+
+            return new DrawingContextImpl(createInfo);
+        }
+    }
+}
diff --git a/src/Skia/Avalonia.Skia/Helpers/ImageSavingHelper.cs b/src/Skia/Avalonia.Skia/Helpers/ImageSavingHelper.cs
index d587a989cc..5fa961cc99 100644
--- a/src/Skia/Avalonia.Skia/Helpers/ImageSavingHelper.cs
+++ b/src/Skia/Avalonia.Skia/Helpers/ImageSavingHelper.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.IO;
 using SkiaSharp;
diff --git a/src/Skia/Avalonia.Skia/Helpers/PixelFormatHelper.cs b/src/Skia/Avalonia.Skia/Helpers/PixelFormatHelper.cs
index 04756994f5..9236bdee8d 100644
--- a/src/Skia/Avalonia.Skia/Helpers/PixelFormatHelper.cs
+++ b/src/Skia/Avalonia.Skia/Helpers/PixelFormatHelper.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Platform;
+using Avalonia.Platform;
 using SkiaSharp;
 
 namespace Avalonia.Skia.Helpers
diff --git a/src/Skia/Avalonia.Skia/ICustomSkiaGpu.cs b/src/Skia/Avalonia.Skia/ICustomSkiaGpu.cs
deleted file mode 100644
index 751dd3c1e7..0000000000
--- a/src/Skia/Avalonia.Skia/ICustomSkiaGpu.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.Collections.Generic;
-using SkiaSharp;
-
-namespace Avalonia.Skia
-{
-    /// <summary>
-    /// Custom Skia gpu instance.
-    /// </summary>
-    public interface ICustomSkiaGpu
-    {
-        /// <summary>
-        /// Skia GrContext used.
-        /// </summary>
-        GRContext GrContext { get; }
-
-        /// <summary>
-        /// Attempts to create custom render target from given surfaces.
-        /// </summary>
-        /// <param name="surfaces">Surfaces.</param>
-        /// <returns>Created render target or <see langword="null"/> if it fails.</returns>
-        ICustomSkiaRenderTarget TryCreateRenderTarget(IEnumerable<object> surfaces);
-    }
-}
diff --git a/src/Skia/Avalonia.Skia/ICustomSkiaRenderTarget.cs b/src/Skia/Avalonia.Skia/ICustomSkiaRenderTarget.cs
deleted file mode 100644
index f67b28b77b..0000000000
--- a/src/Skia/Avalonia.Skia/ICustomSkiaRenderTarget.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-
-namespace Avalonia.Skia
-{
-    /// <summary>
-    /// Custom Skia render target.
-    /// </summary>
-    public interface ICustomSkiaRenderTarget : IDisposable
-    {
-        /// <summary>
-        /// Start rendering to this render target.
-        /// </summary>
-        /// <returns></returns>
-        ICustomSkiaRenderSession BeginRendering();
-    }
-}
diff --git a/src/Skia/Avalonia.Skia/IDrawableBitmapImpl.cs b/src/Skia/Avalonia.Skia/IDrawableBitmapImpl.cs
index f900e7af77..be751021d5 100644
--- a/src/Skia/Avalonia.Skia/IDrawableBitmapImpl.cs
+++ b/src/Skia/Avalonia.Skia/IDrawableBitmapImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Platform;
 using SkiaSharp;
 
diff --git a/src/Skia/Avalonia.Skia/ISkiaDrawingContextImpl.cs b/src/Skia/Avalonia.Skia/ISkiaDrawingContextImpl.cs
index a9b91384d7..38fa5a5253 100644
--- a/src/Skia/Avalonia.Skia/ISkiaDrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/ISkiaDrawingContextImpl.cs
@@ -7,5 +7,6 @@ namespace Avalonia.Skia
     {
         SKCanvas SkCanvas { get; }
         GRContext GrContext { get; }
+        SKSurface SkSurface { get; }
     }
 }
diff --git a/src/Skia/Avalonia.Skia/ImmutableBitmap.cs b/src/Skia/Avalonia.Skia/ImmutableBitmap.cs
index f283040eac..3010f49420 100644
--- a/src/Skia/Avalonia.Skia/ImmutableBitmap.cs
+++ b/src/Skia/Avalonia.Skia/ImmutableBitmap.cs
@@ -1,10 +1,11 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 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
@@ -39,6 +40,71 @@ namespace Avalonia.Skia
             }
         }
 
+        public ImmutableBitmap(ImmutableBitmap src, PixelSize destinationSize, BitmapInterpolationMode interpolationMode)
+        {
+            SKImageInfo info = new SKImageInfo(destinationSize.Width, destinationSize.Height, SKColorType.Bgra8888);
+            SKImage output = SKImage.Create(info);
+            src._image.ScalePixels(output.PeekPixels(), interpolationMode.ToSKFilterQuality());
+
+            _image = output;
+
+            PixelSize = new PixelSize(_image.Width, _image.Height);
+
+            // TODO: Skia doesn't have an API for DPI.
+            Dpi = new Vector(96, 96);
+        }
+
+        public ImmutableBitmap(Stream stream, int decodeSize, bool horizontal, BitmapInterpolationMode interpolationMode)
+        {
+            using (var skStream = new SKManagedStream(stream))
+            using (var codec = SKCodec.Create(skStream))
+            {
+                var info = codec.Info;
+
+                // get the scale that is nearest to what we want (eg: jpg returned 512)
+                var supportedScale = codec.GetScaledDimensions(horizontal ? ((float)decodeSize / info.Width) : ((float)decodeSize / info.Height));
+
+                // decode the bitmap at the nearest size
+                var nearest = new SKImageInfo(supportedScale.Width, supportedScale.Height);
+                var bmp = SKBitmap.Decode(codec, nearest);
+
+                // now scale that to the size that we want
+                var realScale = horizontal ? ((double)info.Height / info.Width) : ((double)info.Width / info.Height);
+
+                SKImageInfo desired;
+
+
+                if (horizontal)
+                {
+                    desired = new SKImageInfo(decodeSize, (int)(realScale * decodeSize));
+                }
+                else
+                {
+                    desired = new SKImageInfo((int)(realScale * decodeSize), decodeSize);
+                }
+
+                if (bmp.Width != desired.Width || bmp.Height != desired.Height)
+                {
+                    var scaledBmp = bmp.Resize(desired, interpolationMode.ToSKFilterQuality());
+                    bmp.Dispose();
+                    bmp = scaledBmp;
+                }
+
+                _image = SKImage.FromBitmap(bmp);
+                bmp.Dispose();
+
+                if (_image == null)
+                {
+                    throw new ArgumentException("Unable to load bitmap from provided data");
+                }
+
+                PixelSize = new PixelSize(_image.Width, _image.Height);
+
+                // TODO: Skia doesn't have an API for DPI.
+                Dpi = new Vector(96, 96);
+            }
+        }
+
         /// <summary>
         /// Create immutable bitmap from given pixel data copy.
         /// </summary>
@@ -46,10 +112,11 @@ namespace Avalonia.Skia
         /// <param name="dpi">DPI of the bitmap.</param>
         /// <param name="stride">Stride of data pixels.</param>
         /// <param name="format">Format of data pixels.</param>
+        /// <param name="alphaFormat">Alpha format of data pixels.</param>
         /// <param name="data">Data pixels.</param>
-        public ImmutableBitmap(PixelSize size, Vector dpi, int stride, PixelFormat format, IntPtr data)
+        public ImmutableBitmap(PixelSize size, Vector dpi, int stride, PixelFormat format, AlphaFormat alphaFormat, IntPtr data)
         {
-            var imageInfo = new SKImageInfo(size.Width, size.Height, format.ToSkColorType(), SKAlphaType.Premul);
+            var imageInfo = new SKImageInfo(size.Width, size.Height, format.ToSkColorType(), alphaFormat.ToSkAlphaType());
 
             _image = SKImage.FromPixelCopy(imageInfo, data, stride);
 
diff --git a/src/Skia/Avalonia.Skia/LineGeometryImpl.cs b/src/Skia/Avalonia.Skia/LineGeometryImpl.cs
index e929e153d1..b102a4c119 100644
--- a/src/Skia/Avalonia.Skia/LineGeometryImpl.cs
+++ b/src/Skia/Avalonia.Skia/LineGeometryImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using SkiaSharp;
 
diff --git a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
index ee0cfb2f06..6d0be9f64d 100644
--- a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
+++ b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
@@ -1,14 +1,16 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
-using System.Collections.Concurrent;
+using System.Collections;
 using System.Collections.Generic;
-using System.IO;
+using System.IO; 
+using System.Linq;
+using System.Threading;
+
 using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Media;
 using Avalonia.OpenGL;
+using Avalonia.OpenGL.Imaging;
 using Avalonia.Platform;
+using Avalonia.Visuals.Media.Imaging;
 using SkiaSharp;
 
 namespace Avalonia.Skia
@@ -16,38 +18,23 @@ namespace Avalonia.Skia
     /// <summary>
     /// Skia platform render interface.
     /// </summary>
-    internal class PlatformRenderInterface : IPlatformRenderInterface
+    internal class PlatformRenderInterface : IPlatformRenderInterface, IOpenGlAwarePlatformRenderInterface
     {
-        private readonly ConcurrentDictionary<Typeface, GlyphTypefaceImpl> _glyphTypefaceCache =
-            new ConcurrentDictionary<Typeface, GlyphTypefaceImpl>();
-
-        private readonly ICustomSkiaGpu _customSkiaGpu;
+        private readonly ISkiaGpu _skiaGpu;
 
-        private GRContext GrContext { get; }
-
-        public PlatformRenderInterface(ICustomSkiaGpu customSkiaGpu)
+        public PlatformRenderInterface(ISkiaGpu skiaGpu, long? maxResourceBytes = null)
         {
-            if (customSkiaGpu != null)
-            {
-                _customSkiaGpu = customSkiaGpu;
-
-                GrContext = _customSkiaGpu.GrContext;
+            DefaultPixelFormat = SKImageInfo.PlatformColorType.ToPixelFormat();
 
+            if (skiaGpu != null)
+            {
+                _skiaGpu = skiaGpu;
                 return;
             }
 
-            var gl = AvaloniaLocator.Current.GetService<IWindowingPlatformGlFeature>();
-            if (gl != null)
-            {
-                var display = gl.ImmediateContext.Display;
-                gl.ImmediateContext.MakeCurrent();
-                using (var iface = display.Type == GlDisplayType.OpenGL2
-                    ? GRGlInterface.AssembleGlInterface((_, proc) => display.GlInterface.GetProcAddress(proc))
-                    : GRGlInterface.AssembleGlesInterface((_, proc) => display.GlInterface.GetProcAddress(proc)))
-                {
-                    GrContext = GRContext.Create(GRBackend.OpenGL, iface);
-                }
-            }
+            var gl = AvaloniaLocator.Current.GetService<IPlatformOpenGlInterface>();
+            if (gl != null) 
+                _skiaGpu = new GlSkiaGpu(gl, maxResourceBytes);
         }
 
         /// <inheritdoc />
@@ -60,7 +47,7 @@ namespace Avalonia.Skia
             Size constraint,
             IReadOnlyList<FormattedTextStyleSpan> spans)
         {
-            return new FormattedTextImpl(text, typeface,fontSize, textAlignment, wrapping, constraint, spans);
+            return new FormattedTextImpl(text, typeface, fontSize, textAlignment, wrapping, constraint, spans);
         }
 
         public IGeometryImpl CreateEllipseGeometry(Rect rect) => new EllipseGeometryImpl(rect);
@@ -75,6 +62,15 @@ namespace Avalonia.Skia
             return new StreamGeometryImpl();
         }
 
+        /// <inheritdoc />
+        public IBitmapImpl LoadBitmap(string fileName)
+        {
+            using (var stream = File.OpenRead(fileName))
+            {
+                return LoadBitmap(stream);
+            }
+        }
+
         /// <inheritdoc />
         public IBitmapImpl LoadBitmap(Stream stream)
         {
@@ -82,18 +78,34 @@ namespace Avalonia.Skia
         }
 
         /// <inheritdoc />
-        public IBitmapImpl LoadBitmap(string fileName)
+        public IBitmapImpl LoadBitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride)
         {
-            using (var stream = File.OpenRead(fileName))
-            {
-                return LoadBitmap(stream);
-            }
+            return new ImmutableBitmap(size, dpi, stride, format, alphaFormat, data);
+        }
+
+        /// <inheritdoc />
+        public IBitmapImpl LoadBitmapToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            return new ImmutableBitmap(stream, width, true, interpolationMode);
         }
 
         /// <inheritdoc />
-        public IBitmapImpl LoadBitmap(PixelFormat format, IntPtr data, PixelSize size, Vector dpi, int stride)
+        public IBitmapImpl LoadBitmapToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
         {
-            return new ImmutableBitmap(size, dpi, stride, format, data);
+            return new ImmutableBitmap(stream, height, false, interpolationMode);
+        }
+
+        /// <inheritdoc />
+        public IBitmapImpl ResizeBitmap(IBitmapImpl bitmapImpl, PixelSize destinationSize, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            if (bitmapImpl is ImmutableBitmap ibmp)
+            {
+                return new ImmutableBitmap(ibmp, destinationSize, interpolationMode);
+            }
+            else
+            {
+                throw new Exception("Invalid source bitmap type.");
+            }
         }
 
         /// <inheritdoc />
@@ -114,7 +126,8 @@ namespace Avalonia.Skia
                 Width = size.Width,
                 Height = size.Height,
                 Dpi = dpi,
-                DisableTextLcdRendering = false
+                DisableTextLcdRendering = false,
+                DisableManualFbo = true,
             };
 
             return new SurfaceRenderTarget(createInfo);
@@ -123,26 +136,18 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces)
         {
-            if (_customSkiaGpu != null)
+            if (!(surfaces is IList))
+                surfaces = surfaces.ToList();
+            var gpuRenderTarget = _skiaGpu?.TryCreateRenderTarget(surfaces);
+            if (gpuRenderTarget != null)
             {
-                ICustomSkiaRenderTarget customRenderTarget = _customSkiaGpu.TryCreateRenderTarget(surfaces);
-
-                if (customRenderTarget != null)
-                {
-                    return new CustomRenderTarget(customRenderTarget);
-                }
+                return new SkiaGpuRenderTarget(_skiaGpu, gpuRenderTarget);
             }
 
             foreach (var surface in surfaces)
             {
-                if (surface is IGlPlatformSurface glSurface && GrContext != null)
-                {
-                    return new GlRenderTarget(GrContext, glSurface);
-                }
                 if (surface is IFramebufferPlatformSurface framebufferSurface)
-                {
                     return new FramebufferRenderTarget(framebufferSurface);
-                }
             }
 
             throw new NotSupportedException(
@@ -150,14 +155,125 @@ namespace Avalonia.Skia
         }
 
         /// <inheritdoc />
-        public IWriteableBitmapImpl CreateWriteableBitmap(PixelSize size, Vector dpi, PixelFormat? format = null)
+        public IWriteableBitmapImpl CreateWriteableBitmap(PixelSize size, Vector dpi, PixelFormat format, AlphaFormat alphaFormat)
         {
-            return new WriteableBitmapImpl(size, dpi, format);
+            return new WriteableBitmapImpl(size, dpi, format, alphaFormat);
         }
 
-        public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)
+        private static readonly SKFont s_font = new SKFont
         {
-            return _glyphTypefaceCache.GetOrAdd(typeface, new GlyphTypefaceImpl(typeface));
+            Subpixel = true,
+            Edging = SKFontEdging.Antialias,
+            Hinting = SKFontHinting.Full,
+            LinearMetrics = true
+        };
+
+        private static readonly ThreadLocal<SKTextBlobBuilder> s_textBlobBuilderThreadLocal = new ThreadLocal<SKTextBlobBuilder>(() => new SKTextBlobBuilder());
+
+        /// <inheritdoc />
+        public IGlyphRunImpl CreateGlyphRun(GlyphRun glyphRun, out double width)
+        {
+            var count = glyphRun.GlyphIndices.Length;
+            var textBlobBuilder = s_textBlobBuilderThreadLocal.Value;
+
+            var glyphTypeface = (GlyphTypefaceImpl)glyphRun.GlyphTypeface.PlatformImpl;
+
+            var typeface = glyphTypeface.Typeface;
+
+            s_font.Size = (float)glyphRun.FontRenderingEmSize;
+            s_font.Typeface = typeface;
+
+
+            SKTextBlob textBlob;
+
+            width = 0;
+
+            var scale = (float)(glyphRun.FontRenderingEmSize / glyphTypeface.DesignEmHeight);
+
+            if (glyphRun.GlyphOffsets.IsEmpty)
+            {
+                if (glyphTypeface.IsFixedPitch)
+                {
+                    textBlobBuilder.AddRun(glyphRun.GlyphIndices.Buffer.Span, s_font);
+
+                    textBlob = textBlobBuilder.Build();
+
+                    width = glyphTypeface.GetGlyphAdvance(glyphRun.GlyphIndices[0]) * scale * glyphRun.GlyphIndices.Length;
+                }
+                else
+                {
+                    var buffer = textBlobBuilder.AllocateHorizontalRun(s_font, count, 0);
+
+                    var positions = buffer.GetPositionSpan();
+
+                    for (var i = 0; i < count; i++)
+                    {
+                        positions[i] = (float)width;
+
+                        if (glyphRun.GlyphAdvances.IsEmpty)
+                        {
+                            width += glyphTypeface.GetGlyphAdvance(glyphRun.GlyphIndices[i]) * scale;
+                        }
+                        else
+                        {
+                            width += glyphRun.GlyphAdvances[i];
+                        }
+                    }
+
+                    buffer.SetGlyphs(glyphRun.GlyphIndices.Buffer.Span);
+
+                    textBlob = textBlobBuilder.Build();
+                }
+            }
+            else
+            {
+                var buffer = textBlobBuilder.AllocatePositionedRun(s_font, count);
+
+                var glyphPositions = buffer.GetPositionSpan();
+
+                var currentX = 0.0;
+
+                for (var i = 0; i < count; i++)
+                {
+                    var glyphOffset = glyphRun.GlyphOffsets[i];
+
+                    glyphPositions[i] = new SKPoint((float)(currentX + glyphOffset.X), (float)glyphOffset.Y);
+
+                    if (glyphRun.GlyphAdvances.IsEmpty)
+                    {
+                        currentX += glyphTypeface.GetGlyphAdvance(glyphRun.GlyphIndices[i]) * scale;
+                    }
+                    else
+                    {
+                        currentX += glyphRun.GlyphAdvances[i];
+                    }
+                }
+
+                buffer.SetGlyphs(glyphRun.GlyphIndices.Buffer.Span);
+
+                width = currentX;
+
+                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");
+        }
+
+        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
new file mode 100644
index 0000000000..309129ccd9
--- /dev/null
+++ b/src/Skia/Avalonia.Skia/Properties/AssemblyInfo.cs
@@ -0,0 +1,8 @@
+using System.Runtime.CompilerServices;
+#if SIGNED_BUILD
+[assembly: InternalsVisibleTo("Avalonia.Skia.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.Skia.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+#else
+[assembly: InternalsVisibleTo("Avalonia.Skia.RenderTests")]
+[assembly: InternalsVisibleTo("Avalonia.Skia.UnitTests")]
+#endif
diff --git a/src/Skia/Avalonia.Skia/RectangleGeometryImpl.cs b/src/Skia/Avalonia.Skia/RectangleGeometryImpl.cs
index a873e8e2df..93d453e8f0 100644
--- a/src/Skia/Avalonia.Skia/RectangleGeometryImpl.cs
+++ b/src/Skia/Avalonia.Skia/RectangleGeometryImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using SkiaSharp;
 
 namespace Avalonia.Skia
diff --git a/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs b/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs
index 577567a8a1..71deb1235f 100644
--- a/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs
+++ b/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs
@@ -1,62 +1,64 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Media;
+using SkiaSharp;
 
 namespace Avalonia.Skia
 {
     internal class SKTypefaceCollection
     {
-        private readonly ConcurrentDictionary<string, ConcurrentDictionary<FontKey, TypefaceCollectionEntry>> _fontFamilies =
-            new ConcurrentDictionary<string, ConcurrentDictionary<FontKey, TypefaceCollectionEntry>>();
+        private readonly ConcurrentDictionary<Typeface, SKTypeface> _typefaces =
+            new ConcurrentDictionary<Typeface, SKTypeface>();
 
-        public void AddEntry(string familyName, FontKey key, TypefaceCollectionEntry entry)
+        public void AddTypeface(Typeface key, SKTypeface typeface)
         {
-            if (!_fontFamilies.TryGetValue(familyName, out var fontFamily))
-            {
-                fontFamily = new ConcurrentDictionary<FontKey, TypefaceCollectionEntry>();
-
-                _fontFamilies.TryAdd(familyName, fontFamily);
-            }
-
-            fontFamily.TryAdd(key, entry);
+            _typefaces.TryAdd(key, typeface);
         }
 
-        public TypefaceCollectionEntry Get(string familyName, FontWeight fontWeight, FontStyle fontStyle)
+        public SKTypeface Get(Typeface typeface)
         {
-            var key = new FontKey(fontWeight, fontStyle);
-
-            return _fontFamilies.TryGetValue(familyName, out var fontFamily) ?
-                fontFamily.GetOrAdd(key, GetFallback(fontFamily, key)) :
-                new TypefaceCollectionEntry(Typeface.Default, SkiaSharp.SKTypeface.Default);
+            return GetNearestMatch(_typefaces, typeface);
         }
 
-        private static TypefaceCollectionEntry GetFallback(IDictionary<FontKey, TypefaceCollectionEntry> fontFamily, FontKey key)
+        private static SKTypeface GetNearestMatch(IDictionary<Typeface, SKTypeface> typefaces, Typeface key)
         {
-            var keys = fontFamily.Keys.Where(
-                x => ((int)x.Weight <= (int)key.Weight || (int)x.Weight > (int)key.Weight) && x.Style == key.Style).ToArray();
-
-            if (!keys.Any())
+            if (typefaces.TryGetValue(key, out var typeface))
             {
-                keys = fontFamily.Keys.Where(
-                    x => x.Weight == key.Weight && (x.Style >= key.Style || x.Style < key.Style)).ToArray();
+                return typeface;
+            }
 
-                if (!keys.Any())
+            var weight = (int)key.Weight;
+
+            weight -= weight % 100; // make sure we start at a full weight
+
+            for (var i = (int)key.Style; i < 2; i++)
+            {
+                // only try 2 font weights in each direction
+                for (var j = 0; j < 200; j += 100)
                 {
-                    keys = fontFamily.Keys.Where(
-                        x => ((int)x.Weight <= (int)key.Weight || (int)x.Weight > (int)key.Weight) &&
-                             (x.Style >= key.Style || x.Style < key.Style)).ToArray();
-                }
-            }
+                    if (weight - j >= 100)
+                    {
+                        if (typefaces.TryGetValue(new Typeface(key.FontFamily, (FontStyle)i, (FontWeight)(weight - j)), out typeface))
+                        {
+                            return typeface;
+                        }
+                    }
 
-            key = keys.FirstOrDefault();
+                    if (weight + j > 900)
+                    {
+                        continue;
+                    }
 
-            fontFamily.TryGetValue(key, out var entry);
+                    if (typefaces.TryGetValue(new Typeface(key.FontFamily, (FontStyle)i, (FontWeight)(weight + j)), out typeface))
+                    {
+                        return typeface;
+                    }
+                }
+            }
 
-            return entry;
+            //Nothing was found so we use the first typeface we can get.
+            return typefaces.Values.FirstOrDefault();
         }
     }
 }
diff --git a/src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs b/src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs
index 4bb42c7118..de77c9186e 100644
--- a/src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs
+++ b/src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs
@@ -1,6 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using System;
 using System.Collections.Concurrent;
 using Avalonia.Media;
 using Avalonia.Media.Fonts;
@@ -11,11 +9,11 @@ namespace Avalonia.Skia
 {
     internal static class SKTypefaceCollectionCache
     {
-        private static readonly ConcurrentDictionary<FontFamilyKey, SKTypefaceCollection> s_cachedCollections;
+        private static readonly ConcurrentDictionary<FontFamily, SKTypefaceCollection> s_cachedCollections;
 
         static SKTypefaceCollectionCache()
         {
-            s_cachedCollections = new ConcurrentDictionary<FontFamilyKey, SKTypefaceCollection>();
+            s_cachedCollections = new ConcurrentDictionary<FontFamily, SKTypefaceCollection>();
         }
 
         /// <summary>
@@ -25,7 +23,7 @@ namespace Avalonia.Skia
         /// <returns></returns>
         public static SKTypefaceCollection GetOrAddTypefaceCollection(FontFamily fontFamily)
         {
-            return s_cachedCollections.GetOrAdd(fontFamily.Key, x => CreateCustomFontCollection(fontFamily));
+            return s_cachedCollections.GetOrAdd(fontFamily, x => CreateCustomFontCollection(fontFamily));
         }
 
         /// <summary>
@@ -45,13 +43,23 @@ namespace Avalonia.Skia
             {
                 var assetStream = assetLoader.Open(asset);
 
-                var skTypeface = SKTypeface.FromStream(assetStream);
+                if (assetStream == null)
+                    throw new InvalidOperationException("Asset could not be loaded.");
+
+                var typeface = SKTypeface.FromStream(assetStream);
+
+                if (typeface == null)
+                    throw new InvalidOperationException("Typeface could not be loaded.");
 
-                var typeface = new Typeface(fontFamily, (FontWeight)skTypeface.FontWeight, (FontStyle)skTypeface.FontSlant);
+                if (typeface.FamilyName != fontFamily.Name)
+                {
+                    continue;
+                }
 
-                var entry = new TypefaceCollectionEntry(typeface, skTypeface);
+                var key = new Typeface(fontFamily, typeface.FontSlant.ToAvalonia(),
+                    (FontWeight)typeface.FontWeight);
 
-                typeFaceCollection.AddEntry(skTypeface.FamilyName, new FontKey(typeface.Weight, typeface.Style), entry);
+                typeFaceCollection.AddTypeface(key, typeface);
             }
 
             return typeFaceCollection;
diff --git a/src/Skia/Avalonia.Skia/SkiaApplicationExtensions.cs b/src/Skia/Avalonia.Skia/SkiaApplicationExtensions.cs
index 102f1f92aa..014298ce83 100644
--- a/src/Skia/Avalonia.Skia/SkiaApplicationExtensions.cs
+++ b/src/Skia/Avalonia.Skia/SkiaApplicationExtensions.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls;
 using Avalonia.Skia;
 
diff --git a/src/Skia/Avalonia.Skia/SkiaOptions.cs b/src/Skia/Avalonia.Skia/SkiaOptions.cs
index bac1849be8..493263677d 100644
--- a/src/Skia/Avalonia.Skia/SkiaOptions.cs
+++ b/src/Skia/Avalonia.Skia/SkiaOptions.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Skia;
 
@@ -14,6 +11,15 @@ namespace Avalonia
         /// <summary>
         /// Custom gpu factory to use. Can be used to customize behavior of Skia renderer.
         /// </summary>
-        public Func<ICustomSkiaGpu> CustomGpuFactory { get; set; }
+        public Func<ISkiaGpu> CustomGpuFactory { get; set; }
+
+        /// <summary>
+        /// The maximum number of bytes for video memory to store textures and resources.
+        /// </summary>
+        /// <remarks>
+        /// This is set by default to the recommended value for Avalonia.
+        /// Setting this to null will give you the default Skia value.
+        /// </remarks>
+        public long? MaxGpuResourceSizeBytes { get; set; } = 1024 * 600 * 4 * 12; // ~28mb 12x 1024 x 600 textures. 
     }
 }
diff --git a/src/Skia/Avalonia.Skia/SkiaPlatform.cs b/src/Skia/Avalonia.Skia/SkiaPlatform.cs
index ce3aef755b..9a5725e06f 100644
--- a/src/Skia/Avalonia.Skia/SkiaPlatform.cs
+++ b/src/Skia/Avalonia.Skia/SkiaPlatform.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Platform;
 
 namespace Avalonia.Skia
@@ -21,15 +18,12 @@ namespace Avalonia.Skia
         public static void Initialize(SkiaOptions options)
         {
             var customGpu = options.CustomGpuFactory?.Invoke();
-            var renderInterface = new PlatformRenderInterface(customGpu);
-
-            AvaloniaLocator.CurrentMutable
-                .Bind<IPlatformRenderInterface>().ToConstant(renderInterface);
-
-            var fontManager = new FontManagerImpl();
+            var renderInterface = new PlatformRenderInterface(customGpu, options.MaxGpuResourceSizeBytes);
 
             AvaloniaLocator.CurrentMutable
-                .Bind<IFontManagerImpl>().ToConstant(fontManager);
+                .Bind<IPlatformRenderInterface>().ToConstant(renderInterface)
+                .Bind<IFontManagerImpl>().ToConstant(new FontManagerImpl())
+                .Bind<ITextShaperImpl>().ToConstant(new TextShaperImpl());
         }
 
         /// <summary>
diff --git a/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs b/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs
index 9196ace4d8..bb3dbbfadc 100644
--- a/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs
+++ b/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs
@@ -1,25 +1,60 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Media;
 using Avalonia.Platform;
+using Avalonia.Visuals.Media.Imaging;
 using SkiaSharp;
 
 namespace Avalonia.Skia
 {
     public static class SkiaSharpExtensions
     {
+        public static SKFilterQuality ToSKFilterQuality(this BitmapInterpolationMode interpolationMode)
+        {
+            switch (interpolationMode)
+            {
+                case BitmapInterpolationMode.LowQuality:
+                    return SKFilterQuality.Low;
+                case BitmapInterpolationMode.MediumQuality:
+                    return SKFilterQuality.Medium;
+                case BitmapInterpolationMode.HighQuality:
+                    return SKFilterQuality.High;
+                case BitmapInterpolationMode.Default:
+                    return SKFilterQuality.None;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(interpolationMode), interpolationMode, null);
+            }
+        }
+
         public static SKPoint ToSKPoint(this Point p)
         {
             return new SKPoint((float)p.X, (float)p.Y);
         }
+        
+        public static SKPoint ToSKPoint(this Vector p)
+        {
+            return new SKPoint((float)p.X, (float)p.Y);
+        }
 
         public static SKRect ToSKRect(this Rect r)
         {
             return new SKRect((float)r.X, (float)r.Y, (float)r.Right, (float)r.Bottom);
         }
 
+        public static SKRoundRect ToSKRoundRect(this RoundedRect r)
+        {
+            var rc = r.Rect.ToSKRect();
+            var result = new SKRoundRect();
+
+            result.SetRectRadii(rc,
+                   new[]
+                   {
+                        r.RadiiTopLeft.ToSKPoint(), r.RadiiTopRight.ToSKPoint(),
+                        r.RadiiBottomRight.ToSKPoint(), r.RadiiBottomLeft.ToSKPoint(),
+                   });            
+
+            return result;
+        }
+
         public static Rect ToAvaloniaRect(this SKRect r)
         {
             return new Rect(r.Left, r.Top, r.Right - r.Left, r.Bottom - r.Top);
@@ -70,6 +105,28 @@ namespace Avalonia.Skia
             throw new ArgumentException("Unknown pixel format: " + fmt);
         }
 
+        public static SKAlphaType ToSkAlphaType(this AlphaFormat fmt)
+        {
+            return fmt switch
+            {
+                AlphaFormat.Premul => SKAlphaType.Premul,
+                AlphaFormat.Unpremul => SKAlphaType.Unpremul,
+                AlphaFormat.Opaque => SKAlphaType.Opaque,
+                _ => throw new ArgumentException($"Unknown alpha format: {fmt}")
+            };
+        }
+
+        public static AlphaFormat ToAlphaFormat(this SKAlphaType fmt)
+        {
+            return fmt switch
+            {
+                SKAlphaType.Premul => AlphaFormat.Premul,
+                SKAlphaType.Unpremul => AlphaFormat.Unpremul,
+                SKAlphaType.Opaque => AlphaFormat.Opaque,
+                _ => throw new ArgumentException($"Unknown alpha format: {fmt}")
+            };
+        }
+
         public static SKShaderTileMode ToSKShaderTileMode(this Media.GradientSpreadMethod m)
         {
             switch (m)
@@ -103,6 +160,17 @@ namespace Avalonia.Skia
             }
         }
 
+        public static FontStyle ToAvalonia(this SKFontStyleSlant slant)
+        {
+            return slant switch
+            {
+                SKFontStyleSlant.Upright => FontStyle.Normal,
+                SKFontStyleSlant.Italic => FontStyle.Italic,
+                SKFontStyleSlant.Oblique => FontStyle.Oblique,
+                _ => throw new ArgumentOutOfRangeException(nameof (slant), slant, null)
+            };
+        }
+
         public static SKPath Clone(this SKPath src)
         {
             return src != null ? new SKPath(src) : null;
diff --git a/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs b/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs
index 2764c65c6f..86450690e6 100644
--- a/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs
+++ b/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Media;
 using Avalonia.Platform;
 using SkiaSharp;
diff --git a/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs b/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs
index 9340c9add4..01b7449b64 100644
--- a/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs
+++ b/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs
@@ -1,9 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.IO;
 using System.Reactive.Disposables;
+using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Skia.Helpers;
@@ -14,12 +12,31 @@ namespace Avalonia.Skia
     /// <summary>
     /// Skia render target that writes to a surface.
     /// </summary>
-    internal class SurfaceRenderTarget : IRenderTargetBitmapImpl, IDrawableBitmapImpl
+    internal class SurfaceRenderTarget : IDrawingContextLayerImpl, IDrawableBitmapImpl
     {
-        private readonly SKSurface _surface;
+        private readonly ISkiaSurface _surface;
         private readonly SKCanvas _canvas;
         private readonly bool _disableLcdRendering;
         private readonly GRContext _grContext;
+        private readonly ISkiaGpu _gpu;
+
+        class SkiaSurfaceWrapper : ISkiaSurface
+        {
+            public SKSurface Surface { get; private set; }
+            public bool CanBlit => false;
+            public void Blit(SKCanvas canvas) => throw new NotSupportedException();
+
+            public SkiaSurfaceWrapper(SKSurface surface)
+            {
+                Surface = surface;
+            }
+
+            public void Dispose()
+            {
+                Surface?.Dispose();
+                Surface = null;
+            }
+        }
         
         /// <summary>
         /// Create new surface render target.
@@ -32,9 +49,15 @@ namespace Avalonia.Skia
 
             _disableLcdRendering = createInfo.DisableTextLcdRendering;
             _grContext = createInfo.GrContext;
-            _surface = CreateSurface(createInfo.GrContext, PixelSize.Width, PixelSize.Height, createInfo.Format);
+            _gpu = createInfo.Gpu;
 
-            _canvas = _surface?.Canvas;
+            if (!createInfo.DisableManualFbo)
+                _surface = _gpu?.TryCreateSurface(PixelSize, createInfo.Session);
+            if (_surface == null)
+                _surface = new SkiaSurfaceWrapper(CreateSurface(createInfo.GrContext, PixelSize.Width, PixelSize.Height,
+                    createInfo.Format));
+
+            _canvas = _surface?.Surface.Canvas;
 
             if (_surface == null || _canvas == null)
             {
@@ -73,11 +96,12 @@ namespace Avalonia.Skia
             
             var createInfo = new DrawingContextImpl.CreateInfo
             {
-                Canvas = _canvas,
+                Surface = _surface.Surface,
                 Dpi = Dpi,
                 VisualBrushRenderer = visualBrushRenderer,
                 DisableTextLcdRendering = _disableLcdRendering,
-                GrContext = _grContext
+                GrContext = _grContext,
+                Gpu = _gpu,
             };
 
             return new DrawingContextImpl(createInfo, Disposable.Create(() => Version++));
@@ -109,14 +133,32 @@ namespace Avalonia.Skia
             }
         }
 
-        /// <inheritdoc />
-        public void Draw(DrawingContextImpl context, SKRect sourceRect, SKRect destRect, SKPaint paint)
+        public void Blit(IDrawingContextImpl contextImpl)
         {
-            using (var image = SnapshotImage())
+            var context = (DrawingContextImpl)contextImpl;
+
+            if (_surface.CanBlit)
+            {
+                _surface.Surface.Canvas.Flush();
+                _surface.Blit(context.Canvas);
+            }
+            else
             {
-                context.Canvas.DrawImage(image, sourceRect, destRect, paint);
+                var oldMatrix = context.Canvas.TotalMatrix;
+                context.Canvas.ResetMatrix();
+                _surface.Surface.Draw(context.Canvas, 0, 0, null);
+                context.Canvas.SetMatrix(oldMatrix);
             }
         }
+
+        public bool CanBlit => true;
+
+        /// <inheritdoc />
+        public void Draw(DrawingContextImpl context, SKRect sourceRect, SKRect destRect, SKPaint paint)
+        {
+            using var image = SnapshotImage();
+            context.Canvas.DrawImage(image, sourceRect, destRect, paint);
+        }
         
         /// <summary>
         /// Create Skia image snapshot from a surface.
@@ -124,7 +166,7 @@ namespace Avalonia.Skia
         /// <returns>Image snapshot.</returns>
         public SKImage SnapshotImage()
         {
-            return _surface.Snapshot();
+            return _surface.Surface.Snapshot();
         }
 
         /// <summary>
@@ -175,6 +217,12 @@ namespace Avalonia.Skia
             /// GPU-accelerated context (optional)
             /// </summary>
             public GRContext GrContext;
+
+            public ISkiaGpu Gpu;
+
+            public ISkiaGpuRenderSession Session;
+
+            public bool DisableManualFbo;
         }
     }
 }
diff --git a/src/Skia/Avalonia.Skia/TextShaperImpl.cs b/src/Skia/Avalonia.Skia/TextShaperImpl.cs
new file mode 100644
index 0000000000..31724bfee9
--- /dev/null
+++ b/src/Skia/Avalonia.Skia/TextShaperImpl.cs
@@ -0,0 +1,146 @@
+using System;
+using System.Globalization;
+using Avalonia.Media;
+using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+using HarfBuzzSharp;
+using Buffer = HarfBuzzSharp.Buffer;
+
+namespace Avalonia.Skia
+{
+    internal class TextShaperImpl : ITextShaperImpl
+    {
+        public GlyphRun ShapeText(ReadOnlySlice<char> text, Typeface typeface, double fontRenderingEmSize, CultureInfo culture)
+        {
+            using (var buffer = new Buffer())
+            {
+                FillBuffer(buffer, text);
+
+                buffer.Language = new Language(culture ?? CultureInfo.CurrentCulture);
+
+                buffer.GuessSegmentProperties();
+
+                var glyphTypeface = typeface.GlyphTypeface;
+
+                var font = ((GlyphTypefaceImpl)glyphTypeface.PlatformImpl).Font;
+
+                font.Shape(buffer);
+
+                font.GetScale(out var scaleX, out _);
+
+                var textScale = fontRenderingEmSize / scaleX;
+
+                var bufferLength = buffer.Length;
+
+                var glyphInfos = buffer.GetGlyphInfoSpan();
+
+                var glyphPositions = buffer.GetGlyphPositionSpan();
+
+                var glyphIndices = new ushort[bufferLength];
+
+                var clusters = new ushort[bufferLength];
+
+                double[] glyphAdvances = null;
+
+                Vector[] glyphOffsets = null;
+
+                for (var i = 0; i < bufferLength; i++)
+                {
+                    glyphIndices[i] = (ushort)glyphInfos[i].Codepoint;
+
+                    clusters[i] = (ushort)glyphInfos[i].Cluster;
+
+                    if (!glyphTypeface.IsFixedPitch)
+                    {
+                        SetAdvance(glyphPositions, i, textScale, ref glyphAdvances);
+                    }
+
+                    SetOffset(glyphPositions, i, textScale, ref glyphOffsets);
+                }
+
+                return new GlyphRun(glyphTypeface, fontRenderingEmSize,
+                    new ReadOnlySlice<ushort>(glyphIndices),
+                    new ReadOnlySlice<double>(glyphAdvances),
+                    new ReadOnlySlice<Vector>(glyphOffsets),
+                    text,
+                    new ReadOnlySlice<ushort>(clusters),
+                    buffer.Direction == Direction.LeftToRight ? 0 : 1);
+            }
+        }
+
+        private static void FillBuffer(Buffer buffer, ReadOnlySlice<char> text)
+        {
+            buffer.ContentType = ContentType.Unicode;
+
+            var i = 0;
+
+            while (i < text.Length)
+            {
+                var codepoint = Codepoint.ReadAt(text, i, out var count);
+
+                var cluster = (uint)(text.Start + i);
+
+                if (codepoint.IsBreakChar)
+                {
+                    if (i + 1 < text.Length)
+                    {
+                        var nextCodepoint = Codepoint.ReadAt(text, i + 1, out _);
+
+                        if (nextCodepoint == '\r' && codepoint == '\n' || nextCodepoint == '\n' && codepoint == '\r')
+                        {
+                            count++;
+
+                            buffer.Add('\u200C', cluster);
+
+                            buffer.Add('\u200D', cluster);
+                        }
+                        else
+                        {
+                            buffer.Add('\u200C', cluster);
+                        }
+                    }
+                    else
+                    {
+                        buffer.Add('\u200C', cluster);
+                    }
+                }
+                else
+                {
+                    buffer.Add(codepoint, cluster);
+                }
+
+                i += count;
+            }
+        }
+
+        private static void SetOffset(ReadOnlySpan<GlyphPosition> glyphPositions, int index, double textScale,
+            ref Vector[] offsetBuffer)
+        {
+            var position = glyphPositions[index];
+
+            if (position.XOffset == 0 && position.YOffset == 0)
+            {
+                return;
+            }
+
+            offsetBuffer ??= new Vector[glyphPositions.Length];
+
+            var offsetX = position.XOffset * textScale;
+
+            var offsetY = position.YOffset * textScale;
+
+            offsetBuffer[index] = new Vector(offsetX, offsetY);
+        }
+
+        private static void SetAdvance(ReadOnlySpan<GlyphPosition> glyphPositions, int index, double textScale,
+            ref double[] advanceBuffer)
+        {
+            advanceBuffer ??= new double[glyphPositions.Length];
+
+            // Depends on direction of layout
+            // advanceBuffer[index] = buffer.GlyphPositions[index].YAdvance * textScale;
+            advanceBuffer[index] = glyphPositions[index].XAdvance * textScale;
+        }
+    }
+}
diff --git a/src/Skia/Avalonia.Skia/TransformedGeometryImpl.cs b/src/Skia/Avalonia.Skia/TransformedGeometryImpl.cs
index 9826bc2ce3..64d5b58970 100644
--- a/src/Skia/Avalonia.Skia/TransformedGeometryImpl.cs
+++ b/src/Skia/Avalonia.Skia/TransformedGeometryImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Platform;
 using SkiaSharp;
 
diff --git a/src/Skia/Avalonia.Skia/TypefaceCache.cs b/src/Skia/Avalonia.Skia/TypefaceCache.cs
deleted file mode 100644
index 1c2b855032..0000000000
--- a/src/Skia/Avalonia.Skia/TypefaceCache.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.Collections.Concurrent;
-using Avalonia.Media;
-using SkiaSharp;
-
-namespace Avalonia.Skia
-{
-    /// <summary>
-    /// Cache for Skia typefaces.
-    /// </summary>
-    internal static class TypefaceCache
-    {
-        private static readonly ConcurrentDictionary<string, ConcurrentDictionary<FontKey, TypefaceCollectionEntry>> s_cache =
-            new ConcurrentDictionary<string, ConcurrentDictionary<FontKey, TypefaceCollectionEntry>>();
-
-        public static TypefaceCollectionEntry Get(FontFamily fontFamily, FontWeight fontWeight, FontStyle fontStyle)
-        {
-            if (fontFamily.Key != null)
-            {
-                return SKTypefaceCollectionCache.GetOrAddTypefaceCollection(fontFamily)
-                    .Get(fontFamily.Name, fontWeight, fontStyle);
-            }
-
-            var typefaceCollection = s_cache.GetOrAdd(fontFamily.Name, new ConcurrentDictionary<FontKey, TypefaceCollectionEntry>());
-
-            var key = new FontKey(fontWeight, fontStyle);
-
-            if (typefaceCollection.TryGetValue(key, out var entry))
-            {
-                return entry;
-            }
-
-            var skTypeface = SKTypeface.FromFamilyName(fontFamily.Name, (SKFontStyleWeight)fontWeight,
-                                 SKFontStyleWidth.Normal, (SKFontStyleSlant)fontStyle) ?? SKTypeface.Default;
-
-            var typeface = new Typeface(fontFamily.Name, fontWeight, fontStyle);
-
-            entry = new TypefaceCollectionEntry(typeface, skTypeface);
-
-            typefaceCollection[key] = entry;
-
-            return entry;
-        }
-    }
-}
diff --git a/src/Skia/Avalonia.Skia/TypefaceCollectionEntry.cs b/src/Skia/Avalonia.Skia/TypefaceCollectionEntry.cs
deleted file mode 100644
index ef9f889819..0000000000
--- a/src/Skia/Avalonia.Skia/TypefaceCollectionEntry.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Media;
-using SkiaSharp;
-
-namespace Avalonia.Skia
-{
-    internal class TypefaceCollectionEntry
-    {
-        public TypefaceCollectionEntry(Typeface typeface, SKTypeface skTypeface)
-        {
-            Typeface = typeface;
-            SKTypeface = skTypeface;
-        }
-        public Typeface Typeface { get; }
-        public SKTypeface SKTypeface { get; }
-    }
-}
diff --git a/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs b/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs
index fea21cde58..d48e7d10e6 100644
--- a/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs
+++ b/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.IO;
 using System.Threading;
@@ -25,12 +22,14 @@ namespace Avalonia.Skia
         /// <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.</param>
-        public WriteableBitmapImpl(PixelSize size, Vector dpi, PixelFormat? format = null)
+        /// <param name="alphaFormat">The alpha format.</param>
+        public WriteableBitmapImpl(PixelSize size, Vector dpi, PixelFormat format, AlphaFormat alphaFormat)
         {
             PixelSize = size;
             Dpi = dpi;
 
-            var colorType = PixelFormatHelper.ResolveColorType(format);
+            SKColorType colorType = format.ToSkColorType();
+            SKAlphaType alphaType = alphaFormat.ToSkAlphaType();
             
             var runtimePlatform = AvaloniaLocator.Current?.GetService<IRuntimePlatform>();
             
@@ -38,14 +37,14 @@ namespace Avalonia.Skia
             {
                 _bitmap = new SKBitmap();
 
-                var nfo = new SKImageInfo(size.Width, size.Height, colorType, SKAlphaType.Premul);
+                var nfo = new SKImageInfo(size.Width, size.Height, colorType, alphaType);
                 var blob = runtimePlatform.AllocBlob(nfo.BytesSize);
 
                 _bitmap.InstallPixels(nfo, blob.Address, nfo.RowBytes, s_releaseDelegate, blob);
             }
             else
             {
-                _bitmap = new SKBitmap(size.Width, size.Height, colorType, SKAlphaType.Premul);
+                _bitmap = new SKBitmap(size.Width, size.Height, colorType, alphaType);
             }
 
             _bitmap.Erase(SKColor.Empty);
diff --git a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
index 7d47b95ede..cda95d2ebb 100644
--- a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
+++ b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
@@ -3,6 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageId>Avalonia.Direct2D1</PackageId>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\Avalonia.Win32\Interop\UnmanagedMethods.cs">
diff --git a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
index 1bda5157a5..6ae27870e8 100644
--- a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
+++ b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -10,7 +7,12 @@ using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Direct2D1.Media;
 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;
 
 namespace Avalonia
 {
@@ -28,8 +30,6 @@ namespace Avalonia.Direct2D1
 {
     public class Direct2D1Platform : IPlatformRenderInterface
     {
-        private readonly ConcurrentDictionary<Typeface, GlyphTypefaceImpl> _glyphTypefaceCache =
-            new ConcurrentDictionary<Typeface, GlyphTypefaceImpl>();
         private static readonly Direct2D1Platform s_instance = new Direct2D1Platform();
 
         public static SharpDX.Direct3D11.Device Direct3D11Device { get; private set; }
@@ -108,16 +108,13 @@ namespace Avalonia.Direct2D1
         public static void Initialize()
         {
             InitializeDirect2D();
-            AvaloniaLocator.CurrentMutable.Bind<IPlatformRenderInterface>().ToConstant(s_instance);
-            AvaloniaLocator.CurrentMutable.Bind<IFontManagerImpl>().ToConstant(new FontManagerImpl());
+            AvaloniaLocator.CurrentMutable
+                .Bind<IPlatformRenderInterface>().ToConstant(s_instance)
+                .Bind<IFontManagerImpl>().ToConstant(new FontManagerImpl())
+                .Bind<ITextShaperImpl>().ToConstant(new TextShaperImpl());
             SharpDX.Configuration.EnableReleaseOnFinalizer = true;
         }
 
-        public IBitmapImpl CreateBitmap(PixelSize size, Vector dpi)
-        {
-            return new WicBitmapImpl(size, dpi);
-        }
-
         public IFormattedTextImpl CreateFormattedText(
             string text,
             Typeface typeface,
@@ -169,9 +166,9 @@ namespace Avalonia.Direct2D1
             return new WicRenderTargetBitmapImpl(size, dpi);
         }
 
-        public IWriteableBitmapImpl CreateWriteableBitmap(PixelSize size, Vector dpi, PixelFormat? format = null)
+        public IWriteableBitmapImpl CreateWriteableBitmap(PixelSize size, Vector dpi, PixelFormat format, AlphaFormat alphaFormat)
         {
-            return new WriteableWicBitmapImpl(size, dpi, format);
+            return new WriteableWicBitmapImpl(size, dpi, format, alphaFormat);
         }
 
         public IGeometryImpl CreateEllipseGeometry(Rect rect) => new EllipseGeometryImpl(rect);
@@ -179,24 +176,118 @@ namespace Avalonia.Direct2D1
         public IGeometryImpl CreateRectangleGeometry(Rect rect) => new RectangleGeometryImpl(rect);
         public IStreamGeometryImpl CreateStreamGeometry() => new StreamGeometryImpl();
 
+        /// <inheritdoc />
         public IBitmapImpl LoadBitmap(string fileName)
         {
             return new WicBitmapImpl(fileName);
         }
 
+        /// <inheritdoc />
         public IBitmapImpl LoadBitmap(Stream stream)
         {
             return new WicBitmapImpl(stream);
         }
 
-        public IBitmapImpl LoadBitmap(PixelFormat format, IntPtr data, PixelSize size, Vector dpi, int stride)
+        /// <inheritdoc />
+        public IBitmapImpl LoadBitmapToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            return new WicBitmapImpl(stream, width, true, interpolationMode);
+        }
+
+        /// <inheritdoc />
+        public IBitmapImpl LoadBitmapToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
         {
-            return new WicBitmapImpl(format, data, size, dpi, stride);
+            return new WicBitmapImpl(stream, height, false, interpolationMode);
         }
 
-        public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)
+        /// <inheritdoc />
+        public IBitmapImpl ResizeBitmap(IBitmapImpl bitmapImpl, PixelSize destinationSize, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
         {
-            return _glyphTypefaceCache.GetOrAdd(typeface, new GlyphTypefaceImpl(typeface));
+            // https://github.com/sharpdx/SharpDX/issues/959 blocks implementation.
+            throw new NotImplementedException();
         }
+
+        /// <inheritdoc />
+        public IBitmapImpl LoadBitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride)
+        {
+            return new WicBitmapImpl(format, alphaFormat, data, size, dpi, stride);
+        }
+
+        public IGlyphRunImpl CreateGlyphRun(GlyphRun glyphRun, out double width)
+        {
+            var glyphTypeface = (GlyphTypefaceImpl)glyphRun.GlyphTypeface.PlatformImpl;
+
+            var glyphCount = glyphRun.GlyphIndices.Length;
+
+            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];
+
+            width = 0;
+
+            var scale = (float)(glyphRun.FontRenderingEmSize / glyphTypeface.DesignEmHeight);
+
+            if (glyphRun.GlyphAdvances.IsEmpty)
+            {
+                for (var i = 0; i < glyphCount; i++)
+                {
+                    var advance = glyphTypeface.GetGlyphAdvance(glyphRun.GlyphIndices[i]) * scale;
+
+                    run.Advances[i] = advance;
+
+                    width += advance;
+                }
+            }
+            else
+            {
+                for (var i = 0; i < glyphCount; i++)
+                {
+                    var advance = (float)glyphRun.GlyphAdvances[i];
+
+                    run.Advances[i] = advance;
+
+                    width += advance;
+                }
+            }
+
+            if (glyphRun.GlyphOffsets.IsEmpty)
+            {
+                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;
+
+        public PixelFormat DefaultPixelFormat => PixelFormat.Bgra8888;
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/Disposable.cs b/src/Windows/Avalonia.Direct2D1/Disposable.cs
index bd5070626b..63dfeb2e0b 100644
--- a/src/Windows/Avalonia.Direct2D1/Disposable.cs
+++ b/src/Windows/Avalonia.Direct2D1/Disposable.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Direct2D1
diff --git a/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs
index aad50331d2..2c0adcac32 100644
--- a/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs
+++ b/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs
@@ -38,7 +38,7 @@ namespace Avalonia.Direct2D1
             });
         }
 
-        public IRenderTargetBitmapImpl CreateLayer(Size size)
+        public IDrawingContextLayerImpl CreateLayer(Size size)
         {
             var renderTarget = _externalRenderTargetProvider.GetOrCreateRenderTarget();
             return D2DRenderTargetBitmapImpl.CreateCompatible(renderTarget, size);
diff --git a/src/Windows/Avalonia.Direct2D1/ILayerFactory.cs b/src/Windows/Avalonia.Direct2D1/ILayerFactory.cs
index 08273f1bb2..a15bc0056a 100644
--- a/src/Windows/Avalonia.Direct2D1/ILayerFactory.cs
+++ b/src/Windows/Avalonia.Direct2D1/ILayerFactory.cs
@@ -4,6 +4,6 @@ namespace Avalonia.Direct2D1
 {
     public interface ILayerFactory
     {
-        IRenderTargetBitmapImpl CreateLayer(Size size);
+        IDrawingContextLayerImpl CreateLayer(Size size);
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/AvaloniaTextRenderer.cs b/src/Windows/Avalonia.Direct2D1/Media/AvaloniaTextRenderer.cs
index 6e6cf47254..22c998df93 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/AvaloniaTextRenderer.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/AvaloniaTextRenderer.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using SharpDX;
 using SharpDX.Direct2D1;
 using SharpDX.DirectWrite;
diff --git a/src/Windows/Avalonia.Direct2D1/Media/BrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/BrushImpl.cs
index 5b0781161f..ad609a0810 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/BrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/BrushImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Direct2D1.Media
diff --git a/src/Windows/Avalonia.Direct2D1/Media/BrushWrapper.cs b/src/Windows/Avalonia.Direct2D1/Media/BrushWrapper.cs
index 6343b38c0e..e9acf996c1 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/BrushWrapper.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/BrushWrapper.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Media;
 using SharpDX;
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Direct2D1FontCollectionCache.cs b/src/Windows/Avalonia.Direct2D1/Media/Direct2D1FontCollectionCache.cs
index b455c4fbee..78bf25d607 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Direct2D1FontCollectionCache.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Direct2D1FontCollectionCache.cs
@@ -24,10 +24,11 @@ namespace Avalonia.Direct2D1.Media
         {
             var fontFamily = typeface.FontFamily;
             var fontCollection = GetOrAddFontCollection(fontFamily);
+            int index;
 
-            foreach (var familyName in fontFamily.FamilyNames)
+            foreach (var name in fontFamily.FamilyNames)
             {
-                if (fontCollection.FindFamilyName(familyName, out var index))
+                if (fontCollection.FindFamilyName(name, out index))
                 {
                     return fontCollection.GetFontFamily(index).GetFirstMatchingFont(
                         (FontWeight)typeface.Weight,
@@ -36,9 +37,9 @@ namespace Avalonia.Direct2D1.Media
                 }
             }
 
-            InstalledFontCollection.FindFamilyName(FontFamily.Default.Name, out var i);
+            InstalledFontCollection.FindFamilyName("Segoe UI", out index);
 
-            return InstalledFontCollection.GetFontFamily(i).GetFirstMatchingFont(
+            return InstalledFontCollection.GetFontFamily(index).GetFirstMatchingFont(
                 (FontWeight)typeface.Weight,
                 FontStretch.Normal,
                 (FontStyle)typeface.Style);
diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
index 39d801eb2f..136ff63f3d 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using Avalonia.Media;
@@ -109,7 +106,7 @@ namespace Avalonia.Direct2D1.Media
         /// <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(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
+        public void DrawBitmap(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
         {
             using (var d2d = ((BitmapImpl)source.Item).GetDirect2DBitmap(_deviceContext))
             {
@@ -149,7 +146,7 @@ namespace Avalonia.Direct2D1.Media
         /// <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>
-        public void DrawImage(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect)
+        public void DrawBitmap(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect)
         {
             using (var d2dSource = ((BitmapImpl)source.Item).GetDirect2DBitmap(_deviceContext))
             using (var sourceBrush = new BitmapBrush(_deviceContext, d2dSource.Value))
@@ -230,34 +227,69 @@ namespace Avalonia.Direct2D1.Media
             }
         }
 
-        /// <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)
+        /// <inheritdoc />
+        public void DrawRectangle(IBrush brush, IPen pen, RoundedRect rrect, BoxShadows boxShadow = default)
         {
-            using (var brush = CreateBrush(pen.Brush, rect.Size))
-            using (var d2dStroke = pen.ToDirect2DStrokeStyle(_deviceContext))
+            var rc = rrect.Rect.ToDirect2D();
+            var rect = rrect.Rect;
+            var radiusX = Math.Max(rrect.RadiiTopLeft.X,
+                Math.Max(rrect.RadiiTopRight.X, Math.Max(rrect.RadiiBottomRight.X, rrect.RadiiBottomLeft.X)));
+            var radiusY = Math.Max(rrect.RadiiTopLeft.Y,
+                Math.Max(rrect.RadiiTopRight.Y, Math.Max(rrect.RadiiBottomRight.Y, rrect.RadiiBottomLeft.Y)));
+            var isRounded = !MathUtilities.IsZero(radiusX) || !MathUtilities.IsZero(radiusY);
+
+            if (brush != null)
             {
-                if (brush.PlatformBrush != null)
+                using (var b = CreateBrush(brush, rect.Size))
                 {
-                    if (cornerRadius == 0)
+                    if (b.PlatformBrush != null)
                     {
-                        _deviceContext.DrawRectangle(
-                            rect.ToDirect2D(),
-                            brush.PlatformBrush,
-                            (float)pen.Thickness,
-                            d2dStroke);
+                        if (isRounded)
+                        {
+                            _deviceContext.FillRoundedRectangle(
+                                new RoundedRectangle
+                                {
+                                    Rect = new RawRectangleF(
+                                        (float)rect.X,
+                                        (float)rect.Y,
+                                        (float)rect.Right,
+                                        (float)rect.Bottom),
+                                    RadiusX = (float)radiusX,
+                                    RadiusY = (float)radiusY
+                                },
+                                b.PlatformBrush);
+                        }
+                        else
+                        {
+                            _deviceContext.FillRectangle(rc, b.PlatformBrush);
+                        }
                     }
-                    else
+                }
+            }
+
+            if (pen?.Brush != null)
+            {
+                using (var wrapper = CreateBrush(pen.Brush, rect.Size))
+                using (var d2dStroke = pen.ToDirect2DStrokeStyle(_deviceContext))
+                {
+                    if (wrapper.PlatformBrush != null)
                     {
-                        _deviceContext.DrawRoundedRectangle(
-                            new RoundedRectangle { Rect = rect.ToDirect2D(), RadiusX = cornerRadius, RadiusY = cornerRadius },
-                            brush.PlatformBrush,
-                            (float)pen.Thickness,
-                            d2dStroke);
+                        if (isRounded)
+                        {
+                            _deviceContext.DrawRoundedRectangle(
+                                new RoundedRectangle { Rect = rc, RadiusX = (float)radiusX, RadiusY = (float)radiusY },
+                                wrapper.PlatformBrush,
+                                (float)pen.Thickness,
+                                d2dStroke);
+                        }
+                        else
+                        {
+                            _deviceContext.DrawRectangle(
+                                rc,
+                                wrapper.PlatformBrush,
+                                (float)pen.Thickness,
+                                d2dStroke);
+                        }
                     }
                 }
             }
@@ -287,41 +319,22 @@ namespace Avalonia.Direct2D1.Media
         }
 
         /// <summary>
-        /// Draws a filled rectangle.
+        /// Draws a glyph run.
         /// </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)
+        /// <param name="foreground">The foreground.</param>
+        /// <param name="glyphRun">The glyph run.</param>
+        public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
         {
-            using (var b = CreateBrush(brush, rect.Size))
+            using (var brush = CreateBrush(foreground, glyphRun.Size))
             {
-                if (b.PlatformBrush != null)
-                {
-                    if (cornerRadius == 0)
-                    {
-                        _deviceContext.FillRectangle(rect.ToDirect2D(), b.PlatformBrush);
-                    }
-                    else
-                    {
-                        _deviceContext.FillRoundedRectangle(
-                            new RoundedRectangle
-                            {
-                                Rect = new RawRectangleF(
-                                        (float)rect.X,
-                                        (float)rect.Y,
-                                        (float)rect.Right,
-                                        (float)rect.Bottom),
-                                RadiusX = cornerRadius,
-                                RadiusY = cornerRadius
-                            },
-                            b.PlatformBrush);
-                    }
-                }
+                var glyphRunImpl = (GlyphRunImpl)glyphRun.GlyphRunImpl;
+
+                _renderTarget.DrawGlyphRun(glyphRun.BaselineOrigin.ToSharpDX(), glyphRunImpl.GlyphRun,
+                    brush.PlatformBrush, MeasuringMode.Natural);
             }
         }
 
-        public IRenderTargetBitmapImpl CreateLayer(Size size)
+        public IDrawingContextLayerImpl CreateLayer(Size size)
         {
             if (_layerFactory != null)
             {
@@ -332,7 +345,7 @@ namespace Avalonia.Direct2D1.Media
                 var platform = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
                 var dpi = new Vector(_deviceContext.DotsPerInch.Width, _deviceContext.DotsPerInch.Height);
                 var pixelSize = PixelSize.FromSizeWithDpi(size, dpi);
-                return platform.CreateRenderTargetBitmap(pixelSize, dpi);
+                return (IDrawingContextLayerImpl)platform.CreateRenderTargetBitmap(pixelSize, dpi);
             }
         }
 
@@ -346,6 +359,12 @@ namespace Avalonia.Direct2D1.Media
             _deviceContext.PushAxisAlignedClip(clip.ToSharpDX(), AntialiasMode.PerPrimitive);
         }
 
+        public void PushClip(RoundedRect clip)
+        {
+            //TODO: radius
+            _deviceContext.PushAxisAlignedClip(clip.Rect.ToDirect2D(), AntialiasMode.PerPrimitive);
+        }
+
         public void PopClip()
         {
             _deviceContext.PopAxisAlignedClip();
@@ -404,6 +423,7 @@ namespace Avalonia.Direct2D1.Media
             var solidColorBrush = brush as ISolidColorBrush;
             var linearGradientBrush = brush as ILinearGradientBrush;
             var radialGradientBrush = brush as IRadialGradientBrush;
+            var conicGradientBrush = brush as IConicGradientBrush;
             var imageBrush = brush as IImageBrush;
             var visualBrush = brush as IVisualBrush;
 
@@ -419,6 +439,11 @@ namespace Avalonia.Direct2D1.Media
             {
                 return new RadialGradientBrushImpl(radialGradientBrush, _deviceContext, destinationSize);
             }
+            else if (conicGradientBrush != null)
+            {
+                // there is no Direct2D implementation of Conic Gradients so use Radial as a stand-in
+                return new SolidColorBrushImpl(conicGradientBrush, _deviceContext);
+            }
             else if (imageBrush?.Source != null)
             {
                 return new ImageBrushImpl(
diff --git a/src/Windows/Avalonia.Direct2D1/Media/EllipseGeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/EllipseGeometryImpl.cs
index 9440966406..97fd6b63ba 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/EllipseGeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/EllipseGeometryImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
diff --git a/src/Windows/Avalonia.Direct2D1/Media/FontManagerImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/FontManagerImpl.cs
index 94de397652..6d95d759ec 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/FontManagerImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/FontManagerImpl.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Globalization;
 using Avalonia.Media;
 using Avalonia.Platform;
@@ -14,14 +11,12 @@ namespace Avalonia.Direct2D1.Media
 {
     internal class FontManagerImpl : IFontManagerImpl
     {
-        public FontManagerImpl()
+        public string GetDefaultFontFamilyName()
         {
             //ToDo: Implement a real lookup of the system's default font.
-            DefaultFontFamilyName = "segoe ui";
+            return "Segoe UI";
         }
 
-        public string DefaultFontFamilyName { get; }
-
         public IEnumerable<string> GetInstalledFontFamilyNames(bool checkForUpdates = false)
         {
             var familyCount = Direct2D1FontCollectionCache.InstalledFontCollection.FontFamilyCount;
@@ -36,17 +31,10 @@ namespace Avalonia.Direct2D1.Media
             return fontFamilies;
         }
 
-        public Typeface GetTypeface(FontFamily fontFamily, FontWeight fontWeight, FontStyle fontStyle)
-        {
-            //ToDo: Implement caching.
-            return new Typeface(fontFamily, fontWeight, fontStyle);
-        }
-
-        public Typeface MatchCharacter(int codepoint, FontWeight fontWeight = default, FontStyle fontStyle = default,
-            FontFamily fontFamily = null, CultureInfo culture = null)
+        public bool TryMatchCharacter(int codepoint, FontStyle fontStyle,
+            FontWeight fontWeight,
+            FontFamily fontFamily, CultureInfo culture, out Typeface typeface)
         {
-            var fontFamilyName = FontFamily.Default.Name;
-
             var familyCount = Direct2D1FontCollectionCache.InstalledFontCollection.FontFamilyCount;
 
             for (var i = 0; i < familyCount; i++)
@@ -60,12 +48,21 @@ namespace Avalonia.Direct2D1.Media
                     continue;
                 }
 
-                fontFamilyName = font.FontFamily.FamilyNames.GetString(0);
+                var fontFamilyName = font.FontFamily.FamilyNames.GetString(0);
 
-                break;
+                typeface = new Typeface(fontFamilyName, fontStyle, fontWeight);
+
+                return true;
             }
 
-            return GetTypeface(new FontFamily(fontFamilyName), fontWeight, fontStyle);
+            typeface = default;
+
+            return false;
+        }
+
+        public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)
+        {
+            return new GlyphTypefaceImpl(typeface);
         }
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/FormattedTextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/FormattedTextImpl.cs
index b1a177ad24..c59067d82d 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/FormattedTextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/FormattedTextImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Media;
@@ -22,10 +19,16 @@ namespace Avalonia.Direct2D1.Media
         {
             Text = text;
 
-            using (var font = Direct2D1FontCollectionCache.GetFont(typeface))
-            using (var textFormat = new DWrite.TextFormat(Direct2D1Platform.DirectWriteFactory,
-                typeface.FontFamily.Name, font.FontFamily.FontCollection, (DWrite.FontWeight)typeface.Weight,
-                (DWrite.FontStyle)typeface.Style, DWrite.FontStretch.Normal, (float)fontSize))
+            var font = ((GlyphTypefaceImpl)typeface.GlyphTypeface.PlatformImpl).DWFont;
+            var familyName = font.FontFamily.FamilyNames.GetString(0);
+            using (var textFormat = new DWrite.TextFormat(
+                Direct2D1Platform.DirectWriteFactory, 
+                familyName, 
+                font.FontFamily.FontCollection, 
+                (DWrite.FontWeight)typeface.Weight,
+                (DWrite.FontStyle)typeface.Style, 
+                DWrite.FontStretch.Normal, 
+                (float)fontSize))
             {
                 textFormat.WordWrapping =
                     wrapping == TextWrapping.Wrap ? DWrite.WordWrapping.Wrap : DWrite.WordWrapping.NoWrap;
diff --git a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
index 51ca2520ad..636309ad1a 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/GlyphRunImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GlyphRunImpl.cs
new file mode 100644
index 0000000000..0b06d5ef3e
--- /dev/null
+++ b/src/Windows/Avalonia.Direct2D1/Media/GlyphRunImpl.cs
@@ -0,0 +1,19 @@
+using Avalonia.Platform;
+
+namespace Avalonia.Direct2D1.Media
+{
+    internal class GlyphRunImpl : IGlyphRunImpl
+    {
+        public GlyphRunImpl(SharpDX.DirectWrite.GlyphRun glyphRun)
+        {
+            GlyphRun = glyphRun;
+        }
+
+        public SharpDX.DirectWrite.GlyphRun GlyphRun { get; }
+
+        public void Dispose()
+        {
+            GlyphRun?.Dispose();
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Direct2D1/Media/GlyphTypefaceImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GlyphTypefaceImpl.cs
index 32def01c39..4f2ed22a25 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/GlyphTypefaceImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/GlyphTypefaceImpl.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using Avalonia.Media;
 using Avalonia.Platform;
 using HarfBuzzSharp;
@@ -17,7 +14,7 @@ namespace Avalonia.Direct2D1.Media
         {
             DWFont = Direct2D1FontCollectionCache.GetFont(typeface);
 
-            FontFace = new FontFace(DWFont);
+            FontFace = new FontFace(DWFont).QueryInterface<FontFace1>();
 
             Face = new Face(GetTable);
 
@@ -59,6 +56,8 @@ namespace Avalonia.Direct2D1.Media
             {
                 StrikethroughThickness = strikethroughThickness;
             }
+
+            IsFixedPitch = FontFace.IsMonospacedFont;
         }
 
         private Blob GetTable(Face face, Tag tag)
@@ -82,7 +81,7 @@ namespace Avalonia.Direct2D1.Media
 
         public SharpDX.DirectWrite.Font DWFont { get; }
 
-        public FontFace FontFace { get; }
+        public FontFace1 FontFace { get; }
 
         public Face Face { get; }
 
@@ -113,6 +112,9 @@ namespace Avalonia.Direct2D1.Media
         /// <inheritdoc cref="IGlyphTypefaceImpl"/>
         public int StrikethroughThickness { get; }
 
+        /// <inheritdoc cref="IGlyphTypefaceImpl"/>
+        public bool IsFixedPitch { get; }
+
         /// <inheritdoc cref="IGlyphTypefaceImpl"/>
         public ushort GetGlyph(uint codepoint)
         {
diff --git a/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs
index fbc6d21cb7..09b900b0c2 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Media;
 using Avalonia.Rendering.Utilities;
 using Avalonia.Utilities;
@@ -107,7 +104,7 @@ namespace Avalonia.Direct2D1.Media
                 context.PushClip(calc.IntermediateClip);
                 context.Transform = calc.IntermediateTransform;
                 
-                context.DrawImage(RefCountable.CreateUnownedNotClonable(bitmap), 1, rect, rect, _bitmapInterpolationMode);
+                context.DrawBitmap(RefCountable.CreateUnownedNotClonable(bitmap), 1, rect, rect, _bitmapInterpolationMode);
                 context.PopClip();
             }
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs
index 1ee869ecb9..63676e30b5 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.IO;
 using SharpDX.WIC;
 using Bitmap = SharpDX.Direct2D1.Bitmap;
@@ -30,7 +27,7 @@ namespace Avalonia.Direct2D1.Media
             _direct2DBitmap = d2DBitmap ?? throw new ArgumentNullException(nameof(d2DBitmap));
         }
 
-        public override Vector Dpi => _direct2DBitmap.DotsPerInch.ToAvaloniaVector();
+        public override Vector Dpi => new Vector(96, 96);
         public override PixelSize PixelSize => _direct2DBitmap.PixelSize.ToAvalonia();
 
         public override void Dispose()
@@ -58,3 +55,4 @@ namespace Avalonia.Direct2D1.Media
         }
     }
 }
+;
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
index 8ec368c999..9a0e2ec00c 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
@@ -1,6 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using System;
 using System.IO;
 using Avalonia.Platform;
 using Avalonia.Rendering;
@@ -11,7 +9,7 @@ using D2DBitmap = SharpDX.Direct2D1.Bitmap;
 
 namespace Avalonia.Direct2D1.Media.Imaging
 {
-    public class D2DRenderTargetBitmapImpl : D2DBitmapImpl, IRenderTargetBitmapImpl, ILayerFactory
+    public class D2DRenderTargetBitmapImpl : D2DBitmapImpl, IDrawingContextLayerImpl, ILayerFactory
     {
         private readonly BitmapRenderTarget _renderTarget;
 
@@ -37,7 +35,11 @@ namespace Avalonia.Direct2D1.Media.Imaging
             return new DrawingContextImpl(visualBrushRenderer, this, _renderTarget, null, () => Version++);
         }
 
-        public IRenderTargetBitmapImpl CreateLayer(Size size)
+        public void Blit(IDrawingContextImpl context) => throw new NotSupportedException();
+
+        public bool CanBlit => false;
+
+        public IDrawingContextLayerImpl CreateLayer(Size size)
         {
             return CreateCompatible(_renderTarget, size);
         }
@@ -58,7 +60,7 @@ namespace Avalonia.Direct2D1.Media.Imaging
             {
                 using (var dc = wic.CreateDrawingContext(null))
                 {
-                    dc.DrawImage(
+                    dc.DrawBitmap(
                         RefCountable.CreateUnownedNotClonable(this),
                         1,
                         new Rect(PixelSize.ToSizeWithDpi(Dpi.X)),
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
index 176c3e0e23..49193afd78 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
@@ -1,11 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.IO;
 using Avalonia.Win32.Interop;
 using SharpDX.WIC;
 using APixelFormat = Avalonia.Platform.PixelFormat;
+using AlphaFormat = Avalonia.Platform.AlphaFormat;
 using D2DBitmap = SharpDX.Direct2D1.Bitmap;
 
 namespace Avalonia.Direct2D1.Media
@@ -17,6 +15,26 @@ namespace Avalonia.Direct2D1.Media
     {
         private BitmapDecoder _decoder;
 
+        private static BitmapInterpolationMode ConvertInterpolationMode(Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode interpolationMode)
+        {
+            switch (interpolationMode)
+            {
+                case Visuals.Media.Imaging.BitmapInterpolationMode.Default:
+                    return BitmapInterpolationMode.Fant;
+
+                case Visuals.Media.Imaging.BitmapInterpolationMode.LowQuality:
+                    return BitmapInterpolationMode.NearestNeighbor;
+
+                case Visuals.Media.Imaging.BitmapInterpolationMode.MediumQuality:
+                    return BitmapInterpolationMode.Fant;
+
+                default:
+                case Visuals.Media.Imaging.BitmapInterpolationMode.HighQuality:
+                    return BitmapInterpolationMode.HighQualityCubic;
+
+            }
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="WicBitmapImpl"/> class.
         /// </summary>
@@ -26,9 +44,16 @@ namespace Avalonia.Direct2D1.Media
             using (BitmapDecoder decoder = new BitmapDecoder(Direct2D1Platform.ImagingFactory, fileName, DecodeOptions.CacheOnDemand))
             {
                 WicImpl = new Bitmap(Direct2D1Platform.ImagingFactory, decoder.GetFrame(0), BitmapCreateCacheOption.CacheOnDemand);
+                Dpi = new Vector(96, 96);
             }
         }
 
+        private WicBitmapImpl(Bitmap bmp)
+        {
+            WicImpl = bmp;
+            Dpi = new Vector(96, 96);
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="WicBitmapImpl"/> class.
         /// </summary>
@@ -39,6 +64,7 @@ namespace Avalonia.Direct2D1.Media
             _decoder = new BitmapDecoder(Direct2D1Platform.ImagingFactory, stream, DecodeOptions.CacheOnLoad);
 
             WicImpl = new Bitmap(Direct2D1Platform.ImagingFactory, _decoder.GetFrame(0), BitmapCreateCacheOption.CacheOnLoad);
+            Dpi = new Vector(96, 96);
         }
 
         /// <summary>
@@ -47,29 +73,37 @@ namespace Avalonia.Direct2D1.Media
         /// <param name="size">The size of the bitmap in device pixels.</param>
         /// <param name="dpi">The DPI of the bitmap.</param>
         /// <param name="pixelFormat">Pixel format</param>
-        public WicBitmapImpl(PixelSize size, Vector dpi, APixelFormat? pixelFormat = null)
+        /// <param name="alphaFormat">Alpha format.</param>
+        public WicBitmapImpl(PixelSize size, Vector dpi, APixelFormat? pixelFormat = null, AlphaFormat? alphaFormat = null)
         {
             if (!pixelFormat.HasValue)
             {
                 pixelFormat = APixelFormat.Bgra8888;
             }
 
+            if (!alphaFormat.HasValue)
+            {
+                alphaFormat = AlphaFormat.Premul;
+            }
+
             PixelFormat = pixelFormat;
             WicImpl = new Bitmap(
                 Direct2D1Platform.ImagingFactory,
                 size.Width,
                 size.Height,
-                pixelFormat.Value.ToWic(),
+                pixelFormat.Value.ToWic(alphaFormat.Value),
                 BitmapCreateCacheOption.CacheOnLoad);
-            WicImpl.SetResolution(dpi.X, dpi.Y);
+
+            Dpi = dpi;
         }
 
-        public WicBitmapImpl(APixelFormat format, IntPtr data, PixelSize size, Vector dpi, int stride)
+        public WicBitmapImpl(APixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride)
         {
-            WicImpl = new Bitmap(Direct2D1Platform.ImagingFactory, size.Width, size.Height, format.ToWic(), BitmapCreateCacheOption.CacheOnDemand);
+            WicImpl = new Bitmap(Direct2D1Platform.ImagingFactory, size.Width, size.Height, format.ToWic(alphaFormat), BitmapCreateCacheOption.CacheOnDemand);
             WicImpl.SetResolution(dpi.X, dpi.Y);
-
             PixelFormat = format;
+            Dpi = dpi;
+
             using (var l = WicImpl.Lock(BitmapLockFlags.Write))
             {
                 for (var row = 0; row < size.Height; row++)
@@ -82,15 +116,45 @@ namespace Avalonia.Direct2D1.Media
             }
         }
 
-        public override Vector Dpi
+        public WicBitmapImpl(Stream stream, int decodeSize, bool horizontal, Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode interpolationMode)
         {
-            get
+            _decoder = new BitmapDecoder(Direct2D1Platform.ImagingFactory, stream, DecodeOptions.CacheOnLoad);
+
+            var frame = _decoder.GetFrame(0);
+
+            // now scale that to the size that we want
+            var realScale = horizontal ? ((double)frame.Size.Height / frame.Size.Width) : ((double)frame.Size.Width / frame.Size.Height);
+
+            PixelSize desired;
+
+            if (horizontal)
+            {
+                desired = new PixelSize(decodeSize, (int)(realScale * decodeSize));
+            }
+            else
+            {
+                desired = new PixelSize((int)(realScale * decodeSize), decodeSize);
+            }
+
+            if (frame.Size.Width != desired.Width || frame.Size.Height != desired.Height)
             {
-                WicImpl.GetResolution(out double x, out double y);
-                return new Vector(x, y);
+                using (var scaler = new BitmapScaler(Direct2D1Platform.ImagingFactory))
+                {
+                    scaler.Initialize(frame, desired.Width, desired.Height, ConvertInterpolationMode(interpolationMode));
+
+                    WicImpl = new Bitmap(Direct2D1Platform.ImagingFactory, scaler, BitmapCreateCacheOption.CacheOnLoad);                    
+                }
             }
+            else
+            {
+                WicImpl = new Bitmap(Direct2D1Platform.ImagingFactory, frame, BitmapCreateCacheOption.CacheOnLoad);
+            }
+
+            Dpi = new Vector(96, 96);
         }
 
+        public override Vector Dpi { get; }
+
         public override PixelSize PixelSize => WicImpl.Size.ToAvalonia();
 
         protected APixelFormat? PixelFormat { get; }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
index 88e669357f..1265a7bdf0 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Platform;
 using Avalonia.Rendering;
@@ -8,7 +5,7 @@ using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
 {
-    public class WicRenderTargetBitmapImpl : WicBitmapImpl, IRenderTargetBitmapImpl
+    public class WicRenderTargetBitmapImpl : WicBitmapImpl, IDrawingContextLayerImpl
     {
         private readonly WicRenderTarget _renderTarget;
 
@@ -48,5 +45,8 @@ namespace Avalonia.Direct2D1.Media
                     finishedCallback?.Invoke();
                 });
         }
+
+        public void Blit(IDrawingContextImpl context) => throw new NotSupportedException();
+        public bool CanBlit => false;
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
index 68f0f0e30d..3261c45f15 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using Avalonia.Platform;
 using SharpDX.WIC;
 using PixelFormat = Avalonia.Platform.PixelFormat;
@@ -10,8 +7,8 @@ namespace Avalonia.Direct2D1.Media.Imaging
 {
     class WriteableWicBitmapImpl : WicBitmapImpl, IWriteableBitmapImpl
     {
-        public WriteableWicBitmapImpl(PixelSize size, Vector dpi, PixelFormat? pixelFormat) 
-            : base(size, dpi, pixelFormat)
+        public WriteableWicBitmapImpl(PixelSize size, Vector dpi, PixelFormat? pixelFormat, AlphaFormat? alphaFormat) 
+            : base(size, dpi, pixelFormat, alphaFormat)
         {
         }
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/LineGeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/LineGeometryImpl.cs
index 6b73fce309..4e020d4ae6 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/LineGeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/LineGeometryImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
diff --git a/src/Windows/Avalonia.Direct2D1/Media/LinearGradientBrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/LinearGradientBrushImpl.cs
index 5369f84f46..0e63d4cc03 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/LinearGradientBrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/LinearGradientBrushImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Linq;
 using Avalonia.Media;
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/RadialGradientBrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/RadialGradientBrushImpl.cs
index 45932a4760..1fca6d4e33 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/RadialGradientBrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/RadialGradientBrushImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Linq;
 using Avalonia.Media;
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/RectangleGeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/RectangleGeometryImpl.cs
index 194de4dd14..8e5dc7a672 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/RectangleGeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/RectangleGeometryImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
diff --git a/src/Windows/Avalonia.Direct2D1/Media/SolidColorBrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/SolidColorBrushImpl.cs
index 966bd19741..fea1ca9157 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/SolidColorBrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/SolidColorBrushImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Media;
 
 namespace Avalonia.Direct2D1.Media
@@ -19,5 +16,22 @@ namespace Avalonia.Direct2D1.Media
                 }
             );
         }
+
+        /// <summary>
+        /// Direct2D has no ConicGradient implementation so fall back to a solid colour brush based on 
+        /// the first gradient stop.
+        /// </summary>
+        public SolidColorBrushImpl(IConicGradientBrush brush, SharpDX.Direct2D1.DeviceContext target)
+        {
+            PlatformBrush = new SharpDX.Direct2D1.SolidColorBrush(
+                target,
+                brush?.GradientStops[0].Color.ToDirect2D() ?? new SharpDX.Mathematics.Interop.RawColor4(),
+                new SharpDX.Direct2D1.BrushProperties
+                {
+                    Opacity = brush != null ? (float)brush.Opacity : 1.0f,
+                    Transform = target.Transform
+                }
+            );
+        }
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryContextImpl.cs
index fd2f14fc58..e1f7aad1b2 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryContextImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Logging;
 using Avalonia.Media;
@@ -85,8 +82,7 @@ namespace Avalonia.Direct2D1.Media
             }
             catch (Exception ex)
             {
-                Logger.TryGet(LogEventLevel.Error)?.Log(
-                    LogArea.Visual,
+                Logger.TryGet(LogEventLevel.Error, LogArea.Visual)?.Log(
                     this,
                     "GeometrySink.Close exception: {Exception}",
                     ex);
diff --git a/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs
index a07d5c1c72..9104be64b2 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/TextShaperImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/TextShaperImpl.cs
new file mode 100644
index 0000000000..20b09a9aac
--- /dev/null
+++ b/src/Windows/Avalonia.Direct2D1/Media/TextShaperImpl.cs
@@ -0,0 +1,145 @@
+using System;
+using System.Globalization;
+using Avalonia.Media;
+using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+using HarfBuzzSharp;
+using Buffer = HarfBuzzSharp.Buffer;
+
+namespace Avalonia.Direct2D1.Media
+{
+    internal class TextShaperImpl : ITextShaperImpl
+    {
+        public GlyphRun ShapeText(ReadOnlySlice<char> text, Typeface typeface, double fontRenderingEmSize, CultureInfo culture)
+        {
+            using (var buffer = new Buffer())
+            {
+                FillBuffer(buffer, text);
+
+                buffer.Language = new Language(culture ?? CultureInfo.CurrentCulture);
+
+                buffer.GuessSegmentProperties();
+
+                var glyphTypeface = typeface.GlyphTypeface;
+
+                var font = ((GlyphTypefaceImpl)glyphTypeface.PlatformImpl).Font;
+
+                font.Shape(buffer);
+
+                font.GetScale(out var scaleX, out _);
+
+                var textScale = fontRenderingEmSize / scaleX;
+
+                var bufferLength = buffer.Length;
+
+                var glyphInfos = buffer.GetGlyphInfoSpan();
+
+                var glyphPositions = buffer.GetGlyphPositionSpan();
+
+                var glyphIndices = new ushort[bufferLength];
+
+                var clusters = new ushort[bufferLength];
+
+                double[] glyphAdvances = null;
+
+                Vector[] glyphOffsets = null;
+
+                for (var i = 0; i < bufferLength; i++)
+                {
+                    glyphIndices[i] = (ushort)glyphInfos[i].Codepoint;
+
+                    clusters[i] = (ushort)glyphInfos[i].Cluster;
+
+                    if (!glyphTypeface.IsFixedPitch)
+                    {
+                        SetAdvance(glyphPositions, i, textScale, ref glyphAdvances);
+                    }
+
+                    SetOffset(glyphPositions, i, textScale, ref glyphOffsets);
+                }
+
+                return new GlyphRun(glyphTypeface, fontRenderingEmSize,
+                    new ReadOnlySlice<ushort>(glyphIndices),
+                    new ReadOnlySlice<double>(glyphAdvances),
+                    new ReadOnlySlice<Vector>(glyphOffsets),
+                    text,
+                    new ReadOnlySlice<ushort>(clusters));
+            }
+        }
+
+        private static void FillBuffer(Buffer buffer, ReadOnlySlice<char> text)
+        {
+            buffer.ContentType = ContentType.Unicode;
+
+            var i = 0;
+
+            while (i < text.Length)
+            {
+                var codepoint = Codepoint.ReadAt(text, i, out var count);
+
+                var cluster = (uint)(text.Start + i);
+
+                if (codepoint.IsBreakChar)
+                {
+                    if (i + 1 < text.Length)
+                    {
+                        var nextCodepoint = Codepoint.ReadAt(text, i + 1, out _);
+
+                        if (nextCodepoint == '\r' && codepoint == '\n' || nextCodepoint == '\n' && codepoint == '\r')
+                        {
+                            count++;
+
+                            buffer.Add('\u200C', cluster);
+
+                            buffer.Add('\u200D', cluster);
+                        }
+                        else
+                        {
+                            buffer.Add('\u200C', cluster);
+                        }
+                    }
+                    else
+                    {
+                        buffer.Add('\u200C', cluster);
+                    }
+                }
+                else
+                {
+                    buffer.Add(codepoint, cluster);
+                }
+
+                i += count;
+            }
+        }
+
+        private static void SetOffset(ReadOnlySpan<GlyphPosition> glyphPositions, int index, double textScale,
+            ref Vector[] offsetBuffer)
+        {
+            var position = glyphPositions[index];
+
+            if (position.XOffset == 0 && position.YOffset == 0)
+            {
+                return;
+            }
+
+            offsetBuffer ??= new Vector[glyphPositions.Length];
+
+            var offsetX = position.XOffset * textScale;
+
+            var offsetY = position.YOffset * textScale;
+
+            offsetBuffer[index] = new Vector(offsetX, offsetY);
+        }
+
+        private static void SetAdvance(ReadOnlySpan<GlyphPosition> glyphPositions, int index, double textScale,
+            ref double[] advanceBuffer)
+        {
+            advanceBuffer ??= new double[glyphPositions.Length];
+
+            // Depends on direction of layout
+            // advanceBuffer[index] = buffer.GlyphPositions[index].YAdvance * textScale;
+            advanceBuffer[index] = glyphPositions[index].XAdvance * textScale;
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs
index c00a826d0c..fe274701bf 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
diff --git a/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs b/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
index 065895859d..31e9c260e0 100644
--- a/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
+++ b/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
@@ -1,8 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Linq;
+using Avalonia.Platform;
 using SharpDX;
 using SharpDX.Direct2D1;
 using SharpDX.Mathematics.Interop;
@@ -92,14 +90,16 @@ namespace Avalonia.Direct2D1
                 return CapStyle.Triangle;
         }
 
-        public static Guid ToWic(this Platform.PixelFormat format)
+        public static Guid ToWic(this Platform.PixelFormat format, Platform.AlphaFormat alphaFormat)
         {
+            bool isPremul = alphaFormat == AlphaFormat.Premul;
+
             if (format == Platform.PixelFormat.Rgb565)
                 return SharpDX.WIC.PixelFormat.Format16bppBGR565;
             if (format == Platform.PixelFormat.Bgra8888)
-                return SharpDX.WIC.PixelFormat.Format32bppPBGRA;
+                return isPremul ? SharpDX.WIC.PixelFormat.Format32bppPBGRA : SharpDX.WIC.PixelFormat.Format32bppBGRA;
             if (format == Platform.PixelFormat.Rgba8888)
-                return SharpDX.WIC.PixelFormat.Format32bppPRGBA;
+                return isPremul ? SharpDX.WIC.PixelFormat.Format32bppPRGBA : SharpDX.WIC.PixelFormat.Format32bppRGBA;
             throw new ArgumentException("Unknown pixel format");
         }
 
diff --git a/src/Windows/Avalonia.Direct2D1/Properties/AssemblyInfo.cs b/src/Windows/Avalonia.Direct2D1/Properties/AssemblyInfo.cs
index a09d5c2d1c..6cc8b793c0 100644
--- a/src/Windows/Avalonia.Direct2D1/Properties/AssemblyInfo.cs
+++ b/src/Windows/Avalonia.Direct2D1/Properties/AssemblyInfo.cs
@@ -1,10 +1,15 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// 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.Platform;
 using Avalonia.Direct2D1;
 
 [assembly: ExportRenderingSubsystem(OperatingSystemType.WinNT, 1, "Direct2D1", typeof(Direct2D1Platform), nameof(Direct2D1Platform.Initialize),
     typeof(Direct2DChecker))]
 
+#if SIGNED_BUILD
+[assembly: InternalsVisibleTo("Avalonia.Direct2D1.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+[assembly: InternalsVisibleTo("Avalonia.Direct2D1.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
+#else
+[assembly: InternalsVisibleTo("Avalonia.Direct2D1.RenderTests")]
+[assembly: InternalsVisibleTo("Avalonia.Direct2D1.UnitTests")]
+#endif
diff --git a/src/Windows/Avalonia.Direct2D1/RenderTarget.cs b/src/Windows/Avalonia.Direct2D1/RenderTarget.cs
index a21b5571c6..d04c616bd9 100644
--- a/src/Windows/Avalonia.Direct2D1/RenderTarget.cs
+++ b/src/Windows/Avalonia.Direct2D1/RenderTarget.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Direct2D1.Media;
 using Avalonia.Direct2D1.Media.Imaging;
 using Avalonia.Platform;
@@ -33,7 +30,7 @@ namespace Avalonia.Direct2D1
             return new DrawingContextImpl(visualBrushRenderer, this, _renderTarget);
         }
 
-        public IRenderTargetBitmapImpl CreateLayer(Size size)
+        public IDrawingContextLayerImpl CreateLayer(Size size)
         {
             return D2DRenderTargetBitmapImpl.CreateCompatible(_renderTarget, size);
         }
diff --git a/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs
index ffa0f5c8bc..f319cfae03 100644
--- a/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs
+++ b/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Direct2D1.Media;
+using Avalonia.Direct2D1.Media;
 using Avalonia.Direct2D1.Media.Imaging;
 using Avalonia.Platform;
 using Avalonia.Rendering;
@@ -38,7 +35,7 @@ namespace Avalonia.Direct2D1
             return new DrawingContextImpl(visualBrushRenderer, this, _deviceContext, _swapChain);
         }
 
-        public IRenderTargetBitmapImpl CreateLayer(Size size)
+        public IDrawingContextLayerImpl CreateLayer(Size size)
         {
             if (_deviceContext == null)
             {
diff --git a/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj b/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
index 0d0dd98a77..0e11ee3b92 100644
--- a/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
+++ b/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
+    <UseWpf>true</UseWpf>
     <ExtrasEnableImplicitWinFormsReferences>true</ExtrasEnableImplicitWinFormsReferences>
     <UseDirect3D9>true</UseDirect3D9>
     <PackageId>Avalonia.Win32.Interoperability</PackageId>
diff --git a/src/Windows/Avalonia.Win32.Interop/WinForms/WinFormsAvaloniaControlHost.cs b/src/Windows/Avalonia.Win32.Interop/WinForms/WinFormsAvaloniaControlHost.cs
index fe626f4d38..a8060d3fbf 100644
--- a/src/Windows/Avalonia.Win32.Interop/WinForms/WinFormsAvaloniaControlHost.cs
+++ b/src/Windows/Avalonia.Win32.Interop/WinForms/WinFormsAvaloniaControlHost.cs
@@ -24,9 +24,7 @@ namespace Avalonia.Win32.Embedding
             if (_root.IsFocused)
                 FocusManager.Instance.Focus(null);
             _root.GotFocus += RootGotFocus;
-            // ReSharper disable once PossibleNullReferenceException
-            // Always non-null at this point
-            _root.PlatformImpl.LostFocus += PlatformImpl_LostFocus;
+
             FixPosition();
         }
 
@@ -36,23 +34,6 @@ namespace Avalonia.Win32.Embedding
             set { _root.Content = value; }
         }
 
-        void Unfocus()
-        {
-            var focused = (IVisual)FocusManager.Instance.Current;
-            if (focused == null)
-                return;
-            while (focused.VisualParent != null)
-                focused = focused.VisualParent;
-
-            if (focused == _root)
-                KeyboardDevice.Instance.SetFocusedElement(null, NavigationMethod.Unspecified, InputModifiers.None);
-        }
-
-        private void PlatformImpl_LostFocus()
-        {
-            Unfocus();
-        }
-
         protected override void Dispose(bool disposing)
         {
             if (disposing)
diff --git a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs b/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs
index 2887468046..3467a33d16 100644
--- a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs
+++ b/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs
@@ -5,6 +5,7 @@ using System.Windows;
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
+using Avalonia.Controls;
 using Avalonia.Controls.Embedding;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
@@ -17,11 +18,11 @@ using MouseButton = System.Windows.Input.MouseButton;
 
 namespace Avalonia.Win32.Interop.Wpf
 {
-    class WpfTopLevelImpl : FrameworkElement, IEmbeddableWindowImpl
+    class WpfTopLevelImpl : FrameworkElement, ITopLevelImpl
     {
         private HwndSource _currentHwndSource;
         private readonly HwndSourceHook _hook;
-        private readonly IEmbeddableWindowImpl _ttl;
+        private readonly ITopLevelImpl _ttl;
         private IInputRoot _inputRoot;
         private readonly IEnumerable<object> _surfaces;
         private readonly IMouseDevice _mouse;
@@ -74,7 +75,7 @@ namespace Avalonia.Win32.Interop.Wpf
         private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam, ref bool handled)
         {
             if (msg == (int)UnmanagedMethods.WindowsMessage.WM_DPICHANGED)
-                _ttl.ScalingChanged?.Invoke(_ttl.Scaling);
+                _ttl.ScalingChanged?.Invoke(_ttl.RenderScaling);
             return IntPtr.Zero;
         }
 
@@ -83,7 +84,7 @@ namespace Avalonia.Win32.Interop.Wpf
             _currentHwndSource?.RemoveHook(_hook);
             _currentHwndSource = e.NewSource as HwndSource;
             _currentHwndSource?.AddHook(_hook);
-            _ttl.ScalingChanged?.Invoke(_ttl.Scaling);
+            _ttl.ScalingChanged?.Invoke(_ttl.RenderScaling);
         }
 
         public IRenderer CreateRenderer(IRenderRoot root)
@@ -101,7 +102,7 @@ namespace Avalonia.Win32.Interop.Wpf
         Size ITopLevelImpl.ClientSize => _finalSize;
         IMouseDevice ITopLevelImpl.MouseDevice => _mouse;
 
-        double ITopLevelImpl.Scaling => PresentationSource.FromVisual(this)?.CompositionTarget?.TransformToDevice.M11 ?? 1;
+        double ITopLevelImpl.RenderScaling => PresentationSource.FromVisual(this)?.CompositionTarget?.TransformToDevice.M11 ?? 1;
 
         IEnumerable<object> ITopLevelImpl.Surfaces => _surfaces;
 
@@ -236,8 +237,11 @@ namespace Avalonia.Win32.Interop.Wpf
         Action<Rect> ITopLevelImpl.Paint { get; set; }
         Action<Size> ITopLevelImpl.Resized { get; set; }
         Action<double> ITopLevelImpl.ScalingChanged { get; set; }
+
+        Action<WindowTransparencyLevel> ITopLevelImpl.TransparencyLevelChanged { get; set; }
+
         Action ITopLevelImpl.Closed { get; set; }
-        public new event Action LostFocus;
+        public new Action LostFocus { get; set; }
 
         internal Vector GetScaling()
         {
@@ -248,5 +252,11 @@ namespace Avalonia.Win32.Interop.Wpf
         }
 
         public IPopupImpl CreatePopup() => null;
+
+        public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel) { }
+
+        public WindowTransparencyLevel TransparencyLevel { get; private set; }
+
+        public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; } = new AcrylicPlatformCompensationLevels(1, 1, 1);
     }
 }
diff --git a/src/Windows/Avalonia.Win32/.gitignore b/src/Windows/Avalonia.Win32/.gitignore
new file mode 100644
index 0000000000..7882fa6540
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/.gitignore
@@ -0,0 +1 @@
+*.Generated.cs
diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
index 67db56dd1b..fe5f806fbe 100644
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
+++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
@@ -5,7 +5,11 @@
     <PackageId>Avalonia.Win32</PackageId>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
+    <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2020091801" />
+    <AvnComIdl Include="WinRT\winrt.idl" OutputFile="WinRT\WinRT.Generated.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\System.Drawing.Common.props" />
+  <Import Project="../../../build/MicroCom.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\System.Drawing.Common.props" />    
 </Project>
diff --git a/src/Windows/Avalonia.Win32/ClipboardImpl.cs b/src/Windows/Avalonia.Win32/ClipboardImpl.cs
index ad000f11eb..047b7c361f 100644
--- a/src/Windows/Avalonia.Win32/ClipboardImpl.cs
+++ b/src/Windows/Avalonia.Win32/ClipboardImpl.cs
@@ -1,28 +1,37 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using System.Linq;
+using System.Reactive.Disposables;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
+using Avalonia.Input;
 using Avalonia.Input.Platform;
+using Avalonia.Threading;
 using Avalonia.Win32.Interop;
 
 namespace Avalonia.Win32
 {
     internal class ClipboardImpl : IClipboard
     {
-        private async Task OpenClipboard()
+        private const int OleRetryCount = 10;
+        private const int OleRetryDelay = 100;
+
+        private async Task<IDisposable> OpenClipboard()
         {
+            var i = OleRetryCount;
+
             while (!UnmanagedMethods.OpenClipboard(IntPtr.Zero))
             {
+                if (--i == 0)
+                    throw new TimeoutException("Timeout opening clipboard.");
                 await Task.Delay(100);
             }
+
+            return Disposable.Create(() => UnmanagedMethods.CloseClipboard());
         }
 
         public async Task<string> GetTextAsync()
         {
-            await OpenClipboard();
-            try
+            using(await OpenClipboard())
             {
                 IntPtr hText = UnmanagedMethods.GetClipboardData(UnmanagedMethods.ClipboardFormat.CF_UNICODETEXT);
                 if (hText == IntPtr.Zero)
@@ -40,10 +49,6 @@ namespace Avalonia.Win32
                 UnmanagedMethods.GlobalUnlock(hText);
                 return rv;
             }
-            finally
-            {
-                UnmanagedMethods.CloseClipboard();
-            }
         }
 
         public async Task SetTextAsync(string text)
@@ -53,31 +58,88 @@ namespace Avalonia.Win32
                 throw new ArgumentNullException(nameof(text));
             }
 
-            await OpenClipboard();
-
-            UnmanagedMethods.EmptyClipboard();
-
-            try
+            using(await OpenClipboard())
             {
+                UnmanagedMethods.EmptyClipboard();
+
                 var hGlobal = Marshal.StringToHGlobalUni(text);
                 UnmanagedMethods.SetClipboardData(UnmanagedMethods.ClipboardFormat.CF_UNICODETEXT, hGlobal);
             }
-            finally
-            {
-                UnmanagedMethods.CloseClipboard();
-            }
         }
 
         public async Task ClearAsync()
         {
-            await OpenClipboard();
-            try
+            using(await OpenClipboard())
             {
                 UnmanagedMethods.EmptyClipboard();
             }
-            finally
+        }
+
+        public async Task SetDataObjectAsync(IDataObject data)
+        {
+            Dispatcher.UIThread.VerifyAccess();
+            var wrapper = new DataObject(data);
+            var i = OleRetryCount;
+
+            while (true)
+            {
+                var hr = UnmanagedMethods.OleSetClipboard(wrapper);
+
+                if (hr == 0)
+                    break;
+
+                if (--i == 0)
+                    Marshal.ThrowExceptionForHR(hr);
+                
+                await Task.Delay(OleRetryDelay);
+            }
+        }
+
+        public async Task<string[]> GetFormatsAsync()
+        {
+            Dispatcher.UIThread.VerifyAccess();
+            var i = OleRetryCount;
+
+            while (true)
+            {
+                var hr = UnmanagedMethods.OleGetClipboard(out var dataObject);
+
+                if (hr == 0)
+                {
+                    var wrapper = new OleDataObject(dataObject);
+                    var formats = wrapper.GetDataFormats().ToArray();
+                    Marshal.ReleaseComObject(dataObject);
+                    return formats;
+                }
+
+                if (--i == 0)
+                    Marshal.ThrowExceptionForHR(hr);
+
+                await Task.Delay(OleRetryDelay);
+            }
+        }
+
+        public async Task<object> GetDataAsync(string format)
+        {
+            Dispatcher.UIThread.VerifyAccess();
+            var i = OleRetryCount;
+
+            while (true)
             {
-                UnmanagedMethods.CloseClipboard();
+                var hr = UnmanagedMethods.OleGetClipboard(out var dataObject);
+
+                if (hr == 0)
+                {
+                    var wrapper = new OleDataObject(dataObject);
+                    var rv = wrapper.Get(format);
+                    Marshal.ReleaseComObject(dataObject);
+                    return rv;
+                }
+
+                if (--i == 0)
+                    Marshal.ThrowExceptionForHR(hr);
+
+                await Task.Delay(OleRetryDelay);
             }
         }
     }
diff --git a/src/Windows/Avalonia.Win32/CursorFactory.cs b/src/Windows/Avalonia.Win32/CursorFactory.cs
index b45138c27a..8c40eaa7b8 100644
--- a/src/Windows/Avalonia.Win32/CursorFactory.cs
+++ b/src/Windows/Avalonia.Win32/CursorFactory.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using Avalonia.Input;
diff --git a/src/Windows/Avalonia.Win32/EmbeddedWindowImpl.cs b/src/Windows/Avalonia.Win32/EmbeddedWindowImpl.cs
index 538a51c01e..e08f1b28be 100644
--- a/src/Windows/Avalonia.Win32/EmbeddedWindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/EmbeddedWindowImpl.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
 using Avalonia.Platform;
@@ -9,11 +6,8 @@ using Avalonia.Win32.Interop;
 
 namespace Avalonia.Win32
 {
-    class EmbeddedWindowImpl : WindowImpl, IEmbeddableWindowImpl
+    class EmbeddedWindowImpl : WindowImpl
     {
-        private static IntPtr DefaultParentWindow = CreateParentWindow();
-        private static UnmanagedMethods.WndProc _wndProcDelegate;
-
         protected override IntPtr CreateWindowOverride(ushort atom)
         {
             var hWnd = UnmanagedMethods.CreateWindowEx(
@@ -25,66 +19,12 @@ namespace Avalonia.Win32
                 0,
                 640,
                 480,
-                DefaultParentWindow,
+                OffscreenParentWindow.Handle,
                 IntPtr.Zero,
                 IntPtr.Zero,
                 IntPtr.Zero);
             return hWnd;
         }
 
-        protected override IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
-        {
-            if (msg == (uint)UnmanagedMethods.WindowsMessage.WM_KILLFOCUS)
-                LostFocus?.Invoke();
-            return base.WndProc(hWnd, msg, wParam, lParam);
-        }
-
-        public event Action LostFocus;
-
-        private static IntPtr CreateParentWindow()
-        {
-            _wndProcDelegate = new UnmanagedMethods.WndProc(ParentWndProc);
-
-            var wndClassEx = new UnmanagedMethods.WNDCLASSEX
-            {
-                cbSize = Marshal.SizeOf<UnmanagedMethods.WNDCLASSEX>(),
-                hInstance = UnmanagedMethods.GetModuleHandle(null),
-                lpfnWndProc = _wndProcDelegate,
-                lpszClassName = "AvaloniaEmbeddedWindow-" + Guid.NewGuid(),
-            };
-
-            var atom = UnmanagedMethods.RegisterClassEx(ref wndClassEx);
-
-            if (atom == 0)
-            {
-                throw new Win32Exception();
-            }
-
-            var hwnd = UnmanagedMethods.CreateWindowEx(
-                0,
-                atom,
-                null,
-                (int)UnmanagedMethods.WindowStyles.WS_OVERLAPPEDWINDOW,
-                UnmanagedMethods.CW_USEDEFAULT,
-                UnmanagedMethods.CW_USEDEFAULT,
-                UnmanagedMethods.CW_USEDEFAULT,
-                UnmanagedMethods.CW_USEDEFAULT,
-                IntPtr.Zero,
-                IntPtr.Zero,
-                IntPtr.Zero,
-                IntPtr.Zero);
-
-            if (hwnd == IntPtr.Zero)
-            {
-                throw new Win32Exception();
-            }
-
-            return hwnd;
-        }
-
-        private static IntPtr ParentWndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
-        {
-            return UnmanagedMethods.DefWindowProc(hWnd, msg, wParam, lParam);
-        }
     }
 }
diff --git a/src/Windows/Avalonia.Win32/FramebufferManager.cs b/src/Windows/Avalonia.Win32/FramebufferManager.cs
index 87c5a1bb02..699dc7c25d 100644
--- a/src/Windows/Avalonia.Win32/FramebufferManager.cs
+++ b/src/Windows/Avalonia.Win32/FramebufferManager.cs
@@ -1,33 +1,191 @@
 using System;
+using System.Threading;
 using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Platform;
 using Avalonia.Win32.Interop;
 
+#nullable enable
+
 namespace Avalonia.Win32
 {
-    class FramebufferManager : IFramebufferPlatformSurface
+    internal class FramebufferManager : IFramebufferPlatformSurface, IDisposable
     {
+        private const int _bytesPerPixel = 4;
+        private const PixelFormat _format = PixelFormat.Bgra8888;
+
         private readonly IntPtr _hwnd;
-        private WindowFramebuffer _fb;
+        private readonly object _lock;
+        private readonly Action _onDisposeAction;
+
+        private FramebufferData? _framebufferData;
 
         public FramebufferManager(IntPtr hwnd)
         {
             _hwnd = hwnd;
+            _lock = new object();
+            _onDisposeAction = DrawAndUnlock;
         }
 
         public ILockedFramebuffer Lock()
         {
-            UnmanagedMethods.RECT rc;
-            UnmanagedMethods.GetClientRect(_hwnd, out rc);
-            var width = rc.right - rc.left;
-            var height = rc.bottom - rc.top;
-            if ((_fb == null || _fb.Size.Width != width || _fb.Size.Height != height) && width > 0 && height > 0)
+            Monitor.Enter(_lock);
+
+            LockedFramebuffer? fb = null;
+
+            try
+            {
+                UnmanagedMethods.GetClientRect(_hwnd, out var rc);
+
+                var width = Math.Max(1, rc.right - rc.left);
+                var height = Math.Max(1, rc.bottom - rc.top);
+
+                if (_framebufferData is null || _framebufferData?.Size.Width != width || _framebufferData?.Size.Height != height)
+                {
+                    _framebufferData?.Dispose();
+
+                    _framebufferData = AllocateFramebufferData(width, height);
+                }
+
+                var framebufferData = _framebufferData.Value;
+
+                return fb = new LockedFramebuffer(
+                    framebufferData.Data.Address, framebufferData.Size, framebufferData.RowBytes,
+                    GetCurrentDpi(), _format, _onDisposeAction);
+            }
+            finally
+            {
+                // We free the lock when for whatever reason framebuffer was not created.
+                // This allows for a potential retry later.
+                if (fb is null)
+                {
+                    Monitor.Exit(_lock);
+                }
+            }
+        }
+
+        public void Dispose()
+        {
+            lock (_lock)
+            {
+                _framebufferData?.Dispose();
+                _framebufferData = null;
+            }
+        }
+
+        private void DrawAndUnlock()
+        {
+            try
+            {
+                if (_framebufferData.HasValue)
+                    DrawToWindow(_hwnd, _framebufferData.Value);
+            }
+            finally
+            {
+                Monitor.Exit(_lock);
+            }
+        }
+
+        private Vector GetCurrentDpi()
+        {
+            if (UnmanagedMethods.ShCoreAvailable)
+            {
+                var monitor =
+                    UnmanagedMethods.MonitorFromWindow(_hwnd, UnmanagedMethods.MONITOR.MONITOR_DEFAULTTONEAREST);
+
+                if (UnmanagedMethods.GetDpiForMonitor(
+                    monitor,
+                    UnmanagedMethods.MONITOR_DPI_TYPE.MDT_EFFECTIVE_DPI,
+                    out var dpix,
+                    out var dpiy) == 0)
+                {
+                    return new Vector(dpix, dpiy);
+                }
+            }
+
+            return new Vector(96, 96);
+        }
+
+        private static FramebufferData AllocateFramebufferData(int width, int height)
+        {
+            var bitmapBlob = AvaloniaLocator.Current.GetService<IRuntimePlatform>().AllocBlob(width * height * _bytesPerPixel);
+
+            return new FramebufferData(bitmapBlob, width, height);
+        }
+
+        private static void DrawToDevice(FramebufferData framebufferData, IntPtr hDC, int destX = 0, int destY = 0, int srcX = 0,
+            int srcY = 0, int width = -1,
+            int height = -1)
+        {
+            if (width == -1)
+                width = framebufferData.Size.Width;
+            if (height == -1)
+                height = framebufferData.Size.Height;
+
+            var bmpInfo = framebufferData.Header;
+
+            UnmanagedMethods.SetDIBitsToDevice(hDC, destX, destY, (uint)width, (uint)height, srcX, srcY,
+                0, (uint)framebufferData.Size.Height, framebufferData.Data.Address, ref bmpInfo, 0);
+        }
+
+        private static bool DrawToWindow(IntPtr hWnd, FramebufferData framebufferData, int destX = 0, int destY = 0, int srcX = 0,
+            int srcY = 0, int width = -1,
+            int height = -1)
+        {
+            if (framebufferData.Data.IsDisposed)
+                throw new ObjectDisposedException("Framebuffer");
+
+            if (hWnd == IntPtr.Zero)
+                return false;
+
+            var hDC = UnmanagedMethods.GetDC(hWnd);
+
+            if (hDC == IntPtr.Zero)
+                return false;
+
+            try
+            {
+                DrawToDevice(framebufferData, hDC, destX, destY, srcX, srcY, width, height);
+            }
+            finally
+            {
+                UnmanagedMethods.ReleaseDC(hWnd, hDC);
+            }
+
+            return true;
+        }
+
+        private readonly struct FramebufferData
+        {
+            public IUnmanagedBlob Data { get; }
+
+            public PixelSize Size { get; }
+
+            public int RowBytes => Size.Width * _bytesPerPixel;
+
+            public UnmanagedMethods.BITMAPINFOHEADER Header { get; }
+
+            public FramebufferData(IUnmanagedBlob data, int width, int height)
+            {
+                Data = data;
+                Size = new PixelSize(width, height);
+
+                var header = new UnmanagedMethods.BITMAPINFOHEADER();
+                header.Init();
+
+                header.biPlanes = 1;
+                header.biBitCount = _bytesPerPixel * 8;
+                header.Init();
+
+                header.biWidth = width;
+                header.biHeight = -height;
+
+                Header = header;
+            }
+
+            public void Dispose()
             {
-                _fb?.Deallocate();
-                _fb = null;
-                _fb = new WindowFramebuffer(_hwnd, new PixelSize(width, height));
+                Data.Dispose();
             }
-            return _fb;
         }
     }
 }
diff --git a/src/Windows/Avalonia.Win32/Input/KeyInterop.cs b/src/Windows/Avalonia.Win32/Input/KeyInterop.cs
index 11c0a6dca9..f5b2d462ab 100644
--- a/src/Windows/Avalonia.Win32/Input/KeyInterop.cs
+++ b/src/Windows/Avalonia.Win32/Input/KeyInterop.cs
@@ -1,8 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Generic;
-using System.Text;
 using Avalonia.Input;
 using Avalonia.Win32.Interop;
 
@@ -211,7 +207,7 @@ namespace Avalonia.Win32.Input
             { 31, Key.ImeModeChange },
             { 32, Key.Space },
             { 33, Key.PageUp },
-            { 34, Key.Next },
+            { 34, Key.PageDown },
             { 35, Key.End },
             { 36, Key.Home },
             { 37, Key.Left },
@@ -364,17 +360,80 @@ namespace Avalonia.Win32.Input
             { 254, Key.OemClear },
         };
 
-        public static Key KeyFromVirtualKey(int virtualKey)
+        /// <summary>
+        /// Indicates whether the key is an extended key, such as the right-hand ALT and CTRL keys.
+        /// According to https://docs.microsoft.com/en-us/windows/win32/inputdev/wm-keydown.
+        /// </summary>
+        private static bool IsExtended(int keyData)
+        {
+            const int extendedMask = 1 << 24;
+
+            return (keyData & extendedMask) != 0;
+        }
+
+        private static int GetVirtualKey(int virtualKey, int keyData)
         {
-            Key result;
-            s_keyFromVirtualKey.TryGetValue(virtualKey, out result);
+            // Adapted from https://github.com/dotnet/wpf/blob/master/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndKeyboardInputProvider.cs.
+
+            if (virtualKey == (int)UnmanagedMethods.VirtualKeyStates.VK_SHIFT)
+            {
+                // Bits from 16 to 23 represent scan code.
+                const int scanCodeMask = 0xFF0000;
+
+                var scanCode = (keyData & scanCodeMask) >> 16;
+
+                virtualKey = (int)UnmanagedMethods.MapVirtualKey((uint)scanCode, (uint)UnmanagedMethods.MapVirtualKeyMapTypes.MAPVK_VSC_TO_VK_EX);
+
+                if (virtualKey == 0)
+                {
+                    virtualKey = (int)UnmanagedMethods.VirtualKeyStates.VK_LSHIFT;
+                }
+            }
+
+            if (virtualKey == (int)UnmanagedMethods.VirtualKeyStates.VK_MENU)
+            {
+                bool isRight = IsExtended(keyData);
+
+                if (isRight)
+                {
+                    virtualKey = (int)UnmanagedMethods.VirtualKeyStates.VK_RMENU;
+                }
+                else
+                {
+                    virtualKey = (int)UnmanagedMethods.VirtualKeyStates.VK_LMENU;
+                }
+            }
+            
+            if (virtualKey == (int)UnmanagedMethods.VirtualKeyStates.VK_CONTROL)
+            {
+                bool isRight = IsExtended(keyData);
+
+                if (isRight)
+                {
+                    virtualKey = (int)UnmanagedMethods.VirtualKeyStates.VK_RCONTROL;
+                }
+                else
+                {
+                    virtualKey = (int)UnmanagedMethods.VirtualKeyStates.VK_LCONTROL;
+                }
+            }
+
+            return virtualKey;
+        }
+
+        public static Key KeyFromVirtualKey(int virtualKey, int keyData)
+        {
+            virtualKey = GetVirtualKey(virtualKey, keyData);
+
+            s_keyFromVirtualKey.TryGetValue(virtualKey, out var result);
+
             return result;
         }
 
         public static int VirtualKeyFromKey(Key key)
         {
-            int result;
-            s_virtualKeyFromKey.TryGetValue(key, out result);
+            s_virtualKeyFromKey.TryGetValue(key, out var result);
+
             return result;
         }
     }
diff --git a/src/Windows/Avalonia.Win32/Input/WindowsKeyboardDevice.cs b/src/Windows/Avalonia.Win32/Input/WindowsKeyboardDevice.cs
index fda5483b00..1258bb0109 100644
--- a/src/Windows/Avalonia.Win32/Input/WindowsKeyboardDevice.cs
+++ b/src/Windows/Avalonia.Win32/Input/WindowsKeyboardDevice.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Text;
 using Avalonia.Controls;
 using Avalonia.Input;
@@ -47,7 +44,7 @@ namespace Avalonia.Win32.Input
 
         public void WindowActivated(Window window)
         {
-            SetFocusedElement(window, NavigationMethod.Unspecified, InputModifiers.None);
+            SetFocusedElement(window, NavigationMethod.Unspecified, KeyModifiers.None);
         }
 
         public string StringFromVirtualKey(uint virtualKey)
diff --git a/src/Windows/Avalonia.Win32/Input/WindowsMouseDevice.cs b/src/Windows/Avalonia.Win32/Input/WindowsMouseDevice.cs
index 8f060b1b81..b1064ae25d 100644
--- a/src/Windows/Avalonia.Win32/Input/WindowsMouseDevice.cs
+++ b/src/Windows/Avalonia.Win32/Input/WindowsMouseDevice.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Controls;
 using Avalonia.Input;
diff --git a/src/Windows/Avalonia.Win32/Interop/TaskBarList.cs b/src/Windows/Avalonia.Win32/Interop/TaskBarList.cs
new file mode 100644
index 0000000000..88b907aeec
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Interop/TaskBarList.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Runtime.InteropServices;
+using static Avalonia.Win32.Interop.UnmanagedMethods;
+
+namespace Avalonia.Win32.Interop
+{
+    internal class TaskBarList
+    {
+        private static IntPtr s_taskBarList;
+        private static HrInit s_hrInitDelegate;
+        private static MarkFullscreenWindow s_markFullscreenWindowDelegate;
+
+        /// <summary>
+        /// Ported from https://github.com/chromium/chromium/blob/master/ui/views/win/fullscreen_handler.cc
+        /// </summary>
+        /// <param name="hwnd">The window handle.</param>
+        /// <param name="fullscreen">Fullscreen state.</param>
+        public static unsafe void MarkFullscreen(IntPtr hwnd, bool fullscreen)
+        {
+            if (s_taskBarList == IntPtr.Zero)
+            {
+                Guid clsid = ShellIds.TaskBarList;
+                Guid iid = ShellIds.ITaskBarList2;
+
+                int result = CoCreateInstance(ref clsid, IntPtr.Zero, 1, ref iid, out s_taskBarList);
+
+                if (s_taskBarList != IntPtr.Zero)
+                {
+                    var ptr = (ITaskBarList2VTable**)s_taskBarList.ToPointer();
+
+                    if (s_hrInitDelegate is null)
+                    {
+                        s_hrInitDelegate = Marshal.GetDelegateForFunctionPointer<HrInit>((*ptr)->HrInit);
+                    }
+
+                    if (s_hrInitDelegate(s_taskBarList) != HRESULT.S_OK)
+                    {
+                        s_taskBarList = IntPtr.Zero;
+                    }
+                }
+            }
+
+            if (s_taskBarList != IntPtr.Zero)
+            {
+                var ptr = (ITaskBarList2VTable**)s_taskBarList.ToPointer();
+
+                if (s_markFullscreenWindowDelegate is null)
+                {
+                    s_markFullscreenWindowDelegate = Marshal.GetDelegateForFunctionPointer<MarkFullscreenWindow>((*ptr)->MarkFullscreenWindow);
+                }
+
+                s_markFullscreenWindowDelegate(s_taskBarList, hwnd, fullscreen);
+            }
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
index 2c6425e26c..b21741453c 100644
--- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
+++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
@@ -1,7 +1,5 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -18,7 +16,7 @@ namespace Avalonia.Win32.Interop
     [SuppressMessage("Microsoft.StyleCop.CSharp.NamingRules", "SA1310:FieldNamesMustNotContainUnderscore", Justification = "Using Win32 naming for consistency.")]
     [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements must be documented", Justification = "Look in Win32 docs.")]
     [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1602:Enumeration items must be documented", Justification = "Look in Win32 docs.")]
-    internal static class UnmanagedMethods
+    internal unsafe static class UnmanagedMethods
     {
         public const int CW_USEDEFAULT = unchecked((int)0x80000000);
 
@@ -241,6 +239,170 @@ namespace Avalonia.Win32.Interop
             MK_XBUTTON2 = 0x0040
         }
 
+        public enum VirtualKeyStates : int
+        {
+            VK_LBUTTON = 0x01,
+            VK_RBUTTON = 0x02,
+            VK_CANCEL = 0x03,
+            VK_MBUTTON = 0x04,
+            VK_XBUTTON1 = 0x05,
+            VK_XBUTTON2 = 0x06,
+            VK_BACK = 0x08,
+            VK_TAB = 0x09,
+            VK_CLEAR = 0x0C,
+            VK_RETURN = 0x0D,
+            VK_SHIFT = 0x10,
+            VK_CONTROL = 0x11,
+            VK_MENU = 0x12,
+            VK_PAUSE = 0x13,
+            VK_CAPITAL = 0x14,
+            VK_KANA = 0x15,
+            VK_HANGEUL = 0x15,
+            VK_HANGUL = 0x15,
+            VK_JUNJA = 0x17,
+            VK_FINAL = 0x18,
+            VK_HANJA = 0x19,
+            VK_KANJI = 0x19,
+            VK_ESCAPE = 0x1B,
+            VK_CONVERT = 0x1C,
+            VK_NONCONVERT = 0x1D,
+            VK_ACCEPT = 0x1E,
+            VK_MODECHANGE = 0x1F,
+            VK_SPACE = 0x20,
+            VK_PRIOR = 0x21,
+            VK_NEXT = 0x22,
+            VK_END = 0x23,
+            VK_HOME = 0x24,
+            VK_LEFT = 0x25,
+            VK_UP = 0x26,
+            VK_RIGHT = 0x27,
+            VK_DOWN = 0x28,
+            VK_SELECT = 0x29,
+            VK_PRINT = 0x2A,
+            VK_EXECUTE = 0x2B,
+            VK_SNAPSHOT = 0x2C,
+            VK_INSERT = 0x2D,
+            VK_DELETE = 0x2E,
+            VK_HELP = 0x2F,
+            VK_LWIN = 0x5B,
+            VK_RWIN = 0x5C,
+            VK_APPS = 0x5D,
+            VK_SLEEP = 0x5F,
+            VK_NUMPAD0 = 0x60,
+            VK_NUMPAD1 = 0x61,
+            VK_NUMPAD2 = 0x62,
+            VK_NUMPAD3 = 0x63,
+            VK_NUMPAD4 = 0x64,
+            VK_NUMPAD5 = 0x65,
+            VK_NUMPAD6 = 0x66,
+            VK_NUMPAD7 = 0x67,
+            VK_NUMPAD8 = 0x68,
+            VK_NUMPAD9 = 0x69,
+            VK_MULTIPLY = 0x6A,
+            VK_ADD = 0x6B,
+            VK_SEPARATOR = 0x6C,
+            VK_SUBTRACT = 0x6D,
+            VK_DECIMAL = 0x6E,
+            VK_DIVIDE = 0x6F,
+            VK_F1 = 0x70,
+            VK_F2 = 0x71,
+            VK_F3 = 0x72,
+            VK_F4 = 0x73,
+            VK_F5 = 0x74,
+            VK_F6 = 0x75,
+            VK_F7 = 0x76,
+            VK_F8 = 0x77,
+            VK_F9 = 0x78,
+            VK_F10 = 0x79,
+            VK_F11 = 0x7A,
+            VK_F12 = 0x7B,
+            VK_F13 = 0x7C,
+            VK_F14 = 0x7D,
+            VK_F15 = 0x7E,
+            VK_F16 = 0x7F,
+            VK_F17 = 0x80,
+            VK_F18 = 0x81,
+            VK_F19 = 0x82,
+            VK_F20 = 0x83,
+            VK_F21 = 0x84,
+            VK_F22 = 0x85,
+            VK_F23 = 0x86,
+            VK_F24 = 0x87,
+            VK_NUMLOCK = 0x90,
+            VK_SCROLL = 0x91,
+            VK_OEM_NEC_EQUAL = 0x92,
+            VK_OEM_FJ_JISHO = 0x92,
+            VK_OEM_FJ_MASSHOU = 0x93,
+            VK_OEM_FJ_TOUROKU = 0x94,
+            VK_OEM_FJ_LOYA = 0x95,
+            VK_OEM_FJ_ROYA = 0x96,
+            VK_LSHIFT = 0xA0,
+            VK_RSHIFT = 0xA1,
+            VK_LCONTROL = 0xA2,
+            VK_RCONTROL = 0xA3,
+            VK_LMENU = 0xA4,
+            VK_RMENU = 0xA5,
+            VK_BROWSER_BACK = 0xA6,
+            VK_BROWSER_FORWARD = 0xA7,
+            VK_BROWSER_REFRESH = 0xA8,
+            VK_BROWSER_STOP = 0xA9,
+            VK_BROWSER_SEARCH = 0xAA,
+            VK_BROWSER_FAVORITES = 0xAB,
+            VK_BROWSER_HOME = 0xAC,
+            VK_VOLUME_MUTE = 0xAD,
+            VK_VOLUME_DOWN = 0xAE,
+            VK_VOLUME_UP = 0xAF,
+            VK_MEDIA_NEXT_TRACK = 0xB0,
+            VK_MEDIA_PREV_TRACK = 0xB1,
+            VK_MEDIA_STOP = 0xB2,
+            VK_MEDIA_PLAY_PAUSE = 0xB3,
+            VK_LAUNCH_MAIL = 0xB4,
+            VK_LAUNCH_MEDIA_SELECT = 0xB5,
+            VK_LAUNCH_APP1 = 0xB6,
+            VK_LAUNCH_APP2 = 0xB7,
+            VK_OEM_1 = 0xBA,
+            VK_OEM_PLUS = 0xBB,
+            VK_OEM_COMMA = 0xBC,
+            VK_OEM_MINUS = 0xBD,
+            VK_OEM_PERIOD = 0xBE,
+            VK_OEM_2 = 0xBF,
+            VK_OEM_3 = 0xC0,
+            VK_OEM_4 = 0xDB,
+            VK_OEM_5 = 0xDC,
+            VK_OEM_6 = 0xDD,
+            VK_OEM_7 = 0xDE,
+            VK_OEM_8 = 0xDF,
+            VK_OEM_AX = 0xE1,
+            VK_OEM_102 = 0xE2,
+            VK_ICO_HELP = 0xE3,
+            VK_ICO_00 = 0xE4,
+            VK_PROCESSKEY = 0xE5,
+            VK_ICO_CLEAR = 0xE6,
+            VK_PACKET = 0xE7,
+            VK_OEM_RESET = 0xE9,
+            VK_OEM_JUMP = 0xEA,
+            VK_OEM_PA1 = 0xEB,
+            VK_OEM_PA2 = 0xEC,
+            VK_OEM_PA3 = 0xED,
+            VK_OEM_WSCTRL = 0xEE,
+            VK_OEM_CUSEL = 0xEF,
+            VK_OEM_ATTN = 0xF0,
+            VK_OEM_FINISH = 0xF1,
+            VK_OEM_COPY = 0xF2,
+            VK_OEM_AUTO = 0xF3,
+            VK_OEM_ENLW = 0xF4,
+            VK_OEM_BACKTAB = 0xF5,
+            VK_ATTN = 0xF6,
+            VK_CRSEL = 0xF7,
+            VK_EXSEL = 0xF8,
+            VK_EREOF = 0xF9,
+            VK_PLAY = 0xFA,
+            VK_ZOOM = 0xFB,
+            VK_NONAME = 0xFC,
+            VK_PA1 = 0xFD,
+            VK_OEM_CLEAR = 0xFE
+        }
+
         public enum WindowActivate
         {
             WA_INACTIVE,
@@ -299,10 +461,12 @@ namespace Avalonia.Win32.Interop
             WS_SIZEFRAME = 0x40000,
             WS_SYSMENU = 0x80000,
             WS_TABSTOP = 0x10000,
+            WS_THICKFRAME = 0x40000,
             WS_VISIBLE = 0x10000000,
             WS_VSCROLL = 0x200000,
             WS_EX_DLGMODALFRAME = 0x00000001,
             WS_EX_NOPARENTNOTIFY = 0x00000004,
+            WS_EX_NOREDIRECTIONBITMAP = 0x00200000,
             WS_EX_TOPMOST = 0x00000008,
             WS_EX_ACCEPTFILES = 0x00000010,
             WS_EX_TRANSPARENT = 0x00000020,
@@ -581,6 +745,14 @@ namespace Avalonia.Win32.Interop
             WM_DISPATCH_WORK_ITEM = WM_USER,
         }
 
+        public enum MapVirtualKeyMapTypes : uint
+        {
+            MAPVK_VK_TO_VSC = 0x00,
+            MAPVK_VSC_TO_VK = 0x01,
+            MAPVK_VK_TO_CHAR = 0x02,
+            MAPVK_VSC_TO_VK_EX = 0x03,
+        }
+
         public enum BitmapCompressionMode : uint
         {
             BI_RGB = 0,
@@ -756,8 +928,11 @@ namespace Avalonia.Win32.Interop
         [DllImport("user32.dll")]
         public static extern bool GetKeyboardState(byte[] lpKeyState);
 
-        [DllImport("user32.dll", EntryPoint = "GetMessageW")]
-        public static extern sbyte GetMessage(out MSG lpMsg, IntPtr hWnd, uint wMsgFilterMin, uint wMsgFilterMax);
+        [DllImport("user32.dll", EntryPoint = "MapVirtualKeyW")]
+        public static extern uint MapVirtualKey(uint uCode, uint uMapType);
+
+        [DllImport("user32.dll", EntryPoint = "GetMessageW", SetLastError = true)]
+        public static extern int GetMessage(out MSG lpMsg, IntPtr hWnd, uint wMsgFilterMin, uint wMsgFilterMax);
 
         [DllImport("user32.dll")]
         public static extern int GetMessageTime();
@@ -816,6 +991,12 @@ namespace Avalonia.Win32.Interop
             }
         }
 
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetSystemMenu(IntPtr hWnd, bool bRevert);
+
+        [DllImport("user32.dll")]
+        public static extern bool EnableMenuItem(IntPtr hMenu, uint uIDEnableItem, uint uEnable);
+
         [DllImport("user32.dll", SetLastError = true)]
         public static extern bool GetWindowPlacement(IntPtr hWnd, ref WINDOWPLACEMENT lpwndpl);
 
@@ -828,6 +1009,17 @@ namespace Avalonia.Win32.Interop
         [DllImport("user32.dll")]
         public static extern bool InvalidateRect(IntPtr hWnd, ref RECT lpRect, bool bErase);
 
+
+        [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);
 
@@ -861,6 +1053,9 @@ namespace Avalonia.Win32.Interop
         [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);
 
@@ -876,8 +1071,22 @@ namespace Avalonia.Win32.Interop
         [DllImport("user32.dll")]
         public static extern bool SetFocus(IntPtr hWnd);
         [DllImport("user32.dll")]
+        public static extern IntPtr GetFocus();
+        [DllImport("user32.dll")]
         public static extern bool SetParent(IntPtr hWnd, IntPtr hWndNewParent);
         [DllImport("user32.dll")]
+        public static extern IntPtr GetParent(IntPtr hWnd);
+
+        public enum GetAncestorFlags
+        {
+            GA_PARENT = 1,
+            GA_ROOT = 2,
+            GA_ROOTOWNER = 3
+        }
+
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetAncestor(IntPtr hwnd, GetAncestorFlags gaFlags);
+        [DllImport("user32.dll")]
         public static extern bool ShowWindow(IntPtr hWnd, ShowWindowCommand nCmdShow);
 
         [DllImport("kernel32.dll", SetLastError = true)]
@@ -974,7 +1183,10 @@ namespace Avalonia.Win32.Interop
         internal static extern int CoCreateInstance(ref Guid clsid,
             IntPtr ignore1, int ignore2, ref Guid iid, [MarshalAs(UnmanagedType.IUnknown), Out] out object pUnkOuter);
 
-        
+        [DllImport("ole32.dll", PreserveSig = true)]
+        internal static extern int CoCreateInstance(ref Guid clsid,
+            IntPtr ignore1, int ignore2, ref Guid iid, [Out] out IntPtr pUnkOuter);
+
         [DllImport("shell32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
         internal static extern int SHCreateItemFromParsingName([MarshalAs(UnmanagedType.LPWStr)] string pszPath, IntPtr pbc, ref Guid riid, [MarshalAs(UnmanagedType.Interface)] out IShellItem ppv);
 
@@ -993,6 +1205,12 @@ namespace Avalonia.Win32.Interop
         [DllImport("user32.dll")]
         public static extern IntPtr SetClipboardData(ClipboardFormat uFormat, IntPtr hMem);
 
+        [DllImport("ole32.dll", PreserveSig = false)]
+        public static extern int OleGetClipboard(out IOleDataObject dataObject);
+
+        [DllImport("ole32.dll", PreserveSig = true)]
+        public static extern int OleSetClipboard(IOleDataObject dataObject);
+
         [DllImport("kernel32.dll", ExactSpelling = true)]
         public static extern IntPtr GlobalLock(IntPtr handle);
 
@@ -1007,6 +1225,9 @@ 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);
 
         [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Ansi)]
         public static extern IntPtr GetProcAddress(IntPtr hModule, string lpProcName);
@@ -1085,6 +1306,41 @@ namespace Avalonia.Win32.Interop
         [DllImport("gdi32.dll")]
         public static extern IntPtr SelectObject(IntPtr hdc, IntPtr hObject);
 
+        [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);
+
+        [DllImport("opengl32.dll")]
+        public static extern IntPtr wglGetCurrentContext();
+
+        [DllImport("opengl32.dll")]
+        public static extern IntPtr wglGetCurrentDC();
+
+        [DllImport("opengl32.dll", CharSet = CharSet.Ansi)]
+        public static extern IntPtr wglGetProcAddress(string name);
+
         [DllImport("kernel32.dll", SetLastError = true)]
         public static extern IntPtr CreateFileMapping(IntPtr hFile,
             IntPtr lpFileMappingAttributes,
@@ -1098,7 +1354,10 @@ namespace Avalonia.Win32.Interop
         
         [DllImport("ole32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
         public static extern HRESULT RegisterDragDrop(IntPtr hwnd, IDropTarget target);
-        
+
+        [DllImport("ole32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+        public static extern HRESULT RevokeDragDrop(IntPtr hwnd);
+
         [DllImport("ole32.dll", EntryPoint = "OleInitialize")]
         public static extern HRESULT OleInitialize(IntPtr val);
 
@@ -1120,7 +1379,145 @@ namespace Avalonia.Win32.Interop
         [DllImport("ole32.dll", CharSet = CharSet.Auto, ExactSpelling = true, PreserveSig = false)]
         internal static extern void DoDragDrop(IOleDataObject dataObject, IDropSource dropSource, int allowedEffects, out int finalEffect);
 
+        [DllImport("dwmapi.dll")]
+        public static extern int DwmExtendFrameIntoClientArea(IntPtr hwnd, ref MARGINS margins);
+
+        [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);
+
+        [Flags]
+        public enum DWM_BB
+        {
+            Enable = 1,
+            BlurRegion = 2,
+            TransitionMaximized = 4
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct DWM_BLURBEHIND
+        {
+            public DWM_BB dwFlags;
+            public bool fEnable;
+            public IntPtr hRgnBlur;
+            public bool fTransitionOnMaximized;
+
+            public DWM_BLURBEHIND(bool enabled)
+            {
+                fEnable = enabled ? true : false;
+                hRgnBlur = IntPtr.Zero;
+                fTransitionOnMaximized = false;
+                dwFlags = DWM_BB.Enable;
+            }
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct RTL_OSVERSIONINFOEX
+        {
+            internal uint dwOSVersionInfoSize;
+            internal uint dwMajorVersion;
+            internal uint dwMinorVersion;
+            internal uint dwBuildNumber;
+            internal uint dwPlatformId;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
+            internal string szCSDVersion;
+        }
+
+        [DllImport("ntdll")]
+        private static extern int RtlGetVersion(out RTL_OSVERSIONINFOEX lpVersionInformation);
+
+        internal static Version RtlGetVersion()
+        {
+            RTL_OSVERSIONINFOEX v = new RTL_OSVERSIONINFOEX();
+            v.dwOSVersionInfoSize = (uint)Marshal.SizeOf(v);
+            if (RtlGetVersion(out v) == 0)
+            {
+                return new Version((int)v.dwMajorVersion, (int)v.dwMinorVersion, (int)v.dwBuildNumber, (int)v.dwPlatformId);
+            }
+            else
+            {
+                throw new Exception("RtlGetVersion failed!");
+            }
+        }
+        
+        [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);
 
+        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)
+            {
+                throw new Win32Exception();
+            }
+
+            return result;
+        }
+
+        [DllImport("user32.dll")]
+        internal static extern int SetWindowCompositionAttribute(IntPtr hwnd, ref WindowCompositionAttributeData data);
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct WindowCompositionAttributeData
+        {
+            public WindowCompositionAttribute Attribute;
+            public IntPtr Data;
+            public int SizeOfData;
+        }
+
+        internal enum WindowCompositionAttribute
+        {
+            // ...
+            WCA_ACCENT_POLICY = 19
+            // ...
+        }
+
+        internal enum AccentState
+        {
+            ACCENT_DISABLED = 0,
+            ACCENT_ENABLE_GRADIENT = 1,
+            ACCENT_ENABLE_TRANSPARENTGRADIENT = 2,
+            ACCENT_ENABLE_BLURBEHIND = 3,
+            ACCENT_ENABLE_ACRYLIC = 4, //1703 and above
+            ACCENT_ENABLE_HOSTBACKDROP = 5,        // RS5 1809
+            ACCENT_INVALID_STATE = 6
+        }
+
+        internal enum AccentFlags
+        {
+            DrawLeftBorder = 0x20,
+            DrawTopBorder = 0x40,
+            DrawRightBorder = 0x80,
+            DrawBottomBorder = 0x100,            
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct AccentPolicy
+        {
+            public AccentState AccentState;
+            public int AccentFlags;
+            public int GradientColor;
+            public int AnimationId;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct MARGINS
+        {
+            public int cxLeftWidth;
+            public int cxRightWidth;
+            public int cyTopHeight;
+            public int cyBottomHeight;
+        }
 
         public enum MONITOR
         {
@@ -1222,6 +1619,12 @@ namespace Avalonia.Win32.Interop
             public int X;
             public int Y;
         }
+        
+        public struct SIZE
+        {
+            public int X;
+            public int Y;
+        }
 
         public struct RECT
         {
@@ -1457,6 +1860,8 @@ namespace Avalonia.Win32.Interop
             public static readonly Guid SaveFileDialog = Guid.Parse("C0B4E2F3-BA21-4773-8DBA-335EC946EB8B");
             public static readonly Guid IFileDialog = Guid.Parse("42F85136-DB7E-439C-85F1-E4075D135FC8");
             public static readonly Guid IShellItem = Guid.Parse("43826D1E-E718-42EE-BC55-A1E261C37BFE");
+            public static readonly Guid TaskBarList = Guid.Parse("56FDF344-FD6D-11D0-958A-006097C9A090");
+            public static readonly Guid ITaskBarList2 = Guid.Parse("ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf");
         }
 
         [ComImport(), Guid("42F85136-DB7E-439C-85F1-E4075D135FC8"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
@@ -1689,6 +2094,22 @@ namespace Avalonia.Win32.Interop
             [MarshalAs(UnmanagedType.LPWStr)]
             public string pszSpec;
         }
+
+        public delegate void MarkFullscreenWindow(IntPtr This, IntPtr hwnd, [MarshalAs(UnmanagedType.Bool)] bool fullscreen);
+        public delegate HRESULT HrInit(IntPtr This);
+
+        public struct ITaskBarList2VTable
+        {
+            public IntPtr IUnknown1;
+            public IntPtr IUnknown2;
+            public IntPtr IUnknown3;
+            public IntPtr HrInit;
+            public IntPtr AddTab;
+            public IntPtr DeleteTab;
+            public IntPtr ActivateTab;
+            public IntPtr SetActiveAlt;
+            public IntPtr MarkFullscreenWindow;
+        }
     }
 
     [Flags]
@@ -1758,4 +2179,57 @@ namespace Avalonia.Win32.Interop
         public bool fNC;
         public bool fWide;
     }
+
+    [Flags]
+    internal enum PixelFormatDescriptorFlags : uint
+    {
+        PFD_DOUBLEBUFFER = 0x00000001,
+        PFD_STEREO = 0x00000002,
+        PFD_DRAW_TO_WINDOW = 0x00000004,
+        PFD_DRAW_TO_BITMAP = 0x00000008,
+        PFD_SUPPORT_GDI = 0x00000010,
+        PFD_SUPPORT_OPENGL = 0x00000020,
+        PFD_GENERIC_FORMAT = 0x00000040,
+        PFD_NEED_PALETTE = 0x00000080,
+        PFD_NEED_SYSTEM_PALETTE = 0x00000100,
+        PFD_SWAP_EXCHANGE = 0x00000200,
+        PFD_SWAP_COPY = 0x00000400,
+        PFD_SWAP_LAYER_BUFFERS = 0x00000800,
+        PFD_GENERIC_ACCELERATED = 0x00001000,
+        PFD_SUPPORT_DIRECTDRAW = 0x00002000,
+        PFD_DEPTH_DONTCARE = 0x20000000,
+        PFD_DOUBLEBUFFER_DONTCARE = 0x40000000,
+        PFD_STEREO_DONTCARE = 0x80000000,
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct PixelFormatDescriptor
+    {
+        public ushort Size;
+        public ushort Version;
+        public PixelFormatDescriptorFlags Flags;
+        public byte PixelType;
+        public byte ColorBits;
+        public byte RedBits;
+        public byte RedShift;
+        public byte GreenBits;
+        public byte GreenShift;
+        public byte BlueBits;
+        public byte BlueShift;
+        public byte AlphaBits;
+        public byte AlphaShift;
+        public byte AccumBits;
+        public byte AccumRedBits;
+        public byte AccumGreenBits;
+        public byte AccumBlueBits;
+        public byte AccumAlphaBits;
+        public byte DepthBits;
+        public byte StencilBits;
+        public byte AuxBuffers;
+        public byte LayerType;
+        private byte Reserved;
+        public uint LayerMask;
+        public uint VisibleMask;
+        public uint DamageMask;
+    }
 }
diff --git a/src/Windows/Avalonia.Win32/NonPumpingSyncContext.cs b/src/Windows/Avalonia.Win32/NonPumpingSyncContext.cs
new file mode 100644
index 0000000000..5577664cc4
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/NonPumpingSyncContext.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Runtime.ConstrainedExecution;
+using System.Threading;
+using Avalonia.Threading;
+using Avalonia.Utilities;
+using Avalonia.Win32.Interop;
+
+namespace Avalonia.Win32
+{
+    internal class NonPumpingSyncContext : SynchronizationContext, IDisposable
+    {
+        private readonly SynchronizationContext _inner;
+
+        private NonPumpingSyncContext(SynchronizationContext inner)
+        {
+            _inner = inner;
+            SetWaitNotificationRequired();
+            SetSynchronizationContext(this);
+        }
+
+        public override void Post(SendOrPostCallback d, object state) => _inner.Post(d, state);
+        public override void Send(SendOrPostCallback d, object state) => _inner.Send(d, state);
+        
+        [PrePrepareMethod]
+        public override int Wait(IntPtr[] waitHandles, bool waitAll, int millisecondsTimeout)
+        {
+            return UnmanagedMethods.WaitForMultipleObjectsEx(waitHandles.Length, waitHandles, waitAll,
+                millisecondsTimeout, false);
+        }
+
+        public void Dispose() => SetSynchronizationContext(_inner);
+
+        public static IDisposable Use()
+        {
+            var current = Current;
+            if (current == null)
+            {
+                if (Thread.CurrentThread.GetApartmentState() != ApartmentState.STA)
+                    return null;
+            }
+            if (current is NonPumpingSyncContext)
+                return null;
+            
+            return new NonPumpingSyncContext(current);
+        }
+
+        internal class HelperImpl : NonPumpingLockHelper.IHelperImpl
+        {
+            IDisposable NonPumpingLockHelper.IHelperImpl.Use() => NonPumpingSyncContext.Use();
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/OffscreenParentWindow.cs b/src/Windows/Avalonia.Win32/OffscreenParentWindow.cs
new file mode 100644
index 0000000000..9de105a3d5
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/OffscreenParentWindow.cs
@@ -0,0 +1,58 @@
+using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using Avalonia.Platform;
+using Avalonia.Win32.Interop;
+namespace Avalonia.Win32
+{
+    class OffscreenParentWindow
+    {
+        public static IntPtr Handle { get; } = CreateParentWindow();
+        private static UnmanagedMethods.WndProc s_wndProcDelegate;
+        private static IntPtr CreateParentWindow()
+        {
+            s_wndProcDelegate = new UnmanagedMethods.WndProc(ParentWndProc);
+
+            var wndClassEx = new UnmanagedMethods.WNDCLASSEX
+            {
+                cbSize = Marshal.SizeOf<UnmanagedMethods.WNDCLASSEX>(),
+                hInstance = UnmanagedMethods.GetModuleHandle(null),
+                lpfnWndProc = s_wndProcDelegate,
+                lpszClassName = "AvaloniaEmbeddedWindow-" + Guid.NewGuid(),
+            };
+
+            var atom = UnmanagedMethods.RegisterClassEx(ref wndClassEx);
+
+            if (atom == 0)
+            {
+                throw new Win32Exception();
+            }
+
+            var hwnd = UnmanagedMethods.CreateWindowEx(
+                0,
+                atom,
+                null,
+                (int)UnmanagedMethods.WindowStyles.WS_OVERLAPPEDWINDOW,
+                UnmanagedMethods.CW_USEDEFAULT,
+                UnmanagedMethods.CW_USEDEFAULT,
+                UnmanagedMethods.CW_USEDEFAULT,
+                UnmanagedMethods.CW_USEDEFAULT,
+                IntPtr.Zero,
+                IntPtr.Zero,
+                IntPtr.Zero,
+                IntPtr.Zero);
+
+            if (hwnd == IntPtr.Zero)
+            {
+                throw new Win32Exception();
+            }
+
+            return hwnd;
+        }
+
+        private static IntPtr ParentWndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
+        {
+            return UnmanagedMethods.DefWindowProc(hWnd, msg, wParam, lParam);
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/OleContext.cs b/src/Windows/Avalonia.Win32/OleContext.cs
index d454c797fa..c6e04a29b4 100644
--- a/src/Windows/Avalonia.Win32/OleContext.cs
+++ b/src/Windows/Avalonia.Win32/OleContext.cs
@@ -7,9 +7,9 @@ using Avalonia.Win32.Interop;
 
 namespace Avalonia.Win32
 {
-    class OleContext
+    internal class OleContext
     {
-        private static OleContext fCurrent;
+        private static OleContext s_current;
 
         internal static OleContext Current
         {
@@ -18,13 +18,12 @@ namespace Avalonia.Win32
                 if (!IsValidOleThread())
                     return null;
 
-                if (fCurrent == null)
-                    fCurrent = new OleContext();
-                return fCurrent;
+                if (s_current == null)
+                    s_current = new OleContext();
+                return s_current;
             }
         }
 
-
         private OleContext()
         {
             UnmanagedMethods.HRESULT res = UnmanagedMethods.OleInitialize(IntPtr.Zero);
@@ -43,9 +42,21 @@ namespace Avalonia.Win32
         internal bool RegisterDragDrop(IPlatformHandle hwnd, IDropTarget target)
         {
             if (hwnd?.HandleDescriptor != "HWND" || target == null)
+            {
                 return false;
+            }
 
             return UnmanagedMethods.RegisterDragDrop(hwnd.Handle, target) == UnmanagedMethods.HRESULT.S_OK;
         }
+
+        internal bool UnregisterDragDrop(IPlatformHandle hwnd)
+        {
+            if (hwnd?.HandleDescriptor != "HWND")
+            {
+                return false;
+            }
+
+            return UnmanagedMethods.RevokeDragDrop(hwnd.Handle) == UnmanagedMethods.HRESULT.S_OK;
+        }
     }
 }
diff --git a/src/Windows/Avalonia.Win32/OleDropTarget.cs b/src/Windows/Avalonia.Win32/OleDropTarget.cs
index b17e0d6c09..37d047689c 100644
--- a/src/Windows/Avalonia.Win32/OleDropTarget.cs
+++ b/src/Windows/Avalonia.Win32/OleDropTarget.cs
@@ -6,7 +6,7 @@ using IDataObject = Avalonia.Input.IDataObject;
 
 namespace Avalonia.Win32
 {
-    class OleDropTarget : IDropTarget
+    internal class OleDropTarget : IDropTarget
     {
         private readonly IInputRoot _target;
         private readonly ITopLevelImpl _tl;
diff --git a/src/Windows/Avalonia.Win32/OpenGl/WglConsts.cs b/src/Windows/Avalonia.Win32/OpenGl/WglConsts.cs
new file mode 100644
index 0000000000..3cb3dc25bb
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/OpenGl/WglConsts.cs
@@ -0,0 +1,62 @@
+namespace Avalonia.Win32.OpenGl
+{
+    internal class WglConsts
+    {
+        public const int WGL_CONTEXT_MAJOR_VERSION_ARB = 0x2091;
+        public const int WGL_CONTEXT_MINOR_VERSION_ARB = 0x2092;
+        public const int WGL_CONTEXT_LAYER_PLANE_ARB = 0x2093;
+        public const int WGL_CONTEXT_FLAGS_ARB = 0x2094;
+        public const int WGL_CONTEXT_PROFILE_MASK_ARB = 0x9126;
+        public const int WGL_NUMBER_PIXEL_FORMATS_ARB = 0x2000;
+
+        public const int WGL_DRAW_TO_WINDOW_ARB = 0x2001;
+        public const int WGL_DRAW_TO_BITMAP_ARB = 0x2002;
+        public const int WGL_ACCELERATION_ARB = 0x2003;
+        public const int WGL_NEED_PALETTE_ARB = 0x2004;
+        public const int WGL_NEED_SYSTEM_PALETTE_ARB = 0x2005;
+        public const int WGL_SWAP_LAYER_BUFFERS_ARB = 0x2006;
+        public const int WGL_SWAP_METHOD_ARB = 0x2007;
+        public const int WGL_NUMBER_OVERLAYS_ARB = 0x2008;
+        public const int WGL_NUMBER_UNDERLAYS_ARB = 0x2009;
+        public const int WGL_TRANSPARENT_ARB = 0x200A;
+        public const int WGL_TRANSPARENT_RED_VALUE_ARB = 0x2037;
+        public const int WGL_TRANSPARENT_GREEN_VALUE_ARB = 0x2038;
+        public const int WGL_TRANSPARENT_BLUE_VALUE_ARB = 0x2039;
+        public const int WGL_TRANSPARENT_ALPHA_VALUE_ARB = 0x203A;
+        public const int WGL_TRANSPARENT_INDEX_VALUE_ARB = 0x203B;
+        public const int WGL_SHARE_DEPTH_ARB = 0x200C;
+        public const int WGL_SHARE_STENCIL_ARB = 0x200D;
+        public const int WGL_SHARE_ACCUM_ARB = 0x200E;
+        public const int WGL_SUPPORT_GDI_ARB = 0x200F;
+        public const int WGL_SUPPORT_OPENGL_ARB = 0x2010;
+        public const int WGL_DOUBLE_BUFFER_ARB = 0x2011;
+        public const int WGL_STEREO_ARB = 0x2012;
+        public const int WGL_PIXEL_TYPE_ARB = 0x2013;
+        public const int WGL_COLOR_BITS_ARB = 0x2014;
+        public const int WGL_RED_BITS_ARB = 0x2015;
+        public const int WGL_RED_SHIFT_ARB = 0x2016;
+        public const int WGL_GREEN_BITS_ARB = 0x2017;
+        public const int WGL_GREEN_SHIFT_ARB = 0x2018;
+        public const int WGL_BLUE_BITS_ARB = 0x2019;
+        public const int WGL_BLUE_SHIFT_ARB = 0x201A;
+        public const int WGL_ALPHA_BITS_ARB = 0x201B;
+        public const int WGL_ALPHA_SHIFT_ARB = 0x201C;
+        public const int WGL_ACCUM_BITS_ARB = 0x201D;
+        public const int WGL_ACCUM_RED_BITS_ARB = 0x201E;
+        public const int WGL_ACCUM_GREEN_BITS_ARB = 0x201F;
+        public const int WGL_ACCUM_BLUE_BITS_ARB = 0x2020;
+        public const int WGL_ACCUM_ALPHA_BITS_ARB = 0x2021;
+        public const int WGL_DEPTH_BITS_ARB = 0x2022;
+        public const int WGL_STENCIL_BITS_ARB = 0x2023;
+        public const int WGL_AUX_BUFFERS_ARB = 0x2024;
+        public const int WGL_NO_ACCELERATION_ARB = 0x2025;
+        public const int WGL_GENERIC_ACCELERATION_ARB = 0x2026;
+        public const int WGL_FULL_ACCELERATION_ARB = 0x2027;
+        public const int WGL_SWAP_EXCHANGE_ARB = 0x2028;
+        public const int WGL_SWAP_COPY_ARB = 0x2029;
+        public const int WGL_SWAP_UNDEFINED_ARB = 0x202A;
+        public const int WGL_TYPE_RGBA_ARB = 0x202B;
+        public const int WGL_TYPE_COLORINDEX_ARB = 0x202C;
+
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/OpenGl/WglContext.cs b/src/Windows/Avalonia.Win32/OpenGl/WglContext.cs
new file mode 100644
index 0000000000..d6633ddb61
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/OpenGl/WglContext.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Reactive.Disposables;
+using Avalonia.OpenGL;
+using Avalonia.Win32.Interop;
+using static Avalonia.Win32.Interop.UnmanagedMethods;
+using static Avalonia.Win32.OpenGl.WglConsts;
+
+namespace Avalonia.Win32.OpenGl
+{
+    class WglContext : IGlContext
+    {
+        private object _lock = new object();
+        private readonly WglContext _sharedWith;
+        private readonly IntPtr _context;
+        private readonly IntPtr _hWnd;
+        private readonly IntPtr _dc;
+        private readonly int _pixelFormat;
+        private readonly PixelFormatDescriptor _formatDescriptor;
+        public IntPtr Handle => _context;
+
+        public WglContext(WglContext sharedWith, GlVersion version, IntPtr context, IntPtr hWnd, IntPtr dc, int pixelFormat,
+            PixelFormatDescriptor formatDescriptor)
+        {
+            Version = version;
+            _sharedWith = sharedWith;
+            _context = context;
+            _hWnd = hWnd;
+            _dc = dc;
+            _pixelFormat = pixelFormat;
+            _formatDescriptor = formatDescriptor;
+            StencilSize = formatDescriptor.StencilBits;
+            using (MakeCurrent())
+                GlInterface = new GlInterface(version, proc =>
+                {
+                    var ext = wglGetProcAddress(proc);
+                    if (ext != IntPtr.Zero)
+                        return ext;
+                    return GetProcAddress(WglDisplay.OpenGl32Handle, proc);
+                });
+
+        }
+
+        public void Dispose()
+        {
+            wglDeleteContext(_context);
+            ReleaseDC(_hWnd, _dc);
+            DestroyWindow(_hWnd);
+        }
+
+        public GlVersion Version { get; }
+        public GlInterface GlInterface { get; }
+        public int SampleCount { get; }
+        public int StencilSize { get; }
+
+        private bool IsCurrent => wglGetCurrentContext() == _context && wglGetCurrentDC() == _dc;
+        public IDisposable MakeCurrent()
+        {
+            if(IsCurrent)
+                return Disposable.Empty;
+            return new WglRestoreContext(_dc, _context, _lock);
+        }
+
+        public IDisposable EnsureCurrent() => MakeCurrent();
+
+
+        public IntPtr CreateConfiguredDeviceContext(IntPtr hWnd)
+        {
+            var dc = GetDC(hWnd);
+            var fmt = _formatDescriptor;
+            SetPixelFormat(dc, _pixelFormat, ref fmt);
+            return dc;
+        }
+        
+        public IDisposable MakeCurrent(IntPtr hdc) => new WglRestoreContext(hdc, _context, _lock);
+
+        public bool IsSharedWith(IGlContext context)
+        {
+            var c = (WglContext)context;
+            return c == this
+                   || c._sharedWith == this
+                   || _sharedWith == context
+                   || _sharedWith != null && _sharedWith == c._sharedWith;
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/OpenGl/WglDisplay.cs b/src/Windows/Avalonia.Win32/OpenGl/WglDisplay.cs
new file mode 100644
index 0000000000..dc3c16b4a3
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/OpenGl/WglDisplay.cs
@@ -0,0 +1,183 @@
+using System;
+using System.Runtime.InteropServices;
+using Avalonia.OpenGL;
+using Avalonia.Win32.Interop;
+using static Avalonia.Win32.Interop.UnmanagedMethods;
+using static Avalonia.Win32.OpenGl.WglConsts;
+namespace Avalonia.Win32.OpenGl
+{
+    internal class WglDisplay
+    {
+        private static bool? _initialized;
+        private static ushort _windowClass;
+        private static readonly WndProc _wndProcDelegate = WndProc;
+        private static readonly DebugCallbackDelegate _debugCallback = DebugCallback;
+
+        private static IntPtr _bootstrapContext;
+        private static IntPtr _bootstrapWindow;
+        private static IntPtr _bootstrapDc;
+        private static PixelFormatDescriptor _defaultPfd;
+        private static int _defaultPixelFormat;
+        public static IntPtr OpenGl32Handle = LoadLibrary("opengl32");
+
+        private delegate bool WglChoosePixelFormatARBDelegate(IntPtr hdc, int[] piAttribIList, float[] pfAttribFList,
+            int nMaxFormats, int[] piFormats, out int nNumFormats);
+
+        private static WglChoosePixelFormatARBDelegate WglChoosePixelFormatArb;
+
+        private delegate IntPtr WglCreateContextAttribsARBDelegate(IntPtr hDC, IntPtr hShareContext, int[] attribList);
+
+        private static WglCreateContextAttribsARBDelegate WglCreateContextAttribsArb;
+        
+        private delegate void GlDebugMessageCallbackDelegate(IntPtr callback, IntPtr userParam);
+
+        private static GlDebugMessageCallbackDelegate GlDebugMessageCallback;
+
+        private delegate void DebugCallbackDelegate(int source, int type, int id, int severity, int len, IntPtr message,
+            IntPtr userParam);
+        
+        static bool Initialize()
+        {
+            if (!_initialized.HasValue)
+                _initialized = InitializeCore();
+            return _initialized.Value;
+        }
+        static bool InitializeCore()
+        {
+            var wndClassEx = new WNDCLASSEX
+            {
+                cbSize = Marshal.SizeOf<WNDCLASSEX>(),
+                hInstance = GetModuleHandle(null),
+                lpfnWndProc = _wndProcDelegate,
+                lpszClassName = "AvaloniaGlWindow-" + Guid.NewGuid(),
+                style = (int)ClassStyles.CS_OWNDC
+            };
+            
+            _windowClass = RegisterClassEx(ref wndClassEx);
+            _bootstrapWindow = CreateOffscreenWindow();
+            _bootstrapDc = GetDC(_bootstrapWindow);
+            _defaultPfd = new PixelFormatDescriptor
+            {
+                Size = (ushort)Marshal.SizeOf<PixelFormatDescriptor>(),
+                Version = 1,
+                Flags = PixelFormatDescriptorFlags.PFD_DRAW_TO_WINDOW |
+                        PixelFormatDescriptorFlags.PFD_SUPPORT_OPENGL | PixelFormatDescriptorFlags.PFD_DOUBLEBUFFER,
+                DepthBits = 24,
+                StencilBits = 8,
+                ColorBits = 32
+            };
+            _defaultPixelFormat = ChoosePixelFormat(_bootstrapDc, ref _defaultPfd);
+            SetPixelFormat(_bootstrapDc, _defaultPixelFormat, ref _defaultPfd);
+
+            _bootstrapContext = wglCreateContext(_bootstrapDc);
+            if (_bootstrapContext == IntPtr.Zero)
+                return false;
+
+            wglMakeCurrent(_bootstrapDc, _bootstrapContext);
+            WglCreateContextAttribsArb = Marshal.GetDelegateForFunctionPointer<WglCreateContextAttribsARBDelegate>(
+                wglGetProcAddress("wglCreateContextAttribsARB"));
+
+            WglChoosePixelFormatArb =
+                Marshal.GetDelegateForFunctionPointer<WglChoosePixelFormatARBDelegate>(
+                    wglGetProcAddress("wglChoosePixelFormatARB"));
+
+            GlDebugMessageCallback =
+                Marshal.GetDelegateForFunctionPointer<GlDebugMessageCallbackDelegate>(
+                    wglGetProcAddress("glDebugMessageCallback"));
+            
+
+            var formats = new int[1];
+            WglChoosePixelFormatArb(_bootstrapDc, new int[]
+            {
+                WGL_DRAW_TO_WINDOW_ARB, 1,
+                WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB,
+                WGL_SUPPORT_OPENGL_ARB, 1,
+                WGL_DOUBLE_BUFFER_ARB, 1,
+                WGL_PIXEL_TYPE_ARB, WGL_TYPE_RGBA_ARB,
+                WGL_COLOR_BITS_ARB, 32,
+                WGL_DEPTH_BITS_ARB, 0,
+                WGL_STENCIL_BITS_ARB, 0,
+                0, // End
+            }, null, 1, formats, out int numFormats);
+            if (numFormats != 0)
+            {
+                DescribePixelFormat(_bootstrapDc, formats[0], Marshal.SizeOf<PixelFormatDescriptor>(), ref _defaultPfd);
+                _defaultPixelFormat = formats[0];
+            }
+
+
+            wglMakeCurrent(IntPtr.Zero, IntPtr.Zero);
+            return true;
+        }
+        
+        static IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
+        {
+            return DefWindowProc(hWnd, msg, wParam, lParam);
+        }
+        
+        private static void DebugCallback(int source, int type, int id, int severity, int len, IntPtr message, IntPtr userparam)
+        {
+            var err = Marshal.PtrToStringAnsi(message, len);
+            Console.Error.WriteLine(err);
+        }
+        
+        public static WglContext CreateContext(GlVersion[] versions, IGlContext share)
+        {
+            if (!Initialize())
+                return null;
+
+            var shareContext = (WglContext)share;
+
+            using (new WglRestoreContext(_bootstrapDc, _bootstrapContext, null))
+            {
+                var window = CreateOffscreenWindow();
+                var dc = GetDC(window);
+                SetPixelFormat(dc, _defaultPixelFormat, ref _defaultPfd);
+                foreach (var version in versions)
+                {
+                    if(version.Type != GlProfileType.OpenGL)
+                        continue;
+                    var context = WglCreateContextAttribsArb(dc, shareContext?.Handle ?? IntPtr.Zero,
+                        new[]
+                        {
+                            // major
+                            WGL_CONTEXT_MAJOR_VERSION_ARB, version.Major,
+                            // minor
+                            WGL_CONTEXT_MINOR_VERSION_ARB,  version.Minor,
+                            // core profile
+                            WGL_CONTEXT_PROFILE_MASK_ARB, 1, 
+                            // debug 
+                            // WGL_CONTEXT_FLAGS_ARB, 1,
+                            // end
+                            0, 0
+                        });
+                    using(new WglRestoreContext(dc, context, null))
+                        GlDebugMessageCallback(Marshal.GetFunctionPointerForDelegate(_debugCallback), IntPtr.Zero);
+                    if (context != IntPtr.Zero)
+                        return new WglContext(shareContext, version, context, window, dc,
+                            _defaultPixelFormat, _defaultPfd);
+                }
+
+                ReleaseDC(window, dc);
+                DestroyWindow(window);
+                return null;
+            }
+        }
+
+
+        static IntPtr CreateOffscreenWindow() =>
+            CreateWindowEx(
+                0,
+                _windowClass,
+                null,
+                (int)WindowStyles.WS_OVERLAPPEDWINDOW,
+                0,
+                0,
+                640,
+                480,
+                IntPtr.Zero, 
+                IntPtr.Zero,
+                IntPtr.Zero,
+                IntPtr.Zero);
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/OpenGl/WglGlPlatformSurface.cs b/src/Windows/Avalonia.Win32/OpenGl/WglGlPlatformSurface.cs
new file mode 100644
index 0000000000..72bcffd447
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/OpenGl/WglGlPlatformSurface.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Diagnostics;
+using Avalonia.OpenGL;
+using Avalonia.OpenGL.Egl;
+using Avalonia.OpenGL.Surfaces;
+using Avalonia.Win32.Interop;
+using static Avalonia.OpenGL.GlConsts;
+using static Avalonia.Win32.Interop.UnmanagedMethods;
+namespace Avalonia.Win32.OpenGl
+{
+    class WglGlPlatformSurface: IGlPlatformSurface
+    {
+
+        private readonly WglContext _context;
+        private readonly EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo _info;
+        
+        public WglGlPlatformSurface(WglContext context, EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo info)
+        {
+            _context = context;
+            _info = info;
+        }
+        
+        public IGlPlatformSurfaceRenderTarget CreateGlRenderTarget()
+        {
+            return new RenderTarget(_context, _info);
+        }
+
+        class RenderTarget : IGlPlatformSurfaceRenderTarget
+        {
+            private readonly WglContext _context;
+            private readonly EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo _info;
+            private IntPtr _hdc;
+            public RenderTarget(WglContext context,  EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo info)
+            {
+                _context = context;
+                _info = info;
+                _hdc = context.CreateConfiguredDeviceContext(info.Handle);
+            }
+
+            public void Dispose()
+            {
+                UnmanagedMethods.ReleaseDC(_hdc, _info.Handle);
+            }
+
+            public IGlPlatformSurfaceRenderingSession BeginDraw()
+            {
+                var oldContext = _context.MakeCurrent(_hdc);
+                
+                // Reset to default FBO first
+                _context.GlInterface.BindFramebuffer(GL_FRAMEBUFFER, 0);
+
+                return new Session(_context, _hdc, _info, oldContext);
+            }
+            
+            class Session : IGlPlatformSurfaceRenderingSession
+            {
+                private readonly WglContext _context;
+                private readonly IntPtr _hdc;
+                private readonly EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo _info;
+                private readonly IDisposable _clearContext;
+                public IGlContext Context => _context;
+
+                public Session(WglContext context, IntPtr hdc, EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo info,
+                    IDisposable clearContext)
+                {
+                    _context = context;
+                    _hdc = hdc;
+                    _info = info;
+                    _clearContext = clearContext;
+                }
+
+                public void Dispose()
+                {
+                    _context.GlInterface.Flush();
+                    UnmanagedMethods.SwapBuffers(_hdc);
+                    _clearContext.Dispose();
+                }
+
+                public PixelSize Size => _info.Size;
+                public double Scaling => _info.Scaling;
+                public bool IsYFlipped { get; }
+            }
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/OpenGl/WglPlatformOpenGlInterface.cs b/src/Windows/Avalonia.Win32/OpenGl/WglPlatformOpenGlInterface.cs
new file mode 100644
index 0000000000..b948495b99
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/OpenGl/WglPlatformOpenGlInterface.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Linq;
+using Avalonia.Logging;
+using Avalonia.OpenGL;
+
+namespace Avalonia.Win32.OpenGl
+{
+    class WglPlatformOpenGlInterface : IPlatformOpenGlInterface
+    {
+        public WglContext PrimaryContext { get; }
+        IGlContext IPlatformOpenGlInterface.PrimaryContext => PrimaryContext;
+        public IGlContext CreateSharedContext() => WglDisplay.CreateContext(new[] { PrimaryContext.Version }, PrimaryContext);
+
+        public bool CanShareContexts => true;
+        public bool CanCreateContexts => true;
+        public IGlContext CreateContext() => WglDisplay.CreateContext(new[] { PrimaryContext.Version }, null);
+
+        private  WglPlatformOpenGlInterface(WglContext primary)
+        {
+            PrimaryContext = primary;
+        }
+
+        public static WglPlatformOpenGlInterface TryCreate()
+        {
+            try
+            {
+                var opts = AvaloniaLocator.Current.GetService<Win32PlatformOptions>() ?? new Win32PlatformOptions();
+                var primary = WglDisplay.CreateContext(opts.WglProfiles.ToArray(), null);
+                return new WglPlatformOpenGlInterface(primary);
+            }
+            catch (Exception e)
+            {
+                Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("WGL", "Unable to initialize WGL: " + e);
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/OpenGl/WglRestoreContext.cs b/src/Windows/Avalonia.Win32/OpenGl/WglRestoreContext.cs
new file mode 100644
index 0000000000..265f078a5c
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/OpenGl/WglRestoreContext.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Threading;
+using Avalonia.OpenGL;
+using static Avalonia.Win32.Interop.UnmanagedMethods;
+
+namespace Avalonia.Win32.OpenGl
+{
+    internal class WglRestoreContext : IDisposable
+    {
+        private readonly object _monitor;
+        private readonly IntPtr _oldDc;
+        private readonly IntPtr _oldContext;
+
+        public WglRestoreContext(IntPtr gc, IntPtr context, object monitor, bool takeMonitor = true)
+        {
+            _monitor = monitor;
+            _oldDc = wglGetCurrentDC();
+            _oldContext = wglGetCurrentContext();
+
+            if (monitor != null && takeMonitor) 
+                Monitor.Enter(monitor);
+
+            if (!wglMakeCurrent(gc, context))
+            {
+                if(monitor != null && takeMonitor)
+                    Monitor.Exit(monitor);
+                throw new OpenGlException("Unable to make the context current");
+            }
+        }
+
+        public void Dispose()
+        {
+            if (!wglMakeCurrent(_oldDc, _oldContext))
+                wglMakeCurrent(IntPtr.Zero, IntPtr.Zero);
+            if (_monitor != null)
+                Monitor.Exit(_monitor);
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/PlatformConstants.cs b/src/Windows/Avalonia.Win32/PlatformConstants.cs
index ba89c5bee6..af1eca29be 100644
--- a/src/Windows/Avalonia.Win32/PlatformConstants.cs
+++ b/src/Windows/Avalonia.Win32/PlatformConstants.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 namespace Avalonia.Win32
 {
     static class PlatformConstants
diff --git a/src/Windows/Avalonia.Win32/PopupImpl.cs b/src/Windows/Avalonia.Win32/PopupImpl.cs
index c9aa1ce4e7..dd3fd1342c 100644
--- a/src/Windows/Avalonia.Win32/PopupImpl.cs
+++ b/src/Windows/Avalonia.Win32/PopupImpl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Controls.Primitives.PopupPositioning;
 using Avalonia.Platform;
@@ -10,16 +7,71 @@ namespace Avalonia.Win32
 {
     class PopupImpl : WindowImpl, IPopupImpl
     {
-        public override void Show()
+        private readonly IWindowBaseImpl _parent;
+        private bool _dropShadowHint = true;
+        private Size? _maxAutoSize;
+
+
+        // This is needed because we are calling virtual methods from constructors
+        // One fabulous design decision leads to another, I guess
+        [ThreadStatic]
+        private static IntPtr s_parentHandle;
+
+        public override void Show(bool activate)
         {
+            // Popups are always shown non-activated.
             UnmanagedMethods.ShowWindow(Handle.Handle, UnmanagedMethods.ShowWindowCommand.ShowNoActivate);
+
+            // We need to steal focus if it's held by a child window of our toplevel window
+            var parent = _parent;
+            while(parent != null)
+            {
+                if(parent is PopupImpl pi)
+                   parent = pi._parent;
+                else
+                    break;
+            }
+
+            if(parent == null)
+                return;
+
+            var focusOwner = UnmanagedMethods.GetFocus();
+            if (focusOwner != IntPtr.Zero &&
+                UnmanagedMethods.GetAncestor(focusOwner, UnmanagedMethods.GetAncestorFlags.GA_ROOT)
+                == parent.Handle.Handle)
+                UnmanagedMethods.SetFocus(parent.Handle.Handle);
+        }
+
+        protected override bool ShouldTakeFocusOnClick => false;
+
+        public override Size MaxAutoSizeHint
+        {
+            get
+            {
+                if (_maxAutoSize is null)
+                {
+                    var monitor = UnmanagedMethods.MonitorFromWindow(
+                        Hwnd,
+                        UnmanagedMethods.MONITOR.MONITOR_DEFAULTTONEAREST);
+                    
+                    if (monitor != IntPtr.Zero)
+                    {
+                        var info = UnmanagedMethods.MONITORINFO.Create();
+                        UnmanagedMethods.GetMonitorInfo(monitor, ref info);
+                        _maxAutoSize = info.rcWork.ToPixelRect().ToRect(RenderScaling).Size;
+                    }
+                }
+
+                return _maxAutoSize ?? Size.Infinity;
+            }
         }
 
         protected override IntPtr CreateWindowOverride(ushort atom)
         {
             UnmanagedMethods.WindowStyles style =
                 UnmanagedMethods.WindowStyles.WS_POPUP |
-                UnmanagedMethods.WindowStyles.WS_CLIPSIBLINGS;
+                UnmanagedMethods.WindowStyles.WS_CLIPSIBLINGS |
+                UnmanagedMethods.WindowStyles.WS_CLIPCHILDREN;
 
             UnmanagedMethods.WindowStyles exStyle =
                 UnmanagedMethods.WindowStyles.WS_EX_TOOLWINDOW |
@@ -34,16 +86,13 @@ namespace Avalonia.Win32
                 UnmanagedMethods.CW_USEDEFAULT,
                 UnmanagedMethods.CW_USEDEFAULT,
                 UnmanagedMethods.CW_USEDEFAULT,
-                IntPtr.Zero,
+                s_parentHandle,
                 IntPtr.Zero,
                 IntPtr.Zero,
                 IntPtr.Zero);
+            s_parentHandle = IntPtr.Zero;
 
-            var classes = (int)UnmanagedMethods.GetClassLongPtr(result, (int)UnmanagedMethods.ClassLongIndex.GCL_STYLE);
-
-            classes |= (int)UnmanagedMethods.ClassStyles.CS_DROPSHADOW;
-
-            UnmanagedMethods.SetClassLong(result, UnmanagedMethods.ClassLongIndex.GCL_STYLE, new IntPtr(classes));
+            EnableBoxShadow(result, _dropShadowHint);
 
             return result;
         }
@@ -52,6 +101,9 @@ namespace Avalonia.Win32
         {
             switch ((UnmanagedMethods.WindowsMessage)msg)
             {
+                case UnmanagedMethods.WindowsMessage.WM_DISPLAYCHANGE:
+                    _maxAutoSize = null;
+                    goto default;
                 case UnmanagedMethods.WindowsMessage.WM_MOUSEACTIVATE:
                     return (IntPtr)UnmanagedMethods.MouseActivate.MA_NOACTIVATE;
                 default:
@@ -59,8 +111,24 @@ namespace Avalonia.Win32
             }
         }
 
-        public PopupImpl(IWindowBaseImpl parent)
+        // This is needed because we are calling virtual methods from constructors
+        // One fabulous design decision leads to another, I guess
+        static IWindowBaseImpl SaveParentHandle(IWindowBaseImpl parent)
         {
+            s_parentHandle = parent.Handle.Handle;
+            return parent;
+        }
+
+        // This is needed because we are calling virtual methods from constructors
+        // One fabulous design decision leads to another, I guess
+        public PopupImpl(IWindowBaseImpl parent) : this(SaveParentHandle(parent), false)
+        {
+
+        }
+
+        private PopupImpl(IWindowBaseImpl parent, bool dummy) : base()
+        {
+            _parent = parent;
             PopupPositioner = new ManagedPopupPositioner(new ManagedPopupPositionerPopupImplHelper(parent, MoveResize));
         }
 
@@ -71,6 +139,32 @@ namespace Avalonia.Win32
             //TODO: We ignore the scaling override for now
         }
 
+        private void EnableBoxShadow (IntPtr hwnd, bool enabled)
+        {
+            var classes = (int)UnmanagedMethods.GetClassLongPtr(hwnd, (int)UnmanagedMethods.ClassLongIndex.GCL_STYLE);
+
+            if (enabled)
+            {
+                classes |= (int)UnmanagedMethods.ClassStyles.CS_DROPSHADOW;
+            }
+            else
+            {
+                classes &= ~(int)UnmanagedMethods.ClassStyles.CS_DROPSHADOW;
+            }
+
+            UnmanagedMethods.SetClassLong(hwnd, UnmanagedMethods.ClassLongIndex.GCL_STYLE, new IntPtr(classes));
+        }
+
+        public void SetWindowManagerAddShadowHint(bool enabled)
+        {
+            _dropShadowHint = enabled;
+
+            if (Handle != null)
+            {
+                EnableBoxShadow(Handle.Handle, enabled);
+            }
+        }
+
         public IPopupPositioner PopupPositioner { get; }
     }
 }
diff --git a/src/Windows/Avalonia.Win32/Properties/AssemblyInfo.cs b/src/Windows/Avalonia.Win32/Properties/AssemblyInfo.cs
index 38ec891f76..30a3f71cad 100644
--- a/src/Windows/Avalonia.Win32/Properties/AssemblyInfo.cs
+++ b/src/Windows/Avalonia.Win32/Properties/AssemblyInfo.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Platform;
 using Avalonia.Win32;
 
diff --git a/src/Windows/Avalonia.Win32/ScreenImpl.cs b/src/Windows/Avalonia.Win32/ScreenImpl.cs
index df4cf7fa19..442794f0f0 100644
--- a/src/Windows/Avalonia.Win32/ScreenImpl.cs
+++ b/src/Windows/Avalonia.Win32/ScreenImpl.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
 using Avalonia.Platform;
 using Avalonia.Win32.Interop;
@@ -11,7 +8,7 @@ namespace Avalonia.Win32
 {
     public class ScreenImpl : IScreenImpl
     {
-        public  int ScreenCount
+        public int ScreenCount
         {
             get => GetSystemMetrics(SystemMetric.SM_CMONITORS);
         }
@@ -36,7 +33,7 @@ namespace Avalonia.Win32
                                 var shcore = LoadLibrary("shcore.dll");
                                 var method = GetProcAddress(shcore, nameof(GetDpiForMonitor));
                                 if (method != IntPtr.Zero)
-                                { 
+                                {
                                     GetDpiForMonitor(monitor, MONITOR_DPI_TYPE.MDT_EFFECTIVE_DPI, out var x, out _);
                                     dpi = (double)x;
                                 }
@@ -54,11 +51,8 @@ namespace Avalonia.Win32
 
                                 RECT bounds = monitorInfo.rcMonitor;
                                 RECT workingArea = monitorInfo.rcWork;
-                                PixelRect avaloniaBounds = new PixelRect(bounds.left, bounds.top, bounds.right - bounds.left,
-                                    bounds.bottom - bounds.top);
-                                PixelRect avaloniaWorkArea =
-                                    new PixelRect(workingArea.left, workingArea.top, workingArea.right - workingArea.left,
-                                        workingArea.bottom - workingArea.top);
+                                PixelRect avaloniaBounds = bounds.ToPixelRect();
+                                PixelRect avaloniaWorkArea = workingArea.ToPixelRect();
                                 screens[index] =
                                     new WinScreen(dpi / 96.0d, avaloniaBounds, avaloniaWorkArea, monitorInfo.dwFlags == 1,
                                         monitor);
diff --git a/src/Windows/Avalonia.Win32/SystemDialogImpl.cs b/src/Windows/Avalonia.Win32/SystemDialogImpl.cs
index c452290afc..ad81cc1778 100644
--- a/src/Windows/Avalonia.Win32/SystemDialogImpl.cs
+++ b/src/Windows/Avalonia.Win32/SystemDialogImpl.cs
@@ -5,27 +5,25 @@ using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
-using Avalonia.Platform;
 using Avalonia.Win32.Interop;
 
 namespace Avalonia.Win32
 {
-
     class SystemDialogImpl : ISystemDialogImpl
     {
         private const UnmanagedMethods.FOS DefaultDialogOptions = UnmanagedMethods.FOS.FOS_FORCEFILESYSTEM | UnmanagedMethods.FOS.FOS_NOVALIDATE |
             UnmanagedMethods.FOS.FOS_NOTESTFILECREATE | UnmanagedMethods.FOS.FOS_DONTADDTORECENT;
 
-        public unsafe Task<string[]> ShowFileDialogAsync(FileDialog dialog, IWindowImpl parent)
+        public unsafe Task<string[]> ShowFileDialogAsync(FileDialog dialog, Window parent)
         {
-            var hWnd = parent?.Handle?.Handle ?? IntPtr.Zero;
+            var hWnd = parent?.PlatformImpl?.Handle?.Handle ?? IntPtr.Zero;
             return Task.Factory.StartNew(() =>
             {
                 var result = Array.Empty<string>();
 
                 Guid clsid = dialog is OpenFileDialog ? UnmanagedMethods.ShellIds.OpenFileDialog : UnmanagedMethods.ShellIds.SaveFileDialog;
                 Guid iid = UnmanagedMethods.ShellIds.IFileDialog;
-                UnmanagedMethods.CoCreateInstance(ref clsid, IntPtr.Zero, 1, ref iid, out var unk);
+                UnmanagedMethods.CoCreateInstance(ref clsid, IntPtr.Zero, 1, ref iid, out object unk);
                 var frm = (UnmanagedMethods.IFileDialog)unk;
 
                 var openDialog = dialog as OpenFileDialog;
@@ -57,11 +55,11 @@ namespace Avalonia.Win32
                 frm.SetFileTypes((uint)filters.Count, filters.ToArray());
                 frm.SetFileTypeIndex(0);
 
-                if (dialog.InitialDirectory != null)
+                if (dialog.Directory != null)
                 {
                     UnmanagedMethods.IShellItem directoryShellItem;
                     Guid riid = UnmanagedMethods.ShellIds.IShellItem;
-                    if (UnmanagedMethods.SHCreateItemFromParsingName(dialog.InitialDirectory, IntPtr.Zero, ref riid, out directoryShellItem) == (uint)UnmanagedMethods.HRESULT.S_OK)
+                    if (UnmanagedMethods.SHCreateItemFromParsingName(dialog.Directory, IntPtr.Zero, ref riid, out directoryShellItem) == (uint)UnmanagedMethods.HRESULT.S_OK)
                     {
                         frm.SetFolder(directoryShellItem);
                         frm.SetDefaultFolder(directoryShellItem);
@@ -98,38 +96,39 @@ namespace Avalonia.Win32
             });
         }
 
-        public Task<string> ShowFolderDialogAsync(OpenFolderDialog dialog, IWindowImpl parent)
+        public Task<string> ShowFolderDialogAsync(OpenFolderDialog dialog, Window parent)
         {
             return Task.Factory.StartNew(() =>
             {
                 string result = string.Empty;
 
-                var hWnd = parent?.Handle?.Handle ?? IntPtr.Zero;
+                var hWnd = parent?.PlatformImpl?.Handle?.Handle ?? IntPtr.Zero;
                 Guid clsid = UnmanagedMethods.ShellIds.OpenFileDialog;
-                Guid iid  = UnmanagedMethods.ShellIds.IFileDialog;
+                Guid iid = UnmanagedMethods.ShellIds.IFileDialog;
 
-                UnmanagedMethods.CoCreateInstance(ref clsid, IntPtr.Zero, 1, ref iid, out var unk);
+                UnmanagedMethods.CoCreateInstance(ref clsid, IntPtr.Zero, 1, ref iid, out object unk);
                 var frm = (UnmanagedMethods.IFileDialog)unk;
                 uint options;
                 frm.GetOptions(out options);
                 options |= (uint)(UnmanagedMethods.FOS.FOS_PICKFOLDERS | DefaultDialogOptions);
                 frm.SetOptions(options);
+                frm.SetTitle(dialog.Title ?? "");
 
-                if (dialog.InitialDirectory != null)
+                if (dialog.Directory != null)
                 {
                     UnmanagedMethods.IShellItem directoryShellItem;
                     Guid riid = UnmanagedMethods.ShellIds.IShellItem;
-                    if (UnmanagedMethods.SHCreateItemFromParsingName(dialog.InitialDirectory, IntPtr.Zero, ref riid, out directoryShellItem) == (uint)UnmanagedMethods.HRESULT.S_OK)
+                    if (UnmanagedMethods.SHCreateItemFromParsingName(dialog.Directory, IntPtr.Zero, ref riid, out directoryShellItem) == (uint)UnmanagedMethods.HRESULT.S_OK)
                     {
                         frm.SetFolder(directoryShellItem);
                     }
                 }
 
-                if (dialog.DefaultDirectory != null)
+                if (dialog.Directory != null)
                 {
                     UnmanagedMethods.IShellItem directoryShellItem;
                     Guid riid = UnmanagedMethods.ShellIds.IShellItem;
-                    if (UnmanagedMethods.SHCreateItemFromParsingName(dialog.DefaultDirectory, IntPtr.Zero, ref riid, out directoryShellItem) == (uint)UnmanagedMethods.HRESULT.S_OK)
+                    if (UnmanagedMethods.SHCreateItemFromParsingName(dialog.Directory, IntPtr.Zero, ref riid, out directoryShellItem) == (uint)UnmanagedMethods.HRESULT.S_OK)
                     {
                         frm.SetDefaultFolder(directoryShellItem);
                     }
diff --git a/src/Windows/Avalonia.Win32/Win32GlManager.cs b/src/Windows/Avalonia.Win32/Win32GlManager.cs
index 585e68056b..f6b07ee33e 100644
--- a/src/Windows/Avalonia.Win32/Win32GlManager.cs
+++ b/src/Windows/Avalonia.Win32/Win32GlManager.cs
@@ -1,25 +1,41 @@
+using System;
 using Avalonia.OpenGL;
+using Avalonia.OpenGL.Angle;
+using Avalonia.OpenGL.Egl;
+using Avalonia.Win32.OpenGl;
+using Avalonia.Win32.WinRT.Composition;
 
 namespace Avalonia.Win32
 {
     static class Win32GlManager
     {
-        /// <summary>This property is initialized if drawing platform requests OpenGL support</summary>
-        public static EglGlPlatformFeature EglFeature { get; private set; }
-
-        private static bool s_attemptedToInitialize;
-
         public static void Initialize()
         {
-            AvaloniaLocator.CurrentMutable.Bind<IWindowingPlatformGlFeature>().ToFunc(() =>
+            AvaloniaLocator.CurrentMutable.Bind<IPlatformOpenGlInterface>().ToLazy<IPlatformOpenGlInterface>(() =>
             {
-                if (!s_attemptedToInitialize)
+                var opts = AvaloniaLocator.Current.GetService<Win32PlatformOptions>();
+                if (opts?.UseWgl == true)
                 {
-                    EglFeature = EglGlPlatformFeature.TryCreate();
-                    s_attemptedToInitialize = true;
+                    var wgl = WglPlatformOpenGlInterface.TryCreate();
+                    return wgl;
+                }
+
+                if (opts?.AllowEglInitialization == true ||
+                    ((!opts?.AllowEglInitialization.HasValue ?? false) &&
+                     Win32Platform.WindowsVersion > new Version(6, 1)))
+                {
+                    var egl = EglPlatformOpenGlInterface.TryCreate(() => new AngleWin32EglDisplay());
+
+                    if (egl is { } &&
+                        opts?.UseWindowsUIComposition == true)
+                    {
+                        WinUICompositorConnection.TryCreateAndRegister(egl);
+                    }
+
+                    return egl;
                 }
 
-                return EglFeature;
+                return null;
             });
         }
     }
diff --git a/src/Windows/Avalonia.Win32/Win32NativeControlHost.cs b/src/Windows/Avalonia.Win32/Win32NativeControlHost.cs
new file mode 100644
index 0000000000..8f62163d81
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Win32NativeControlHost.cs
@@ -0,0 +1,205 @@
+using System;
+using System.Runtime.InteropServices;
+using Avalonia.Controls.Platform;
+using Avalonia.Platform;
+using Avalonia.VisualTree;
+using Avalonia.Win32.Interop;
+
+namespace Avalonia.Win32
+{
+    class Win32NativeControlHost : INativeControlHostImpl
+    {
+        public WindowImpl Window { get; }
+
+        public Win32NativeControlHost(WindowImpl window)
+        {
+            Window = window;
+        }
+
+        void AssertCompatible(IPlatformHandle handle)
+        {
+            if (!IsCompatibleWith(handle))
+                throw new ArgumentException($"Don't know what to do with {handle.HandleDescriptor}");
+        }
+
+        public INativeControlHostDestroyableControlHandle CreateDefaultChild(IPlatformHandle parent)
+        {
+            AssertCompatible(parent);
+            return new DumbWindow(parent.Handle);
+        }
+
+        public INativeControlHostControlTopLevelAttachment CreateNewAttachment(Func<IPlatformHandle, IPlatformHandle> create)
+        {
+            var holder = new DumbWindow(Window.Handle.Handle);
+            Win32NativeControlAttachment attachment = null;
+            try
+            {
+                var child = create(holder);
+                // ReSharper disable once UseObjectOrCollectionInitializer
+                // It has to be assigned to the variable before property setter is called so we dispose it on exception
+                attachment = new Win32NativeControlAttachment(holder, child);
+                attachment.AttachedTo = this;
+                return attachment;
+            }
+            catch
+            {
+                attachment?.Dispose();
+                holder?.Destroy();
+                throw;
+            }
+        }
+
+        public INativeControlHostControlTopLevelAttachment CreateNewAttachment(IPlatformHandle handle)
+        {
+            AssertCompatible(handle);
+            return new Win32NativeControlAttachment(new DumbWindow(Window.Handle.Handle),
+                handle) { AttachedTo = this };
+        }
+
+        public bool IsCompatibleWith(IPlatformHandle handle) => handle.HandleDescriptor == "HWND";
+
+        class DumbWindow : IDisposable, INativeControlHostDestroyableControlHandle
+        {
+            public IntPtr Handle { get;}
+            public string HandleDescriptor => "HWND";
+            public void Destroy() => Dispose();
+
+            UnmanagedMethods.WndProc _wndProcDelegate;
+            private readonly string _className;
+
+            public DumbWindow(IntPtr? parent = null)
+            {
+                _wndProcDelegate = WndProc;
+                var wndClassEx = new UnmanagedMethods.WNDCLASSEX
+                {
+                    cbSize = Marshal.SizeOf<UnmanagedMethods.WNDCLASSEX>(),
+                    hInstance = UnmanagedMethods.GetModuleHandle(null),
+                    lpfnWndProc = _wndProcDelegate,
+                    lpszClassName = _className = "AvaloniaDumbWindow-" + Guid.NewGuid(),
+                };
+
+                var atom = UnmanagedMethods.RegisterClassEx(ref wndClassEx);
+                Handle = UnmanagedMethods.CreateWindowEx(
+                    0,
+                    atom,
+                    null,
+                    (int)UnmanagedMethods.WindowStyles.WS_CHILD,
+                    0,
+                    0,
+                    640,
+                    480,
+                    parent ?? OffscreenParentWindow.Handle,
+                    IntPtr.Zero,
+                    IntPtr.Zero,
+                    IntPtr.Zero);
+            }
+
+
+
+            protected virtual unsafe IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
+            {
+                return UnmanagedMethods.DefWindowProc(hWnd, msg, wParam, lParam);
+            }
+
+            private void ReleaseUnmanagedResources()
+            {
+                UnmanagedMethods.DestroyWindow(Handle);
+                UnmanagedMethods.UnregisterClass(_className, UnmanagedMethods.GetModuleHandle(null));
+            }
+
+            public void Dispose()
+            {
+                ReleaseUnmanagedResources();
+                GC.SuppressFinalize(this);
+            }
+
+            ~DumbWindow()
+            {
+                ReleaseUnmanagedResources();
+            }
+        }
+
+        class Win32NativeControlAttachment : INativeControlHostControlTopLevelAttachment
+        {
+            private DumbWindow _holder;
+            private IPlatformHandle _child;
+            private Win32NativeControlHost _attachedTo;
+
+            public Win32NativeControlAttachment(DumbWindow holder, IPlatformHandle child)
+            {
+                _holder = holder;
+                _child = child;
+                UnmanagedMethods.SetParent(child.Handle, _holder.Handle);
+                UnmanagedMethods.ShowWindow(child.Handle, UnmanagedMethods.ShowWindowCommand.Show);
+            }
+
+            void CheckDisposed()
+            {
+                if (_holder == null)
+                    throw new ObjectDisposedException(nameof(Win32NativeControlAttachment));
+            }
+
+            public void Dispose()
+            {
+                if (_child != null)
+                    UnmanagedMethods.SetParent(_child.Handle, OffscreenParentWindow.Handle);
+                _holder?.Dispose();
+                _holder = null;
+                _child = null;
+                _attachedTo = null;
+            }
+
+            public INativeControlHostImpl AttachedTo
+            {
+                get => _attachedTo;
+                set
+                {
+                    CheckDisposed();
+                    _attachedTo = (Win32NativeControlHost) value;
+                    if (_attachedTo == null)
+                    {
+                        UnmanagedMethods.ShowWindow(_holder.Handle, UnmanagedMethods.ShowWindowCommand.Hide);
+                        UnmanagedMethods.SetParent(_holder.Handle, OffscreenParentWindow.Handle);
+                    }
+                    else
+                        UnmanagedMethods.SetParent(_holder.Handle, _attachedTo.Window.Handle.Handle);
+                }
+            }
+
+            public bool IsCompatibleWith(INativeControlHostImpl host) => host is Win32NativeControlHost;
+
+            public void HideWithSize(Size size)
+            {
+                UnmanagedMethods.SetWindowPos(_holder.Handle, IntPtr.Zero,
+                    -100, -100, 1, 1,
+                    UnmanagedMethods.SetWindowPosFlags.SWP_HIDEWINDOW |
+                    UnmanagedMethods.SetWindowPosFlags.SWP_NOACTIVATE);
+                if (_attachedTo == null || _child == null)
+                    return;
+                size *= _attachedTo.Window.RenderScaling;
+                UnmanagedMethods.MoveWindow(_child.Handle, 0, 0,
+                    Math.Max(1, (int)size.Width), Math.Max(1, (int)size.Height), false);
+            }
+            
+            public unsafe void ShowInBounds(Rect bounds)
+            {
+                CheckDisposed();
+                if (_attachedTo == null)
+                    throw new InvalidOperationException("The control isn't currently attached to a toplevel");
+                bounds *= _attachedTo.Window.RenderScaling;
+                var pixelRect = new PixelRect((int)bounds.X, (int)bounds.Y, Math.Max(1, (int)bounds.Width),
+                    Math.Max(1, (int)bounds.Height));
+                
+                UnmanagedMethods.MoveWindow(_child.Handle, 0, 0, pixelRect.Width, pixelRect.Height, true);
+                UnmanagedMethods.SetWindowPos(_holder.Handle, IntPtr.Zero, pixelRect.X, pixelRect.Y, pixelRect.Width,
+                    pixelRect.Height,
+                    UnmanagedMethods.SetWindowPosFlags.SWP_SHOWWINDOW
+                    | UnmanagedMethods.SetWindowPosFlags.SWP_NOZORDER
+                    | UnmanagedMethods.SetWindowPosFlags.SWP_NOACTIVATE);
+                
+                UnmanagedMethods.InvalidateRect(_attachedTo.Window.Handle.Handle, null, false);
+            }
+        }
+
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs
index ac3fa021f1..45aad77efe 100644
--- a/src/Windows/Avalonia.Win32/Win32Platform.cs
+++ b/src/Windows/Avalonia.Win32/Win32Platform.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -14,9 +11,13 @@ using Avalonia.Controls;
 using Avalonia.Controls.Platform;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
+using Avalonia.OpenGL;
+using Avalonia.OpenGL.Egl;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Threading;
+using Avalonia.Utilities;
+using Avalonia.Win32;
 using Avalonia.Win32.Input;
 using Avalonia.Win32.Interop;
 using static Avalonia.Win32.Interop.UnmanagedMethods;
@@ -39,9 +40,26 @@ namespace Avalonia
     public class Win32PlatformOptions
     {
         public bool UseDeferredRendering { get; set; } = true;
-        public bool AllowEglInitialization { get; set; }
+        
+        public bool? AllowEglInitialization { get; set; }
+        
         public bool? EnableMultitouch { get; set; }
         public bool OverlayPopups { get; set; }
+        public bool UseWgl { get; set; }
+        public IList<GlVersion> WglProfiles { get; set; } = new List<GlVersion>
+        {
+            new GlVersion(GlProfileType.OpenGL, 4, 0),
+            new GlVersion(GlProfileType.OpenGL, 3, 2),
+        };
+
+        /// <summary>
+        /// Render Avalonia to a Texture inside the Windows.UI.Composition tree.
+        /// </summary>
+        /// <remarks>
+        /// Supported on Windows 10 build 16299 and above. Ignored on other versions.
+        /// This is recommended if you need to use AcrylicBlur or acrylic in your applications.
+        /// </remarks>
+        public bool UseWindowsUIComposition { get; set; } = true;
     }
 }
 
@@ -61,6 +79,11 @@ namespace Avalonia.Win32
             CreateMessageWindow();
         }
 
+        /// <summary>
+        /// Gets the actual WindowsVersion. Same as the info returned from RtlGetVersion.
+        /// </summary>
+        public static Version WindowsVersion { get; } = RtlGetVersion();
+
         public static bool UseDeferredRendering => Options.UseDeferredRendering;
         internal static bool UseOverlayPopups => Options.OverlayPopups;
         public static Win32PlatformOptions Options { get; private set; }
@@ -91,11 +114,11 @@ namespace Avalonia.Win32
                 .Bind<IWindowingPlatform>().ToConstant(s_instance)
                 .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>()
                 .Bind<IPlatformIconLoader>().ToConstant(s_instance)
+                .Bind<NonPumpingLockHelper.IHelperImpl>().ToConstant(new NonPumpingSyncContext.HelperImpl())
                 .Bind<IMountedVolumeInfoProvider>().ToConstant(new WindowsMountedVolumeInfoProvider());
 
-            if (options.AllowEglInitialization)
-                Win32GlManager.Initialize();
-            
+            Win32GlManager.Initialize();
+
             _uiThread = Thread.CurrentThread;
 
             if (OleContext.Current != null)
@@ -110,21 +133,34 @@ namespace Avalonia.Win32
 
         public void ProcessMessage()
         {
-            UnmanagedMethods.MSG msg;
-            UnmanagedMethods.GetMessage(out msg, IntPtr.Zero, 0, 0);
-            UnmanagedMethods.TranslateMessage(ref msg);
-            UnmanagedMethods.DispatchMessage(ref msg);
+
+            if (UnmanagedMethods.GetMessage(out var msg, IntPtr.Zero, 0, 0) > -1)
+            {
+                UnmanagedMethods.TranslateMessage(ref msg);
+                UnmanagedMethods.DispatchMessage(ref msg);
+            }
+            else
+            {
+                Logging.Logger.TryGet(Logging.LogEventLevel.Error, Logging.LogArea.Win32Platform)
+                    ?.Log(this, "Unmanaged error in {0}. Error Code: {1}", nameof(ProcessMessage), Marshal.GetLastWin32Error());
+
+            }
         }
 
         public void RunLoop(CancellationToken cancellationToken)
         {
-            while (!cancellationToken.IsCancellationRequested)
+            var result = 0;
+            while (!cancellationToken.IsCancellationRequested 
+                && (result = UnmanagedMethods.GetMessage(out var msg, IntPtr.Zero, 0, 0)) > 0)
             {
-                UnmanagedMethods.MSG msg;
-                UnmanagedMethods.GetMessage(out msg, IntPtr.Zero, 0, 0);
                 UnmanagedMethods.TranslateMessage(ref msg);
                 UnmanagedMethods.DispatchMessage(ref msg);
             }
+            if (result < 0)
+            {
+                Logging.Logger.TryGet(Logging.LogEventLevel.Error, Logging.LogArea.Win32Platform)
+                    ?.Log(this, "Unmanaged error in {0}. Error Code: {1}", nameof(RunLoop), Marshal.GetLastWin32Error());
+            }
         }
 
         public IDisposable StartTimer(DispatcherPriority priority, TimeSpan interval, Action callback)
@@ -207,10 +243,10 @@ namespace Avalonia.Win32
             return new WindowImpl();
         }
 
-        public IEmbeddableWindowImpl CreateEmbeddableWindow()
+        public IWindowImpl CreateEmbeddableWindow()
         {
             var embedded = new EmbeddedWindowImpl();
-            embedded.Show();
+            embedded.Show(true);
             return embedded;
         }
 
diff --git a/src/Windows/Avalonia.Win32/Win32TypeExtensions.cs b/src/Windows/Avalonia.Win32/Win32TypeExtensions.cs
new file mode 100644
index 0000000000..8193611f6d
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/Win32TypeExtensions.cs
@@ -0,0 +1,13 @@
+using static Avalonia.Win32.Interop.UnmanagedMethods;
+
+namespace Avalonia.Win32
+{
+    internal static class Win32TypeExtensions
+    {
+        public static PixelRect ToPixelRect(this RECT rect)
+        {
+            return new PixelRect(rect.left, rect.top, rect.right - rect.left,
+                    rect.bottom - rect.top);
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/WinRT/Composition/D2DEffects.cs b/src/Windows/Avalonia.Win32/WinRT/Composition/D2DEffects.cs
new file mode 100644
index 0000000000..bef5a55b06
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/WinRT/Composition/D2DEffects.cs
@@ -0,0 +1,130 @@
+using System;
+
+namespace Avalonia.Win32.WinRT.Composition
+{
+    class D2DEffects
+    {
+        public static readonly Guid CLSID_D2D12DAffineTransform =
+            new Guid(0x6AA97485, 0x6354, 0x4CFC, 0x90, 0x8C, 0xE4, 0xA7, 0x4F, 0x62, 0xC9, 0x6C);
+
+        public static readonly Guid CLSID_D2D13DPerspectiveTransform =
+            new Guid(0xC2844D0B, 0x3D86, 0x46E7, 0x85, 0xBA, 0x52, 0x6C, 0x92, 0x40, 0xF3, 0xFB);
+
+        public static readonly Guid CLSID_D2D13DTransform =
+            new Guid(0xE8467B04, 0xEC61, 0x4B8A, 0xB5, 0xDE, 0xD4, 0xD7, 0x3D, 0xEB, 0xEA, 0x5A);
+
+        public static readonly Guid CLSID_D2D1ArithmeticComposite =
+            new Guid(0xFC151437, 0x049A, 0x4784, 0xA2, 0x4A, 0xF1, 0xC4, 0xDA, 0xF2, 0x09, 0x87);
+
+        public static readonly Guid CLSID_D2D1Atlas =
+            new Guid(0x913E2BE4, 0xFDCF, 0x4FE2, 0xA5, 0xF0, 0x24, 0x54, 0xF1, 0x4F, 0xF4, 0x08);
+
+        public static readonly Guid CLSID_D2D1BitmapSource =
+            new Guid(0x5FB6C24D, 0xC6DD, 0x4231, 0x94, 0x4, 0x50, 0xF4, 0xD5, 0xC3, 0x25, 0x2D);
+
+        public static readonly Guid CLSID_D2D1Blend =
+            new Guid(0x81C5B77B, 0x13F8, 0x4CDD, 0xAD, 0x20, 0xC8, 0x90, 0x54, 0x7A, 0xC6, 0x5D);
+
+        public static readonly Guid CLSID_D2D1Border =
+            new Guid(0x2A2D49C0, 0x4ACF, 0x43C7, 0x8C, 0x6A, 0x7C, 0x4A, 0x27, 0x87, 0x4D, 0x27);
+
+        public static readonly Guid CLSID_D2D1Brightness =
+            new Guid(0x8CEA8D1E, 0x77B0, 0x4986, 0xB3, 0xB9, 0x2F, 0x0C, 0x0E, 0xAE, 0x78, 0x87);
+
+        public static readonly Guid CLSID_D2D1ColorManagement =
+            new Guid(0x1A28524C, 0xFDD6, 0x4AA4, 0xAE, 0x8F, 0x83, 0x7E, 0xB8, 0x26, 0x7B, 0x37);
+
+        public static readonly Guid CLSID_D2D1ColorMatrix =
+            new Guid(0x921F03D6, 0x641C, 0x47DF, 0x85, 0x2D, 0xB4, 0xBB, 0x61, 0x53, 0xAE, 0x11);
+
+        public static readonly Guid CLSID_D2D1Composite =
+            new Guid(0x48FC9F51, 0xF6AC, 0x48F1, 0x8B, 0x58, 0x3B, 0x28, 0xAC, 0x46, 0xF7, 0x6D);
+
+        public static readonly Guid CLSID_D2D1ConvolveMatrix =
+            new Guid(0x407F8C08, 0x5533, 0x4331, 0xA3, 0x41, 0x23, 0xCC, 0x38, 0x77, 0x84, 0x3E);
+
+        public static readonly Guid CLSID_D2D1Crop =
+            new Guid(0xE23F7110, 0x0E9A, 0x4324, 0xAF, 0x47, 0x6A, 0x2C, 0x0C, 0x46, 0xF3, 0x5B);
+
+        public static readonly Guid CLSID_D2D1DirectionalBlur =
+            new Guid(0x174319A6, 0x58E9, 0x49B2, 0xBB, 0x63, 0xCA, 0xF2, 0xC8, 0x11, 0xA3, 0xDB);
+
+        public static readonly Guid CLSID_D2D1DiscreteTransfer =
+            new Guid(0x90866FCD, 0x488E, 0x454B, 0xAF, 0x06, 0xE5, 0x04, 0x1B, 0x66, 0xC3, 0x6C);
+
+        public static readonly Guid CLSID_D2D1DisplacementMap =
+            new Guid(0xEDC48364, 0x417, 0x4111, 0x94, 0x50, 0x43, 0x84, 0x5F, 0xA9, 0xF8, 0x90);
+
+        public static readonly Guid CLSID_D2D1DistantDiffuse =
+            new Guid(0x3E7EFD62, 0xA32D, 0x46D4, 0xA8, 0x3C, 0x52, 0x78, 0x88, 0x9A, 0xC9, 0x54);
+
+        public static readonly Guid CLSID_D2D1DistantSpecular =
+            new Guid(0x428C1EE5, 0x77B8, 0x4450, 0x8A, 0xB5, 0x72, 0x21, 0x9C, 0x21, 0xAB, 0xDA);
+
+        public static readonly Guid CLSID_D2D1DpiCompensation =
+            new Guid(0x6C26C5C7, 0x34E0, 0x46FC, 0x9C, 0xFD, 0xE5, 0x82, 0x37, 0x6, 0xE2, 0x28);
+
+        public static readonly Guid CLSID_D2D1Flood =
+            new Guid(0x61C23C20, 0xAE69, 0x4D8E, 0x94, 0xCF, 0x50, 0x07, 0x8D, 0xF6, 0x38, 0xF2);
+
+        public static readonly Guid CLSID_D2D1GammaTransfer =
+            new Guid(0x409444C4, 0xC419, 0x41A0, 0xB0, 0xC1, 0x8C, 0xD0, 0xC0, 0xA1, 0x8E, 0x42);
+
+        public static readonly Guid CLSID_D2D1GaussianBlur =
+            new Guid(0x1FEB6D69, 0x2FE6, 0x4AC9, 0x8C, 0x58, 0x1D, 0x7F, 0x93, 0xE7, 0xA6, 0xA5);
+
+        public static readonly Guid CLSID_D2D1Scale =
+            new Guid(0x9DAF9369, 0x3846, 0x4D0E, 0xA4, 0x4E, 0xC, 0x60, 0x79, 0x34, 0xA5, 0xD7);
+
+        public static readonly Guid CLSID_D2D1Histogram =
+            new Guid(0x881DB7D0, 0xF7EE, 0x4D4D, 0xA6, 0xD2, 0x46, 0x97, 0xAC, 0xC6, 0x6E, 0xE8);
+
+        public static readonly Guid CLSID_D2D1HueRotation =
+            new Guid(0x0F4458EC, 0x4B32, 0x491B, 0x9E, 0x85, 0xBD, 0x73, 0xF4, 0x4D, 0x3E, 0xB6);
+
+        public static readonly Guid CLSID_D2D1LinearTransfer =
+            new Guid(0xAD47C8FD, 0x63EF, 0x4ACC, 0x9B, 0x51, 0x67, 0x97, 0x9C, 0x03, 0x6C, 0x06);
+
+        public static readonly Guid CLSID_D2D1LuminanceToAlpha =
+            new Guid(0x41251AB7, 0x0BEB, 0x46F8, 0x9D, 0xA7, 0x59, 0xE9, 0x3F, 0xCC, 0xE5, 0xDE);
+
+        public static readonly Guid CLSID_D2D1Morphology =
+            new Guid(0xEAE6C40D, 0x626A, 0x4C2D, 0xBF, 0xCB, 0x39, 0x10, 0x01, 0xAB, 0xE2, 0x02);
+
+        public static readonly Guid CLSID_D2D1OpacityMetadata =
+            new Guid(0x6C53006A, 0x4450, 0x4199, 0xAA, 0x5B, 0xAD, 0x16, 0x56, 0xFE, 0xCE, 0x5E);
+
+        public static readonly Guid CLSID_D2D1PointDiffuse =
+            new Guid(0xB9E303C3, 0xC08C, 0x4F91, 0x8B, 0x7B, 0x38, 0x65, 0x6B, 0xC4, 0x8C, 0x20);
+
+        public static readonly Guid CLSID_D2D1PointSpecular =
+            new Guid(0x09C3CA26, 0x3AE2, 0x4F09, 0x9E, 0xBC, 0xED, 0x38, 0x65, 0xD5, 0x3F, 0x22);
+
+        public static readonly Guid CLSID_D2D1Premultiply =
+            new Guid(0x06EAB419, 0xDEED, 0x4018, 0x80, 0xD2, 0x3E, 0x1D, 0x47, 0x1A, 0xDE, 0xB2);
+
+        public static readonly Guid CLSID_D2D1Saturation =
+            new Guid(0x5CB2D9CF, 0x327D, 0x459F, 0xA0, 0xCE, 0x40, 0xC0, 0xB2, 0x08, 0x6B, 0xF7);
+
+        public static readonly Guid CLSID_D2D1Shadow =
+            new Guid(0xC67EA361, 0x1863, 0x4E69, 0x89, 0xDB, 0x69, 0x5D, 0x3E, 0x9A, 0x5B, 0x6B);
+
+        public static readonly Guid CLSID_D2D1SpotDiffuse =
+            new Guid(0x818A1105, 0x7932, 0x44F4, 0xAA, 0x86, 0x08, 0xAE, 0x7B, 0x2F, 0x2C, 0x93);
+
+        public static readonly Guid CLSID_D2D1SpotSpecular =
+            new Guid(0xEDAE421E, 0x7654, 0x4A37, 0x9D, 0xB8, 0x71, 0xAC, 0xC1, 0xBE, 0xB3, 0xC1);
+
+        public static readonly Guid CLSID_D2D1TableTransfer =
+            new Guid(0x5BF818C3, 0x5E43, 0x48CB, 0xB6, 0x31, 0x86, 0x83, 0x96, 0xD6, 0xA1, 0xD4);
+
+        public static readonly Guid CLSID_D2D1Tile =
+            new Guid(0xB0784138, 0x3B76, 0x4BC5, 0xB1, 0x3B, 0x0F, 0xA2, 0xAD, 0x02, 0x65, 0x9F);
+
+        public static readonly Guid CLSID_D2D1Turbulence =
+            new Guid(0xCF2BB6AE, 0x889A, 0x4AD7, 0xBA, 0x29, 0xA2, 0xFD, 0x73, 0x2C, 0x9F, 0xC9);
+
+        public static readonly Guid CLSID_D2D1UnPremultiply =
+            new Guid(0xFB9AC489, 0xAD8D, 0x41ED, 0x99, 0x99, 0xBB, 0x63, 0x47, 0xD1, 0x10, 0xF7);
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositedWindow.cs b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositedWindow.cs
new file mode 100644
index 0000000000..4ae9c08410
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositedWindow.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Numerics;
+using System.Reactive.Disposables;
+using System.Threading;
+using Avalonia.MicroCom;
+using Avalonia.OpenGL;
+using Avalonia.OpenGL.Egl;
+using Avalonia.Win32.Interop;
+
+namespace Avalonia.Win32.WinRT.Composition
+{
+    public class WinUICompositedWindow : IDisposable
+    {
+        private EglContext _syncContext;
+        private readonly object _pumpLock;
+        private readonly IVisual _blurVisual;
+        private ICompositionTarget _compositionTarget;
+        private IVisual _contentVisual;
+        private ICompositionDrawingSurfaceInterop _surfaceInterop;
+        private PixelSize _size;
+
+        private static Guid IID_ID3D11Texture2D = Guid.Parse("6f15aaf2-d208-4e89-9ab4-489535d34f9c");
+        private ICompositor _compositor;
+
+
+        internal WinUICompositedWindow(EglContext syncContext,
+            ICompositor compositor,
+            object pumpLock,
+            ICompositionTarget compositionTarget,
+            ICompositionDrawingSurfaceInterop surfaceInterop,
+            IVisual contentVisual, IVisual blurVisual)
+        {
+            _compositor = compositor.CloneReference();
+            _syncContext = syncContext;
+            _pumpLock = pumpLock;
+            _blurVisual = blurVisual.CloneReference();
+            _compositionTarget = compositionTarget.CloneReference();
+            _contentVisual = contentVisual.CloneReference();
+            _surfaceInterop = surfaceInterop.CloneReference();
+        }
+
+
+        public void ResizeIfNeeded(PixelSize size)
+        {
+            using (_syncContext.EnsureLocked())
+            {
+                if (_size != size)
+                {
+                    _surfaceInterop.Resize(new UnmanagedMethods.POINT { X = size.Width, Y = size.Height });
+                    _contentVisual.SetSize(new Vector2(size.Width, size.Height));
+                    _size = size;
+                }
+            }
+        }
+
+        public unsafe IUnknown BeginDrawToTexture(out PixelPoint offset)
+        {
+            if (!_syncContext.IsCurrent)
+                throw new InvalidOperationException();
+            
+            var iid = IID_ID3D11Texture2D;
+            void* pTexture;
+            var off = _surfaceInterop.BeginDraw(null, &iid, &pTexture);
+            offset = new PixelPoint(off.X, off.Y);
+            return MicroComRuntime.CreateProxyFor<IUnknown>(pTexture, true);
+        }
+
+        public void EndDraw()
+        {
+            if (!_syncContext.IsCurrent)
+                throw new InvalidOperationException();
+            _surfaceInterop.EndDraw();
+        }
+
+        public void SetBlur(bool enable)
+        {
+            using (_syncContext.EnsureLocked())
+                _blurVisual.SetIsVisible(enable ? 1 : 0);
+        }
+
+        public IDisposable BeginTransaction()
+        {
+            Monitor.Enter(_pumpLock);
+            return Disposable.Create(() => Monitor.Exit(_pumpLock));
+        }
+        
+        public void Dispose()
+        {
+            if (_syncContext == null)
+            {
+                _compositor.Dispose();
+                _blurVisual.Dispose();
+                _contentVisual.Dispose();
+                _surfaceInterop.Dispose();
+                _compositionTarget.Dispose();
+            }
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs
new file mode 100644
index 0000000000..2aa82436f6
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs
@@ -0,0 +1,238 @@
+using System;
+using System.Diagnostics;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Logging;
+using Avalonia.MicroCom;
+using Avalonia.OpenGL;
+using Avalonia.OpenGL.Angle;
+using Avalonia.OpenGL.Egl;
+using Avalonia.Rendering;
+using Avalonia.Win32.Interop;
+
+namespace Avalonia.Win32.WinRT.Composition
+{
+    class WinUICompositorConnection : IRenderTimer
+    {
+        private readonly EglContext _syncContext;
+        private IntPtr _queue;
+        private ICompositor _compositor;
+        private ICompositor2 _compositor2;
+        private ICompositor5 _compositor5;
+        private ICompositorInterop _compositorInterop;
+        private AngleWin32EglDisplay _angle;
+        private ICompositionGraphicsDevice _device;
+        private EglPlatformOpenGlInterface _gl;
+        private ICompositorDesktopInterop _compositorDesktopInterop;
+        private ICompositionBrush _blurBrush;
+        private object _pumpLock = new object();
+
+        public WinUICompositorConnection(EglPlatformOpenGlInterface gl, object pumpLock)
+        {
+            _gl = gl;
+            _pumpLock = pumpLock;
+            _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 = CreateBlurBrush();
+            
+        }
+
+        public EglPlatformOpenGlInterface Egl => _gl;
+
+        static bool TryCreateAndRegisterCore(EglPlatformOpenGlInterface angle)
+        {
+            var tcs = new TaskCompletionSource<bool>();
+            var pumpLock = new object();
+            var th = new Thread(() =>
+            {
+                WinUICompositorConnection connect;
+                try
+                {
+                    NativeWinRTMethods.CreateDispatcherQueueController(new NativeWinRTMethods.DispatcherQueueOptions
+                    {
+                        apartmentType = NativeWinRTMethods.DISPATCHERQUEUE_THREAD_APARTMENTTYPE.DQTAT_COM_NONE,
+                        dwSize = Marshal.SizeOf<NativeWinRTMethods.DispatcherQueueOptions>(),
+                        threadType = NativeWinRTMethods.DISPATCHERQUEUE_THREAD_TYPE.DQTYPE_THREAD_CURRENT
+                    });
+                    connect = new WinUICompositorConnection(angle, pumpLock);
+                    AvaloniaLocator.CurrentMutable.BindToSelf(connect);
+                    AvaloniaLocator.CurrentMutable.Bind<IRenderTimer>().ToConstant(connect);
+                    tcs.SetResult(true);
+                    
+                }
+                catch (Exception e)
+                {
+                    tcs.SetException(e);
+                    return;
+                }
+                connect.RunLoop();
+            })
+            {
+                IsBackground = true
+            };
+            th.SetApartmentState(ApartmentState.STA);
+            th.Start();
+            return tcs.Task.Result;
+        }
+
+        class RunLoopHandler : IAsyncActionCompletedHandler, IMicroComShadowContainer
+        {
+            private readonly WinUICompositorConnection _parent;
+            private Stopwatch _st = Stopwatch.StartNew();
+
+            public RunLoopHandler(WinUICompositorConnection parent)
+            {
+                _parent = parent;
+            }
+            public void Dispose()
+            {
+                
+            }
+
+            public void Invoke(IAsyncAction asyncInfo, AsyncStatus asyncStatus)
+            {
+                _parent.Tick?.Invoke(_st.Elapsed);
+                using var act = _parent._compositor5.RequestCommitAsync();
+                act.SetCompleted(this);
+            }
+
+            public MicroComShadow Shadow { get; set; }
+            public void OnReferencedFromNative()
+            {
+            }
+
+            public void OnUnreferencedFromNative()
+            {
+            }
+        }
+        
+        private void RunLoop()
+        {
+            {
+                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);
+                }
+            }
+        }
+
+        public static void TryCreateAndRegister(EglPlatformOpenGlInterface angle)
+        {
+            const int majorRequired = 10;
+            const int buildRequired = 17134;
+
+            var majorInstalled = Win32Platform.WindowsVersion.Major;
+            var buildInstalled = Win32Platform.WindowsVersion.Build;
+
+            if (majorInstalled >= majorRequired &&
+                buildInstalled >= buildRequired)
+            {
+                try
+                {
+                    TryCreateAndRegisterCore(angle);
+                }
+                catch (Exception e)
+                {
+                    Logger.TryGet(LogEventLevel.Error, "WinUIComposition")
+                        ?.Log(null, "Unable to initialize WinUI compositor: {0}", e);
+
+                }
+            }
+
+            var osVersionNotice =
+                $"Windows {majorRequired} Build {buildRequired} is required. Your machine has Windows {majorInstalled} Build {buildInstalled} installed.";
+
+            Logger.TryGet(LogEventLevel.Warning, "WinUIComposition")?.Log(null,
+                $"Unable to initialize WinUI compositor: {osVersionNotice}");
+        }
+
+
+        public WinUICompositedWindow CreateWindow(IntPtr hWnd)
+        {
+            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,
+                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>();
+
+            using var spriteVisual = _compositor.CreateSpriteVisual();
+            spriteVisual.SetBrush(brush);
+            using var visual = spriteVisual.QueryInterface<IVisual>();
+            using var visual2 = spriteVisual.QueryInterface<IVisual2>();
+            using var container = _compositor.CreateContainerVisual();
+            using var containerVisual = container.QueryInterface<IVisual>();
+            using var containerVisual2 = container.QueryInterface<IVisual2>();
+            containerVisual2.SetRelativeSizeAdjustment(new Vector2(1, 1));
+            using var containerChildren = container.Children;
+            
+            target.SetRoot(containerVisual);
+
+            using var blur = CreateBlurVisual(); 
+            
+            containerChildren.InsertAtTop(blur);
+            containerChildren.InsertAtTop(visual);
+            
+            return new WinUICompositedWindow(_syncContext, _compositor, _pumpLock, target, surfaceInterop, visual, blur);
+        }
+
+
+        private unsafe ICompositionBrush CreateBlurBrush()
+        {
+            using var backDropParameterFactory = NativeWinRTMethods.CreateActivationFactory<ICompositionEffectSourceParameterFactory>(
+                "Windows.UI.Composition.CompositionEffectSourceParameter");
+            using var backdropString = new HStringInterop("backdrop");
+            using var backDropParameter =
+                backDropParameterFactory.Create(backdropString.Handle);
+            using var backDropParameterAsSource = backDropParameter.QueryInterface<IGraphicsEffectSource>();
+            var blurEffect = new WinUIGaussianBlurEffect(backDropParameterAsSource);
+            using var blurEffectFactory = _compositor.CreateEffectFactory(blurEffect);
+            using var backdrop = _compositor2.CreateBackdropBrush();
+            using var backdropBrush = backdrop.QueryInterface<ICompositionBrush>();
+            
+            
+            var saturateEffect = new SaturationEffect(blurEffect);
+            using var satEffectFactory = _compositor.CreateEffectFactory(saturateEffect);
+            using var sat = satEffectFactory.CreateBrush();
+            sat.SetSourceParameter(backdropString.Handle, backdropBrush);
+            return sat.QueryInterface<ICompositionBrush>();
+        }
+        
+        private unsafe IVisual CreateBlurVisual()
+        {
+            using var spriteVisual = _compositor.CreateSpriteVisual();
+            using var visual = spriteVisual.QueryInterface<IVisual>();
+            using var visual2 = spriteVisual.QueryInterface<IVisual2>();
+           
+            
+            spriteVisual.SetBrush(_blurBrush);
+            visual.SetIsVisible(0);
+            visual2.SetRelativeSizeAdjustment(new Vector2(1.0f, 1.0f));
+
+            return visual.CloneReference();
+        }
+
+
+        public event Action<TimeSpan> Tick;
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUIEffectBase.cs b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUIEffectBase.cs
new file mode 100644
index 0000000000..ea75a2f311
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUIEffectBase.cs
@@ -0,0 +1,135 @@
+using System;
+using System.Linq;
+using System.Runtime.InteropServices;
+using Avalonia.MicroCom;
+
+namespace Avalonia.Win32.WinRT.Composition
+{
+    abstract class WinUIEffectBase : WinRTInspectable, IGraphicsEffect,  IGraphicsEffectSource, IGraphicsEffectD2D1Interop
+    {
+        private IGraphicsEffectSource[] _sources;
+
+        public WinUIEffectBase(params IGraphicsEffectSource[] _sources)
+        {
+            this._sources = _sources.Select(e =>
+            {
+                if (e is WinUIEffectBase)
+                    return e;
+                return e.CloneReference();
+            }).ToArray();
+        }
+
+        public IntPtr Name => IntPtr.Zero;
+
+        public void SetName(IntPtr name)
+        {
+            
+        }
+
+        public abstract Guid EffectId { get; }
+        public unsafe void GetNamedPropertyMapping(IntPtr name, uint* index, GRAPHICS_EFFECT_PROPERTY_MAPPING* mapping) =>
+            throw new COMException("Not supported", unchecked((int)0x80004001));
+
+        public abstract uint PropertyCount { get; }
+        public abstract IPropertyValue GetProperty(uint index);
+
+        public IGraphicsEffectSource GetSource(uint index)
+        {
+            if (_sources == null || index> _sources.Length)
+                throw new COMException("Invalid index", unchecked((int)0x80070057));
+            return _sources[index];
+        }
+
+        public uint SourceCount => (uint)(_sources?.Length ?? 0);
+
+        public override void OnUnreferencedFromNative()
+        {
+            if (_sources == null)
+                return;
+            
+            /*foreach(var s in _sources)
+                s.Dispose();*/
+            _sources = null;
+        }
+    }
+    
+    class WinUIGaussianBlurEffect : WinUIEffectBase
+    {
+        public WinUIGaussianBlurEffect(IGraphicsEffectSource source) : base(source)
+        {
+        }
+
+        enum D2D1_GAUSSIANBLUR_OPTIMIZATION
+        {
+            D2D1_GAUSSIANBLUR_OPTIMIZATION_SPEED,
+            D2D1_GAUSSIANBLUR_OPTIMIZATION_BALANCED,
+            D2D1_GAUSSIANBLUR_OPTIMIZATION_QUALITY,
+            D2D1_GAUSSIANBLUR_OPTIMIZATION_FORCE_DWORD
+        };
+
+        enum D2D1_BORDER_MODE
+        {
+            D2D1_BORDER_MODE_SOFT,
+            D2D1_BORDER_MODE_HARD,
+            D2D1_BORDER_MODE_FORCE_DWORD
+        };
+
+        enum D2D1GaussianBlurProp
+        {
+            D2D1_GAUSSIANBLUR_PROP_STANDARD_DEVIATION,
+            D2D1_GAUSSIANBLUR_PROP_OPTIMIZATION,
+            D2D1_GAUSSIANBLUR_PROP_BORDER_MODE,
+            D2D1_GAUSSIANBLUR_PROP_FORCE_DWORD
+        };
+
+        public override Guid EffectId => D2DEffects.CLSID_D2D1GaussianBlur;
+
+        public override uint PropertyCount => 3;
+
+        public override IPropertyValue GetProperty(uint index)
+        {
+            switch ((D2D1GaussianBlurProp)index)
+            {
+                case D2D1GaussianBlurProp.D2D1_GAUSSIANBLUR_PROP_STANDARD_DEVIATION:
+                    return new WinRTPropertyValue(30.0f);
+
+                case D2D1GaussianBlurProp.D2D1_GAUSSIANBLUR_PROP_OPTIMIZATION:
+                    return new WinRTPropertyValue((uint)D2D1_GAUSSIANBLUR_OPTIMIZATION
+                        .D2D1_GAUSSIANBLUR_OPTIMIZATION_BALANCED);
+
+                case D2D1GaussianBlurProp.D2D1_GAUSSIANBLUR_PROP_BORDER_MODE:
+                    return new WinRTPropertyValue((uint)D2D1_BORDER_MODE.D2D1_BORDER_MODE_HARD);
+            }
+
+            return null;
+        }
+    }
+    
+    class SaturationEffect : WinUIEffectBase
+    {
+        public SaturationEffect(IGraphicsEffectSource source) : base(source)
+        {
+        }
+
+        enum D2D1_SATURATION_PROP
+        {
+            D2D1_SATURATION_PROP_SATURATION,
+            D2D1_SATURATION_PROP_FORCE_DWORD
+        };
+
+        public override Guid EffectId => D2DEffects.CLSID_D2D1Saturation;
+
+        public override uint PropertyCount => 1;
+
+        public override IPropertyValue GetProperty(uint index)
+        {
+            switch ((D2D1_SATURATION_PROP)index)
+            {
+                case D2D1_SATURATION_PROP.D2D1_SATURATION_PROP_SATURATION:
+                    return new WinRTPropertyValue(2.0f);
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUiCompositedWindowSurface.cs b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUiCompositedWindowSurface.cs
new file mode 100644
index 0000000000..f59d50860a
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUiCompositedWindowSurface.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Runtime.InteropServices;
+using Avalonia.MicroCom;
+using Avalonia.OpenGL.Angle;
+using Avalonia.OpenGL.Egl;
+using Avalonia.OpenGL.Surfaces;
+using Avalonia.Utilities;
+using Avalonia.Win32.Interop;
+
+namespace Avalonia.Win32.WinRT.Composition
+{
+    internal class WinUiCompositedWindowSurface : EglGlPlatformSurfaceBase, IBlurHost, IDisposable
+    {
+        private readonly WinUICompositorConnection _connection;
+        private EglPlatformOpenGlInterface _egl;
+        private readonly EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo _info;
+        private IRef<WinUICompositedWindow> _window;
+        private bool _enableBlur;
+
+        public WinUiCompositedWindowSurface(WinUICompositorConnection connection, IEglWindowGlPlatformSurfaceInfo info) : base()
+        {
+            _connection = connection;
+            _egl = connection.Egl;
+            _info = info;
+        }
+
+        public override IGlPlatformSurfaceRenderTarget CreateGlRenderTarget()
+        {
+            using (_egl.PrimaryContext.EnsureCurrent())
+            {
+                if (_window?.Item == null)
+                {
+                    _window = RefCountable.Create(_connection.CreateWindow(_info.Handle));
+                    _window.Item.SetBlur(_enableBlur);
+                }
+
+                return new CompositionRenderTarget(_egl, _window, _info);
+            }
+        }
+
+        class CompositionRenderTarget : EglPlatformSurfaceRenderTargetBase
+        {
+            private readonly EglPlatformOpenGlInterface _egl;
+            private readonly IRef<WinUICompositedWindow> _window;
+            private readonly IEglWindowGlPlatformSurfaceInfo _info;
+
+            public CompositionRenderTarget(EglPlatformOpenGlInterface egl,
+                IRef<WinUICompositedWindow> window,
+                IEglWindowGlPlatformSurfaceInfo info)
+                : base(egl)
+            {
+                _egl = egl;
+                _window = window.Clone();
+                _info = info;
+                _window.Item.ResizeIfNeeded(_info.Size);
+            }
+
+            public override IGlPlatformSurfaceRenderingSession BeginDraw()
+            {
+                var contextLock = _egl.PrimaryEglContext.EnsureCurrent();
+                IUnknown texture = null;
+                EglSurface surface = null;
+                IDisposable transaction = null;
+                var success = false;
+                try
+                {
+                    if (_window?.Item == null)
+                        throw new ObjectDisposedException(GetType().FullName);
+                    
+                    var size = _info.Size;
+                    transaction = _window.Item.BeginTransaction();
+                    _window.Item.ResizeIfNeeded(size);
+                    texture = _window.Item.BeginDrawToTexture(out var offset);
+
+                    surface = ((AngleWin32EglDisplay) _egl.Display).WrapDirect3D11Texture(_egl,
+                        texture.GetNativeIntPtr(),
+                        offset.X, offset.Y, size.Width, size.Height);
+
+                    var res = base.BeginDraw(surface, _info, () =>
+                    {
+                        surface?.Dispose();
+                        texture?.Dispose();
+                        _window.Item.EndDraw();
+                        transaction?.Dispose();
+                        contextLock?.Dispose();
+                    }, true);
+                    success = true;
+                    return res;
+                }
+                finally
+                {
+                    if (!success)
+                    {
+                        surface?.Dispose();
+                        texture?.Dispose();
+                        transaction?.Dispose();
+                        contextLock.Dispose();
+                    }
+                }
+            }
+        }
+
+        public void SetBlur(bool enable)
+        {
+            _enableBlur = enable;
+            _window?.Item?.SetBlur(enable);
+        }
+
+        public void Dispose()
+        {
+            using (_egl.PrimaryEglContext.EnsureLocked())
+            {
+                _window?.Dispose();
+                _window = null;
+            }
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/WinRT/IBlurHost.cs b/src/Windows/Avalonia.Win32/WinRT/IBlurHost.cs
new file mode 100644
index 0000000000..81c0e3e185
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/WinRT/IBlurHost.cs
@@ -0,0 +1,7 @@
+namespace Avalonia.Win32.WinRT
+{
+    public interface IBlurHost
+    {
+        void SetBlur(bool enable);
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/WinRT/NativeWinRTMethods.cs b/src/Windows/Avalonia.Win32/WinRT/NativeWinRTMethods.cs
new file mode 100644
index 0000000000..087bd2fd43
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/WinRT/NativeWinRTMethods.cs
@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.WindowsRuntime;
+using System.Threading;
+using Avalonia.MicroCom;
+using Avalonia.Win32.Interop;
+
+namespace Avalonia.Win32.WinRT
+{
+    internal static class NativeWinRTMethods
+    {
+        [DllImport("api-ms-win-core-winrt-string-l1-1-0.dll", CallingConvention = CallingConvention.StdCall,
+            PreserveSig = false)]
+        internal static extern unsafe IntPtr WindowsCreateString(
+            [MarshalAs(UnmanagedType.LPWStr)] string sourceString,
+            int length);
+
+        internal static IntPtr WindowsCreateString(string sourceString) 
+            => WindowsCreateString(sourceString, sourceString.Length);
+
+        [DllImport("api-ms-win-core-winrt-string-l1-1-0.dll", 
+            CallingConvention = CallingConvention.StdCall, PreserveSig = false)]
+        internal static extern unsafe IntPtr WindowsDeleteString(IntPtr hString);
+        
+        [DllImport("Windows.UI.Composition", EntryPoint = "DllGetActivationFactory",
+            CallingConvention = CallingConvention.StdCall, PreserveSig = false)]
+        private extern static IntPtr GetWindowsUICompositionActivationFactory(
+            IntPtr activatableClassId);
+
+        internal static IActivationFactory GetWindowsUICompositionActivationFactory(string className)
+        {//"Windows.UI.Composition.Compositor"
+            var s = WindowsCreateString(className);
+            var factory = GetWindowsUICompositionActivationFactory(s);
+            return MicroComRuntime.CreateProxyFor<IActivationFactory>(factory, true);
+        }
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        delegate int GetActivationFactoryDelegate(IntPtr classId, out IntPtr ppv);
+        
+        internal static T CreateInstance<T>(string fullName) where T : IUnknown
+        {
+            var s = WindowsCreateString(fullName);
+            EnsureRoInitialized();
+            var pUnk = RoActivateInstance(s);
+            using var unk = MicroComRuntime.CreateProxyFor<IUnknown>(pUnk, true);
+            WindowsDeleteString(s);
+            return MicroComRuntime.QueryInterface<T>(unk);
+        }
+        
+        internal static TFactory CreateActivationFactory<TFactory>(string fullName) where TFactory : IUnknown
+        {
+            var s = WindowsCreateString(fullName);
+            EnsureRoInitialized();
+            var guid = MicroComRuntime.GetGuidFor(typeof(TFactory));
+            var pUnk = RoGetActivationFactory(s, ref guid);
+            using var unk = MicroComRuntime.CreateProxyFor<IUnknown>(pUnk, true);
+            WindowsDeleteString(s);
+            return MicroComRuntime.QueryInterface<TFactory>(unk);
+        }
+        
+        internal enum DISPATCHERQUEUE_THREAD_APARTMENTTYPE
+        {
+            DQTAT_COM_NONE = 0,
+            DQTAT_COM_ASTA = 1,
+            DQTAT_COM_STA = 2
+        };
+
+        internal enum DISPATCHERQUEUE_THREAD_TYPE
+        {
+            DQTYPE_THREAD_DEDICATED = 1,
+            DQTYPE_THREAD_CURRENT = 2,
+        };
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct DispatcherQueueOptions
+        {
+            public int dwSize;
+
+            [MarshalAs(UnmanagedType.I4)]
+            public DISPATCHERQUEUE_THREAD_TYPE threadType;
+
+            [MarshalAs(UnmanagedType.I4)]
+            public DISPATCHERQUEUE_THREAD_APARTMENTTYPE apartmentType;
+        };
+
+        [DllImport("coremessaging.dll", PreserveSig = false)]
+        internal static extern IntPtr CreateDispatcherQueueController(DispatcherQueueOptions options);
+
+        internal enum RO_INIT_TYPE
+        {
+            RO_INIT_SINGLETHREADED = 0, // Single-threaded application
+            RO_INIT_MULTITHREADED = 1, // COM calls objects on any thread.
+        }
+
+        [DllImport("combase.dll", PreserveSig = false)]
+        private static extern void RoInitialize(RO_INIT_TYPE initType);
+
+        [DllImport("combase.dll", PreserveSig = false)]
+        private static extern IntPtr RoActivateInstance(IntPtr activatableClassId);
+
+        [DllImport("combase.dll", PreserveSig = false)]
+        private static extern IntPtr RoGetActivationFactory(IntPtr activatableClassId, ref Guid iid);
+        
+        private static bool _initialized;
+        private static void EnsureRoInitialized()
+        {
+            if (_initialized)
+                return;
+            RoInitialize(Thread.CurrentThread.GetApartmentState() == ApartmentState.STA ?
+                RO_INIT_TYPE.RO_INIT_SINGLETHREADED :
+                RO_INIT_TYPE.RO_INIT_MULTITHREADED);
+            _initialized = true;
+        }
+    }
+
+    class HStringInterop : IDisposable
+    {
+        private IntPtr _s;
+
+        public HStringInterop(string s)
+        {
+            _s = s == null ? IntPtr.Zero : NativeWinRTMethods.WindowsCreateString(s);
+        }
+
+        public IntPtr Handle => _s;
+
+        public void Dispose()
+        {
+            if (_s != IntPtr.Zero)
+            {
+                NativeWinRTMethods.WindowsDeleteString(_s);
+                _s = IntPtr.Zero;
+            }
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/WinRT/WinRTColor.cs b/src/Windows/Avalonia.Win32/WinRT/WinRTColor.cs
new file mode 100644
index 0000000000..786d698daa
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/WinRT/WinRTColor.cs
@@ -0,0 +1,18 @@
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.WinRT
+{
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    public struct WinRTColor
+    {
+        public byte A;
+        public byte R;
+        public byte G;
+        public byte B;
+
+        public static WinRTColor FromArgb(byte a, byte r, byte g, byte b) => new WinRTColor()
+        {
+            A = a, R = r, G = g, B = b
+        };
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/WinRT/WinRTInspectable.cs b/src/Windows/Avalonia.Win32/WinRT/WinRTInspectable.cs
new file mode 100644
index 0000000000..d2ec957b8e
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/WinRT/WinRTInspectable.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Avalonia.MicroCom;
+
+namespace Avalonia.Win32.WinRT
+{
+    class WinRTInspectable : IInspectable, IMicroComShadowContainer
+    {
+        public virtual void Dispose()
+        {
+            
+        }
+
+        public unsafe void GetIids(ulong* iidCount, Guid** iids)
+        {
+            var interfaces = GetType().GetInterfaces().Where(typeof(IUnknown).IsAssignableFrom)
+                .Select(MicroComRuntime.GetGuidFor).ToArray();
+            var mem = (Guid*)Marshal.AllocCoTaskMem(Unsafe.SizeOf<Guid>() * interfaces.Length);
+            for (var c = 0; c < interfaces.Length; c++)
+                mem[c] = interfaces[c];
+            *iids = mem;
+            *iidCount = (ulong) interfaces.Length;
+        }
+
+        public IntPtr RuntimeClassName => NativeWinRTMethods.WindowsCreateString(GetType().FullName);
+        public TrustLevel TrustLevel => TrustLevel.BaseTrust;
+        public MicroComShadow Shadow { get; set; }
+        public virtual void OnReferencedFromNative()
+        {
+        }
+
+        public virtual void OnUnreferencedFromNative()
+        {
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/WinRT/WinRTPropertyValue.cs b/src/Windows/Avalonia.Win32/WinRT/WinRTPropertyValue.cs
new file mode 100644
index 0000000000..684e7ff7b5
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/WinRT/WinRTPropertyValue.cs
@@ -0,0 +1,89 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.Win32.WinRT
+{
+    class WinRTPropertyValue : WinRTInspectable, IPropertyValue 
+    {
+        public WinRTPropertyValue(float f)
+        {
+            Type = PropertyType.Single;
+            Single = f;
+        }
+
+        public WinRTPropertyValue(uint u)
+        {
+            UInt32 = u;
+            Type = PropertyType.UInt32;
+        }
+        
+        public PropertyType Type { get; }
+        public int IsNumericScalar { get; }
+        public byte UInt8 { get; }
+        public short Int16 { get; }
+        public ushort UInt16 { get; }
+        public int Int32 { get; }
+        public uint UInt32 { get; }
+        public long Int64 { get; }
+        public ulong UInt64 { get; }
+        public float Single { get; }
+        public double Double { get; }
+        public char Char16 { get; }
+        public int Boolean { get; }
+        public IntPtr String { get; }
+        public Guid Guid { get; }
+
+        private static COMException NotImplemented => new COMException("Not supported", unchecked((int)0x80004001));
+        
+        public unsafe void GetDateTime(void* value) => throw NotImplemented;
+
+        public unsafe void GetTimeSpan(void* value) => throw NotImplemented;
+
+        public unsafe void GetPoint(void* value) => throw NotImplemented;
+
+        public unsafe void GetSize(void* value) => throw NotImplemented;
+
+        public unsafe void GetRect(void* value) => throw NotImplemented;
+
+        public unsafe byte* GetUInt8Array(uint* __valueSize) => throw NotImplemented;
+
+        public unsafe short* GetInt16Array(uint* __valueSize) => throw NotImplemented;
+
+        public unsafe ushort* GetUInt16Array(uint* __valueSize) => throw NotImplemented;
+
+        public unsafe int* GetInt32Array(uint* __valueSize)
+        {
+            throw NotImplemented;
+        }
+
+        public unsafe uint* GetUInt32Array(uint* __valueSize) => throw NotImplemented;
+
+        public unsafe long* GetInt64Array(uint* __valueSize) => throw NotImplemented;
+
+        public unsafe ulong* GetUInt64Array(uint* __valueSize) => throw NotImplemented;
+
+        public unsafe float* GetSingleArray(uint* __valueSize) => throw NotImplemented;
+
+        public unsafe double* GetDoubleArray(uint* __valueSize) => throw NotImplemented;
+
+        public unsafe char* GetChar16Array(uint* __valueSize) => throw NotImplemented;
+
+        public unsafe int* GetBooleanArray(uint* __valueSize) => throw NotImplemented;
+
+        public unsafe IntPtr* GetStringArray(uint* __valueSize) => throw NotImplemented;
+
+        public unsafe void** GetInspectableArray(uint* __valueSize) => throw NotImplemented;
+
+        public unsafe Guid* GetGuidArray(uint* __valueSize) => throw NotImplemented;
+
+        public unsafe void* GetDateTimeArray(uint* __valueSize) => throw NotImplemented;
+
+        public unsafe void* GetTimeSpanArray(uint* __valueSize) => throw NotImplemented;
+
+        public unsafe void* GetPointArray(uint* __valueSize) => throw NotImplemented;
+
+        public unsafe void* GetSizeArray(uint* __valueSize) => throw NotImplemented;
+
+        public unsafe void* GetRectArray(uint* __valueSize) => throw NotImplemented;
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/WinRT/winrt.idl b/src/Windows/Avalonia.Win32/WinRT/winrt.idl
new file mode 100644
index 0000000000..929377999c
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/WinRT/winrt.idl
@@ -0,0 +1,718 @@
+@clr-namespace Avalonia.Win32.WinRT
+@clr-access internal
+@clr-map FLOAT float
+@clr-map HSTRING IntPtr
+@clr-map Vector2 System.Numerics.Vector2
+@clr-map Vector3 System.Numerics.Vector3
+@clr-map Quaternion System.Numerics.Quaternion
+@clr-map Matrix4x4 System.Numerics.Matrix4x4
+@clr-map RECT Avalonia.Win32.Interop.UnmanagedMethods.RECT
+@clr-map SIZE Avalonia.Win32.Interop.UnmanagedMethods.SIZE
+@clr-map POINT Avalonia.Win32.Interop.UnmanagedMethods.POINT
+@clr-map HWND IntPtr
+@clr-map BOOL int
+@clr-map DWORD int
+@clr-map boolean int
+@clr-map BYTE byte
+@clr-map INT16 short
+@clr-map INT32 int
+@clr-map INT64 long
+@clr-map UINT16 ushort
+@clr-map UINT32 uint
+@clr-map UINT64 ulong
+@clr-map DOUBLE double
+@clr-map GUID System.Guid
+@clr-map WCHAR System.Char
+@clr-map Color Avalonia.Win32.WinRT.WinRTColor
+
+enum TrustLevel
+{
+    BaseTrust,
+    PartialTrust,
+    FullTrust
+}
+
+enum DirectXAlphaMode
+{
+ Unspecified,
+ Premultiplied,
+ Straight,
+ Ignore
+}
+
+enum DirectXPixelFormat
+{
+    Unknown = 0,
+    R32G32B32A32Typeless = 1,
+    R32G32B32A32Float = 2,
+    R32G32B32A32UInt = 3,
+    R32G32B32A32Int = 4,
+    R32G32B32Typeless = 5,
+    R32G32B32Float = 6,
+    R32G32B32UInt = 7,
+    R32G32B32Int = 8,
+    R16G16B16A16Typeless = 9,
+    R16G16B16A16Float = 10, 
+    R16G16B16A16UIntNormalized = 11, 
+    R16G16B16A16UInt = 12, 
+    R16G16B16A16IntNormalized = 13, 
+    R16G16B16A16Int = 14, 
+    R32G32Typeless = 15, 
+    R32G32Float = 16, 
+    R32G32UInt = 17, 
+    R32G32Int = 18, 
+    R32G8X24Typeless = 19, 
+    D32FloatS8X24UInt = 20, 
+    R32FloatX8X24Typeless = 21, 
+    X32TypelessG8X24UInt = 22, 
+    R10G10B10A2Typeless = 23, 
+    R10G10B10A2UIntNormalized = 24, 
+    R10G10B10A2UInt = 25, 
+    R11G11B10Float = 26, 
+    R8G8B8A8Typeless = 27, 
+    R8G8B8A8UIntNormalized = 28, 
+    R8G8B8A8UIntNormalizedSrgb = 29, 
+    R8G8B8A8UInt = 30, 
+    R8G8B8A8IntNormalized = 31, 
+    R8G8B8A8Int = 32, 
+    R16G16Typeless = 33, 
+    R16G16Float = 34, 
+    R16G16UIntNormalized = 35, 
+    R16G16UInt = 36, 
+    R16G16IntNormalized = 37, 
+    R16G16Int = 38, 
+    R32Typeless = 39, 
+    D32Float = 40, 
+    R32Float = 41, 
+    R32UInt = 42, 
+    R32Int = 43, 
+    R24G8Typeless = 44, 
+    D24UIntNormalizedS8UInt = 45, 
+    R24UIntNormalizedX8Typeless = 46, 
+    X24TypelessG8UInt = 47, 
+    R8G8Typeless = 48, 
+    R8G8UIntNormalized = 49, 
+    R8G8UInt = 50, 
+    R8G8IntNormalized = 51, 
+    R8G8Int = 52, 
+    R16Typeless = 53, 
+    R16Float = 54, 
+    D16UIntNormalized = 55, 
+    R16UIntNormalized = 56, 
+    R16UInt = 57, 
+    R16IntNormalized = 58, 
+    R16Int = 59, 
+    R8Typeless = 60, 
+    R8UIntNormalized = 61, 
+    R8UInt = 62, 
+    R8IntNormalized = 63, 
+    R8Int = 64, 
+    A8UIntNormalized = 65, 
+    R1UIntNormalized = 66, 
+    R9G9B9E5SharedExponent = 67, 
+    R8G8B8G8UIntNormalized = 68, 
+    G8R8G8B8UIntNormalized = 69, 
+    BC1Typeless = 70, 
+    BC1UIntNormalized = 71, 
+    BC1UIntNormalizedSrgb = 72, 
+    BC2Typeless = 73, 
+    BC2UIntNormalized = 74, 
+    BC2UIntNormalizedSrgb = 75, 
+    BC3Typeless = 76, 
+    BC3UIntNormalized = 77, 
+    BC3UIntNormalizedSrgb = 78, 
+    BC4Typeless = 79, 
+    BC4UIntNormalized = 80, 
+    BC4IntNormalized = 81, 
+    BC5Typeless = 82, 
+    BC5UIntNormalized = 83, 
+    BC5IntNormalized = 84, 
+    B5G6R5UIntNormalized = 85, 
+    B5G5R5A1UIntNormalized = 86, 
+    B8G8R8A8UIntNormalized = 87, 
+    B8G8R8X8UIntNormalized = 88, 
+    R10G10B10XRBiasA2UIntNormalized = 89, 
+    B8G8R8A8Typeless = 90, 
+    B8G8R8A8UIntNormalizedSrgb = 91, 
+    B8G8R8X8Typeless = 92, 
+    B8G8R8X8UIntNormalizedSrgb = 93, 
+    BC6HTypeless = 94, 
+    BC6H16UnsignedFloat = 95, 
+    BC6H16Float = 96, 
+    BC7Typeless = 97, 
+    BC7UIntNormalized = 98, 
+    BC7UIntNormalizedSrgb = 99, 
+    Ayuv = 100, 
+    Y410 = 101, 
+    Y416 = 102, 
+    NV12 = 103, 
+    P010 = 104, 
+    P016 = 105, 
+    Opaque420 = 106, 
+    Yuy2 = 107, 
+    Y210 = 108, 
+    Y216 = 109, 
+    NV11 = 110, 
+    AI44 = 111, 
+    IA44 = 112, 
+    P8 = 113, 
+    A8P8 = 114, 
+    B4G4R4A4UIntNormalized = 115, 
+    P208 = 130, 
+    V208 = 131, 
+    V408 = 132, 
+}
+
+[uuid(AF86E2E0-B12D-4c6a-9C5A-D7AA65101E90)]
+interface IInspectable : IUnknown
+{
+    HRESULT GetIids(ulong * iidCount, Guid ** iids);
+    HRESULT GetRuntimeClassName( [out] IntPtr* className);
+    HRESULT GetTrustLevel([out] TrustLevel * trustLevel);
+}
+
+enum PropertyType
+{
+    Empty            = 0,
+    UInt8            = 1,
+    Int16            = 2,
+    UInt16           = 3,
+    Int32            = 4,
+    UInt32           = 5,
+    Int64            = 6,
+    UInt64           = 7,
+    Single           = 8,
+    Double           = 9,
+    Char16           = 10,
+    Boolean          = 11,
+    String           = 12,
+    Inspectable      = 13,
+    DateTime         = 14,
+    TimeSpan         = 15,
+    Guid             = 16,
+    Point            = 17,
+    Size             = 18,
+    Rect             = 19,
+    OtherType        = 20,
+    UInt8Array       = 1025,
+    Int16Array       = 1026,
+    UInt16Array      = 1027,
+    Int32Array       = 1028,
+    UInt32Array      = 1029,
+    Int64Array       = 1030,
+    UInt64Array      = 1031,
+    SingleArray      = 1032,
+    DoubleArray      = 1033,
+    Char16Array      = 1034,
+    BooleanArray     = 1035,
+    StringArray      = 1036,
+    InspectableArray = 1037,
+    DateTimeArray    = 1038,
+    TimeSpanArray    = 1039,
+    GuidArray        = 1040,
+    PointArray       = 1041,
+    SizeArray        = 1042,
+    RectArray        = 1043,
+    OtherTypeArray   = 1044
+}
+
+[uuid(4BD682DD-7554-40E9-9A9B-82654EDE7E62)]
+interface IPropertyValue : IInspectable
+{
+    [propget] HRESULT Type([out] [retval] PropertyType* value);
+    [propget] HRESULT IsNumericScalar([out] [retval] boolean* value);
+    HRESULT GetUInt8([out] [retval] BYTE* value);
+    HRESULT GetInt16([out] [retval] INT16* value);
+    HRESULT GetUInt16([out] [retval] UINT16* value);
+    HRESULT GetInt32([out] [retval] INT32* value);
+    HRESULT GetUInt32([out] [retval] UINT32* value);
+    HRESULT GetInt64([out] [retval] INT64* value);
+    HRESULT GetUInt64([out] [retval] UINT64* value);
+    HRESULT GetSingle([out] [retval] FLOAT* value);
+    HRESULT GetDouble([out] [retval] DOUBLE* value);
+    HRESULT GetChar16([out] [retval] WCHAR* value);
+    HRESULT GetBoolean([out] [retval] boolean* value);
+    HRESULT GetString([out] [retval] HSTRING* value);
+    HRESULT GetGuid([out] [retval] GUID* value);
+    HRESULT GetDateTime( void* value);
+    HRESULT GetTimeSpan(void* value);
+    HRESULT GetPoint(void* value);
+    HRESULT GetSize(void* value);
+    HRESULT GetRect(void* value);
+    HRESULT GetUInt8Array([out] UINT32* __valueSize, [out] [size_is(, *__valueSize)] BYTE** value);
+    HRESULT GetInt16Array([out] UINT32* __valueSize, [out] [size_is(, *__valueSize)] INT16** value);
+    HRESULT GetUInt16Array([out] UINT32* __valueSize, [out] [size_is(, *__valueSize)] UINT16** value);
+    HRESULT GetInt32Array([out] UINT32* __valueSize, [out] [size_is(, *__valueSize)] INT32** value);
+    HRESULT GetUInt32Array([out] UINT32* __valueSize, [out] [size_is(, *__valueSize)] UINT32** value);
+    HRESULT GetInt64Array([out] UINT32* __valueSize, [out] [size_is(, *__valueSize)] INT64** value);
+    HRESULT GetUInt64Array([out] UINT32* __valueSize, [out] [size_is(, *__valueSize)] UINT64** value);
+    HRESULT GetSingleArray([out] UINT32* __valueSize, [out] [size_is(, *__valueSize)] FLOAT** value);
+    HRESULT GetDoubleArray([out] UINT32* __valueSize, [out] [size_is(, *__valueSize)] DOUBLE** value);
+    HRESULT GetChar16Array([out] UINT32* __valueSize, [out] [size_is(, *__valueSize)] WCHAR** value);
+    HRESULT GetBooleanArray([out] UINT32* __valueSize, [out] [size_is(, *__valueSize)] boolean** value);
+    HRESULT GetStringArray([out] UINT32* __valueSize, [out] [size_is(, *__valueSize)] HSTRING** value);
+    HRESULT GetInspectableArray([out] UINT32* __valueSize, [out] [size_is(, *__valueSize)] void*** value);
+    HRESULT GetGuidArray([out] UINT32* __valueSize, [out] [size_is(, *__valueSize)] GUID** value);
+    HRESULT GetDateTimeArray([out] UINT32* __valueSize, [out] [size_is(, *__valueSize)] void** value);
+    HRESULT GetTimeSpanArray([out] UINT32* __valueSize, [out] [size_is(, *__valueSize)] void** value);
+    HRESULT GetPointArray([out] UINT32* __valueSize, [out] [size_is(, *__valueSize)] void** value);
+    HRESULT GetSizeArray([out] UINT32* __valueSize, [out] [size_is(, *__valueSize)] void** value);
+    HRESULT GetRectArray([out] UINT32* __valueSize, [out] [size_is(, *__valueSize)] void** value);
+}
+
+enum AsyncStatus {
+  Started = 0,
+  Completed, 
+  Canceled, 
+  Error,
+}
+
+[uuid(A4ED5C81-76C9-40BD-8BE6-B1D90FB20AE7)]
+interface IAsyncActionCompletedHandler : IUnknown
+{
+    HRESULT Invoke([in] IAsyncAction* asyncInfo, [in] AsyncStatus asyncStatus);
+}
+
+[uuid(5A648006-843A-4DA9-865B-9D26E5DFAD7B)]
+interface IAsyncAction : IInspectable
+{
+    HRESULT SetCompleted([in] IAsyncActionCompletedHandler* handler);
+    HRESULT GetCompleted([out] [retval] IAsyncActionCompletedHandler** ppv);
+    HRESULT GetResults();
+}
+
+[uuid(603E88E4-A338-4FFE-A457-A5CFB9CEB899)]
+interface IDispatcherQueue : IInspectable
+{
+    //TODO
+}
+
+[uuid(22F34E66-50DB-4E36-A98D-61C01B384D20)]
+interface IDispatcherQueueController : IInspectable
+{
+    [propget] HRESULT DispatcherQueue([out] [retval] IDispatcherQueue** value);
+    HRESULT ShutdownQueueAsync([out] [retval] IAsyncAction** operation);
+}
+
+[uuid(00000035-0000-0000-C000-000000000046)]
+interface IActivationFactory : IInspectable
+{
+    HRESULT ActivateInstance([out, retval] IntPtr* instance);
+}
+
+[flags]
+enum CompositionBatchTypes
+{
+    None              = 0x0,
+    Animation         = 0x1,
+    Effect            = 0x2,
+    InfiniteAnimation = 0x4,
+    AllAnimations     = 0x5
+}
+
+[uuid(B403CA50-7F8C-4E83-985F-CC45060036D8)]
+interface ICompositor : IInspectable
+{
+    HRESULT CreateColorKeyFrameAnimation([out] [retval] void** result);
+    [overload("CreateColorBrush")] HRESULT CreateColorBrush([out] [retval]void** result);
+    [overload("CreateColorBrush")] HRESULT CreateColorBrushWithColor([in] Color* color, [out] [retval] ICompositionColorBrush** result);
+    HRESULT CreateContainerVisual([out] [retval] IContainerVisual** result);
+    HRESULT CreateCubicBezierEasingFunction([in] Vector2 controlPoint1, [in] Vector2 controlPoint2, [out] [retval] void** result);
+    [overload("CreateEffectFactory")] HRESULT CreateEffectFactory([in] IGraphicsEffect* graphicsEffect, [out] [retval] ICompositionEffectFactory** result);
+    [overload("CreateEffectFactory")] HRESULT CreateEffectFactoryWithProperties([in] void* graphicsEffect, [in] void* animatableProperties, [out] [retval] void** result);
+    [overload("CreateExpressionAnimation")] HRESULT CreateExpressionAnimation([out] [retval] void** result);
+    [overload("CreateExpressionAnimation")] HRESULT CreateExpressionAnimationWithExpression([in] HSTRING expression, [out] [retval] void** result);
+    [overload("CreateInsetClip")] HRESULT CreateInsetClip([out] [retval] void** result);
+    [overload("CreateInsetClip")] HRESULT CreateInsetClipWithInsets([in] FLOAT leftInset, [in] FLOAT topInset, [in] FLOAT rightInset, [in] FLOAT bottomInset, [out] [retval] void** result);
+    HRESULT CreateLinearEasingFunction([out] [retval] void** result);
+    HRESULT CreatePropertySet([out] [retval] void** result);
+    HRESULT CreateQuaternionKeyFrameAnimation([out] [retval] void** result);
+    HRESULT CreateScalarKeyFrameAnimation([out] [retval] void** result);
+    HRESULT CreateScopedBatch([in] CompositionBatchTypes batchType, [out] [retval] ICompositionScopedBatch** result);
+    HRESULT CreateSpriteVisual([out] [retval] ISpriteVisual** result);
+    HRESULT CreateSurfaceBrush([out] [retval] ICompositionSurfaceBrush** result);
+    HRESULT CreateSurfaceBrushWithSurface([in] ICompositionSurface* surface, 
+        [out] [retval] ICompositionSurfaceBrush** result);
+    HRESULT CreateTargetForCurrentView([out] [retval] void** result);
+    HRESULT CreateVector2KeyFrameAnimation([out] [retval] void** result);
+    HRESULT CreateVector3KeyFrameAnimation([out] [retval] void** result);
+    HRESULT CreateVector4KeyFrameAnimation([out] [retval] void** result);
+    HRESULT GetCommitBatch([in]  CompositionBatchTypes batchType, [out] [retval] void** result);
+}
+
+[uuid(735081DC-5E24-45DA-A38F-E32CC349A9A0)]
+interface ICompositor2 : IInspectable
+{
+    HRESULT CreateAmbientLight([out] [retval] void** result);
+    HRESULT CreateAnimationGroup([out] [retval] void** result);
+    HRESULT CreateBackdropBrush([out] [retval] ICompositionBackdropBrush** result);
+    HRESULT CreateDistantLight([out] [retval] void** result);
+    HRESULT CreateDropShadow([out] [retval] void** result);
+    HRESULT CreateImplicitAnimationCollection([out] [retval] void** result);
+    HRESULT CreateLayerVisual([out] [retval] void** result);
+    HRESULT CreateMaskBrush([out] [retval] void** result);
+    HRESULT CreateNineGridBrush([out] [retval] void** result);
+    HRESULT CreatePointLight([out] [retval] void** result);
+    HRESULT CreateSpotLight([out] [retval] void** result);
+    [overload("CreateStepEasingFunction")] HRESULT CreateStepEasingFunction([out] [retval] void** result);
+    [overload("CreateStepEasingFunction")] HRESULT CreateStepEasingFunctionWithStepCount([in] INT32 stepCount, [out] [retval] void** result);
+}
+
+[uuid(08E05581-1AD1-4F97-9757-402D76E4233B)]
+interface ISpriteVisual : IInspectable
+{
+    [propget] HRESULT GetBrush([out] [retval] ICompositionBrush** value);
+    [propput] HRESULT SetBrush([in] ICompositionBrush* value);
+}
+
+[uuid(FD04E6E3-FE0C-4C3C-AB19-A07601A576EE)]
+interface ICompositionDrawingSurfaceInterop : IUnknown
+{
+    HRESULT BeginDraw(RECT* updateRect, Guid* iid, void** updateObject, [out, retval]POINT* updateOffset);
+    HRESULT EndDraw();
+    HRESULT Resize(POINT sizePixels);
+    HRESULT Scroll(RECT * scrollRect, RECT * clipRect, int offsetX, int offsetY);
+    HRESULT ResumeDraw();
+    HRESULT SuspendDraw();
+};
+
+[uuid(A116FF71-F8BF-4C8A-9C98-70779A32A9C8)]
+interface ICompositionGraphicsDeviceInterop : IUnknown
+{
+    HRESULT GetRenderingDevice([out] IUnknown ** value);
+    HRESULT SetRenderingDevice([out] IUnknown * value);
+};
+
+[uuid(25297D5C-3AD4-4C9C-B5CF-E36A38512330)]
+interface ICompositorInterop : IUnknown
+{
+    HRESULT CreateCompositionSurfaceForHandle(IntPtr swapChain, [out] ICompositionSurface ** res);
+    HRESULT CreateCompositionSurfaceForSwapChain(IUnknown* swapChain, [out] ICompositionSurface ** result);
+    HRESULT CreateGraphicsDevice(IUnknown * renderingDevice, [out] ICompositionGraphicsDevice ** result);
+};
+
+[uuid(26f496a0-7f38-45fb-88f7-faaabe67dd59)]
+interface ISwapChainInterop : IUnknown
+{
+    HRESULT SetSwapChain(IUnknown * swapChain);
+};
+
+/*
+[uuid(2C9DB356-E70D-4642-8298-BC4AA5B4865C)]
+interface ICompositionCapabilitiesInteropFactory : IInspectable
+{
+    HRESULT GetForWindow(IntPtr hwnd, [out] ICompositionCapabilities ** result);
+}*/
+
+[uuid(29E691FA-4567-4DCA-B319-D0F207EB6807)]
+interface ICompositorDesktopInterop : IUnknown
+{
+    HRESULT CreateDesktopWindowTarget(HWND hwndTarget, BOOL isTopmost, [out] IDesktopWindowTarget ** result);
+    HRESULT EnsureOnThread(DWORD threadId);
+};
+
+
+[uuid(35DBF59E-E3F9-45B0-81E7-FE75F4145DC9)]
+interface IDesktopWindowTargetInterop : IUnknown
+{
+    HRESULT GetHWnd([out] IntPtr* value);
+};
+
+[uuid(37642806-F421-4FD0-9F82-23AE7C776182)]
+interface IDesktopWindowContentBridgeInterop : IUnknown
+{
+    HRESULT Initialize(ICompositor* compositor, HWND parentHwnd);
+    HRESULT GetHWnd([out] IntPtr* value);
+
+    HRESULT GetAppliedScaleFactor([out] float* value);
+};
+
+[uuid(FB22C6E1-80A2-4667-9936-DBEAF6EEFE95)]
+interface ICompositionGraphicsDevice : IInspectable
+{
+    HRESULT CreateDrawingSurface([in] SIZE sizePixels, [in] DirectXPixelFormat pixelFormat,
+        [in] DirectXAlphaMode alphaMode, [out] [retval] ICompositionDrawingSurface** result);
+    HRESULT AddRenderingDeviceReplaced(void* handler, void* token);
+    HRESULT RemoveRenderingDeviceReplaced([in] int token);
+}
+
+[uuid(1527540D-42C7-47A6-A408-668F79A90DFB)]
+interface ICompositionSurface : IInspectable
+{
+}
+
+[uuid(6329D6CA-3366-490E-9DB3-25312929AC51)]
+interface IDesktopWindowTarget : IInspectable
+{
+    [propget] HRESULT IsTopmost([out] [retval] int* value);
+}
+
+
+[uuid(A166C300-FAD0-4D11-9E67-E433162FF49E)]
+interface ICompositionDrawingSurface : IInspectable
+{
+    [propget] HRESULT GetAlphaMode([out] [retval] DirectXAlphaMode* value);
+    [propget] HRESULT GetPixelFormat([out] [retval] DirectXPixelFormat* value);
+    [propget] HRESULT GetSize([out] [retval] POINT* value);
+}
+
+enum CompositionBitmapInterpolationMode
+{
+    NearestNeighbor,
+    Linear,
+    MagLinearMinLinearMipLinear,
+    MagLinearMinLinearMipNearest,
+    MagLinearMinNearestMipLinear,
+    MagLinearMinNearestMipNearest,
+    MagNearestMinLinearMipLinear,
+    MagNearestMinLinearMipNearest,
+    MagNearestMinNearestMipLinear,
+    MagNearestMinNearestMipNearest,
+}
+
+enum CompositionStretch
+{
+    None,
+    Fill,
+    Uniform,
+    UniformToFill,
+}
+
+[uuid(AD016D79-1E4C-4C0D-9C29-83338C87C162)]
+interface ICompositionSurfaceBrush : IInspectable
+{
+    [propget] HRESULT BitmapInterpolationMode([out] [retval] CompositionBitmapInterpolationMode* value);
+    [propput] HRESULT BitmapInterpolationMode([in] CompositionBitmapInterpolationMode value);
+    [propget] HRESULT HorizontalAlignmentRatio([out] [retval] FLOAT* value);
+    [propput] HRESULT HorizontalAlignmentRatio([in] FLOAT value);
+    [propget] HRESULT Stretch([out] [retval] CompositionStretch* value);
+    [propput] HRESULT Stretch([in] CompositionStretch value);
+    [propget] HRESULT Surface([out] [retval] ICompositionSurface** value);
+    [propput] HRESULT Surface([in] ICompositionSurface* value);
+    [propget] HRESULT VerticalAlignmentRatio([out] [retval] FLOAT* value);
+    [propput] HRESULT VerticalAlignmentRatio([in] FLOAT value);
+}
+
+[uuid(AB0D7608-30C0-40E9-B568-B60A6BD1FB46)]
+interface ICompositionBrush : IInspectable
+{
+}
+
+enum CompositionBackfaceVisibility
+{
+    Inherit,
+    Visible,
+    Hidden
+}
+
+enum CompositionBorderMode
+{
+    Inherit,
+    Soft,
+    Hard
+}
+
+enum CompositionCompositeMode
+{
+    Inherit,
+    SourceOver,
+    DestinationInvert,
+    MinBlend,
+}
+
+[uuid(117E202D-A859-4C89-873B-C2AA566788E3)]
+interface IVisual : IInspectable
+{
+    [propget] HRESULT AnchorPoint([out] [retval] Vector2* value);
+    [propput] HRESULT AnchorPoint([in] Vector2 value);
+    [propget] HRESULT BackfaceVisibility([out] [retval] CompositionBackfaceVisibility* value);
+    [propput] HRESULT BackfaceVisibility([in] CompositionBackfaceVisibility value);
+    [propget] HRESULT BorderMode([out] [retval] CompositionBorderMode* value);
+    [propput] HRESULT BorderMode([in] CompositionBorderMode value);
+    [propget] HRESULT CenterPoint([out] [retval] Vector3* value);
+    [propput] HRESULT CenterPoint([in] Vector3 value);
+    [propget] HRESULT Clip([out] [retval]void** value);
+    [propput] HRESULT Clip([in] void* value);
+    [propget] HRESULT CompositeMode([out] [retval] CompositionCompositeMode* value);
+    [propput] HRESULT CompositeMode([in] CompositionCompositeMode value);
+    [propget] HRESULT IsVisible([out] [retval] boolean* value);
+    [propput] HRESULT IsVisible([in] boolean value);
+    [propget] HRESULT Offset([out] [retval] Vector3* value);
+    [propput] HRESULT Offset([in] Vector3 value);
+    [propget] HRESULT Opacity([out] [retval] FLOAT* value);
+    [propput] HRESULT Opacity([in] FLOAT value);
+    [propget] HRESULT Orientation([out] [retval] Quaternion* value);
+    [propput] HRESULT Orientation([in] Quaternion value);
+    [propget] HRESULT Parent([out] [retval] IContainerVisual** value);
+    [propget] HRESULT RotationAngle([out] [retval] FLOAT* value);
+    [propput] HRESULT RotationAngle([in] FLOAT value);
+    [propget] HRESULT RotationAngleInDegrees([out] [retval] FLOAT* value);
+    [propput] HRESULT RotationAngleInDegrees([in] FLOAT value);
+    [propget] HRESULT RotationAxis([out] [retval] Vector3* value);
+    [propput] HRESULT RotationAxis([in] Vector3 value);
+    [propget] HRESULT Scale([out] [retval] Vector3* value);
+    [propput] HRESULT Scale([in] Vector3 value);
+    [propget] HRESULT Size([out] [retval] Vector2* value);
+    [propput] HRESULT Size([in] Vector2 value);
+    [propget] HRESULT TransformMatrix([out] [retval] Matrix4x4* value);
+    [propput] HRESULT TransformMatrix([in] Matrix4x4 value);
+}
+
+[uuid(3052B611-56C3-4C3E-8BF3-F6E1AD473F06)]
+interface IVisual2 : IInspectable
+{
+    [propget] HRESULT ParentForTransform([out] [retval] IVisual** value);
+    [propput] HRESULT ParentForTransform([in] IVisual* value);
+    [propget] HRESULT RelativeOffsetAdjustment([out] [retval] Vector3* value);
+    [propput] HRESULT RelativeOffsetAdjustment([in] Vector3 value);
+    [propget] HRESULT RelativeSizeAdjustment([out] [retval] Vector2* value);
+    [propput] HRESULT RelativeSizeAdjustment([in] Vector2 value);
+}
+
+[uuid(02F6BC74-ED20-4773-AFE6-D49B4A93DB32)]
+interface IContainerVisual : IInspectable
+{
+    [propget] HRESULT GetChildren([out] [retval] IVisualCollection** value);
+}
+
+[uuid(8B745505-FD3E-4A98-84A8-E949468C6BCB)]
+interface IVisualCollection : IInspectable
+{
+    [propget] HRESULT GetCount([out] [retval] INT32* value);
+    HRESULT InsertAbove([in] IVisual* newChild, [in] IVisual* sibling);
+    HRESULT InsertAtBottom([in] IVisual* newChild);
+    HRESULT InsertAtTop([in] IVisual* newChild);
+    HRESULT InsertBelow([in] IVisual* newChild, [in] IVisual* sibling);
+    HRESULT Remove([in] IVisual* child);
+    HRESULT RemoveAll();
+}
+
+[uuid(A1BEA8BA-D726-4663-8129-6B5E7927FFA6)]
+interface ICompositionTarget : IInspectable
+{
+    [propget] HRESULT Root([out] [retval] IVisual** value);
+    [propput] HRESULT Root([in] IVisual* value);
+}
+
+
+[uuid(CB51C0CE-8FE6-4636-B202-861FAA07D8F3)]
+interface IGraphicsEffect : IInspectable
+{
+    [propget] HRESULT Name([out] [retval] HSTRING* name);
+    [propput] HRESULT Name([in] HSTRING name);
+}
+
+[uuid(2D8F9DDC-4339-4EB9-9216-F9DEB75658A2)]
+interface IGraphicsEffectSource : IInspectable
+{
+}
+
+enum GRAPHICS_EFFECT_PROPERTY_MAPPING
+{
+    GRAPHICS_EFFECT_PROPERTY_MAPPING_UNKNOWN,
+    GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT,
+    GRAPHICS_EFFECT_PROPERTY_MAPPING_VECTORX,
+    GRAPHICS_EFFECT_PROPERTY_MAPPING_VECTORY,
+    GRAPHICS_EFFECT_PROPERTY_MAPPING_VECTORZ,
+    GRAPHICS_EFFECT_PROPERTY_MAPPING_VECTORW,
+    GRAPHICS_EFFECT_PROPERTY_MAPPING_RECT_TO_VECTOR4,
+    GRAPHICS_EFFECT_PROPERTY_MAPPING_RADIANS_TO_DEGREES,
+    GRAPHICS_EFFECT_PROPERTY_MAPPING_COLORMATRIX_ALPHA_MODE,
+    GRAPHICS_EFFECT_PROPERTY_MAPPING_COLOR_TO_VECTOR3,
+    GRAPHICS_EFFECT_PROPERTY_MAPPING_COLOR_TO_VECTOR4
+}
+
+[uuid(2FC57384-A068-44D7-A331-30982FCF7177)]
+interface IGraphicsEffectD2D1Interop : IUnknown
+{
+    HRESULT GetEffectId([out] Guid* id);
+    HRESULT GetNamedPropertyMapping(IntPtr name, uint* index, GRAPHICS_EFFECT_PROPERTY_MAPPING* mapping);
+    HRESULT GetPropertyCount([out] uint* count);
+    HRESULT GetProperty(uint index, [out]IPropertyValue** value);
+    HRESULT GetSource(uint index, [out, retval] IGraphicsEffectSource** source);
+    HRESULT GetSourceCount([retval]uint *count);
+};
+
+[uuid(858AB13A-3292-4E4E-B3BB-2B6C6544A6EE)]
+interface ICompositionEffectSourceParameter : IInspectable
+{
+    [propget] HRESULT Name([out] [retval] HSTRING* value);
+}
+
+[uuid(B3D9F276-ABA3-4724-ACF3-D0397464DB1C)]
+interface ICompositionEffectSourceParameterFactory : IInspectable
+{
+    HRESULT Create([in] HSTRING name, [out] [retval] ICompositionEffectSourceParameter** instance);
+}
+
+enum CompositionEffectFactoryLoadStatus
+{
+    Success          = 0,
+    EffectTooComplex = 1,
+    Pending          = 2,
+    Other            = -1
+}
+
+[uuid(BE5624AF-BA7E-4510-9850-41C0B4FF74DF)]
+interface ICompositionEffectFactory : IInspectable
+{
+    HRESULT CreateBrush([out] [retval] ICompositionEffectBrush** result);
+    [propget] HRESULT ExtendedError([out] [retval] int* value);
+    [propget] HRESULT LoadStatus([out] [retval] CompositionEffectFactoryLoadStatus* value);
+}
+
+[uuid(BF7F795E-83CC-44BF-A447-3E3C071789EC)]
+interface ICompositionEffectBrush : IInspectable
+{
+    HRESULT GetSourceParameter([in] HSTRING name, [out] [retval] ICompositionBrush** result);
+    HRESULT SetSourceParameter([in] HSTRING name, [in] ICompositionBrush* source);
+}
+
+[uuid(C5ACAE58-3898-499E-8D7F-224E91286A5D)]
+interface ICompositionBackdropBrush : IInspectable
+{
+}
+
+[uuid(2B264C5E-BF35-4831-8642-CF70C20FFF2F)]
+interface ICompositionColorBrush : IInspectable
+{
+    [propget] HRESULT Color([out] [retval] Color* value);
+    [propput] HRESULT Color([in] Color value);
+}
+
+[uuid(0D00DAD0-FB07-46FD-8C72-6280D1A3D1DD)]
+interface ICompositionScopedBatch : IInspectable
+{
+    [propget] HRESULT IsActive([out] [retval] boolean* value);
+    [propget] HRESULT IsEnded([out] [retval] boolean* value);
+    HRESULT End();
+    HRESULT Resume();
+    HRESULT Suspend();
+    [eventadd] HRESULT AddCompleted([in] void* handler, [out] [retval] int* token);
+    [eventremove] HRESULT RemoveCompleted([in] int token);
+}
+
+[uuid(48EA31AD-7FCD-4076-A79C-90CC4B852C9B)]
+interface ICompositor5 : IInspectable
+{
+    [propget] HRESULT GetComment([out] [retval] HSTRING* value);
+    [propput] HRESULT SetComment([in] HSTRING value);
+    [propget] HRESULT GetGlobalPlaybackRate([out] [retval] FLOAT* value);
+    [propput] HRESULT SetGlobalPlaybackRate([in] FLOAT value);
+    HRESULT CreateBounceScalarAnimation([out] [retval] void** result);
+    HRESULT CreateBounceVector2Animation([out] [retval] void** result);
+    HRESULT CreateBounceVector3Animation([out] [retval] void** result);
+    HRESULT CreateContainerShape([out] [retval] void** result);
+    HRESULT CreateEllipseGeometry([out] [retval] void** result);
+    HRESULT CreateLineGeometry([out] [retval] void** result);
+    [overload("CreatePathGeometry")] HRESULT CreatePathGeometry([out] [retval] void** result);
+    [overload("CreatePathGeometry")] HRESULT CreatePathGeometryWithPath([in] void* path, [out] [retval] void** result);
+    HRESULT CreatePathKeyFrameAnimation([out] [retval] void** result);
+    HRESULT CreateRectangleGeometry([out] [retval] void** result);
+    HRESULT CreateRoundedRectangleGeometry([out] [retval] void** result);
+    HRESULT CreateShapeVisual([out] [retval] void** result);
+    [overload("CreateSpriteShape")] HRESULT CreateSpriteShape([out] [retval] void** result);
+    [overload("CreateSpriteShape")] HRESULT CreateSpriteShapeWithGeometry([in] void* geometry, [out] [retval] void** result);
+    HRESULT CreateViewBox([out] [retval] void** result);
+    HRESULT RequestCommitAsync([out] [retval] IAsyncAction** operation);
+}
diff --git a/src/Windows/Avalonia.Win32/WindowFramebuffer.cs b/src/Windows/Avalonia.Win32/WindowFramebuffer.cs
deleted file mode 100644
index 19b90685bf..0000000000
--- a/src/Windows/Avalonia.Win32/WindowFramebuffer.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using Avalonia.Platform;
-using Avalonia.Win32.Interop;
-using PixelFormat = Avalonia.Platform.PixelFormat;
-
-namespace Avalonia.Win32
-{
-    public class WindowFramebuffer : ILockedFramebuffer
-    {
-        private readonly IntPtr _handle;
-        private IUnmanagedBlob _bitmapBlob;
-        private UnmanagedMethods.BITMAPINFOHEADER _bmpInfo;
-
-        public WindowFramebuffer(IntPtr handle, PixelSize size)
-        {
-            
-            if (size.Width <= 0)
-                throw new ArgumentException("Width is less than zero");
-            if (size.Height <= 0)
-                throw new ArgumentException("Height is less than zero");
-            _handle = handle;
-            _bmpInfo.Init();
-            _bmpInfo.biPlanes = 1;
-            _bmpInfo.biBitCount = 32;
-            _bmpInfo.Init();
-            _bmpInfo.biWidth = size.Width;
-            _bmpInfo.biHeight = -size.Height;
-            _bitmapBlob = AvaloniaLocator.Current.GetService<IRuntimePlatform>().AllocBlob(size.Width * size.Height * 4);
-        }
-
-        ~WindowFramebuffer()
-        {
-            Deallocate();
-        }
-
-        public IntPtr Address => _bitmapBlob.Address;
-        public int RowBytes => Size.Width * 4;
-        public PixelFormat Format => PixelFormat.Bgra8888;
-
-        public Vector Dpi
-        {
-            get
-            {
-                if (UnmanagedMethods.ShCoreAvailable)
-                {
-                    uint dpix, dpiy;
-
-                    var monitor = UnmanagedMethods.MonitorFromWindow(_handle,
-                        UnmanagedMethods.MONITOR.MONITOR_DEFAULTTONEAREST);
-
-                    if (UnmanagedMethods.GetDpiForMonitor(
-                            monitor,
-                            UnmanagedMethods.MONITOR_DPI_TYPE.MDT_EFFECTIVE_DPI,
-                            out dpix,
-                            out dpiy) == 0)
-                    {
-                        return new Vector(dpix, dpiy);
-                    }
-                }
-                return new Vector(96, 96);
-            }
-        }
-
-        public PixelSize Size => new PixelSize(_bmpInfo.biWidth, -_bmpInfo.biHeight);
-
-        public void DrawToDevice(IntPtr hDC, int destX = 0, int destY = 0, int srcX = 0, int srcY = 0, int width = -1,
-            int height = -1)
-        {
-            if (width == -1)
-                width = Size.Width;
-            if (height == -1)
-                height = Size.Height;
-            UnmanagedMethods.SetDIBitsToDevice(hDC, destX, destY, (uint) width, (uint) height, srcX, srcY,
-                0, (uint)Size.Height, _bitmapBlob.Address, ref _bmpInfo, 0);
-        }
-
-        public bool DrawToWindow(IntPtr hWnd, int destX = 0, int destY = 0, int srcX = 0, int srcY = 0, int width = -1,
-            int height = -1)
-        {
-            if (_bitmapBlob.IsDisposed)
-                throw new ObjectDisposedException("Framebuffer");
-            if (hWnd == IntPtr.Zero)
-                return false;
-            IntPtr hDC = UnmanagedMethods.GetDC(hWnd);
-            if (hDC == IntPtr.Zero)
-                return false;
-            DrawToDevice(hDC, destX, destY, srcX, srcY, width, height);
-            UnmanagedMethods.ReleaseDC(hWnd, hDC);
-            return true;
-        }
-
-        public void Dispose()
-        {
-            //It's not an *actual* dispose. This call means "We are done drawing"
-            DrawToWindow(_handle);
-        }
-
-        public void Deallocate() => _bitmapBlob.Dispose();
-    }
-}
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
new file mode 100644
index 0000000000..e7d16f731c
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
@@ -0,0 +1,552 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.InteropServices;
+using Avalonia.Controls;
+using Avalonia.Controls.Platform;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Win32.Input;
+using static Avalonia.Win32.Interop.UnmanagedMethods;
+
+namespace Avalonia.Win32
+{
+    public partial class WindowImpl
+    {
+        [SuppressMessage("Microsoft.StyleCop.CSharp.NamingRules", "SA1305:FieldNamesMustNotUseHungarianNotation",
+            Justification = "Using Win32 naming for consistency.")]
+        protected virtual unsafe IntPtr AppWndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
+        {
+            const double wheelDelta = 120.0;
+            uint timestamp = unchecked((uint)GetMessageTime());
+
+            RawInputEventArgs e = null;
+            var shouldTakeFocus = false;
+
+            switch ((WindowsMessage)msg)
+            {
+                case WindowsMessage.WM_ACTIVATE:
+                    {
+                        var wa = (WindowActivate)(ToInt32(wParam) & 0xffff);
+
+                        switch (wa)
+                        {
+                            case WindowActivate.WA_ACTIVE:
+                            case WindowActivate.WA_CLICKACTIVE:
+                                {
+                                    Activated?.Invoke();
+                                    break;
+                                }
+
+                            case WindowActivate.WA_INACTIVE:
+                                {
+                                    Deactivated?.Invoke();
+                                    break;
+                                }
+                        }
+
+                        return IntPtr.Zero;
+                    }
+
+                case WindowsMessage.WM_NCCALCSIZE:
+                    {
+                        if (ToInt32(wParam) == 1 && !HasFullDecorations || _isClientAreaExtended)
+                        {
+                            return IntPtr.Zero;
+                        }
+
+                        break;
+                    }
+
+                case WindowsMessage.WM_CLOSE:
+                    {
+                        bool? preventClosing = Closing?.Invoke();
+                        if (preventClosing == true)
+                        {
+                            return IntPtr.Zero;
+                        }
+
+                        BeforeCloseCleanup(false);
+
+                        // Used to distinguish between programmatic and regular close requests.
+                        _isCloseRequested = true;
+
+                        break;
+                    }
+
+                case WindowsMessage.WM_DESTROY:
+                    {
+                        //Window doesn't exist anymore
+                        _hwnd = IntPtr.Zero;
+                        //Remove root reference to this class, so unmanaged delegate can be collected
+                        s_instances.Remove(this);
+                        Closed?.Invoke();
+
+                        _mouseDevice.Dispose();
+                        _touchDevice?.Dispose();
+                        //Free other resources
+                        Dispose();
+                        return IntPtr.Zero;
+                    }
+
+                case WindowsMessage.WM_DPICHANGED:
+                    {
+                        var dpi = ToInt32(wParam) & 0xffff;
+                        var newDisplayRect = Marshal.PtrToStructure<RECT>(lParam);
+                        _scaling = dpi / 96.0;
+                        ScalingChanged?.Invoke(_scaling);
+                        SetWindowPos(hWnd,
+                            IntPtr.Zero,
+                            newDisplayRect.left,
+                            newDisplayRect.top,
+                            newDisplayRect.right - newDisplayRect.left,
+                            newDisplayRect.bottom - newDisplayRect.top,
+                            SetWindowPosFlags.SWP_NOZORDER |
+                            SetWindowPosFlags.SWP_NOACTIVATE);
+                        return IntPtr.Zero;
+                    }
+
+                case WindowsMessage.WM_KEYDOWN:
+                case WindowsMessage.WM_SYSKEYDOWN:
+                    {
+                        e = new RawKeyEventArgs(
+                            WindowsKeyboardDevice.Instance,
+                            timestamp,
+                            _owner,
+                            RawKeyEventType.KeyDown,
+                            KeyInterop.KeyFromVirtualKey(ToInt32(wParam), ToInt32(lParam)),
+                            WindowsKeyboardDevice.Instance.Modifiers);
+                        break;
+                    }
+
+                case WindowsMessage.WM_MENUCHAR:
+                    {
+                        // mute the system beep
+                        return (IntPtr)((int)MenuCharParam.MNC_CLOSE << 16);
+                    }
+
+                case WindowsMessage.WM_KEYUP:
+                case WindowsMessage.WM_SYSKEYUP:
+                    {
+                        e = new RawKeyEventArgs(
+                            WindowsKeyboardDevice.Instance,
+                            timestamp,
+                            _owner,
+                            RawKeyEventType.KeyUp,
+                            KeyInterop.KeyFromVirtualKey(ToInt32(wParam), ToInt32(lParam)),
+                            WindowsKeyboardDevice.Instance.Modifiers);
+                        break;
+                    }
+                case WindowsMessage.WM_CHAR:
+                    {
+                        // Ignore control chars
+                        if (ToInt32(wParam) >= 32)
+                        {
+                            e = new RawTextInputEventArgs(WindowsKeyboardDevice.Instance, timestamp, _owner,
+                                new string((char)ToInt32(wParam), 1));
+                        }
+
+                        break;
+                    }
+
+                case WindowsMessage.WM_LBUTTONDOWN:
+                case WindowsMessage.WM_RBUTTONDOWN:
+                case WindowsMessage.WM_MBUTTONDOWN:
+                case WindowsMessage.WM_XBUTTONDOWN:
+                    {
+                        shouldTakeFocus = ShouldTakeFocusOnClick;
+                        if (ShouldIgnoreTouchEmulatedMessage())
+                        {
+                            break;
+                        }
+
+                        e = new RawPointerEventArgs(
+                            _mouseDevice,
+                            timestamp,
+                            _owner,
+                            (WindowsMessage)msg switch
+                            {
+                                WindowsMessage.WM_LBUTTONDOWN => RawPointerEventType.LeftButtonDown,
+                                WindowsMessage.WM_RBUTTONDOWN => RawPointerEventType.RightButtonDown,
+                                WindowsMessage.WM_MBUTTONDOWN => RawPointerEventType.MiddleButtonDown,
+                                WindowsMessage.WM_XBUTTONDOWN =>
+                                HighWord(ToInt32(wParam)) == 1 ?
+                                    RawPointerEventType.XButton1Down :
+                                    RawPointerEventType.XButton2Down
+                            },
+                            DipFromLParam(lParam), GetMouseModifiers(wParam));
+                        break;
+                    }
+
+                case WindowsMessage.WM_LBUTTONUP:
+                case WindowsMessage.WM_RBUTTONUP:
+                case WindowsMessage.WM_MBUTTONUP:
+                case WindowsMessage.WM_XBUTTONUP:
+                    {
+                        shouldTakeFocus = ShouldTakeFocusOnClick;
+                        if (ShouldIgnoreTouchEmulatedMessage())
+                        {
+                            break;
+                        }
+
+                        e = new RawPointerEventArgs(
+                            _mouseDevice,
+                            timestamp,
+                            _owner,
+                            (WindowsMessage)msg switch
+                            {
+                                WindowsMessage.WM_LBUTTONUP => RawPointerEventType.LeftButtonUp,
+                                WindowsMessage.WM_RBUTTONUP => RawPointerEventType.RightButtonUp,
+                                WindowsMessage.WM_MBUTTONUP => RawPointerEventType.MiddleButtonUp,
+                                WindowsMessage.WM_XBUTTONUP =>
+                                HighWord(ToInt32(wParam)) == 1 ?
+                                    RawPointerEventType.XButton1Up :
+                                    RawPointerEventType.XButton2Up,
+                            },
+                            DipFromLParam(lParam), GetMouseModifiers(wParam));
+                        break;
+                    }
+                // Mouse capture is lost
+                case WindowsMessage.WM_CANCELMODE:
+                    _mouseDevice.Capture(null);
+                    break;
+
+                case WindowsMessage.WM_MOUSEMOVE:
+                    {
+                        if (ShouldIgnoreTouchEmulatedMessage())
+                        {
+                            break;
+                        }
+
+                        if (!_trackingMouse)
+                        {
+                            var tm = new TRACKMOUSEEVENT
+                            {
+                                cbSize = Marshal.SizeOf<TRACKMOUSEEVENT>(),
+                                dwFlags = 2,
+                                hwndTrack = _hwnd,
+                                dwHoverTime = 0,
+                            };
+
+                            TrackMouseEvent(ref tm);
+                        }
+
+                        e = new RawPointerEventArgs(
+                            _mouseDevice,
+                            timestamp,
+                            _owner,
+                            RawPointerEventType.Move,
+                            DipFromLParam(lParam), GetMouseModifiers(wParam));
+
+                        break;
+                    }
+
+                case WindowsMessage.WM_MOUSEWHEEL:
+                    {
+                        e = new RawMouseWheelEventArgs(
+                            _mouseDevice,
+                            timestamp,
+                            _owner,
+                            PointToClient(PointFromLParam(lParam)),
+                            new Vector(0, (ToInt32(wParam) >> 16) / wheelDelta), GetMouseModifiers(wParam));
+                        break;
+                    }
+
+                case WindowsMessage.WM_MOUSEHWHEEL:
+                    {
+                        e = new RawMouseWheelEventArgs(
+                            _mouseDevice,
+                            timestamp,
+                            _owner,
+                            PointToClient(PointFromLParam(lParam)),
+                            new Vector(-(ToInt32(wParam) >> 16) / wheelDelta, 0), GetMouseModifiers(wParam));
+                        break;
+                    }
+
+                case WindowsMessage.WM_MOUSELEAVE:
+                    {
+                        _trackingMouse = false;
+                        e = new RawPointerEventArgs(
+                            _mouseDevice,
+                            timestamp,
+                            _owner,
+                            RawPointerEventType.LeaveWindow,
+                            new Point(-1, -1), WindowsKeyboardDevice.Instance.Modifiers);
+                        break;
+                    }
+
+                case WindowsMessage.WM_NCLBUTTONDOWN:
+                case WindowsMessage.WM_NCRBUTTONDOWN:
+                case WindowsMessage.WM_NCMBUTTONDOWN:
+                case WindowsMessage.WM_NCXBUTTONDOWN:
+                    {
+                        e = new RawPointerEventArgs(
+                            _mouseDevice,
+                            timestamp,
+                            _owner,
+                            (WindowsMessage)msg switch
+                            {
+                                WindowsMessage.WM_NCLBUTTONDOWN => RawPointerEventType
+                                    .NonClientLeftButtonDown,
+                                WindowsMessage.WM_NCRBUTTONDOWN => RawPointerEventType.RightButtonDown,
+                                WindowsMessage.WM_NCMBUTTONDOWN => RawPointerEventType.MiddleButtonDown,
+                                WindowsMessage.WM_NCXBUTTONDOWN =>
+                                HighWord(ToInt32(wParam)) == 1 ?
+                                    RawPointerEventType.XButton1Down :
+                                    RawPointerEventType.XButton2Down,
+                            },
+                            PointToClient(PointFromLParam(lParam)), GetMouseModifiers(wParam));
+                        break;
+                    }
+                case WindowsMessage.WM_TOUCH:
+                    {
+                        var touchInputCount = wParam.ToInt32();
+
+                        var pTouchInputs = stackalloc TOUCHINPUT[touchInputCount];
+                        var touchInputs = new Span<TOUCHINPUT>(pTouchInputs, touchInputCount);
+
+                        if (GetTouchInputInfo(lParam, (uint)touchInputCount, pTouchInputs, Marshal.SizeOf<TOUCHINPUT>()))
+                        {
+                            foreach (var touchInput in touchInputs)
+                            {
+                                Input?.Invoke(new RawTouchEventArgs(_touchDevice, touchInput.Time,
+                                    _owner,
+                                    touchInput.Flags.HasFlagCustom(TouchInputFlags.TOUCHEVENTF_UP) ?
+                                        RawPointerEventType.TouchEnd :
+                                        touchInput.Flags.HasFlagCustom(TouchInputFlags.TOUCHEVENTF_DOWN) ?
+                                            RawPointerEventType.TouchBegin :
+                                            RawPointerEventType.TouchUpdate,
+                                    PointToClient(new PixelPoint(touchInput.X / 100, touchInput.Y / 100)),
+                                    WindowsKeyboardDevice.Instance.Modifiers,
+                                    touchInput.Id));
+                            }
+
+                            CloseTouchInputHandle(lParam);
+                            return IntPtr.Zero;
+                        }
+
+                        break;
+                    }
+                case WindowsMessage.WM_NCPAINT:
+                    {
+                        if (!HasFullDecorations)
+                        {
+                            return IntPtr.Zero;
+                        }
+
+                        break;
+                    }
+
+                case WindowsMessage.WM_NCACTIVATE:
+                    {
+                        if (!HasFullDecorations)
+                        {
+                            return new IntPtr(1);
+                        }
+
+                        break;
+                    }
+
+                case WindowsMessage.WM_PAINT:
+                {
+                    using(NonPumpingSyncContext.Use())
+                    using (_rendererLock.Lock())
+                    {
+                        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;
+                }
+
+                case WindowsMessage.WM_SIZE:
+                    {
+                        using(NonPumpingSyncContext.Use())
+                        using (_rendererLock.Lock())
+                        {
+                            // Do nothing here, just block until the pending frame render is completed on the render thread
+                        }
+
+                        var size = (SizeCommand)wParam;
+
+                        if (Resized != null &&
+                            (size == SizeCommand.Restored ||
+                             size == SizeCommand.Maximized))
+                        {
+                            var clientSize = new Size(ToInt32(lParam) & 0xffff, ToInt32(lParam) >> 16);
+                            Resized(clientSize / RenderScaling);
+                        }
+
+                        var windowState = size == SizeCommand.Maximized ?
+                            WindowState.Maximized :
+                            (size == SizeCommand.Minimized ? WindowState.Minimized : WindowState.Normal);
+
+                        if (windowState != _lastWindowState)
+                        {
+                            _lastWindowState = windowState;
+
+                            WindowStateChanged?.Invoke(windowState);
+
+                            if (_isClientAreaExtended)
+                            {
+                                UpdateExtendMargins();
+
+                                ExtendClientAreaToDecorationsChanged?.Invoke(true);
+                            }
+                        }
+
+                        return IntPtr.Zero;
+                    }
+
+                case WindowsMessage.WM_MOVE:
+                    {
+                        PositionChanged?.Invoke(new PixelPoint((short)(ToInt32(lParam) & 0xffff),
+                            (short)(ToInt32(lParam) >> 16)));
+                        return IntPtr.Zero;
+                    }
+
+                case WindowsMessage.WM_GETMINMAXINFO:
+                    {
+                        MINMAXINFO mmi = Marshal.PtrToStructure<MINMAXINFO>(lParam);
+                        
+                        _maxTrackSize = mmi.ptMaxTrackSize;
+
+                        if (_minSize.Width > 0)
+                        {
+                            mmi.ptMinTrackSize.X =
+                                (int)((_minSize.Width * RenderScaling) + BorderThickness.Left + BorderThickness.Right);
+                        }
+
+                        if (_minSize.Height > 0)
+                        {
+                            mmi.ptMinTrackSize.Y =
+                                (int)((_minSize.Height * RenderScaling) + BorderThickness.Top + BorderThickness.Bottom);
+                        }
+
+                        if (!double.IsInfinity(_maxSize.Width) && _maxSize.Width > 0)
+                        {
+                            mmi.ptMaxTrackSize.X =
+                                (int)((_maxSize.Width * RenderScaling) + BorderThickness.Left + BorderThickness.Right);
+                        }
+
+                        if (!double.IsInfinity(_maxSize.Height) && _maxSize.Height > 0)
+                        {
+                            mmi.ptMaxTrackSize.Y =
+                                (int)((_maxSize.Height * RenderScaling) + BorderThickness.Top + BorderThickness.Bottom);
+                        }
+
+                        Marshal.StructureToPtr(mmi, lParam, true);
+                        return IntPtr.Zero;
+                    }
+
+                case WindowsMessage.WM_DISPLAYCHANGE:
+                    {
+                        (Screen as ScreenImpl)?.InvalidateScreensCache();
+                        return IntPtr.Zero;
+                    }
+
+                case WindowsMessage.WM_KILLFOCUS:
+                    LostFocus?.Invoke();
+                    break;
+            }
+
+#if USE_MANAGED_DRAG
+            if (_managedDrag.PreprocessInputEvent(ref e))
+                return UnmanagedMethods.DefWindowProc(hWnd, msg, wParam, lParam);
+#endif
+            
+            if(shouldTakeFocus)
+            {
+                SetFocus(_hwnd);
+            }
+
+            if (e != null && Input != null)
+            {
+                Input(e);
+
+                if (e.Handled)
+                {
+                    return IntPtr.Zero;
+                }
+            }
+
+            using (_rendererLock.Lock())
+            {
+                return DefWindowProc(hWnd, msg, wParam, lParam);
+            }
+        }
+
+        private static int ToInt32(IntPtr ptr)
+        {
+            if (IntPtr.Size == 4)
+                return ptr.ToInt32();
+
+            return (int)(ptr.ToInt64() & 0xffffffff);
+        }
+
+        private static int HighWord(int param) => param >> 16;
+
+        private Point DipFromLParam(IntPtr lParam)
+        {
+            return new Point((short)(ToInt32(lParam) & 0xffff), (short)(ToInt32(lParam) >> 16)) / RenderScaling;
+        }
+
+        private PixelPoint PointFromLParam(IntPtr lParam)
+        {
+            return new PixelPoint((short)(ToInt32(lParam) & 0xffff), (short)(ToInt32(lParam) >> 16));
+        }
+
+        private bool ShouldIgnoreTouchEmulatedMessage()
+        {
+            if (!_multitouch)
+            {
+                return false;
+            }
+
+            // MI_WP_SIGNATURE
+            // https://docs.microsoft.com/en-us/windows/win32/tablet/system-events-and-mouse-messages
+            const long marker = 0xFF515700L;
+
+            var info = GetMessageExtraInfo().ToInt64();
+            return (info & marker) == marker;
+        }
+
+        private static RawInputModifiers GetMouseModifiers(IntPtr wParam)
+        {
+            var keys = (ModifierKeys)ToInt32(wParam);
+            var modifiers = WindowsKeyboardDevice.Instance.Modifiers;
+
+            if (keys.HasFlagCustom(ModifierKeys.MK_LBUTTON))
+            {
+                modifiers |= RawInputModifiers.LeftMouseButton;
+            }
+
+            if (keys.HasFlagCustom(ModifierKeys.MK_RBUTTON))
+            {
+                modifiers |= RawInputModifiers.RightMouseButton;
+            }
+
+            if (keys.HasFlagCustom(ModifierKeys.MK_MBUTTON))
+            {
+                modifiers |= RawInputModifiers.MiddleMouseButton;
+            }
+
+            if (keys.HasFlagCustom(ModifierKeys.MK_XBUTTON1))
+            {
+                modifiers |= RawInputModifiers.XButton1MouseButton;
+            }
+
+            if (keys.HasFlagCustom(ModifierKeys.MK_XBUTTON2))
+            {
+                modifiers |= RawInputModifiers.XButton2MouseButton;
+            }
+
+            return modifiers;
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
new file mode 100644
index 0000000000..68bd40da79
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
@@ -0,0 +1,147 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Input;
+using static Avalonia.Win32.Interop.UnmanagedMethods;
+
+#nullable enable
+
+namespace Avalonia.Win32
+{
+    public partial class WindowImpl
+    {
+        // Hit test the frame for resizing and moving.
+        private HitTestValues HitTestNCA(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            // Get the point coordinates for the hit test (screen space).
+            var ptMouse = PointFromLParam(lParam);
+
+            // Get the window rectangle.
+            GetWindowRect(hWnd, out var rcWindow);
+
+            // Get the frame rectangle, adjusted for the style without a caption.
+            var rcFrame = new RECT();
+            AdjustWindowRectEx(ref rcFrame, (uint)(WindowStyles.WS_OVERLAPPEDWINDOW & ~WindowStyles.WS_CAPTION), false, 0);
+
+            var borderThickness = new RECT();
+            if (GetStyle().HasFlag(WindowStyles.WS_THICKFRAME))
+            {
+                AdjustWindowRectEx(ref borderThickness, (uint)(GetStyle()), false, 0);
+                borderThickness.left *= -1;
+                borderThickness.top *= -1;
+            }
+            else if (GetStyle().HasFlag(WindowStyles.WS_BORDER))
+            {
+                borderThickness = new RECT { bottom = 1, left = 1, right = 1, top = 1 };
+            }
+
+            if (_extendTitleBarHint >= 0)
+            {
+                borderThickness.top = (int)(_extendedMargins.Top * RenderScaling);
+            }
+
+            // Determine if the hit test is for resizing. Default middle (1,1).
+            ushort uRow = 1;
+            ushort uCol = 1;
+            bool onResizeBorder = false;
+
+            // Determine if the point is at the left or right of the window.
+            if (ptMouse.X >= rcWindow.left && ptMouse.X < rcWindow.left + borderThickness.left)
+            {
+                uCol = 0; // left side
+            }
+            else if (ptMouse.X < rcWindow.right && ptMouse.X >= rcWindow.right - borderThickness.right)
+            {
+                uCol = 2; // right side
+            }
+
+            // Determine if the point is at the top or bottom of the window.
+            if (ptMouse.Y >= rcWindow.top && ptMouse.Y < rcWindow.top + borderThickness.top)
+            {
+                onResizeBorder = (ptMouse.Y < (rcWindow.top - rcFrame.top));
+
+                // Two cases where we have a valid row 0 hit test:
+                // - window resize border (top resize border hit)
+                // - area below resize border that is actual titlebar (caption hit).
+                if (onResizeBorder || uCol == 1)
+                {
+                    uRow = 0;
+                }
+            }
+            else if (ptMouse.Y < rcWindow.bottom && ptMouse.Y >= rcWindow.bottom - borderThickness.bottom)
+            {
+                uRow = 2;
+            }
+
+            ReadOnlySpan<HitTestValues> hitZones = stackalloc HitTestValues[]
+            {
+                HitTestValues.HTTOPLEFT, onResizeBorder ? HitTestValues.HTTOP : HitTestValues.HTCAPTION,
+                HitTestValues.HTTOPRIGHT, HitTestValues.HTLEFT, HitTestValues.HTNOWHERE, HitTestValues.HTRIGHT,
+                HitTestValues.HTBOTTOMLEFT, HitTestValues.HTBOTTOM, HitTestValues.HTBOTTOMRIGHT
+            };
+
+            var zoneIndex = uRow * 3 + uCol;
+
+            return hitZones[zoneIndex];
+        }
+
+        protected virtual IntPtr CustomCaptionProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam, ref bool callDwp)
+        {
+            IntPtr lRet = IntPtr.Zero;
+
+            callDwp = !DwmDefWindowProc(hWnd, msg, wParam, lParam, ref lRet);
+
+            switch ((WindowsMessage)msg)
+            {
+                case WindowsMessage.WM_DWMCOMPOSITIONCHANGED:
+                    // TODO handle composition changed.
+                    break;
+
+                case WindowsMessage.WM_NCHITTEST:
+                    if (lRet == IntPtr.Zero)
+                    {
+                        if(WindowState == WindowState.FullScreen)
+                        {
+                            return (IntPtr)HitTestValues.HTCLIENT;
+                        }
+                        var hittestResult = HitTestNCA(hWnd, wParam, lParam);
+
+                        lRet = (IntPtr)hittestResult;
+
+                        uint timestamp = unchecked((uint)GetMessageTime());
+
+                        if (hittestResult == HitTestValues.HTCAPTION)
+                        {
+                            var position = PointToClient(PointFromLParam(lParam));
+
+                            if (_owner is Window window)
+                            {
+                                var visual = window.Renderer.HitTestFirst(position, _owner as Window, x =>
+                                {
+                                    if (x is IInputElement ie && !ie.IsHitTestVisible)
+                                    {
+                                        return false;
+                                    }
+
+                                    return true;
+                                });
+
+                                if (visual != null)
+                                {
+                                    hittestResult = HitTestValues.HTCLIENT;
+                                    lRet = (IntPtr)hittestResult;
+                                }
+                            }
+                        }
+
+                        if (hittestResult != HitTestValues.HTNOWHERE)
+                        {
+                            callDwp = false;
+                        }
+                    }
+                    break;
+            }
+
+            return lRet;
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.WndProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.WndProc.cs
new file mode 100644
index 0000000000..07f2311be8
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/WindowImpl.WndProc.cs
@@ -0,0 +1,40 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.InteropServices;
+using Avalonia.Controls;
+using Avalonia.Controls.Platform;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Win32.Input;
+using static Avalonia.Win32.Interop.UnmanagedMethods;
+
+namespace Avalonia.Win32
+{
+    public partial class WindowImpl
+    {
+        protected virtual unsafe IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
+        {
+            IntPtr lRet = IntPtr.Zero;
+            bool callDwp = true;
+
+            if (_isClientAreaExtended)
+            {
+                lRet = CustomCaptionProc(hWnd, msg, wParam, lParam, ref callDwp);
+            }
+
+            if (callDwp)
+            {
+                lRet = AppWndProc(hWnd, msg, wParam, lParam);
+            }
+
+            return lRet;
+        }
+        
+        public INativeControlHostImpl NativeControlHost => _nativeControlHost;
+
+        protected virtual bool ShouldTakeFocusOnClick => true;
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 9d35342fb9..3c09d2b7a0 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -1,60 +1,95 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 using Avalonia.Controls;
+using Avalonia.Controls.Platform;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.OpenGL;
+using Avalonia.OpenGL.Angle;
+using Avalonia.OpenGL.Egl;
+using Avalonia.OpenGL.Surfaces;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 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;
 
 namespace Avalonia.Win32
 {
-    public class WindowImpl : IWindowImpl, EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo
+    /// <summary>
+    /// Window implementation for Win32 platform.
+    /// </summary>
+    public partial class WindowImpl : IWindowImpl, EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo,
+        ITopLevelImplWithNativeControlHost
     {
         private static readonly List<WindowImpl> s_instances = new List<WindowImpl>();
 
-        private static readonly IntPtr DefaultCursor = UnmanagedMethods.LoadCursor(
+        private static readonly IntPtr DefaultCursor = LoadCursor(
             IntPtr.Zero, new IntPtr((int)UnmanagedMethods.Cursor.IDC_ARROW));
 
-        private UnmanagedMethods.WndProc _wndProcDelegate;
+        private static readonly Dictionary<WindowEdge, HitTestValues> s_edgeLookup =
+            new Dictionary<WindowEdge, HitTestValues>
+            {
+                { WindowEdge.East, HitTestValues.HTRIGHT },
+                { WindowEdge.North, HitTestValues.HTTOP },
+                { WindowEdge.NorthEast, HitTestValues.HTTOPRIGHT },
+                { WindowEdge.NorthWest, HitTestValues.HTTOPLEFT },
+                { WindowEdge.South, HitTestValues.HTBOTTOM },
+                { WindowEdge.SouthEast, HitTestValues.HTBOTTOMRIGHT },
+                { WindowEdge.SouthWest, HitTestValues.HTBOTTOMLEFT },
+                { WindowEdge.West, HitTestValues.HTLEFT }
+            };
+
+        private SavedWindowInfo _savedWindowInfo;
+        private bool _isFullScreenActive;
+        private bool _isClientAreaExtended;
+        private Thickness _extendedMargins;
+        private Thickness _offScreenMargin;
+        private double _extendTitleBarHint = -1;
+        private bool _isUsingComposition;
+        private IBlurHost _blurHost;
+
+#if USE_MANAGED_DRAG
+        private readonly ManagedWindowResizeDragHelper _managedDrag;
+#endif
+
+        private const WindowStyles WindowStateMask = (WindowStyles.WS_MAXIMIZE | WindowStyles.WS_MINIMIZE);
+        private readonly TouchDevice _touchDevice;
+        private readonly MouseDevice _mouseDevice;
+        private readonly ManagedDeferredRendererLock _rendererLock;
+        private readonly FramebufferManager _framebuffer;
+        private readonly IGlPlatformSurface _gl;
+
+        private Win32NativeControlHost _nativeControlHost;
+        private WndProc _wndProcDelegate;
         private string _className;
         private IntPtr _hwnd;
         private bool _multitouch;
-        private TouchDevice _touchDevice = new TouchDevice();
-        private MouseDevice _mouseDevice = new WindowsMouseDevice();
         private IInputRoot _owner;
-        private ManagedDeferredRendererLock _rendererLock = new ManagedDeferredRendererLock();
+        private WindowProperties _windowProperties;
         private bool _trackingMouse;
-        private bool _decorated = true;
-        private bool _resizable = true;
-        private bool _topmost = false;
-        private bool _taskbarIcon = true;
+        private bool _topmost;
         private double _scaling = 1;
         private WindowState _showWindowState;
         private WindowState _lastWindowState;
-        private FramebufferManager _framebuffer;
-        private IGlPlatformSurface _gl;
         private OleDropTarget _dropTarget;
         private Size _minSize;
         private Size _maxSize;
-        private WindowImpl _parent;
-        private readonly List<WindowImpl> _disabledBy = new List<WindowImpl>();
-
-#if USE_MANAGED_DRAG
-        private readonly ManagedWindowResizeDragHelper _managedDrag;
-#endif
+        private POINT _maxTrackSize;
+        private WindowImpl _parent;        
+        private ExtendClientAreaChromeHints _extendChromeHints = ExtendClientAreaChromeHints.Default;
+        private bool _isCloseRequested;
 
         public WindowImpl()
         {
+            _touchDevice = new TouchDevice();
+            _mouseDevice = new WindowsMouseDevice();
+
 #if USE_MANAGED_DRAG
             _managedDrag = new ManagedWindowResizeDragHelper(this, capture =>
             {
@@ -64,12 +99,50 @@ namespace Avalonia.Win32
                     UnmanagedMethods.ReleaseCapture();
             });
 #endif
+
+            _windowProperties = new WindowProperties
+            {
+                ShowInTaskbar = false,
+                IsResizable = true,
+                Decorations = SystemDecorations.Full
+            };
+            _rendererLock = new ManagedDeferredRendererLock();
+
+            var glPlatform = AvaloniaLocator.Current.GetService<IPlatformOpenGlInterface>();
+
+            var compositionConnector = AvaloniaLocator.Current.GetService<WinUICompositorConnection>();
+
+            _isUsingComposition = compositionConnector is { } &&
+                glPlatform is EglPlatformOpenGlInterface egl &&
+                    egl.Display is AngleWin32EglDisplay angleDisplay &&
+                    angleDisplay.PlatformApi == AngleOptions.PlatformApi.DirectX11;
+
             CreateWindow();
             _framebuffer = new FramebufferManager(_hwnd);
-            if (Win32GlManager.EglFeature != null)
-                _gl = new EglGlPlatformSurface((EglDisplay)Win32GlManager.EglFeature.Display,
-                    Win32GlManager.EglFeature.DeferredContext, this);
+            
+            if (glPlatform != null)
+            {
+                if (_isUsingComposition)
+                {
+                    var cgl = new WinUiCompositedWindowSurface(compositionConnector, this);
+                    _blurHost = cgl;
+
+                    _gl = cgl;
+
+                    _isUsingComposition = true;
+                }
+                else
+                {
+                    if (glPlatform is EglPlatformOpenGlInterface egl2)
+                        _gl = new EglGlPlatformSurface(egl2, this);
+                    else if (glPlatform is WglPlatformOpenGlInterface wgl)
+                        _gl = new WglGlPlatformSurface(wgl.PrimaryContext, this);
+                }
+            }
 
+            Screen = new ScreenImpl();
+
+            _nativeControlHost = new Win32NativeControlHost(this);
             s_instances.Add(this);
         }
 
@@ -92,19 +165,23 @@ 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; }
 
         public Thickness BorderThickness
         {
             get
             {
-                if (_decorated)
+                if (HasFullDecorations)
                 {
-                    var style = UnmanagedMethods.GetWindowLong(_hwnd, (int)UnmanagedMethods.WindowLongParam.GWL_STYLE);
-                    var exStyle = UnmanagedMethods.GetWindowLong(_hwnd, (int)UnmanagedMethods.WindowLongParam.GWL_EXSTYLE);
+                    var style = GetStyle();
+                    var exStyle = GetExtendedStyle();
 
                     var padding = new RECT();
 
-                    if (UnmanagedMethods.AdjustWindowRectEx(ref padding, style, false, exStyle))
+                    if (AdjustWindowRectEx(ref padding, (uint)style, false, (uint)exStyle))
                     {
                         return new Thickness(-padding.left, -padding.top, padding.right, padding.bottom);
                     }
@@ -120,198 +197,362 @@ namespace Avalonia.Win32
             }
         }
 
+        public double RenderScaling => _scaling;
+
+        public double DesktopScaling => RenderScaling;
+
         public Size ClientSize
         {
             get
             {
-                UnmanagedMethods.RECT rect;
-                UnmanagedMethods.GetClientRect(_hwnd, out rect);
-                return new Size(rect.right, rect.bottom) / Scaling;
+                GetClientRect(_hwnd, out var rect);
+
+                return new Size(rect.right, rect.bottom) / RenderScaling;
             }
         }
 
-        public void Move(PixelPoint point) => Position = point;
+        public IScreenImpl Screen { get; }
 
-        public void SetMinMaxSize(Size minSize, Size maxSize)
-        {
-            _minSize = minSize;
-            _maxSize = maxSize;
-        }
+        public IPlatformHandle Handle { get; private set; }
 
-        public IScreenImpl Screen
-        {
-            get;
-        } = new ScreenImpl();
+        public virtual Size MaxAutoSizeHint => new Size(_maxTrackSize.X / RenderScaling, _maxTrackSize.Y / RenderScaling);
 
+        public IMouseDevice MouseDevice => _mouseDevice;
 
-        public IRenderer CreateRenderer(IRenderRoot root)
+        public WindowState WindowState
         {
-            var loop = AvaloniaLocator.Current.GetService<IRenderLoop>();
-            var customRendererFactory = AvaloniaLocator.Current.GetService<IRendererFactory>();
+            get
+            {
+                if(_isFullScreenActive)
+                {
+                    return WindowState.FullScreen;
+                }
 
-            if (customRendererFactory != null)
-                return customRendererFactory.Create(root, loop);
+                var placement = default(WINDOWPLACEMENT);
+                GetWindowPlacement(_hwnd, ref placement);
 
-            return Win32Platform.UseDeferredRendering ?
-                (IRenderer)new DeferredRenderer(root, loop, rendererLock: _rendererLock) :
-                new ImmediateRenderer(root);
-        }
+                return placement.ShowCmd switch
+                {
+                    ShowWindowCommand.Maximize => WindowState.Maximized,
+                    ShowWindowCommand.Minimize => WindowState.Minimized,
+                    _ => WindowState.Normal
+                };
+            }
 
-        public void Resize(Size value)
-        {
-            int requestedClientWidth = (int)(value.Width * Scaling);
-            int requestedClientHeight = (int)(value.Height * Scaling);
-            UnmanagedMethods.RECT clientRect;
-            UnmanagedMethods.GetClientRect(_hwnd, out clientRect);
-           
-            // do comparison after scaling to avoid rounding issues
-            if (requestedClientWidth != clientRect.Width || requestedClientHeight != clientRect.Height)
+            set
             {
-                UnmanagedMethods.RECT windowRect;
-                UnmanagedMethods.GetWindowRect(_hwnd, out windowRect);
-
-                UnmanagedMethods.SetWindowPos(
-                    _hwnd,
-                    IntPtr.Zero,
-                    0,
-                    0,
-                    requestedClientWidth + (windowRect.Width - clientRect.Width),
-                    requestedClientHeight + (windowRect.Height - clientRect.Height),
-                    UnmanagedMethods.SetWindowPosFlags.SWP_RESIZE);
+                if (IsWindowVisible(_hwnd))
+                {
+                    ShowWindow(value, true);
+                }
+                else
+                {
+                    _showWindowState = value;
+                }
             }
         }
 
-        public double Scaling => _scaling;
+        public WindowTransparencyLevel TransparencyLevel { get; private set; }
+
+        protected IntPtr Hwnd => _hwnd;
 
-        public IPlatformHandle Handle
+        public void SetTransparencyLevelHint (WindowTransparencyLevel transparencyLevel)
         {
-            get;
-            private set;
+            TransparencyLevel = EnableBlur(transparencyLevel);
         }
 
-
-        void UpdateEnabled()
+        private WindowTransparencyLevel EnableBlur(WindowTransparencyLevel transparencyLevel)
         {
-            EnableWindow(_hwnd, _disabledBy.Count == 0);
+            if (Win32Platform.WindowsVersion.Major >= 6)
+            {
+                if (DwmIsCompositionEnabled(out var compositionEnabled) != 0 || !compositionEnabled)
+                {
+                    return WindowTransparencyLevel.None;
+                }
+                else if (Win32Platform.WindowsVersion.Major >= 10)
+                {
+                    return Win10EnableBlur(transparencyLevel);
+                }
+                else if (Win32Platform.WindowsVersion.Minor >= 2)
+                {
+                    return Win8xEnableBlur(transparencyLevel);
+                }
+                else
+                {
+                    return Win7EnableBlur(transparencyLevel);
+                }
+            }
+            else
+            {
+                return WindowTransparencyLevel.None;
+            }
         }
 
-        public Size MaxClientSize
+        private WindowTransparencyLevel Win7EnableBlur(WindowTransparencyLevel transparencyLevel)
         {
-            get
+            if (transparencyLevel == WindowTransparencyLevel.AcrylicBlur)
+            {
+                transparencyLevel = WindowTransparencyLevel.Blur;
+            }
+
+            var blurInfo = new DWM_BLURBEHIND(false);
+            
+            if (transparencyLevel == WindowTransparencyLevel.Blur)
+            {
+                blurInfo = new DWM_BLURBEHIND(true);
+            }
+            
+            DwmEnableBlurBehindWindow(_hwnd, ref blurInfo);
+
+            if (transparencyLevel == WindowTransparencyLevel.Transparent)
+            {
+                return WindowTransparencyLevel.None;
+            }
+            else
             {
-                return (new Size(
-                    UnmanagedMethods.GetSystemMetrics(UnmanagedMethods.SystemMetric.SM_CXMAXTRACK),
-                    UnmanagedMethods.GetSystemMetrics(UnmanagedMethods.SystemMetric.SM_CYMAXTRACK))
-                    - BorderThickness) / Scaling;
+                return transparencyLevel;
             }
         }
 
-        public IMouseDevice MouseDevice => _mouseDevice;
+        private WindowTransparencyLevel Win8xEnableBlur(WindowTransparencyLevel transparencyLevel)
+        {
+            var accent = new AccentPolicy();
+            var accentStructSize = Marshal.SizeOf(accent);
 
-        public WindowState WindowState
+            if (transparencyLevel == WindowTransparencyLevel.AcrylicBlur)
+            {
+                transparencyLevel = WindowTransparencyLevel.Blur;
+            }
+
+            if (transparencyLevel == WindowTransparencyLevel.Transparent)
+            {
+                accent.AccentState = AccentState.ACCENT_ENABLE_BLURBEHIND;
+            }
+            else
+            {
+                accent.AccentState = AccentState.ACCENT_DISABLED;
+            }
+
+            var accentPtr = Marshal.AllocHGlobal(accentStructSize);
+            Marshal.StructureToPtr(accent, accentPtr, false);
+
+            var data = new WindowCompositionAttributeData();
+            data.Attribute = WindowCompositionAttribute.WCA_ACCENT_POLICY;
+            data.SizeOfData = accentStructSize;
+            data.Data = accentPtr;
+
+            SetWindowCompositionAttribute(_hwnd, ref data);
+
+            Marshal.FreeHGlobal(accentPtr);
+
+            if (transparencyLevel >= WindowTransparencyLevel.Blur)
+            {
+                Win7EnableBlur(transparencyLevel);
+            }
+
+            return transparencyLevel;
+        }
+
+        private WindowTransparencyLevel Win10EnableBlur(WindowTransparencyLevel transparencyLevel)
         {
-            get
+            if (_isUsingComposition)
+            {
+                _blurHost?.SetBlur(transparencyLevel >= WindowTransparencyLevel.Blur);
+
+                return transparencyLevel;
+            }
+            else
             {
-                var placement = default(UnmanagedMethods.WINDOWPLACEMENT);
-                UnmanagedMethods.GetWindowPlacement(_hwnd, ref placement);
+                bool canUseAcrylic = Win32Platform.WindowsVersion.Major > 10 || Win32Platform.WindowsVersion.Build >= 19628;
+
+                var accent = new AccentPolicy();
+                var accentStructSize = Marshal.SizeOf(accent);
 
-                switch (placement.ShowCmd)
+                if (transparencyLevel == WindowTransparencyLevel.AcrylicBlur && !canUseAcrylic)
+                {
+                    transparencyLevel = WindowTransparencyLevel.Blur;
+                }
+
+                switch (transparencyLevel)
                 {
-                    case UnmanagedMethods.ShowWindowCommand.Maximize:
-                        return WindowState.Maximized;
-                    case UnmanagedMethods.ShowWindowCommand.Minimize:
-                        return WindowState.Minimized;
                     default:
-                        return WindowState.Normal;
+                    case WindowTransparencyLevel.None:
+                        accent.AccentState = AccentState.ACCENT_DISABLED;
+                        break;
+
+                    case WindowTransparencyLevel.Transparent:
+                        accent.AccentState = AccentState.ACCENT_ENABLE_TRANSPARENTGRADIENT;
+                        break;
+
+                    case WindowTransparencyLevel.Blur:
+                        accent.AccentState = AccentState.ACCENT_ENABLE_BLURBEHIND;
+                        break;
+
+                    case WindowTransparencyLevel.AcrylicBlur:
+                    case (WindowTransparencyLevel.AcrylicBlur + 1): // hack-force acrylic.
+                        accent.AccentState = AccentState.ACCENT_ENABLE_ACRYLIC;
+                        transparencyLevel = WindowTransparencyLevel.AcrylicBlur;
+                        break;
                 }
+
+                accent.AccentFlags = 2;
+                accent.GradientColor = 0x01000000;
+
+                var accentPtr = Marshal.AllocHGlobal(accentStructSize);
+                Marshal.StructureToPtr(accent, accentPtr, false);
+
+                var data = new WindowCompositionAttributeData();
+                data.Attribute = WindowCompositionAttribute.WCA_ACCENT_POLICY;
+                data.SizeOfData = accentStructSize;
+                data.Data = accentPtr;
+
+                SetWindowCompositionAttribute(_hwnd, ref data);
+
+                Marshal.FreeHGlobal(accentPtr);
+
+                return transparencyLevel;
             }
+        }
+
+        public IEnumerable<object> Surfaces => new object[] { Handle, _gl, _framebuffer };
+
+        public PixelPoint Position
+        {
+            get
+            {
+                GetWindowRect(_hwnd, out var rc);
 
+                return new PixelPoint(rc.left, rc.top);
+            }
             set
             {
-                if (UnmanagedMethods.IsWindowVisible(_hwnd))
-                {
-                    ShowWindow(value);
-                }
-                else
-                {
-                    _showWindowState = value;
-                }
+                SetWindowPos(
+                    Handle.Handle,
+                    IntPtr.Zero,
+                    value.X,
+                    value.Y,
+                    0,
+                    0,
+                    SetWindowPosFlags.SWP_NOSIZE | SetWindowPosFlags.SWP_NOACTIVATE);
             }
         }
 
-        public IEnumerable<object> Surfaces => new object[]
+        private bool HasFullDecorations => _windowProperties.Decorations == SystemDecorations.Full;
+
+        public void Move(PixelPoint point) => Position = point;
+
+        public void SetMinMaxSize(Size minSize, Size maxSize)
         {
-            Handle, _gl, _framebuffer
-        };
+            _minSize = minSize;
+            _maxSize = maxSize;
+        }
+
+        public IRenderer CreateRenderer(IRenderRoot root)
+        {
+            var loop = AvaloniaLocator.Current.GetService<IRenderLoop>();
+            var customRendererFactory = AvaloniaLocator.Current.GetService<IRendererFactory>();
+
+            if (customRendererFactory != null)
+                return customRendererFactory.Create(root, loop);
+
+            return Win32Platform.UseDeferredRendering 
+                ?  _isUsingComposition 
+                    ? new DeferredRenderer(root, loop)
+                    {
+                        RenderOnlyOnRenderThread = true
+                    } 
+                    : (IRenderer)new DeferredRenderer(root, loop, rendererLock: _rendererLock)
+                : new ImmediateRenderer(root);
+        }
+
+        public void Resize(Size value)
+        {
+            int requestedClientWidth = (int)(value.Width * RenderScaling);
+            int requestedClientHeight = (int)(value.Height * RenderScaling);
+
+            GetClientRect(_hwnd, out var clientRect);
+
+            // do comparison after scaling to avoid rounding issues
+            if (requestedClientWidth != clientRect.Width || requestedClientHeight != clientRect.Height)
+            {
+                GetWindowRect(_hwnd, out var windowRect);
+
+                SetWindowPos(
+                    _hwnd,
+                    IntPtr.Zero,
+                    0,
+                    0,
+                    requestedClientWidth + (windowRect.Width - clientRect.Width),
+                    requestedClientHeight + (windowRect.Height - clientRect.Height),
+                    SetWindowPosFlags.SWP_RESIZE);
+            }
+        }
 
         public void Activate()
         {
-            UnmanagedMethods.SetActiveWindow(_hwnd);
+            SetActiveWindow(_hwnd);
         }
 
         public IPopupImpl CreatePopup() => Win32Platform.UseOverlayPopups ? null : new PopupImpl(this);
 
         public void Dispose()
         {
-            if (_hwnd != IntPtr.Zero)
-            {
-                UnmanagedMethods.DestroyWindow(_hwnd);
-                _hwnd = IntPtr.Zero;
-            }
-            if (_className != null)
+            (_gl as IDisposable)?.Dispose();
+
+            if (_dropTarget != null)
             {
-                UnmanagedMethods.UnregisterClass(_className, UnmanagedMethods.GetModuleHandle(null));
-                _className = null;
+                OleContext.Current?.UnregisterDragDrop(Handle);
+                _dropTarget = null;
             }
-        }
 
-        public void Hide()
-        {
-            if (_parent != null)
+            if (_hwnd != IntPtr.Zero)
             {
-                _parent._disabledBy.Remove(this);
-                _parent.UpdateEnabled();
-                _parent = null;
+                // Detect if we are being closed programmatically - this would mean that WM_CLOSE was not called
+                // and we didn't prepare this window for destruction.
+                if (!_isCloseRequested)
+                {
+                    BeforeCloseCleanup(true);
+                }
+                
+                DestroyWindow(_hwnd);
+                _hwnd = IntPtr.Zero;
             }
-            UnmanagedMethods.ShowWindow(_hwnd, UnmanagedMethods.ShowWindowCommand.Hide);
-        }
 
-        public void SetSystemDecorations(bool value)
-        {
-            if (value == _decorated)
+            if (_className != null)
             {
-                return;
+                UnregisterClass(_className, GetModuleHandle(null));
+                _className = null;
             }
 
-            UpdateWMStyles(()=> _decorated = value);
+            _framebuffer.Dispose();
         }
 
         public void Invalidate(Rect rect)
         {
-            var f = Scaling;
-            var r = new UnmanagedMethods.RECT
+            var scaling = RenderScaling;
+            var r = new RECT
             {
-                left = (int)Math.Floor(rect.X * f),
-                top = (int)Math.Floor(rect.Y * f),
-                right = (int)Math.Ceiling(rect.Right * f),
-                bottom = (int)Math.Ceiling(rect.Bottom * f),
+                left = (int)Math.Floor(rect.X * scaling),
+                top = (int)Math.Floor(rect.Y * scaling),
+                right = (int)Math.Ceiling(rect.Right * scaling),
+                bottom = (int)Math.Ceiling(rect.Bottom * scaling),
             };
 
-            UnmanagedMethods.InvalidateRect(_hwnd, ref r, false);
+            InvalidateRect(_hwnd, ref r, false);
         }
 
         public Point PointToClient(PixelPoint point)
         {
-            var p = new UnmanagedMethods.POINT { X = (int)point.X, Y = (int)point.Y };
+            var p = new POINT { X = point.X, Y = point.Y };
             UnmanagedMethods.ScreenToClient(_hwnd, ref p);
-            return new Point(p.X, p.Y) / Scaling;
+            return new Point(p.X, p.Y) / RenderScaling;
         }
 
         public PixelPoint PointToScreen(Point point)
         {
-            point *= Scaling;
-            var p = new UnmanagedMethods.POINT { X = (int)point.X, Y = (int)point.Y };
-            UnmanagedMethods.ClientToScreen(_hwnd, ref p);
+            point *= RenderScaling;
+            var p = new POINT { X = (int)point.X, Y = (int)point.Y };
+            ClientToScreen(_hwnd, ref p);
             return new PixelPoint(p.X, p.Y);
         }
 
@@ -321,485 +562,153 @@ namespace Avalonia.Win32
             CreateDropTarget();
         }
 
-        public void SetTitle(string title)
+        public void Hide()
         {
-            UnmanagedMethods.SetWindowText(_hwnd, title);
+            UnmanagedMethods.ShowWindow(_hwnd, ShowWindowCommand.Hide);
+        }
+
+        public virtual void Show(bool activate)
+        {
+            SetWindowLongPtr(_hwnd, (int)WindowLongParam.GWL_HWNDPARENT, _parent != null ? _parent._hwnd : IntPtr.Zero);
+
+            ShowWindow(_showWindowState, activate);
         }
 
-        public virtual void Show()
+        public Action GotInputWhenDisabled { get; set; }
+
+        public void SetParent(IWindowImpl parent)
         {
-            SetWindowLongPtr(_hwnd, (int)WindowLongParam.GWL_HWNDPARENT, IntPtr.Zero);
-            ShowWindow(_showWindowState);
+            _parent = (WindowImpl)parent;
+            SetWindowLongPtr(_hwnd, (int)WindowLongParam.GWL_HWNDPARENT, _parent._hwnd);
         }
 
+        public void SetEnabled(bool enable) => EnableWindow(_hwnd, enable);
+
         public void BeginMoveDrag(PointerPressedEventArgs e)
         {
             _mouseDevice.Capture(null);
-            UnmanagedMethods.DefWindowProc(_hwnd, (int)UnmanagedMethods.WindowsMessage.WM_NCLBUTTONDOWN,
-                new IntPtr((int)UnmanagedMethods.HitTestValues.HTCAPTION), IntPtr.Zero);
+            DefWindowProc(_hwnd, (int)WindowsMessage.WM_NCLBUTTONDOWN,
+                new IntPtr((int)HitTestValues.HTCAPTION), IntPtr.Zero);
             e.Pointer.Capture(null);
         }
 
-        static readonly Dictionary<WindowEdge, UnmanagedMethods.HitTestValues> EdgeDic = new Dictionary<WindowEdge, UnmanagedMethods.HitTestValues>
-        {
-            {WindowEdge.East, UnmanagedMethods.HitTestValues.HTRIGHT},
-            {WindowEdge.North, UnmanagedMethods.HitTestValues.HTTOP },
-            {WindowEdge.NorthEast, UnmanagedMethods.HitTestValues.HTTOPRIGHT },
-            {WindowEdge.NorthWest, UnmanagedMethods.HitTestValues.HTTOPLEFT },
-            {WindowEdge.South, UnmanagedMethods.HitTestValues.HTBOTTOM },
-            {WindowEdge.SouthEast, UnmanagedMethods.HitTestValues.HTBOTTOMRIGHT },
-            {WindowEdge.SouthWest, UnmanagedMethods.HitTestValues.HTBOTTOMLEFT },
-            {WindowEdge.West, UnmanagedMethods.HitTestValues.HTLEFT}
-        };
-
         public void BeginResizeDrag(WindowEdge edge, PointerPressedEventArgs e)
         {
 #if USE_MANAGED_DRAG
-            _managedDrag.BeginResizeDrag(edge, ScreenToClient(MouseDevice.Position));
+            _managedDrag.BeginResizeDrag(edge, ScreenToClient(MouseDevice.Position.ToPoint(_scaling)));
 #else
             _mouseDevice.Capture(null);
-            UnmanagedMethods.DefWindowProc(_hwnd, (int)UnmanagedMethods.WindowsMessage.WM_NCLBUTTONDOWN,
-                new IntPtr((int)EdgeDic[edge]), IntPtr.Zero);
+            DefWindowProc(_hwnd, (int)WindowsMessage.WM_NCLBUTTONDOWN,
+                new IntPtr((int)s_edgeLookup[edge]), IntPtr.Zero);
 #endif
         }
 
-        public PixelPoint Position
+        public void SetTitle(string title)
         {
-            get
-            {
-                UnmanagedMethods.RECT rc;
-                UnmanagedMethods.GetWindowRect(_hwnd, out rc);
-                return new PixelPoint(rc.left, rc.top);
-            }
-            set
-            {
-                UnmanagedMethods.SetWindowPos(
-                    Handle.Handle,
-                    IntPtr.Zero,
-                    value.X,
-                    value.Y,
-                    0,
-                    0,
-                    UnmanagedMethods.SetWindowPosFlags.SWP_NOSIZE | UnmanagedMethods.SetWindowPosFlags.SWP_NOACTIVATE);
-
-            }
+            SetWindowText(_hwnd, title);
         }
 
-        public void ShowDialog(IWindowImpl parent)
-        {
-            _parent = (WindowImpl)parent;
-            _parent._disabledBy.Add(this);
-            _parent.UpdateEnabled();
-            SetWindowLongPtr(_hwnd, (int)WindowLongParam.GWL_HWNDPARENT, ((WindowImpl)parent)._hwnd);
-            ShowWindow(_showWindowState);
-        }
-
-        public void SetCursor(IPlatformHandle cursor)
+        public void SetCursor(IPlatformHandle cursor)
         {
             var hCursor = cursor?.Handle ?? DefaultCursor;
-            UnmanagedMethods.SetClassLong(_hwnd, UnmanagedMethods.ClassLongIndex.GCLP_HCURSOR, hCursor);
+            SetClassLong(_hwnd, ClassLongIndex.GCLP_HCURSOR, hCursor);
 
             if (_owner.IsPointerOver)
+            {
                 UnmanagedMethods.SetCursor(hCursor);
+            }
         }
 
-        protected virtual IntPtr CreateWindowOverride(ushort atom)
+        public void SetIcon(IWindowIconImpl icon)
         {
-            return UnmanagedMethods.CreateWindowEx(
-                0,
-                atom,
-                null,
-                (int)UnmanagedMethods.WindowStyles.WS_OVERLAPPEDWINDOW,
-                UnmanagedMethods.CW_USEDEFAULT,
-                UnmanagedMethods.CW_USEDEFAULT,
-                UnmanagedMethods.CW_USEDEFAULT,
-                UnmanagedMethods.CW_USEDEFAULT,
-                IntPtr.Zero,
-                IntPtr.Zero,
-                IntPtr.Zero,
-                IntPtr.Zero);
+            var impl = (IconImpl)icon;
+            var hIcon = impl?.HIcon ?? IntPtr.Zero;
+            PostMessage(_hwnd, (int)WindowsMessage.WM_SETICON,
+                new IntPtr((int)Icons.ICON_BIG), hIcon);
         }
 
-        bool ShouldIgnoreTouchEmulatedMessage()
-        {
-            if (!_multitouch)
-                return false;
-            var marker = 0xFF515700L;
-            var info = GetMessageExtraInfo().ToInt64();
-            return (info & marker) == marker;
-        }
-        
-        [SuppressMessage("Microsoft.StyleCop.CSharp.NamingRules", "SA1305:FieldNamesMustNotUseHungarianNotation", Justification = "Using Win32 naming for consistency.")]
-        protected virtual unsafe IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
+        public void ShowTaskbarIcon(bool value)
         {
-            bool unicode = UnmanagedMethods.IsWindowUnicode(hWnd);
-
-            const double wheelDelta = 120.0;
-            uint timestamp = unchecked((uint)UnmanagedMethods.GetMessageTime());
-
-            RawInputEventArgs e = null;
-            
-            switch ((UnmanagedMethods.WindowsMessage)msg)
-            {
-                case UnmanagedMethods.WindowsMessage.WM_ACTIVATE:
-                    var wa = (UnmanagedMethods.WindowActivate)(ToInt32(wParam) & 0xffff);
-
-                    switch (wa)
-                    {
-                        case UnmanagedMethods.WindowActivate.WA_ACTIVE:
-                        case UnmanagedMethods.WindowActivate.WA_CLICKACTIVE:
-                            Activated?.Invoke();
-                            break;
-
-                        case UnmanagedMethods.WindowActivate.WA_INACTIVE:
-                            Deactivated?.Invoke();
-                            break;
-                    }
-
-                    return IntPtr.Zero;
-
-                case WindowsMessage.WM_NCCALCSIZE:
-                    if (ToInt32(wParam) == 1 && !_decorated)
-                    {
-                        return IntPtr.Zero;
-                    }
-                    break;
-
-                case UnmanagedMethods.WindowsMessage.WM_CLOSE:
-                    bool? preventClosing = Closing?.Invoke();
-                    if (preventClosing == true)
-                    {
-                        return IntPtr.Zero;
-                    }
-                    break;
-
-                case UnmanagedMethods.WindowsMessage.WM_DESTROY:
-                    //Window doesn't exist anymore
-                    _hwnd = IntPtr.Zero;
-                    //Remove root reference to this class, so unmanaged delegate can be collected
-                    s_instances.Remove(this);
-                    Closed?.Invoke();
-                    if (_parent != null)
-                    {
-                        _parent._disabledBy.Remove(this);
-                        _parent.UpdateEnabled();
-                    }
-                    _mouseDevice.Dispose();
-                    _touchDevice?.Dispose();
-                    //Free other resources
-                    Dispose();
-                    return IntPtr.Zero;
-
-                case UnmanagedMethods.WindowsMessage.WM_DPICHANGED:
-                    var dpi = ToInt32(wParam) & 0xffff;
-                    var newDisplayRect = Marshal.PtrToStructure<UnmanagedMethods.RECT>(lParam);
-                    _scaling = dpi / 96.0;
-                    ScalingChanged?.Invoke(_scaling);
-                    SetWindowPos(hWnd,
-                        IntPtr.Zero,
-                        newDisplayRect.left,
-                        newDisplayRect.top,
-                        newDisplayRect.right - newDisplayRect.left,
-                        newDisplayRect.bottom - newDisplayRect.top,
-                        SetWindowPosFlags.SWP_NOZORDER | SetWindowPosFlags.SWP_NOACTIVATE);
-                    return IntPtr.Zero;
-
-                case UnmanagedMethods.WindowsMessage.WM_KEYDOWN:
-                case UnmanagedMethods.WindowsMessage.WM_SYSKEYDOWN:
-                    e = new RawKeyEventArgs(
-                            WindowsKeyboardDevice.Instance,
-                            timestamp,
-                            _owner,
-                            RawKeyEventType.KeyDown,
-                            KeyInterop.KeyFromVirtualKey(ToInt32(wParam)), WindowsKeyboardDevice.Instance.Modifiers);
-                    break;
-
-                case UnmanagedMethods.WindowsMessage.WM_MENUCHAR:
-                    // mute the system beep
-                    return (IntPtr)((Int32)UnmanagedMethods.MenuCharParam.MNC_CLOSE << 16);
-
-                case UnmanagedMethods.WindowsMessage.WM_KEYUP:
-                case UnmanagedMethods.WindowsMessage.WM_SYSKEYUP:
-                    e = new RawKeyEventArgs(
-                            WindowsKeyboardDevice.Instance,
-                            timestamp,
-                            _owner,
-                            RawKeyEventType.KeyUp,
-                            KeyInterop.KeyFromVirtualKey(ToInt32(wParam)), WindowsKeyboardDevice.Instance.Modifiers);
-                    break;
-                case UnmanagedMethods.WindowsMessage.WM_CHAR:
-                    // Ignore control chars
-                    if (ToInt32(wParam) >= 32)
-                    {
-                        e = new RawTextInputEventArgs(WindowsKeyboardDevice.Instance, timestamp, _owner,
-                            new string((char)ToInt32(wParam), 1));
-                    }
-
-                    break;
-
-                case UnmanagedMethods.WindowsMessage.WM_LBUTTONDOWN:
-                case UnmanagedMethods.WindowsMessage.WM_RBUTTONDOWN:
-                case UnmanagedMethods.WindowsMessage.WM_MBUTTONDOWN:
-                    if(ShouldIgnoreTouchEmulatedMessage())
-                        break;
-                    e = new RawPointerEventArgs(
-                        _mouseDevice,
-                        timestamp,
-                        _owner,
-                        msg == (int)UnmanagedMethods.WindowsMessage.WM_LBUTTONDOWN
-                            ? RawPointerEventType.LeftButtonDown
-                            : msg == (int)UnmanagedMethods.WindowsMessage.WM_RBUTTONDOWN
-                                ? RawPointerEventType.RightButtonDown
-                                : RawPointerEventType.MiddleButtonDown,
-                        DipFromLParam(lParam), GetMouseModifiers(wParam));
-                    break;
-
-                case UnmanagedMethods.WindowsMessage.WM_LBUTTONUP:
-                case UnmanagedMethods.WindowsMessage.WM_RBUTTONUP:
-                case UnmanagedMethods.WindowsMessage.WM_MBUTTONUP:
-                    if(ShouldIgnoreTouchEmulatedMessage())
-                        break;
-                    e = new RawPointerEventArgs(
-                        _mouseDevice,
-                        timestamp,
-                        _owner,
-                        msg == (int)UnmanagedMethods.WindowsMessage.WM_LBUTTONUP
-                            ? RawPointerEventType.LeftButtonUp
-                            : msg == (int)UnmanagedMethods.WindowsMessage.WM_RBUTTONUP
-                                ? RawPointerEventType.RightButtonUp
-                                : RawPointerEventType.MiddleButtonUp,
-                        DipFromLParam(lParam), GetMouseModifiers(wParam));
-                    break;
-
-                case UnmanagedMethods.WindowsMessage.WM_MOUSEMOVE:
-                    if(ShouldIgnoreTouchEmulatedMessage())
-                        break;
-                    if (!_trackingMouse)
-                    {
-                        var tm = new UnmanagedMethods.TRACKMOUSEEVENT
-                        {
-                            cbSize = Marshal.SizeOf<UnmanagedMethods.TRACKMOUSEEVENT>(),
-                            dwFlags = 2,
-                            hwndTrack = _hwnd,
-                            dwHoverTime = 0,
-                        };
-
-                        UnmanagedMethods.TrackMouseEvent(ref tm);
-                    }
-
-                    e = new RawPointerEventArgs(
-                        _mouseDevice,
-                        timestamp,
-                        _owner,
-                        RawPointerEventType.Move,
-                        DipFromLParam(lParam), GetMouseModifiers(wParam));
-
-                    break;
-
-                case UnmanagedMethods.WindowsMessage.WM_MOUSEWHEEL:
-                    e = new RawMouseWheelEventArgs(
-                        _mouseDevice,
-                        timestamp,
-                        _owner,
-                        PointToClient(PointFromLParam(lParam)),
-                        new Vector(0, (ToInt32(wParam) >> 16) / wheelDelta), GetMouseModifiers(wParam));
-                    break;
-
-                case UnmanagedMethods.WindowsMessage.WM_MOUSEHWHEEL:
-                    e = new RawMouseWheelEventArgs(
-                        _mouseDevice,
-                        timestamp,
-                        _owner,
-                        PointToClient(PointFromLParam(lParam)),
-                        new Vector(-(ToInt32(wParam) >> 16) / wheelDelta, 0), GetMouseModifiers(wParam));
-                    break;
-
-                case UnmanagedMethods.WindowsMessage.WM_MOUSELEAVE:
-                    _trackingMouse = false;
-                    e = new RawPointerEventArgs(
-                        _mouseDevice,
-                        timestamp,
-                        _owner,
-                        RawPointerEventType.LeaveWindow,
-                        new Point(-1,-1), WindowsKeyboardDevice.Instance.Modifiers);
-                    break;
-
-                case UnmanagedMethods.WindowsMessage.WM_NCLBUTTONDOWN:
-                case UnmanagedMethods.WindowsMessage.WM_NCRBUTTONDOWN:
-                case UnmanagedMethods.WindowsMessage.WM_NCMBUTTONDOWN:
-                    e = new RawPointerEventArgs(
-                        _mouseDevice,
-                        timestamp,
-                        _owner,
-                        msg == (int)UnmanagedMethods.WindowsMessage.WM_NCLBUTTONDOWN
-                            ? RawPointerEventType.NonClientLeftButtonDown
-                            : msg == (int)UnmanagedMethods.WindowsMessage.WM_NCRBUTTONDOWN
-                                ? RawPointerEventType.RightButtonDown
-                                : RawPointerEventType.MiddleButtonDown,
-                        PointToClient(PointFromLParam(lParam)), GetMouseModifiers(wParam));
-                    break;
-                case WindowsMessage.WM_TOUCH:
-                    var touchInputCount = wParam.ToInt32();
-
-                    var pTouchInputs = stackalloc TOUCHINPUT[touchInputCount];
-                    var touchInputs = new Span<TOUCHINPUT>(pTouchInputs, touchInputCount);
-
-                    if (GetTouchInputInfo(lParam, (uint)touchInputCount, pTouchInputs, Marshal.SizeOf<TOUCHINPUT>()))
-                    {
-                        foreach (var touchInput in touchInputs)
-                        {
-                            Input?.Invoke(new RawTouchEventArgs(_touchDevice, touchInput.Time,
-                                _owner,
-                                touchInput.Flags.HasFlagCustom(TouchInputFlags.TOUCHEVENTF_UP) ?
-                                    RawPointerEventType.TouchEnd :
-                                    touchInput.Flags.HasFlagCustom(TouchInputFlags.TOUCHEVENTF_DOWN) ?
-                                        RawPointerEventType.TouchBegin :
-                                        RawPointerEventType.TouchUpdate,
-                                PointToClient(new PixelPoint(touchInput.X / 100, touchInput.Y / 100)),
-                                WindowsKeyboardDevice.Instance.Modifiers,
-                                touchInput.Id));
-                        }
-                        CloseTouchInputHandle(lParam);
-                        return IntPtr.Zero;
-                    }
-                    
-                    break;
-                case WindowsMessage.WM_NCPAINT:
-                    if (!_decorated)
-                    {
-                        return IntPtr.Zero;
-                    }
-                    break;
-
-                case WindowsMessage.WM_NCACTIVATE:
-                    if (!_decorated)
-                    {
-                        return new IntPtr(1);
-                    }
-                    break;
-
-                case UnmanagedMethods.WindowsMessage.WM_PAINT:
-                    using (_rendererLock.Lock())
-                    {
-                        UnmanagedMethods.PAINTSTRUCT ps;
-                        if (UnmanagedMethods.BeginPaint(_hwnd, out ps) != IntPtr.Zero)
-                        {
-                            var f = Scaling;
-                            var r = ps.rcPaint;
-                            Paint?.Invoke(new Rect(r.left / f, r.top / f, (r.right - r.left) / f,
-                                (r.bottom - r.top) / f));
-                            UnmanagedMethods.EndPaint(_hwnd, ref ps);
-                        }
-                    }
+            var newWindowProperties = _windowProperties;
 
-                    return IntPtr.Zero;
+            newWindowProperties.ShowInTaskbar = value;
 
-                case UnmanagedMethods.WindowsMessage.WM_SIZE:
-                    using (_rendererLock.Lock())
-                    {
-                        // Do nothing here, just block until the pending frame render is completed on the render thread
-                    }
-                    var size = (UnmanagedMethods.SizeCommand)wParam;
-
-                    if (Resized != null &&
-                        (size == UnmanagedMethods.SizeCommand.Restored ||
-                         size == UnmanagedMethods.SizeCommand.Maximized))
-                    {
-                        var clientSize = new Size(ToInt32(lParam) & 0xffff, ToInt32(lParam) >> 16);
-                        Resized(clientSize / Scaling);
-                    }
-
-                    var windowState = size == SizeCommand.Maximized ? WindowState.Maximized
-                        : (size == SizeCommand.Minimized ? WindowState.Minimized : WindowState.Normal);
-
-                    if (windowState != _lastWindowState)
-                    {
-                        _lastWindowState = windowState;
-                        WindowStateChanged?.Invoke(windowState);
-                    }
-
-                    return IntPtr.Zero;
-
-                case UnmanagedMethods.WindowsMessage.WM_MOVE:
-                    PositionChanged?.Invoke(new PixelPoint((short)(ToInt32(lParam) & 0xffff), (short)(ToInt32(lParam) >> 16)));
-                    return IntPtr.Zero;
-
-                case UnmanagedMethods.WindowsMessage.WM_GETMINMAXINFO:
-
-                    MINMAXINFO mmi = Marshal.PtrToStructure<UnmanagedMethods.MINMAXINFO>(lParam);
-
-                    if (_minSize.Width > 0)
-                        mmi.ptMinTrackSize.X = (int)((_minSize.Width * Scaling) + BorderThickness.Left + BorderThickness.Right);
+            UpdateWindowProperties(newWindowProperties);
+        }
 
-                    if (_minSize.Height > 0)
-                        mmi.ptMinTrackSize.Y = (int)((_minSize.Height * Scaling) + BorderThickness.Top + BorderThickness.Bottom);
+        public void CanResize(bool value)
+        {
+            var newWindowProperties = _windowProperties;
 
-                    if (!Double.IsInfinity(_maxSize.Width) && _maxSize.Width > 0)
-                        mmi.ptMaxTrackSize.X = (int)((_maxSize.Width * Scaling) + BorderThickness.Left + BorderThickness.Right);
+            newWindowProperties.IsResizable = value;
 
-                    if (!Double.IsInfinity(_maxSize.Height) && _maxSize.Height > 0)
-                        mmi.ptMaxTrackSize.Y = (int)((_maxSize.Height * Scaling) + BorderThickness.Top + BorderThickness.Bottom);
+            UpdateWindowProperties(newWindowProperties);
+        }
 
-                    Marshal.StructureToPtr(mmi, lParam, true);
-                    return IntPtr.Zero;
+        public void SetSystemDecorations(SystemDecorations value)
+        {
+            var newWindowProperties = _windowProperties;
 
-                case UnmanagedMethods.WindowsMessage.WM_DISPLAYCHANGE:
-                    (Screen as ScreenImpl)?.InvalidateScreensCache();
-                    return IntPtr.Zero;
-            }
+            newWindowProperties.Decorations = value;
 
-#if USE_MANAGED_DRAG
-
-            if (_managedDrag.PreprocessInputEvent(ref e))
-                return UnmanagedMethods.DefWindowProc(hWnd, msg, wParam, lParam);
-#endif
+            UpdateWindowProperties(newWindowProperties);
+        }
 
-            if (e != null && Input != null)
+        public void SetTopmost(bool value)
+        {
+            if (value == _topmost)
             {
-                Input(e);
-
-                if (e.Handled)
-                {
-                    return IntPtr.Zero;
-                }
+                return;
             }
 
-            using (_rendererLock.Lock())
-                return UnmanagedMethods.DefWindowProc(hWnd, msg, wParam, lParam);
+            IntPtr hWndInsertAfter = value ? WindowPosZOrder.HWND_TOPMOST : WindowPosZOrder.HWND_NOTOPMOST;
+            SetWindowPos(_hwnd,
+                hWndInsertAfter,
+                0, 0, 0, 0,
+                SetWindowPosFlags.SWP_NOMOVE | SetWindowPosFlags.SWP_NOSIZE | SetWindowPosFlags.SWP_NOACTIVATE);
+
+            _topmost = value;
         }
 
-        static RawInputModifiers GetMouseModifiers(IntPtr wParam)
+        protected virtual IntPtr CreateWindowOverride(ushort atom)
         {
-            var keys = (UnmanagedMethods.ModifierKeys)ToInt32(wParam);
-            var modifiers = WindowsKeyboardDevice.Instance.Modifiers;
-            if (keys.HasFlagCustom(UnmanagedMethods.ModifierKeys.MK_LBUTTON))
-                modifiers |= RawInputModifiers.LeftMouseButton;
-            if (keys.HasFlagCustom(UnmanagedMethods.ModifierKeys.MK_RBUTTON))
-                modifiers |= RawInputModifiers.RightMouseButton;
-            if (keys.HasFlagCustom(UnmanagedMethods.ModifierKeys.MK_MBUTTON))
-                modifiers |= RawInputModifiers.MiddleMouseButton;
-            return modifiers;
+            return CreateWindowEx(
+                _isUsingComposition ? (int)WindowStyles.WS_EX_NOREDIRECTIONBITMAP : 0,
+                atom,
+                null,
+                (int)WindowStyles.WS_OVERLAPPEDWINDOW | (int) WindowStyles.WS_CLIPCHILDREN,
+                CW_USEDEFAULT,
+                CW_USEDEFAULT,
+                CW_USEDEFAULT,
+                CW_USEDEFAULT,
+                IntPtr.Zero,
+                IntPtr.Zero,
+                IntPtr.Zero,
+                IntPtr.Zero);
         }
 
         private void CreateWindow()
         {
             // Ensure that the delegate doesn't get garbage collected by storing it as a field.
-            _wndProcDelegate = new UnmanagedMethods.WndProc(WndProc);
+            _wndProcDelegate = WndProc;
 
             _className = $"Avalonia-{Guid.NewGuid().ToString()}";
 
-            UnmanagedMethods.WNDCLASSEX wndClassEx = new UnmanagedMethods.WNDCLASSEX
+            // Unique DC helps with performance when using Gpu based rendering
+            const ClassStyles windowClassStyle = ClassStyles.CS_OWNDC | ClassStyles.CS_HREDRAW | ClassStyles.CS_VREDRAW;
+
+            var wndClassEx = new WNDCLASSEX
             {
-                cbSize = Marshal.SizeOf<UnmanagedMethods.WNDCLASSEX>(),
-                style = (int)(ClassStyles.CS_OWNDC | ClassStyles.CS_HREDRAW | ClassStyles.CS_VREDRAW), // Unique DC helps with performance when using Gpu based rendering
+                cbSize = Marshal.SizeOf<WNDCLASSEX>(),
+                style = (int)windowClassStyle,
                 lpfnWndProc = _wndProcDelegate,
-                hInstance = UnmanagedMethods.GetModuleHandle(null),
+                hInstance = GetModuleHandle(null),
                 hCursor = DefaultCursor,
                 hbrBackground = IntPtr.Zero,
                 lpszClassName = _className
             };
 
-            ushort atom = UnmanagedMethods.RegisterClassEx(ref wndClassEx);
+            ushort atom = RegisterClassEx(ref wndClassEx);
 
             if (atom == 0)
             {
@@ -815,23 +724,24 @@ namespace Avalonia.Win32
 
             Handle = new PlatformHandle(_hwnd, PlatformConstants.WindowHandleType);
 
-            _multitouch = Win32Platform.Options.EnableMultitouch ?? false;
+            _multitouch = Win32Platform.Options.EnableMultitouch ?? true;
+
             if (_multitouch)
-                RegisterTouchWindow(_hwnd, 0);
-            
-            if (UnmanagedMethods.ShCoreAvailable)
             {
-                uint dpix, dpiy;
+                RegisterTouchWindow(_hwnd, 0);
+            }
 
-                var monitor = UnmanagedMethods.MonitorFromWindow(
+            if (ShCoreAvailable)
+            {
+                var monitor = MonitorFromWindow(
                     _hwnd,
-                    UnmanagedMethods.MONITOR.MONITOR_DEFAULTTONEAREST);
+                    MONITOR.MONITOR_DEFAULTTONEAREST);
 
-                if (UnmanagedMethods.GetDpiForMonitor(
-                        monitor,
-                        UnmanagedMethods.MONITOR_DPI_TYPE.MDT_EFFECTIVE_DPI,
-                        out dpix,
-                        out dpiy) == 0)
+                if (GetDpiForMonitor(
+                    monitor,
+                    MONITOR_DPI_TYPE.MDT_EFFECTIVE_DPI,
+                    out var dpix,
+                    out var dpiy) == 0)
                 {
                     _scaling = dpix / 96.0;
                 }
@@ -840,50 +750,203 @@ namespace Avalonia.Win32
 
         private void CreateDropTarget()
         {
-            OleDropTarget odt = new OleDropTarget(this, _owner);
+            var odt = new OleDropTarget(this, _owner);
+
             if (OleContext.Current?.RegisterDragDrop(Handle, odt) ?? false)
+            {
                 _dropTarget = odt;
+            }
         }
 
-        private Point DipFromLParam(IntPtr lParam)
+        /// <summary>
+        /// Ported from https://github.com/chromium/chromium/blob/master/ui/views/win/fullscreen_handler.cc
+        /// Method must only be called from inside UpdateWindowProperties.
+        /// </summary>
+        /// <param name="fullscreen"></param>
+        private void SetFullScreen(bool fullscreen)
         {
-            return new Point((short)(ToInt32(lParam) & 0xffff), (short)(ToInt32(lParam) >> 16)) / Scaling;
+            if (fullscreen)
+            {
+                GetWindowRect(_hwnd, out var windowRect);
+                _savedWindowInfo.WindowRect = windowRect;
+
+                var current = GetStyle();
+                var currentEx = GetExtendedStyle();
+
+                _savedWindowInfo.Style = current;
+                _savedWindowInfo.ExStyle = currentEx;
+
+                // Set new window style and size.
+                SetStyle(current & ~(WindowStyles.WS_CAPTION | WindowStyles.WS_THICKFRAME), false);
+                SetExtendedStyle(currentEx & ~(WindowStyles.WS_EX_DLGMODALFRAME | WindowStyles.WS_EX_WINDOWEDGE | WindowStyles.WS_EX_CLIENTEDGE | WindowStyles.WS_EX_STATICEDGE), false);
+
+                // On expand, if we're given a window_rect, grow to it, otherwise do
+                // not resize.
+                MONITORINFO monitor_info = MONITORINFO.Create();
+                GetMonitorInfo(MonitorFromWindow(_hwnd, MONITOR.MONITOR_DEFAULTTONEAREST), ref monitor_info);
+
+                var window_rect = monitor_info.rcMonitor.ToPixelRect();
+
+                SetWindowPos(_hwnd, IntPtr.Zero, window_rect.X, window_rect.Y,
+                             window_rect.Width, window_rect.Height,
+                             SetWindowPosFlags.SWP_NOZORDER | SetWindowPosFlags.SWP_NOACTIVATE | SetWindowPosFlags.SWP_FRAMECHANGED);
+
+                _isFullScreenActive = true;
+            }
+            else
+            {
+                // Reset original window style and size.  The multiple window size/moves
+                // here are ugly, but if SetWindowPos() doesn't redraw, the taskbar won't be
+                // repainted.  Better-looking methods welcome.
+                _isFullScreenActive = false;
+
+                var windowStates = GetWindowStateStyles();
+                SetStyle((_savedWindowInfo.Style & ~WindowStateMask) | windowStates, false);
+                SetExtendedStyle(_savedWindowInfo.ExStyle, false);
+
+                // On restore, resize to the previous saved rect size.
+                var new_rect = _savedWindowInfo.WindowRect.ToPixelRect();
+
+                SetWindowPos(_hwnd, IntPtr.Zero, new_rect.X, new_rect.Y, new_rect.Width,
+                             new_rect.Height,
+                            SetWindowPosFlags.SWP_NOZORDER | SetWindowPosFlags.SWP_NOACTIVATE | SetWindowPosFlags.SWP_FRAMECHANGED);
+
+                UpdateWindowProperties(_windowProperties, true);
+            }
+
+            TaskBarList.MarkFullscreen(_hwnd, fullscreen);
+            
+            ExtendClientArea();
         }
 
-        private PixelPoint PointFromLParam(IntPtr lParam)
+        private MARGINS UpdateExtendMargins()
         {
-            return new PixelPoint((short)(ToInt32(lParam) & 0xffff), (short)(ToInt32(lParam) >> 16));
+            RECT borderThickness = new RECT();
+            RECT borderCaptionThickness = new RECT();            
+
+            AdjustWindowRectEx(ref borderCaptionThickness, (uint)(GetStyle()), false, 0);
+            AdjustWindowRectEx(ref borderThickness, (uint)(GetStyle() & ~WindowStyles.WS_CAPTION), false, 0);
+            borderThickness.left *= -1;
+            borderThickness.top *= -1;
+            borderCaptionThickness.left *= -1;
+            borderCaptionThickness.top *= -1;
+
+            bool wantsTitleBar = _extendChromeHints.HasFlag(ExtendClientAreaChromeHints.SystemChrome) || _extendTitleBarHint == -1;
+
+            if (!wantsTitleBar)
+            {
+                borderCaptionThickness.top = 1;
+            }
+
+            MARGINS margins = new MARGINS();
+            margins.cxLeftWidth = 1;
+            margins.cxRightWidth = 1;
+            margins.cyBottomHeight = 1;
+
+            if (_extendTitleBarHint != -1)
+            {
+                borderCaptionThickness.top = (int)(_extendTitleBarHint * RenderScaling);                
+            }
+
+            margins.cyTopHeight = _extendChromeHints.HasFlag(ExtendClientAreaChromeHints.SystemChrome) && !_extendChromeHints.HasFlag(ExtendClientAreaChromeHints.PreferSystemChrome) ? borderCaptionThickness.top : 1;
+
+            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);
+            }
+            else
+            {
+                _extendedMargins = new Thickness(0, (borderCaptionThickness.top) / RenderScaling, 0, 0);
+                _offScreenMargin = new Thickness();
+            }
+
+            return margins;
         }
 
-        private Point ScreenToClient(Point point)
+        private void ExtendClientArea()
         {
-            var p = new UnmanagedMethods.POINT { X = (int)point.X, Y = (int)point.Y };
-            UnmanagedMethods.ScreenToClient(_hwnd, ref p);
-            return new Point(p.X, p.Y);
+            if (DwmIsCompositionEnabled(out bool compositionEnabled) < 0 || !compositionEnabled)
+            {
+                _isClientAreaExtended = false;
+                return;
+            }
+
+            GetWindowRect(_hwnd, out var rcClient);
+
+            // Inform the application of the frame change.
+            SetWindowPos(_hwnd,
+                         IntPtr.Zero,
+                         rcClient.left, rcClient.top,
+                         rcClient.Width, rcClient.Height,
+                         SetWindowPosFlags.SWP_FRAMECHANGED);
+
+            if (_isClientAreaExtended && WindowState != WindowState.FullScreen)
+            {
+                var margins = UpdateExtendMargins();
+
+                DwmExtendFrameIntoClientArea(_hwnd, ref margins);
+            }
+            else
+            {
+                var margins = new MARGINS();
+                DwmExtendFrameIntoClientArea(_hwnd, ref margins);
+
+                _offScreenMargin = new Thickness();
+                _extendedMargins = new Thickness();
+            }
+
+            if(!_isClientAreaExtended || (_extendChromeHints.HasFlag(ExtendClientAreaChromeHints.SystemChrome) &&
+                !_extendChromeHints.HasFlag(ExtendClientAreaChromeHints.PreferSystemChrome)))
+            {
+                EnableCloseButton(_hwnd);
+            }
+            else
+            {
+                DisableCloseButton(_hwnd);
+            }
+
+            ExtendClientAreaToDecorationsChanged?.Invoke(_isClientAreaExtended);
         }
 
-        private void ShowWindow(WindowState state)
+        private void ShowWindow(WindowState state, bool activate)
         {
-            UnmanagedMethods.ShowWindowCommand command;
+            ShowWindowCommand? command;
+
+            var newWindowProperties = _windowProperties;
 
             switch (state)
             {
                 case WindowState.Minimized:
-                    command = ShowWindowCommand.Minimize;
+                    newWindowProperties.IsFullScreen = false;
+                    command = activate ? ShowWindowCommand.Minimize : ShowWindowCommand.ShowMinNoActive;
                     break;
                 case WindowState.Maximized:
+                    newWindowProperties.IsFullScreen = false;
                     command = ShowWindowCommand.Maximize;
                     break;
 
                 case WindowState.Normal:
-                    command = ShowWindowCommand.Restore;
+                    newWindowProperties.IsFullScreen = false;
+                    command = IsWindowVisible(_hwnd) ? ShowWindowCommand.Restore : 
+                        activate ? ShowWindowCommand.Normal : ShowWindowCommand.ShowNoActivate;
+                    break;
+
+                case WindowState.FullScreen:
+                    newWindowProperties.IsFullScreen = true;
+                    command = IsWindowVisible(_hwnd) ? (ShowWindowCommand?)null : ShowWindowCommand.Restore;
                     break;
 
                 default:
                     throw new ArgumentException("Invalid WindowState.");
             }
 
-            UnmanagedMethods.ShowWindow(_hwnd, command);
+            UpdateWindowProperties(newWindowProperties);
+
+            if (command.HasValue)
+            {
+                UnmanagedMethods.ShowWindow(_hwnd, command.Value);
+            }
 
             if (state == WindowState.Maximized)
             {
@@ -895,6 +958,32 @@ namespace Avalonia.Win32
                 SetFocus(_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
+            // We need to enable parent window before destroying child window to prevent OS from activating a random window behind us (or last active window).
+            // This is described here: https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-enablewindow#remarks
+            // We need to verify if parent is still alive (perhaps it got destroyed somehow).
+            if (_parent != null && IsWindow(_parent._hwnd))
+            {
+                var wasActive = GetActiveWindow() == _hwnd;
+
+                // We can only set enabled state if we are not disposing - generally Dispose happens after enabled state has been set.
+                // Ignoring this would cause us to enable a window that might be disabled.
+                if (!isDisposing)
+                {
+                    // 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)
+                {
+                    SetActiveWindow(_parent._hwnd);
+                }
+            }
+        }
 
         private void MaximizeWithoutCoveringTaskbar()
         {
@@ -902,12 +991,10 @@ namespace Avalonia.Win32
 
             if (monitor != IntPtr.Zero)
             {
-                MONITORINFO monitorInfo = MONITORINFO.Create();
+                var monitorInfo = MONITORINFO.Create();
 
                 if (GetMonitorInfo(monitor, ref monitorInfo))
                 {
-                    RECT rcMonitorArea = monitorInfo.rcMonitor;
-
                     var x = monitorInfo.rcWork.left;
                     var y = monitorInfo.rcWork.top;
                     var cx = Math.Abs(monitorInfo.rcWork.right - x);
@@ -916,145 +1003,261 @@ namespace Avalonia.Win32
                     SetWindowPos(_hwnd, WindowPosZOrder.HWND_NOTOPMOST, x, y, cx, cy, SetWindowPosFlags.SWP_SHOWWINDOW);
                 }
             }
-        }
+        }        
 
-        public void SetIcon(IWindowIconImpl icon)
+        private WindowStyles GetWindowStateStyles()
         {
-            var impl = (IconImpl)icon;
-            var hIcon = impl.HIcon;
-            UnmanagedMethods.PostMessage(_hwnd, (int)UnmanagedMethods.WindowsMessage.WM_SETICON,
-                new IntPtr((int)UnmanagedMethods.Icons.ICON_BIG), hIcon);
+            return GetStyle() & WindowStateMask;
         }
 
-        private static int ToInt32(IntPtr ptr)
+        private WindowStyles GetStyle()
         {
-            if (IntPtr.Size == 4) return ptr.ToInt32();
-
-            return (int)(ptr.ToInt64() & 0xffffffff);
+            if (_isFullScreenActive)
+            {
+                return _savedWindowInfo.Style;
+            }
+            else
+            {
+                return (WindowStyles)GetWindowLong(_hwnd, (int)WindowLongParam.GWL_STYLE);
+            }
         }
 
-
-        public void ShowTaskbarIcon(bool value)
+        private WindowStyles GetExtendedStyle()
         {
-            if (_taskbarIcon == value)
+            if (_isFullScreenActive)
             {
-                return;
+                return _savedWindowInfo.ExStyle;
             }
+            else
+            {
+                return (WindowStyles)GetWindowLong(_hwnd, (int)WindowLongParam.GWL_EXSTYLE);
+            }
+        }
 
-            _taskbarIcon = value;
-
-            var style = (UnmanagedMethods.WindowStyles)UnmanagedMethods.GetWindowLong(_hwnd, (int)UnmanagedMethods.WindowLongParam.GWL_EXSTYLE);
-
-            style &= ~(UnmanagedMethods.WindowStyles.WS_VISIBLE);
+        private void SetStyle(WindowStyles style, bool save = true)
+        {
+            if (save)
+            {
+                _savedWindowInfo.Style = style;
+            }
 
-            style |= UnmanagedMethods.WindowStyles.WS_EX_TOOLWINDOW;
+            if (!_isFullScreenActive)
+            {
+                SetWindowLong(_hwnd, (int)WindowLongParam.GWL_STYLE, (uint)style);
+            }
+        }
 
-            if (value)
-                style |= UnmanagedMethods.WindowStyles.WS_EX_APPWINDOW;
-            else
-                style &= ~(UnmanagedMethods.WindowStyles.WS_EX_APPWINDOW);
+        private void SetExtendedStyle(WindowStyles style, bool save = true)
+        {
+            if (save)
+            {
+                _savedWindowInfo.ExStyle = style;
+            }
 
-            WINDOWPLACEMENT windowPlacement = UnmanagedMethods.WINDOWPLACEMENT.Default;
-            if (UnmanagedMethods.GetWindowPlacement(_hwnd, ref windowPlacement))
+            if (!_isFullScreenActive)
             {
-                //Toggle to make the styles stick
-                UnmanagedMethods.ShowWindow(_hwnd, ShowWindowCommand.Hide);
-                UnmanagedMethods.SetWindowLong(_hwnd, (int)UnmanagedMethods.WindowLongParam.GWL_EXSTYLE, (uint)style);
-                UnmanagedMethods.ShowWindow(_hwnd, windowPlacement.ShowCmd);
+                SetWindowLong(_hwnd, (int)WindowLongParam.GWL_EXSTYLE, (uint)style);
             }
         }
 
-        private void UpdateWMStyles(Action change)
+        private void UpdateWindowProperties(WindowProperties newProperties, bool forceChanges = false)
         {
-            var oldDecorated = _decorated;
+            var oldProperties = _windowProperties;
 
-            var oldThickness = BorderThickness;
+            // Calling SetWindowPos will cause events to be sent and we need to respond
+            // according to the new values already.
+            _windowProperties = newProperties;
 
-            change();
-
-            var style = (WindowStyles)GetWindowLong(_hwnd, (int)WindowLongParam.GWL_STYLE);
+            if ((oldProperties.ShowInTaskbar != newProperties.ShowInTaskbar) || forceChanges)
+            {
+                var exStyle = GetExtendedStyle();
 
-            const WindowStyles controlledFlags = WindowStyles.WS_OVERLAPPEDWINDOW;
+                if (newProperties.ShowInTaskbar)
+                {
+                    exStyle |= WindowStyles.WS_EX_APPWINDOW;
+                }
+                else
+                {
+                    exStyle &= ~WindowStyles.WS_EX_APPWINDOW;
+                }
 
-            style = style | controlledFlags ^ controlledFlags;
+                SetExtendedStyle(exStyle);
 
-            style |= WindowStyles.WS_OVERLAPPEDWINDOW;
+                // TODO: To hide non-owned window from taskbar we need to parent it to a hidden window.
+                // Otherwise it will still show in the taskbar.
+            }
 
-            if (!_decorated)
+            WindowStyles style;
+            if ((oldProperties.IsResizable != newProperties.IsResizable) || forceChanges)
             {
-                style ^= (WindowStyles.WS_CAPTION | WindowStyles.WS_SYSMENU);
+                style = GetStyle();
+
+                if (newProperties.IsResizable)
+                {
+                    style |= WindowStyles.WS_SIZEFRAME;
+                    style |= WindowStyles.WS_MAXIMIZEBOX;
+                }
+                else
+                {
+                    style &= ~WindowStyles.WS_SIZEFRAME;
+                    style &= ~WindowStyles.WS_MAXIMIZEBOX;
+                }
+
+                SetStyle(style);
             }
 
-            if (!_resizable)
+            if (oldProperties.IsFullScreen != newProperties.IsFullScreen)
             {
-                style ^= (WindowStyles.WS_SIZEFRAME);
+                SetFullScreen(newProperties.IsFullScreen);
             }
 
-            GetClientRect(_hwnd, out var oldClientRect);
-            var oldClientRectOrigin = new UnmanagedMethods.POINT();
-            ClientToScreen(_hwnd, ref oldClientRectOrigin);
-            oldClientRect.Offset(oldClientRectOrigin);
-            
-            
-            SetWindowLong(_hwnd, (int)WindowLongParam.GWL_STYLE, (uint)style);
-
-            UnmanagedMethods.GetWindowRect(_hwnd, out var windowRect);
-            bool frameUpdated = false;
-            if (oldDecorated != _decorated)
-            {
-                var newRect = oldClientRect;
-                if (_decorated)
-                    AdjustWindowRectEx(ref newRect, (uint)style, false,
-                        GetWindowLong(_hwnd, (int)WindowLongParam.GWL_EXSTYLE));
-                SetWindowPos(_hwnd, IntPtr.Zero, newRect.left, newRect.top, newRect.Width, newRect.Height,
-                    SetWindowPosFlags.SWP_NOZORDER | SetWindowPosFlags.SWP_NOACTIVATE | SetWindowPosFlags.SWP_FRAMECHANGED);
-                frameUpdated = true;
-            }
+            if ((oldProperties.Decorations != newProperties.Decorations) || forceChanges)
+            {
+                style = GetStyle();
 
-            if (!frameUpdated)
-                SetWindowPos(_hwnd, IntPtr.Zero, 0, 0, 0, 0,
-                    SetWindowPosFlags.SWP_FRAMECHANGED | SetWindowPosFlags.SWP_NOZORDER |
-                    SetWindowPosFlags.SWP_NOACTIVATE
-                    | SetWindowPosFlags.SWP_NOMOVE | SetWindowPosFlags.SWP_NOSIZE);
-        }
+                const WindowStyles fullDecorationFlags = WindowStyles.WS_CAPTION | WindowStyles.WS_SYSMENU;
 
-        public void CanResize(bool value)
-        {
-            if (value == _resizable)
-            {
-                return;
-            }
+                if (newProperties.Decorations == SystemDecorations.Full)
+                {
+                    style |= fullDecorationFlags;
+                }
+                else
+                {
+                    style &= ~fullDecorationFlags;
+                }
+
+                SetStyle(style);
+
+                if (!_isFullScreenActive)
+                {
+                    var margin = newProperties.Decorations == SystemDecorations.BorderOnly ? 1 : 0;
+
+                    var margins = new MARGINS
+                    {
+                        cyBottomHeight = margin,
+                        cxRightWidth = margin,
+                        cxLeftWidth = margin,
+                        cyTopHeight = margin
+                    };
+
+                    DwmExtendFrameIntoClientArea(_hwnd, ref margins);
+
+                    GetClientRect(_hwnd, out var oldClientRect);
+                    var oldClientRectOrigin = new POINT();
+                    ClientToScreen(_hwnd, ref oldClientRectOrigin);
+                    oldClientRect.Offset(oldClientRectOrigin);
 
-            UpdateWMStyles(()=> _resizable = value);
+                    var newRect = oldClientRect;
+
+                    if (newProperties.Decorations == SystemDecorations.Full)
+                    {
+                        AdjustWindowRectEx(ref newRect, (uint)style, false, (uint)GetExtendedStyle());
+                    }
+
+                    SetWindowPos(_hwnd, IntPtr.Zero, newRect.left, newRect.top, newRect.Width, newRect.Height,
+                        SetWindowPosFlags.SWP_NOZORDER | SetWindowPosFlags.SWP_NOACTIVATE |
+                        SetWindowPosFlags.SWP_FRAMECHANGED);
+                }
+            }            
         }
 
-        public void SetTopmost(bool value)
-        {
-            if (value == _topmost)
-            {
-                return;
-            }
+        private const int MF_BYCOMMAND = 0x0;
+        private const int MF_BYPOSITION = 0x400;
+        private const int MF_REMOVE = 0x1000;
+        private const int MF_ENABLED = 0x0;
+        private const int MF_GRAYED = 0x1;
+        private const int MF_DISABLED = 0x2;
+        private const int SC_CLOSE = 0xF060;
 
-            IntPtr hWndInsertAfter = value ? WindowPosZOrder.HWND_TOPMOST : WindowPosZOrder.HWND_NOTOPMOST;
-            UnmanagedMethods.SetWindowPos(_hwnd,
-                   hWndInsertAfter,
-                   0, 0, 0, 0,
-                   SetWindowPosFlags.SWP_NOMOVE | SetWindowPosFlags.SWP_NOSIZE | SetWindowPosFlags.SWP_NOACTIVATE);
+        void DisableCloseButton(IntPtr hwnd)
+        {
+            EnableMenuItem(GetSystemMenu(hwnd, false), SC_CLOSE,
+                           MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+        }
+        void EnableCloseButton(IntPtr hwnd)
+        {
+            EnableMenuItem(GetSystemMenu(hwnd, false), SC_CLOSE,
+                           MF_BYCOMMAND | MF_ENABLED);
+        }
 
-            _topmost = value;
+#if USE_MANAGED_DRAG
+        private Point ScreenToClient(Point point)
+        {
+            var p = new UnmanagedMethods.POINT { X = (int)point.X, Y = (int)point.Y };
+            UnmanagedMethods.ScreenToClient(_hwnd, ref p);
+            return new Point(p.X, p.Y);
         }
+#endif
 
         PixelSize EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo.Size
         {
             get
             {
-                RECT rect;
-                GetClientRect(_hwnd, out rect);
+                GetClientRect(_hwnd, out var rect);
+
                 return new PixelSize(
                     Math.Max(1, rect.right - rect.left),
                     Math.Max(1, rect.bottom - rect.top));
             }
         }
+
+        double EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo.Scaling => RenderScaling;
+
         IntPtr EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo.Handle => Handle.Handle;
+
+        public void SetExtendClientAreaToDecorationsHint(bool hint)
+        {
+            _isClientAreaExtended = hint;
+            
+            ExtendClientArea();            
+        }        
+
+        public void SetExtendClientAreaChromeHints(ExtendClientAreaChromeHints hints)
+        {
+            _extendChromeHints = hints;
+
+            ExtendClientArea();
+        }
+        
+        /// <inheritdoc/>
+        public void SetExtendClientAreaTitleBarHeightHint(double titleBarHeight)
+        {
+            _extendTitleBarHint = titleBarHeight;
+
+            ExtendClientArea();
+        }
+
+        /// <inheritdoc/>
+        public bool IsClientAreaExtendedToDecorations => _isClientAreaExtended;
+
+        /// <inheritdoc/>
+        public Action<bool> ExtendClientAreaToDecorationsChanged { get; set; }
+        
+        /// <inheritdoc/>
+        public bool NeedsManagedDecorations => _isClientAreaExtended && _extendChromeHints.HasFlag(ExtendClientAreaChromeHints.PreferSystemChrome);
+
+        /// <inheritdoc/>
+        public Thickness ExtendedMargins => _extendedMargins;
+
+        /// <inheritdoc/>
+        public Thickness OffScreenMargin => _offScreenMargin;
+
+        /// <inheritdoc/>
+        public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; } = new AcrylicPlatformCompensationLevels(1, 0.8, 0);
+
+        private struct SavedWindowInfo
+        {
+            public WindowStyles Style { get; set; }
+            public WindowStyles ExStyle { get; set; }
+            public RECT WindowRect { get; set; }
+        };
+
+        private struct WindowProperties
+        {
+            public bool ShowInTaskbar;
+            public bool IsResizable;
+            public SystemDecorations Decorations;
+            public bool IsFullScreen;
+        }
     }
 }
diff --git a/src/Windows/Avalonia.Win32/WindowsMountedVolumeInfoListener.cs b/src/Windows/Avalonia.Win32/WindowsMountedVolumeInfoListener.cs
index db4c916052..ba1bfda949 100644
--- a/src/Windows/Avalonia.Win32/WindowsMountedVolumeInfoListener.cs
+++ b/src/Windows/Avalonia.Win32/WindowsMountedVolumeInfoListener.cs
@@ -5,12 +5,13 @@ using System.Linq;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using Avalonia.Controls.Platform;
+using Avalonia.Logging;
 
 namespace Avalonia.Win32
 {
     internal class WindowsMountedVolumeInfoListener : IDisposable
     {
-        private readonly CompositeDisposable _disposables;        
+        private readonly CompositeDisposable _disposables;
         private bool _beenDisposed = false;
         private ObservableCollection<MountedVolumeInfo> mountedDrives;
 
@@ -32,10 +33,22 @@ namespace Avalonia.Win32
             var allDrives = DriveInfo.GetDrives();
 
             var mountVolInfos = allDrives
-                                .Where(p => p.IsReady)
+                                .Where(p =>
+                                {
+                                    try
+                                    {
+                                        var ret = p.IsReady;
+                                        return ret;
+                                    }
+                                    catch (Exception e)
+                                    {
+                                        Logger.TryGet(LogEventLevel.Warning, LogArea.Control)?.Log(this, $"Error in Windows drive enumeration: {e.Message}");
+                                    }
+                                    return false;
+                                })
                                 .Select(p => new MountedVolumeInfo()
                                 {
-                                    VolumeLabel = string.IsNullOrEmpty(p.VolumeLabel.Trim()) ? p.RootDirectory.FullName 
+                                    VolumeLabel = string.IsNullOrEmpty(p.VolumeLabel.Trim()) ? p.RootDirectory.FullName
                                                                                              : $"{p.VolumeLabel} ({p.Name})",
                                     VolumePath = p.RootDirectory.FullName,
                                     VolumeSizeBytes = (ulong)p.TotalSize
diff --git a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
index e57fcc643f..d5b95b3151 100644
--- a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
+++ b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
@@ -1,15 +1,24 @@
-<Project>
+<Project>
   <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" />
   <PropertyGroup>
     <TargetFramework>xamarin.ios10</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Update="Boilerplate\Shared.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Boilerplate\RuntimePlatform.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="OpenTK-1.0" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
-    <PackageReference Include="System.Reflection.Emit" Version="4.3.0" ExcludeAssets="All" />
+    <ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
   </ItemGroup>
-  <Import Project="..\..\Shared\PlatformSupport\PlatformSupport.projitems" Label="Shared" />
-  <Import Project="..\..\..\build\Rx.props" />
   <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" />
-  <Import Project="..\..\..\build\iOSWorkarounds.props" />
 </Project>
diff --git a/src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs b/src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs
new file mode 100644
index 0000000000..b75aad17cf
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs
@@ -0,0 +1,49 @@
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Foundation;
+using UIKit;
+
+namespace Avalonia.iOS
+{
+    public class AvaloniaAppDelegate<TApp> : UIResponder, IUIApplicationDelegate
+        where TApp : Application, new()
+    {
+        protected virtual AppBuilder CustomizeAppBuilder(AppBuilder builder) => builder;
+        
+        [Export("window")]
+        public UIWindow Window { get; set; }
+
+        [Export("application:didFinishLaunchingWithOptions:")]
+        public bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
+        {
+            var builder = AppBuilder.Configure<TApp>();
+            CustomizeAppBuilder(builder);
+            var lifetime = new Lifetime();
+            builder.AfterSetup(_ =>
+            {
+                Window = new UIWindow();
+                var view = new AvaloniaView();
+                lifetime.View = view;
+                Window.RootViewController = new UIViewController
+                {
+                    View = view
+                };
+            });
+            
+            builder.SetupWithLifetime(lifetime);
+            
+            Window.Hidden = false;
+            return true;
+        }
+
+        class Lifetime : ISingleViewApplicationLifetime
+        {
+            public AvaloniaView View;
+            public Control MainView
+            {
+                get => View.Content;
+                set => View.Content = value;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/AvaloniaRootViewController.cs b/src/iOS/Avalonia.iOS/AvaloniaRootViewController.cs
deleted file mode 100644
index 52f55d6574..0000000000
--- a/src/iOS/Avalonia.iOS/AvaloniaRootViewController.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using Avalonia.Media;
-using CoreGraphics;
-using UIKit;
-
-namespace Avalonia.iOS
-{
-    class AvaloniaRootViewController : UIViewController
-    {
-        private object _content;
-        private Color _statusBarColor = Colors.White;
-
-        public object Content
-        {
-            get { return _content; }
-            set
-            {
-                _content = value;
-                var view = (View as AvaloniaView);
-                if (view != null)
-                    view.Content = value;
-            }
-        }
-
-        public Color StatusBarColor
-        {
-            get { return _statusBarColor; }
-            set
-            {
-                _statusBarColor = value;
-                var view = (View as AvaloniaView);
-                if (view != null)
-                    view.BackgroundColor = value.ToUiColor();
-            }
-        }
-
-        void AutoFit()
-        {
-            var needFlip = !UIDevice.CurrentDevice.CheckSystemVersion(8, 0) &&
-               (InterfaceOrientation == UIInterfaceOrientation.LandscapeLeft
-                || InterfaceOrientation == UIInterfaceOrientation.LandscapeRight);
-            // Bounds here (if top level) needs to correspond with the rendertarget 
-            var frame = UIScreen.MainScreen.Bounds;
-            if (needFlip)
-                frame = new CGRect(frame.Y, frame.X, frame.Height, frame.Width);
-            ((AvaloniaView) View).Padding =
-                new Thickness(0, UIApplication.SharedApplication.StatusBarFrame.Size.Height, 0, 0);
-            View.Frame = frame;
-        }
-
-        public override void LoadView()
-        {
-            View = new AvaloniaView() {Content = Content, BackgroundColor = _statusBarColor.ToUiColor()};
-            UIApplication.Notifications.ObserveDidChangeStatusBarOrientation(delegate { AutoFit(); });
-            UIApplication.Notifications.ObserveDidChangeStatusBarFrame(delegate { AutoFit(); });
-            AutoFit();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/AvaloniaView.Text.cs b/src/iOS/Avalonia.iOS/AvaloniaView.Text.cs
new file mode 100644
index 0000000000..dc963726b0
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/AvaloniaView.Text.cs
@@ -0,0 +1,32 @@
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Foundation;
+using ObjCRuntime;
+using UIKit;
+
+namespace Avalonia.iOS
+{
+    [Adopts("UIKeyInput")]
+    public partial class AvaloniaView
+    {
+        public override bool CanBecomeFirstResponder => true;
+
+        [Export("hasText")] public bool HasText => false;
+
+        [Export("insertText:")]
+        public void InsertText(string text) =>
+            _topLevelImpl.Input?.Invoke(new RawTextInputEventArgs(KeyboardDevice.Instance,
+                0, InputRoot, text));
+
+        [Export("deleteBackward")]
+        public void DeleteBackward()
+        {
+            // 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));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/AvaloniaView.cs b/src/iOS/Avalonia.iOS/AvaloniaView.cs
index b1de4b8d47..7d367c99d1 100644
--- a/src/iOS/Avalonia.iOS/AvaloniaView.cs
+++ b/src/iOS/Avalonia.iOS/AvaloniaView.cs
@@ -1,48 +1,139 @@
-using Avalonia.Controls.Embedding;
+using System;
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Controls.Embedding;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using CoreAnimation;
 using CoreGraphics;
+using Foundation;
+using ObjCRuntime;
+using OpenGLES;
 using UIKit;
 
 namespace Avalonia.iOS
 {
-    public class AvaloniaView : UIView
+    public partial class AvaloniaView : UIView
     {
-        private EmbeddableImpl _impl;
-        private EmbeddableControlRoot _root;
-        private Thickness _padding;
+        internal IInputRoot InputRoot { get; private set; }
+        private TopLevelImpl _topLevelImpl;
+        private EmbeddableControlRoot _topLevel;
+        private TouchHandler _touches;
 
-        public Thickness Padding
+        public AvaloniaView()
+        {
+            _topLevelImpl = new TopLevelImpl(this);
+            _touches = new TouchHandler(this, _topLevelImpl);
+            _topLevel = new EmbeddableControlRoot(_topLevelImpl);
+            _topLevel.Prepare();
+            
+            _topLevel.Renderer.Start();
+            
+            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)};
+            MultipleTouchEnabled = true;
+        }
+
+        internal class TopLevelImpl : ITopLevelImpl
         {
-            get { return _padding; }
-            set
+            private readonly AvaloniaView _view;
+            public AvaloniaView View => _view;
+
+            public TopLevelImpl(AvaloniaView view)
+            {
+                _view = view;
+            }
+
+            public void Dispose()
             {
-                _padding = value;
-                SetNeedsLayout();
+                // No-op
             }
+
+            public IRenderer CreateRenderer(IRenderRoot root) => new DeferredRenderer(root,
+                AvaloniaLocator.Current.GetService<IRenderLoop>());
+
+            public void Invalidate(Rect rect)
+            {
+                // No-op
+            }
+
+            public void SetInputRoot(IInputRoot inputRoot)
+            {
+                _view.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(IPlatformHandle cursor)
+            {
+                // no-op
+            }
+
+            public IPopupImpl CreatePopup()
+            {
+                // In-window popups
+                return null;
+            }
+
+            public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel)
+            {
+                // No-op
+            }
+
+            public Size ClientSize => new Size(_view.Bounds.Width, _view.Bounds.Height);
+            public double RenderScaling => _view.ContentScaleFactor;
+            public IEnumerable<object> Surfaces { get; set; }
+            public Action<RawInputEventArgs> Input { get; set; }
+            public Action<Rect> Paint { get; set; }
+            public Action<Size> 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; }
+
+            // legacy no-op
+            public IMouseDevice MouseDevice { get; } = new MouseDevice();
+            public WindowTransparencyLevel TransparencyLevel { get; }
+
+            public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; } =
+                new AcrylicPlatformCompensationLevels();
         }
 
-        public AvaloniaView()
+        [Export("layerClass")]
+        public static Class LayerClass()
         {
-            
-            _impl = new EmbeddableImpl();
-            AddSubview(_impl);
-            BackgroundColor = UIColor.White;
-            AutoresizingMask = UIViewAutoresizing.All;
-            _root = new EmbeddableControlRoot(_impl);
-            _root.Prepare();
+            return new Class(typeof(CAEAGLLayer));
         }
 
+        public override void TouchesBegan(NSSet touches, UIEvent evt) => _touches.Handle(touches, evt);
+
+        public override void TouchesMoved(NSSet touches, UIEvent evt) => _touches.Handle(touches, evt);
+
+        public override void TouchesEnded(NSSet touches, UIEvent evt) => _touches.Handle(touches, evt);
+
+        public override void TouchesCancelled(NSSet touches, UIEvent evt) => _touches.Handle(touches, evt);
+
         public override void LayoutSubviews()
         {
-            _impl.Frame = new CGRect(Padding.Left, Padding.Top,
-                Frame.Width - Padding.Left - Padding.Right,
-                Frame.Height - Padding.Top - Padding.Bottom);
+            _topLevelImpl.Resized?.Invoke(_topLevelImpl.ClientSize);
+            base.LayoutSubviews();
         }
 
-
-        public object Content
+        public Control Content
         {
-            get { return _root.Content; }
-            set { _root.Content = value; }
+            get => (Control)_topLevel.Content;
+            set => _topLevel.Content = value;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/AvaloniaWindow.cs b/src/iOS/Avalonia.iOS/AvaloniaWindow.cs
deleted file mode 100644
index 19e2bb494c..0000000000
--- a/src/iOS/Avalonia.iOS/AvaloniaWindow.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Avalonia.Media;
-using UIKit;
-
-namespace Avalonia.iOS
-{
-    public sealed class AvaloniaWindow : UIWindow
-    {
-        readonly AvaloniaRootViewController _controller = new AvaloniaRootViewController();
-        public object Content
-        {
-            get { return _controller.Content; }
-            set { _controller.Content = value; }
-        }
-
-        public AvaloniaWindow() : base(UIScreen.MainScreen.Bounds)
-        {
-            RootViewController = _controller;
-        }
-
-        public Color StatusBarColor
-        {
-            get { return _controller.StatusBarColor; }
-            set { _controller.StatusBarColor = value; }
-        }
-    }
-}
diff --git a/src/iOS/Avalonia.iOS/AppBuilder.cs b/src/iOS/Avalonia.iOS/Boilerplate/AppBuilder.cs
similarity index 57%
rename from src/iOS/Avalonia.iOS/AppBuilder.cs
rename to src/iOS/Avalonia.iOS/Boilerplate/AppBuilder.cs
index cb8e0a7954..65143c939f 100644
--- a/src/iOS/Avalonia.iOS/AppBuilder.cs
+++ b/src/iOS/Avalonia.iOS/Boilerplate/AppBuilder.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.iOS;
 using Avalonia.Shared.PlatformSupport;
 
 namespace Avalonia
@@ -6,9 +7,9 @@ namespace Avalonia
     public class AppBuilder : AppBuilderBase<AppBuilder>
     {
         public AppBuilder() : base(new StandardRuntimePlatform(),
-            builder => StandardRuntimePlatformServices.Register(builder.ApplicationType.Assembly))
+            b => StandardRuntimePlatformServices.Register(b.ApplicationType.Assembly))
         {
-
+            this.UseSkia().UseWindowingSubsystem(iOS.Platform.Register);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/Boilerplate/RuntimePlatform.cs b/src/iOS/Avalonia.iOS/Boilerplate/RuntimePlatform.cs
new file mode 100644
index 0000000000..c5c4d66450
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/Boilerplate/RuntimePlatform.cs
@@ -0,0 +1,19 @@
+using Avalonia.Platform;
+
+namespace Avalonia.Shared.PlatformSupport
+{
+    partial class StandardRuntimePlatform
+    {
+        public RuntimePlatformInfo GetRuntimeInfo()
+        {
+            return new RuntimePlatformInfo
+            {
+                IsDesktop = false,
+                IsMobile = true,
+                IsMono = true,
+                IsUnix = true,
+                OperatingSystem = OperatingSystemType.iOS
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/Boilerplate/Shared.cs b/src/iOS/Avalonia.iOS/Boilerplate/Shared.cs
new file mode 100644
index 0000000000..c6e6e01e64
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/Boilerplate/Shared.cs
@@ -0,0 +1,595 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Avalonia.Platform;
+using Avalonia.Platform.Interop;
+using Avalonia.Utilities;
+
+namespace Avalonia.Shared.PlatformSupport
+{
+    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 __IOS__
+                    new IOSLoader()
+#else
+                RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+                    ? (IDynamicLibraryLoader)new Win32Loader()
+                    : new UnixLoader()
+#endif
+                );
+        }
+    }
+    
+    
+    internal partial 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);
+        
+        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)
+            {
+                if (size <= 0)
+                    throw new ArgumentException("Positive number required", nameof(size));
+                _plat = plat;
+                _address = plat.Alloc(size);
+                GC.AddMemoryPressure(size);
+                Size = size;
+#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
+        [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
+        
+
+    }
+    
+    internal class IOSLoader : IDynamicLibraryLoader
+    {
+        IntPtr IDynamicLibraryLoader.LoadLibrary(string dll)
+        {
+            throw new PlatformNotSupportedException();
+        }
+
+        IntPtr IDynamicLibraryLoader.GetProcAddress(IntPtr dll, string proc, bool optional)
+        {
+            throw new PlatformNotSupportedException();
+        }
+    }
+    
+    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.");
+                }
+
+                IAssetDescriptor rv;
+
+                var resourceKey = uri.AbsolutePath;
+                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);
+                    string assemblyName;
+
+                    if (qs.TryGetValue("assembly", out assemblyName))
+                    {
+                        return GetAssembly(assemblyName);
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private AssemblyDescriptor GetAssembly(string name)
+        {
+            if (name == null)
+                throw new ArgumentNullException(nameof(name));
+
+            AssemblyDescriptor rv;
+            if (!AssemblyNameCache.TryGetValue(name, out 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 __IOS__
+                    throw new InvalidOperationException(
+                        $"Assembly {name} needs to be referenced and explicitly loaded before loading resources");
+#else
+                    name = Uri.UnescapeDataString(name);
+                    AssemblyNameCache[name] = rv = new AssemblyDescriptor(Assembly.Load(name));
+#endif
+                }
+            }
+
+            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()
+            {
+                return _asm.GetManifestResourceStream(_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()
+            {
+                return new SlicedStream(Assembly.GetManifestResourceStream(AvaloniaResourceName), _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);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/Clipboard.cs b/src/iOS/Avalonia.iOS/ClipboardImpl.cs
similarity index 58%
rename from src/iOS/Avalonia.iOS/Clipboard.cs
rename to src/iOS/Avalonia.iOS/ClipboardImpl.cs
index c66b379453..b9f74d69c6 100644
--- a/src/iOS/Avalonia.iOS/Clipboard.cs
+++ b/src/iOS/Avalonia.iOS/ClipboardImpl.cs
@@ -1,10 +1,12 @@
+using System;
 using System.Threading.Tasks;
+using Avalonia.Input;
 using Avalonia.Input.Platform;
 using UIKit;
 
 namespace Avalonia.iOS
 {
-    public class Clipboard : IClipboard
+    public class ClipboardImpl : IClipboard
     {
         public Task<string> GetTextAsync()
         {
@@ -22,5 +24,11 @@ namespace Avalonia.iOS
             UIPasteboard.General.String = "";
             return Task.FromResult(0);
         }
+
+        public Task SetDataObjectAsync(IDataObject data) => throw new PlatformNotSupportedException();
+
+        public Task<string[]> GetFormatsAsync() => throw new PlatformNotSupportedException();
+
+        public Task<object> GetDataAsync(string format) => throw new PlatformNotSupportedException();
     }
-}
+}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/CursorFactory.cs b/src/iOS/Avalonia.iOS/CursorFactory.cs
deleted file mode 100644
index a3b2e8906d..0000000000
--- a/src/iOS/Avalonia.iOS/CursorFactory.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using Avalonia.Input;
-using Avalonia.Platform;
-
-namespace Avalonia.iOS
-{
-    class CursorFactory : IStandardCursorFactory
-    {
-        public IPlatformHandle GetCursor(StandardCursorType cursorType) => new PlatformHandle(IntPtr.Zero, "NULL");
-    }
-}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/DisplayLinkRenderTimer.cs b/src/iOS/Avalonia.iOS/DisplayLinkRenderTimer.cs
deleted file mode 100644
index 0cefba7f19..0000000000
--- a/src/iOS/Avalonia.iOS/DisplayLinkRenderTimer.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using Avalonia.Rendering;
-using CoreAnimation;
-using Foundation;
-
-namespace Avalonia.iOS
-{
-    class DisplayLinkRenderTimer : IRenderTimer
-    {
-        public event Action<TimeSpan> Tick;
-        private CADisplayLink _link;
-
-        public DisplayLinkRenderTimer()
-        {
-
-            _link = CADisplayLink.Create(OnFrame);
-            _link.AddToRunLoop(NSRunLoop.Main, NSRunLoop.NSDefaultRunLoopMode);
-        }
-
-        private void OnFrame()
-        {
-            try
-            {
-                Tick?.Invoke(TimeSpan.FromMilliseconds(Environment.TickCount));
-            }
-            catch (Exception)
-            {
-                //TODO: log
-            }
-        }
-    }
-}
diff --git a/src/iOS/Avalonia.iOS/DisplayLinkTimer.cs b/src/iOS/Avalonia.iOS/DisplayLinkTimer.cs
new file mode 100644
index 0000000000..df73479a65
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/DisplayLinkTimer.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Rendering;
+using CoreAnimation;
+using Foundation;
+using UIKit;
+
+namespace Avalonia.iOS
+{
+    class DisplayLinkTimer : IRenderTimer
+    {
+        public event Action<TimeSpan> Tick;
+        private Stopwatch _st = Stopwatch.StartNew();
+
+        public DisplayLinkTimer()
+        {
+            var link = CADisplayLink.Create(OnLinkTick);
+            TimerThread = new Thread(() =>
+            {
+                link.AddToRunLoop(NSRunLoop.Current, NSRunLoopMode.Common);
+                NSRunLoop.Current.Run();
+            });
+            TimerThread.Start();
+            UIApplication.Notifications.ObserveDidEnterBackground((_,__) => link.Paused = true);
+            UIApplication.Notifications.ObserveWillEnterForeground((_, __) => link.Paused = false);
+        }
+
+        public Thread TimerThread { get;  }
+
+        private void OnLinkTick()
+        {
+            Tick?.Invoke(_st.Elapsed);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/EaglDisplay.cs b/src/iOS/Avalonia.iOS/EaglDisplay.cs
new file mode 100644
index 0000000000..f9c787b6a8
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/EaglDisplay.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Reactive.Disposables;
+using Avalonia.OpenGL;
+using OpenGLES;
+using OpenTK.Graphics.ES30;
+
+namespace Avalonia.iOS
+{
+    class EaglFeature : IPlatformOpenGlInterface
+    {
+        public IGlContext PrimaryContext => Context;
+        public IGlContext CreateSharedContext() => throw new NotSupportedException();
+        public bool CanShareContexts => false;
+        public bool CanCreateContexts => false;
+        public IGlContext CreateContext() => throw new System.NotSupportedException();
+        public GlContext Context { get; } = new GlContext();
+    }
+
+    class GlContext : IGlContext
+    {
+        public EAGLContext Context { get; private set; }
+        
+        public GlContext()
+        {
+            const string path = "/System/Library/Frameworks/OpenGLES.framework/OpenGLES";
+            var libGl = ObjCRuntime.Dlfcn.dlopen(path, 1);
+            if (libGl == IntPtr.Zero)
+                throw new OpenGlException("Unable to load " + path);
+            GlInterface = new GlInterface(Version, proc => ObjCRuntime.Dlfcn.dlsym(libGl, proc));
+            Context = new EAGLContext(EAGLRenderingAPI.OpenGLES3);
+        }
+        
+        public void Dispose()
+        {
+            Context?.Dispose();
+            Context = null;
+        }
+
+        class ResetContext : IDisposable
+        {
+            private EAGLContext _old;
+            private bool _disposed;
+
+            public ResetContext(EAGLContext old)
+            {
+                _old = old;
+            }
+            
+            public void Dispose()
+            {
+                if(_disposed)
+                    return;
+                _disposed = true;
+                EAGLContext.SetCurrentContext(_old);
+                _old = null;
+            }
+        }
+        
+        public IDisposable MakeCurrent()
+        {
+            var old = EAGLContext.CurrentContext;
+            if (!EAGLContext.SetCurrentContext(Context))
+                throw new OpenGlException("Unable to make context current");
+            return new ResetContext(old);
+        }
+
+        public IDisposable EnsureCurrent()
+        {
+            if(EAGLContext.CurrentContext == Context)
+                return Disposable.Empty;
+            return MakeCurrent();
+        }
+
+        public bool IsSharedWith(IGlContext context) => false;
+
+        public GlVersion Version { get; } = new GlVersion(GlProfileType.OpenGLES, 3, 0);
+        public GlInterface GlInterface { get; }
+        public int SampleCount { get; } = 0;
+        public int StencilSize { get; } = 9;
+    }
+}
diff --git a/src/iOS/Avalonia.iOS/EaglLayerSurface.cs b/src/iOS/Avalonia.iOS/EaglLayerSurface.cs
new file mode 100644
index 0000000000..5e5e1da949
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/EaglLayerSurface.cs
@@ -0,0 +1,95 @@
+
+using System;
+using System.Threading;
+using Avalonia.OpenGL;
+using Avalonia.OpenGL.Surfaces;
+using CoreAnimation;
+using OpenTK.Graphics.ES30;
+
+namespace Avalonia.iOS
+{
+    class EaglLayerSurface : IGlPlatformSurface
+    {
+        private readonly CAEAGLLayer _layer;
+
+        public EaglLayerSurface(CAEAGLLayer layer)
+        {
+            _layer = layer;
+        }
+
+        class RenderSession : IGlPlatformSurfaceRenderingSession
+        {
+            private readonly GlContext _ctx;
+            private readonly IDisposable _restoreContext;
+            private readonly SizeSynchronizedLayerFbo _fbo;
+
+            public RenderSession(GlContext ctx, IDisposable restoreContext, SizeSynchronizedLayerFbo fbo)
+            {
+                _ctx = ctx;
+                _restoreContext = restoreContext;
+                _fbo = fbo;
+                Size = new PixelSize(_fbo.Width, _fbo.Height);
+                Scaling = _fbo.Scaling;
+                Context = ctx;
+            }
+
+            public void Dispose()
+            {
+                GL.Finish();
+                _fbo.Present();
+                _restoreContext.Dispose();
+            }
+
+            public IGlContext Context { get; }
+            public PixelSize Size { get; }
+            public double Scaling { get; }
+            public bool IsYFlipped { get; }
+        }
+
+        class RenderTarget : IGlPlatformSurfaceRenderTarget
+        {
+            private readonly GlContext _ctx;
+            private readonly SizeSynchronizedLayerFbo _fbo;
+
+            public RenderTarget(GlContext ctx, SizeSynchronizedLayerFbo fbo)
+            {
+                _ctx = ctx;
+                _fbo = fbo;
+            }
+
+            public void Dispose()
+            {
+                CheckThread();
+                using (_ctx.MakeCurrent())
+                    _fbo.Dispose();
+            }
+
+            public IGlPlatformSurfaceRenderingSession BeginDraw()
+            {
+                CheckThread();
+                var restoreContext = _ctx.MakeCurrent();
+                _fbo.Bind();
+                return new RenderSession(_ctx, restoreContext, _fbo);
+            }
+        }
+
+        static void CheckThread()
+        {
+            if (Platform.Timer.TimerThread != Thread.CurrentThread)
+                throw new InvalidOperationException("Invalid thread, go away");
+        }
+        
+        public IGlPlatformSurfaceRenderTarget CreateGlRenderTarget()
+        {
+            CheckThread();
+            var ctx = Platform.GlFeature.Context;
+            using (ctx.MakeCurrent())
+            {
+                var fbo = new SizeSynchronizedLayerFbo(ctx.Context, _layer);
+                if (!fbo.Sync())
+                    throw new InvalidOperationException("Unable to create render target");
+                return new RenderTarget(ctx, fbo);
+            }
+        }
+    }
+}
diff --git a/src/iOS/Avalonia.iOS/EmbeddableImpl.cs b/src/iOS/Avalonia.iOS/EmbeddableImpl.cs
deleted file mode 100644
index 65a6c15971..0000000000
--- a/src/iOS/Avalonia.iOS/EmbeddableImpl.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Reactive.Disposables;
-using Avalonia.Platform;
-
-namespace Avalonia.iOS
-{
-    class EmbeddableImpl : TopLevelImpl, IEmbeddableWindowImpl
-    {
-        public void SetTitle(string title)
-        {
-            
-        }
-
-        public void SetMinMaxSize(Size minSize, Size maxSize)
-        {
-        }
-
-        public IDisposable ShowDialog()
-        {
-            return Disposable.Empty;
-        }
-
-        public void SetSystemDecorations(bool enabled)
-        {
-        }
-
-        public event Action LostFocus
-        {
-            add {}
-            remove {}
-        }
-    }
-}
diff --git a/src/iOS/Avalonia.iOS/EmulatedFramebuffer.cs b/src/iOS/Avalonia.iOS/EmulatedFramebuffer.cs
deleted file mode 100644
index 89c7aaf76c..0000000000
--- a/src/iOS/Avalonia.iOS/EmulatedFramebuffer.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using Avalonia.Platform;
-using CoreGraphics;
-using UIKit;
-
-namespace Avalonia.iOS
-{
-
-    /// <summary>
-    /// This is a bit weird, but CG doesn't provide proper bitmap
-    /// with lockable bits, but can create one from data pointer
-    /// So we are using our own buffer here.
-    /// </summary>
-    class EmulatedFramebuffer : ILockedFramebuffer
-    {
-        private nfloat _viewWidth;
-        private nfloat _viewHeight;
-
-        public EmulatedFramebuffer(UIView view)
-        {
-            var factor = (int) UIScreen.MainScreen.Scale;
-            var frame = view.Frame;
-            _viewWidth = frame.Width;
-            _viewHeight = frame.Height;
-            Size = new PixelSize((int)frame.Width * factor, (int)frame.Height * factor);
-            RowBytes = Size.Width * 4;
-            Dpi = new Vector(96, 96) * factor;
-            Format = PixelFormat.Rgba8888;
-            Address = Marshal.AllocHGlobal(Size.Height * RowBytes);
-        }
-
-        public void Dispose()
-        {
-            if (Address == IntPtr.Zero)
-                return;
-            var nfo = (int) CGBitmapFlags.ByteOrder32Big | (int) CGImageAlphaInfo.PremultipliedLast;
-            using (var colorSpace = CGColorSpace.CreateDeviceRGB())
-            using (var bContext = new CGBitmapContext(Address, Size.Width, Size.Height, 8, Size.Width * 4,
-                colorSpace, (CGImageAlphaInfo) nfo))
-            using (var image = bContext.ToImage())
-            using (var context = UIGraphics.GetCurrentContext())
-            {
-                // flip the image for CGContext.DrawImage
-                context.TranslateCTM(0, _viewHeight);
-                context.ScaleCTM(1, -1);
-                context.DrawImage(new CGRect(0, 0, _viewWidth, _viewHeight), image);
-            }
-            Marshal.FreeHGlobal(Address);
-            Address = IntPtr.Zero;
-        }
-
-        public IntPtr Address { get; private set; }
-        public PixelSize Size { get; }
-        public int RowBytes { get; }
-        public Vector Dpi { get; }
-        public PixelFormat Format { get; }
-    }
-}
-
diff --git a/src/iOS/Avalonia.iOS/Extensions.cs b/src/iOS/Avalonia.iOS/Extensions.cs
index 28708b20d8..bf6262e5c5 100644
--- a/src/iOS/Avalonia.iOS/Extensions.cs
+++ b/src/iOS/Avalonia.iOS/Extensions.cs
@@ -14,10 +14,10 @@ namespace Avalonia.iOS
 
         static nfloat ColorComponent(byte c) => ((float) c) / 255;
 
-        public static UIColor ToUiColor(this Color color)=>new UIColor(
+        public static UIColor ToUiColor(this Color color) => new UIColor(
             ColorComponent(color.R),
             ColorComponent(color.G),
             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
new file mode 100644
index 0000000000..907af58c7e
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/LayerFbo.cs
@@ -0,0 +1,143 @@
+using System;
+using CoreAnimation;
+using OpenGLES;
+using OpenTK.Graphics.ES20;
+
+namespace Avalonia.iOS
+{
+    public class LayerFbo
+    {
+        private readonly EAGLContext _context;
+        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)
+        {
+            _context = context;
+            _layer = layer;
+            _framebuffer = framebuffer;
+            _renderbuffer = renderbuffer;
+            _depthBuffer = depthBuffer;
+        }
+
+        public static LayerFbo TryCreate(EAGLContext context, 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);
+            
+            GL.GenRenderbuffers(1, out int depthBuffer);
+            
+            //GL.BindRenderbuffer(RenderbufferTarget.Renderbuffer, depthBuffer);
+            //GL.RenderbufferStorage(RenderbufferTarget.Renderbuffer, RenderbufferInternalFormat.DepthComponent16, w, h);
+            GL.FramebufferRenderbuffer(FramebufferTarget.Framebuffer, FramebufferSlot.DepthAttachment, RenderbufferTarget.Renderbuffer, depthBuffer);
+
+            var frameBufferError = GL.CheckFramebufferStatus(FramebufferTarget.Framebuffer);
+            if(frameBufferError != FramebufferErrorCode.FramebufferComplete)
+            {
+                GL.DeleteFramebuffers(1, ref fb);
+                GL.DeleteRenderbuffers(1, ref depthBuffer);
+                GL.DeleteRenderbuffers(1, ref rb);
+                return null;
+            }
+
+            return new LayerFbo(context, layer, fb, rb, depthBuffer)
+            {
+                Width = w,
+                Height = h
+            };
+        }
+        
+        public int Width { get; private set; }
+        public int Height { get; private set; }
+
+        public void Bind()
+        {
+            GL.BindFramebuffer(FramebufferTarget.Framebuffer, _framebuffer);
+        }
+
+        public void Present()
+        {
+            Bind();
+            var success = _context.PresentRenderBuffer((uint) All.Renderbuffer);
+        }
+
+        public void Dispose()
+        {
+            if(_disposed)
+                return;
+            _disposed = true;
+            GL.DeleteFramebuffers(1, ref _framebuffer);
+            GL.DeleteRenderbuffers(1, ref _depthBuffer);
+            GL.DeleteRenderbuffers(1, ref _renderbuffer);
+            if (_context != EAGLContext.CurrentContext)
+                throw new InvalidOperationException("Associated EAGLContext is not current");
+        }
+    }
+
+    class SizeSynchronizedLayerFbo : IDisposable
+    {
+        private readonly EAGLContext _context;
+        private readonly CAEAGLLayer _layer;
+        private LayerFbo _fbo;
+        private nfloat _oldLayerWidth, _oldLayerHeight, _oldLayerScale;
+        
+        public SizeSynchronizedLayerFbo(EAGLContext context, CAEAGLLayer layer)
+        {
+            _context = context;
+            _layer = layer;
+            
+        }
+
+        public bool Sync()
+        {
+            if (_fbo != null 
+                && _oldLayerWidth == _layer.Bounds.Width
+                && _oldLayerHeight == _layer.Bounds.Height
+                && _oldLayerScale == _layer.ContentsScale)
+                return true;
+            _fbo?.Dispose();
+            _fbo = null;
+            _fbo = LayerFbo.TryCreate(_context, _layer);
+            _oldLayerWidth = _layer.Bounds.Width;
+            _oldLayerHeight = _layer.Bounds.Height;
+            _oldLayerScale = _layer.ContentsScale;
+            return _fbo != null;
+        }
+
+        public void Dispose()
+        {
+            if (_context != EAGLContext.CurrentContext)
+                throw new InvalidOperationException("Associated EAGLContext is not current");
+            _fbo?.Dispose();
+            _fbo = null;
+        }
+
+        public void Bind()
+        {
+            if(!Sync())
+                throw new InvalidOperationException("Unable to create a render target");
+            _fbo.Bind();
+        }
+
+        public void Present() => _fbo.Present();
+
+        public int Width => _fbo?.Width ?? 0;
+        public int Height => _fbo?.Height ?? 0;
+        public double Scaling => _oldLayerScale;
+    }
+}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/Platform.cs b/src/iOS/Avalonia.iOS/Platform.cs
new file mode 100644
index 0000000000..28bccb6637
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/Platform.cs
@@ -0,0 +1,50 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Input.Platform;
+using Avalonia.OpenGL;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.Shared.PlatformSupport;
+
+namespace Avalonia.iOS
+{
+    static class Platform
+    {
+        public static EaglFeature GlFeature;
+        public static DisplayLinkTimer Timer;
+        class PlatformSettings : IPlatformSettings
+        {
+            public Size DoubleClickSize { get; } = new Size(10, 10);
+            public TimeSpan DoubleClickTime { get; } = TimeSpan.FromMilliseconds(500);
+        }
+        
+        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<IStandardCursorFactory>().ToConstant(new CursorFactoryStub())
+                .Bind<IWindowingPlatform>().ToConstant(new WindowingPlatformStub())
+                .Bind<IClipboard>().ToConstant(new ClipboardImpl())
+                .Bind<IPlatformSettings>().ToConstant(new PlatformSettings())
+                .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);
+            };
+        }
+
+
+    }
+}
+
diff --git a/src/iOS/Avalonia.iOS/PlatformIconLoader.cs b/src/iOS/Avalonia.iOS/PlatformIconLoader.cs
deleted file mode 100644
index c539aba846..0000000000
--- a/src/iOS/Avalonia.iOS/PlatformIconLoader.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.IO;
-using Avalonia.Platform;
-
-namespace Avalonia.iOS
-{
-    class PlatformIconLoader : IPlatformIconLoader
-    {
-        public IWindowIconImpl LoadIcon(IBitmapImpl bitmap)
-        {
-            using (var stream = new MemoryStream())
-            {
-                bitmap.Save(stream);
-                return LoadIcon(stream);
-            }
-        }
-
-        public IWindowIconImpl LoadIcon(Stream stream)
-        {
-            return new FakeIcon(stream);
-        }
-
-        public IWindowIconImpl LoadIcon(string fileName)
-        {
-            using (var file = File.Open(fileName, FileMode.Open))
-            {
-                return new FakeIcon(file);
-            }
-        }
-    }
-
-    // Stores the icon created as a stream to support saving even though an icon is never shown
-    public class FakeIcon : IWindowIconImpl
-    {
-        private readonly Stream stream = new MemoryStream();
-
-        public FakeIcon(Stream stream)
-        {
-            stream.CopyTo(this.stream);
-        }
-
-        public void Save(Stream outputStream)
-        {
-            stream.CopyTo(outputStream);
-        }
-    }
-}
diff --git a/src/iOS/Avalonia.iOS/PlatformSettings.cs b/src/iOS/Avalonia.iOS/PlatformSettings.cs
deleted file mode 100644
index 9545795629..0000000000
--- a/src/iOS/Avalonia.iOS/PlatformSettings.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using Avalonia.Platform;
-using UIKit;
-
-namespace Avalonia.iOS
-{
-    class PlatformSettings : IPlatformSettings
-    {
-        public Size DoubleClickSize =>new Size(4, 4);
-        public TimeSpan DoubleClickTime => TimeSpan.FromMilliseconds(200);
-        public double RenderScalingFactor => UIScreen.MainScreen.Scale;
-        public double LayoutScalingFactor => 1;
-    }
-}
diff --git a/src/iOS/Avalonia.iOS/PlatformThreadingInterface.cs b/src/iOS/Avalonia.iOS/PlatformThreadingInterface.cs
index 7762e0e03b..fa36ab6c79 100644
--- a/src/iOS/Avalonia.iOS/PlatformThreadingInterface.cs
+++ b/src/iOS/Avalonia.iOS/PlatformThreadingInterface.cs
@@ -2,6 +2,7 @@ using System;
 using System.Threading;
 using Avalonia.Platform;
 using Avalonia.Threading;
+using CoreFoundation;
 using Foundation;
 
 namespace Avalonia.iOS
@@ -18,32 +19,7 @@ namespace Avalonia.iOS
             //Mobile platforms are using external main loop
             throw new NotSupportedException(); 
         }
-        /*
-        class Timer : NSObject
-        {
-            private readonly Action _tick;
-            private NSTimer _timer;
-
-            public Timer(TimeSpan interval, Action tick)
-            {
-                _tick = tick;
-                _timer = new NSTimer(NSDate.Now, interval.TotalSeconds, true, OnTick);
-            }
-
-            [Export("onTick")]
-            private void OnTick(NSTimer nsTimer)
-            {
-                _tick();
-            }
-
-            protected override void Dispose(bool disposing)
-            {
-                if(disposing)
-                    _timer.Dispose();
-                base.Dispose(disposing);
-            }
-        }*/
-
+        
         public IDisposable StartTimer(DispatcherPriority priority, TimeSpan interval, Action tick)
             => NSTimer.CreateRepeatingScheduledTimer(interval, _ => tick());
 
@@ -55,7 +31,8 @@ namespace Avalonia.iOS
                     return;
                 _signaled = true;
             }
-            NSRunLoop.Main.BeginInvokeOnMainThread(() =>
+
+            DispatchQueue.MainQueue.DispatchAsync(() =>
             {
                 lock (this)
                     _signaled = false;
@@ -63,4 +40,4 @@ namespace Avalonia.iOS
             });
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/RuntimeInfo.cs b/src/iOS/Avalonia.iOS/RuntimeInfo.cs
deleted file mode 100644
index 101561b246..0000000000
--- a/src/iOS/Avalonia.iOS/RuntimeInfo.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Avalonia.Platform;
-namespace Avalonia.Shared.PlatformSupport
-{
-    internal partial class StandardRuntimePlatform
-    {
-        public RuntimePlatformInfo GetRuntimeInfo() => new RuntimePlatformInfo
-        {
-            IsCoreClr = false,
-            IsDesktop = false,
-            IsMobile = true,
-            IsDotNetFramework = false,
-            IsMono = true,
-            IsUnix = true,
-            OperatingSystem = OperatingSystemType.Android
-        };
-    }
-}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/SingleViewLifetime.cs b/src/iOS/Avalonia.iOS/SingleViewLifetime.cs
new file mode 100644
index 0000000000..914f0ba548
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/SingleViewLifetime.cs
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 0000000000..b05ab280d2
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/SoftKeyboardHelper.cs
@@ -0,0 +1,24 @@
+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/Specific/KeyboardEventsHelper.cs b/src/iOS/Avalonia.iOS/Specific/KeyboardEventsHelper.cs
deleted file mode 100644
index cdf244d330..0000000000
--- a/src/iOS/Avalonia.iOS/Specific/KeyboardEventsHelper.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Input.Raw;
-using Avalonia.Platform;
-using ObjCRuntime;
-using UIKit;
-
-namespace Avalonia.iOS.Specific
-{
-    /// <summary>
-    /// In order to have properly handle of keyboard event in iOS View should already made some things in the View:
-    /// 1. Adopt the UIKeyInput protocol - add [Adopts("UIKeyInput")] to your view class
-    /// 2. Implement all the methods required by UIKeyInput:
-    ///     2.1  Implement HasText
-    ///             example:
-    ///                 [Export("hasText")]
-    ///                 bool HasText => _keyboardHelper.HasText()
-    ///     2.2   Implement InsertText
-    ///            example:
-    ///                [Export("insertText:")]
-    ///                void InsertText(string text) => _keyboardHelper.InsertText(text);
-    ///     2.3   Implement InsertText
-    ///            example:
-    ///               [Export("deleteBackward")]
-    ///               void DeleteBackward() => _keyboardHelper.DeleteBackward();
-    /// 3.Let iOS know that this can become a first responder:
-    ///            public override bool CanBecomeFirstResponder => _keyboardHelper.CanBecomeFirstResponder();
-    ///            or
-    ///            public override bool CanBecomeFirstResponder { get { return true; } }
-    ///
-    /// 4. To show keyboard:
-    ///             view.BecomeFirstResponder();
-    /// 5. To hide keyboard
-    ///             view.ResignFirstResponder();
-    /// </summary>
-    /// <typeparam name="TView">View that needs keyboard events and show/hide keyboard</typeparam>
-    internal class KeyboardEventsHelper<TView> where TView : UIView, ITopLevelImpl
-    {
-        private TView _view;
-        private IInputElement _lastFocusedElement;
-
-        public KeyboardEventsHelper(TView view)
-        {
-            _view = view;
-
-            var uiKeyInputAttribute = view.GetType().GetCustomAttributes(typeof(AdoptsAttribute), true).OfType<AdoptsAttribute>().Where(a => a.ProtocolType == "UIKeyInput").FirstOrDefault();
-
-            if (uiKeyInputAttribute == null) throw new NotSupportedException($"View class {typeof(TView).Name} should have class attribute - [Adopts(\"UIKeyInput\")] in order to access keyboard events!");
-
-            HandleEvents = true;
-        }
-
-        /// <summary>
-        /// HandleEvents in order to suspend keyboard notifications or resume it
-        /// </summary>
-        public bool HandleEvents { get; set; }
-
-        public bool HasText() => false;
-
-        public bool CanBecomeFirstResponder() => true;
-
-        public void DeleteBackward()
-        {
-            HandleKey(Key.Back, RawKeyEventType.KeyDown);
-            HandleKey(Key.Back, RawKeyEventType.KeyUp);
-        }
-
-        public void InsertText(string text)
-        {
-            var rawTextEvent = new RawTextInputEventArgs(KeyboardDevice.Instance, (uint)DateTime.Now.Ticks, text);
-            _view.Input(rawTextEvent);
-        }
-
-        private void HandleKey(Key key, RawKeyEventType type)
-        {
-            var rawKeyEvent = new RawKeyEventArgs(KeyboardDevice.Instance, (uint)DateTime.Now.Ticks, type, key, RawInputModifiers.None);
-            _view.Input(rawKeyEvent);
-        }
-
-        //currently not found a way to get InputModifiers state
-        //private static InputModifiers GetModifierKeys(object e)
-        //{
-        //    var im = InputModifiers.None;
-        //    //if (IsCtrlPressed) rv |= InputModifiers.Control;
-        //    //if (IsShiftPressed) rv |= InputModifiers.Shift;
-
-        //    return im;
-        //}
-
-        private bool NeedsKeyboard(IInputElement element)
-        {
-            //may be some other elements
-            return element is TextBox;
-        }
-
-        private void TryShowHideKeyboard(IInputElement element, bool value)
-        {
-            if (value)
-            {
-                _view.BecomeFirstResponder();
-            }
-            else
-            {
-                _view.ResignFirstResponder();
-            }
-        }
-
-        public void UpdateKeyboardState(IInputElement element)
-        {
-            var focusedElement = element;
-            bool oldValue = NeedsKeyboard(_lastFocusedElement);
-            bool newValue = NeedsKeyboard(focusedElement);
-
-            if (newValue != oldValue || newValue)
-            {
-                TryShowHideKeyboard(focusedElement, newValue);
-            }
-
-            _lastFocusedElement = element;
-        }
-
-        public void ActivateAutoShowKeyboard()
-        {
-            var kbDevice = (KeyboardDevice.Instance as INotifyPropertyChanged);
-
-            //just in case we've called more than once the method
-            kbDevice.PropertyChanged -= KeyboardDevice_PropertyChanged;
-            kbDevice.PropertyChanged += KeyboardDevice_PropertyChanged;
-        }
-
-        private void KeyboardDevice_PropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            if (e.PropertyName == nameof(KeyboardDevice.FocusedElement))
-            {
-                UpdateKeyboardState(KeyboardDevice.Instance.FocusedElement);
-            }
-        }
-
-        public void Dispose()
-        {
-            HandleEvents = false;
-        }
-    }
-}
diff --git a/src/iOS/Avalonia.iOS/Stubs.cs b/src/iOS/Avalonia.iOS/Stubs.cs
new file mode 100644
index 0000000000..a35b301a7f
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/Stubs.cs
@@ -0,0 +1,60 @@
+using System;
+using System.IO;
+using Avalonia.Input;
+using Avalonia.Platform;
+
+namespace Avalonia.iOS
+{
+    class CursorFactoryStub : IStandardCursorFactory
+    {
+        public IPlatformHandle GetCursor(StandardCursorType cursorType) => new PlatformHandle(IntPtr.Zero, "NULL");
+    }
+
+    class WindowingPlatformStub : IWindowingPlatform
+    {
+        public IWindowImpl CreateWindow() => throw new NotSupportedException();
+
+        public IWindowImpl CreateEmbeddableWindow() => throw new NotSupportedException();
+    }
+    
+    class PlatformIconLoaderStub : IPlatformIconLoader
+    {
+        public IWindowIconImpl LoadIcon(IBitmapImpl bitmap)
+        {
+            using (var stream = new MemoryStream())
+            {
+                bitmap.Save(stream);
+                return LoadIcon(stream);
+            }
+        }
+
+        public IWindowIconImpl LoadIcon(Stream stream)
+        {
+            var ms = new MemoryStream();
+            stream.CopyTo(ms);
+            return new IconStub(ms);
+        }
+
+        public IWindowIconImpl LoadIcon(string fileName)
+        {
+            using (var file = File.Open(fileName, FileMode.Open))
+                return LoadIcon(file);
+        }
+    }
+
+    public class IconStub : IWindowIconImpl
+    {
+        private readonly MemoryStream _ms;
+
+        public IconStub(MemoryStream stream)
+        {
+            _ms = stream;
+        }
+
+        public void Save(Stream outputStream)
+        {
+            _ms.Position = 0;
+            _ms.CopyTo(outputStream);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/TopLevelImpl.cs b/src/iOS/Avalonia.iOS/TopLevelImpl.cs
deleted file mode 100644
index c5b6642982..0000000000
--- a/src/iOS/Avalonia.iOS/TopLevelImpl.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Avalonia.Controls.Platform.Surfaces;
-using Avalonia.Input;
-using Avalonia.Input.Raw;
-using Avalonia.iOS.Specific;
-using Avalonia.Platform;
-using Avalonia.Rendering;
-using CoreGraphics;
-using Foundation;
-using ObjCRuntime;
-using UIKit;
-
-namespace Avalonia.iOS
-{
-    [Adopts("UIKeyInput")]
-    class TopLevelImpl : UIView, ITopLevelImpl, IFramebufferPlatformSurface
-    {
-        private readonly KeyboardEventsHelper<TopLevelImpl> _keyboardHelper;
-
-        private IInputRoot _inputRoot;
-
-        public TopLevelImpl()
-        {
-            _keyboardHelper = new KeyboardEventsHelper<TopLevelImpl>(this);
-            AutoresizingMask = UIViewAutoresizing.All;
-            _keyboardHelper.ActivateAutoShowKeyboard();
-
-            Surfaces = new object[] { this };
-        }
-
-        [Export("hasText")]
-        public bool HasText => _keyboardHelper.HasText();
-
-        [Export("insertText:")]
-        public void InsertText(string text) => _keyboardHelper.InsertText(text);
-
-        [Export("deleteBackward")]
-        public void DeleteBackward() => _keyboardHelper.DeleteBackward();
-
-        public override bool CanBecomeFirstResponder => _keyboardHelper.CanBecomeFirstResponder();
-        
-        public Action Closed { get; set; }
-        public Action<RawInputEventArgs> Input { get; set; }
-        public Action<Rect> Paint { get; set; }
-        public Action<Size> Resized { get; set; }
-        public Action<double> ScalingChanged { get; set; }
-
-        public new IPlatformHandle Handle => null;
-
-        public double Scaling => UIScreen.MainScreen.Scale;
-
-       
-        public override void LayoutSubviews() => Resized?.Invoke(ClientSize);
-
-        public Size ClientSize => Bounds.Size.ToAvalonia();
-
-        public IMouseDevice MouseDevice => iOSPlatform.MouseDevice;
-
-        public IRenderer CreateRenderer(IRenderRoot root)
-        {
-            return new ImmediateRenderer(root);
-        }
-
-        public override void Draw(CGRect rect)
-        {
-            Paint?.Invoke(new Rect(rect.X, rect.Y, rect.Width, rect.Height));
-        }
-
-        public void Invalidate(Rect rect) => SetNeedsDisplay();
-
-        public void SetInputRoot(IInputRoot inputRoot) => _inputRoot = inputRoot;
-
-        public Point PointToClient(PixelPoint point) => point.ToPoint(1);
-
-        public PixelPoint PointToScreen(Point point) => PixelPoint.FromPoint(point, 1);
-
-        public void SetCursor(IPlatformHandle cursor)
-        {
-            //Not supported
-        }
-
-        public IEnumerable<object> Surfaces { get; }
-        
-        public override void TouchesEnded(NSSet touches, UIEvent evt)
-        {
-            var touch = touches.AnyObject as UITouch;
-            if (touch != null)
-            {
-                var location = touch.LocationInView(this).ToAvalonia();
-
-                Input?.Invoke(new RawPointerEventArgs(
-                    iOSPlatform.MouseDevice,
-                    (uint)touch.Timestamp,
-                    _inputRoot,
-                    RawPointerEventType.LeftButtonUp,
-                    location,
-                    RawInputModifiers.None));
-            }
-        }
-
-        Point _touchLastPoint;
-        public override void TouchesBegan(NSSet touches, UIEvent evt)
-        {
-            var touch = touches.AnyObject as UITouch;
-            if (touch != null)
-            {
-                var location = touch.LocationInView(this).ToAvalonia();
-                _touchLastPoint = location;
-                Input?.Invoke(new RawPointerEventArgs(iOSPlatform.MouseDevice, (uint)touch.Timestamp, _inputRoot,
-                    RawPointerEventType.Move, location, RawInputModifiers.None));
-
-                Input?.Invoke(new RawPointerEventArgs(iOSPlatform.MouseDevice, (uint)touch.Timestamp, _inputRoot,
-                    RawPointerEventType.LeftButtonDown, location, RawInputModifiers.None));
-            }
-        }
-
-        public override void TouchesMoved(NSSet touches, UIEvent evt)
-        {
-            var touch = touches.AnyObject as UITouch;
-            if (touch != null)
-            {
-                var location = touch.LocationInView(this).ToAvalonia();
-                if (iOSPlatform.MouseDevice.Captured != null)
-                    Input?.Invoke(new RawPointerEventArgs(iOSPlatform.MouseDevice, (uint)touch.Timestamp, _inputRoot,
-                        RawPointerEventType.Move, location, RawInputModifiers.LeftMouseButton));
-                else
-                {
-                    //magic number based on test - correction of 0.02 is working perfect
-                    double correction = 0.02;
-
-                    Input?.Invoke(new RawMouseWheelEventArgs(iOSPlatform.MouseDevice, (uint)touch.Timestamp,
-                        _inputRoot, location, (location - _touchLastPoint) * correction, RawInputModifiers.LeftMouseButton));
-                }
-                _touchLastPoint = location;
-            }
-        }
-        
-        public ILockedFramebuffer Lock() => new EmulatedFramebuffer(this);
-
-        public IPopupImpl CreatePopup() => null;
-    }
-}
diff --git a/src/iOS/Avalonia.iOS/TouchHandler.cs b/src/iOS/Avalonia.iOS/TouchHandler.cs
new file mode 100644
index 0000000000..43b19c85af
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/TouchHandler.cs
@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Platform;
+using Foundation;
+using UIKit;
+
+namespace Avalonia.iOS
+{
+    class TouchHandler
+    {
+        private readonly AvaloniaView _view;
+        private readonly ITopLevelImpl _tl;
+        public TouchDevice _device = new TouchDevice();
+
+        public TouchHandler(AvaloniaView view, ITopLevelImpl tl)
+        {
+            _view = view;
+            _tl = tl;
+        }
+
+        ulong Ts(UIEvent evt) => (ulong) (evt.Timestamp * 1000);
+        private IInputRoot Root => _view.InputRoot;
+        private static long _nextTouchPointId = 1;
+        private Dictionary<UITouch, long> _knownTouches = new Dictionary<UITouch, long>();
+
+        public void Handle(NSSet touches, UIEvent evt)
+        {
+            foreach (UITouch t in touches)
+            {
+                var pt = t.LocationInView(_view).ToAvalonia();
+                if (!_knownTouches.TryGetValue(t, out var id))
+                    _knownTouches[t] = id = _nextTouchPointId++;
+
+                var ev = new RawTouchEventArgs(_device, Ts(evt), Root,
+                    t.Phase switch
+                    {
+                        UITouchPhase.Began => RawPointerEventType.TouchBegin,
+                        UITouchPhase.Ended => RawPointerEventType.TouchEnd,
+                        UITouchPhase.Cancelled => RawPointerEventType.TouchCancel,
+                        _ => RawPointerEventType.TouchUpdate
+                    }, pt, RawInputModifiers.None, id);
+
+                _device.ProcessRawEvent(ev);
+                
+                if (t.Phase == UITouchPhase.Cancelled || t.Phase == UITouchPhase.Ended)
+                    _knownTouches.Remove(t);
+            }
+        }
+        
+    }
+}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/WindowingPlatformImpl.cs b/src/iOS/Avalonia.iOS/WindowingPlatformImpl.cs
deleted file mode 100644
index 9a40b7162e..0000000000
--- a/src/iOS/Avalonia.iOS/WindowingPlatformImpl.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using Avalonia.Platform;
-
-namespace Avalonia.iOS
-{
-    class WindowingPlatformImpl : IWindowingPlatform
-    {
-        public IWindowImpl CreateWindow()
-        {
-            throw new NotSupportedException();
-        }
-
-        public IEmbeddableWindowImpl CreateEmbeddableWindow()
-        {
-            throw new NotSupportedException();
-        }
-
-        public IPopupImpl CreatePopup()
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/src/iOS/Avalonia.iOS/iOSPlatform.cs b/src/iOS/Avalonia.iOS/iOSPlatform.cs
deleted file mode 100644
index b0092bc98a..0000000000
--- a/src/iOS/Avalonia.iOS/iOSPlatform.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Input.Platform;
-using Avalonia.iOS;
-using Avalonia.Platform;
-using Avalonia.Rendering;
-using Avalonia.Shared.PlatformSupport;
-
-namespace Avalonia
-{
-    public static class iOSApplicationExtensions
-    {
-        public static T UseiOS<T>(this T builder) where T : AppBuilderBase<T>, new()
-        {
-            builder.UseWindowingSubsystem(iOSPlatform.Initialize, "iOS");
-            return builder;
-        }
-    }
-}
-
-namespace Avalonia.iOS
-{
-    public class iOSPlatform
-    {
-        internal static MouseDevice MouseDevice;
-        internal static KeyboardDevice KeyboardDevice;
-
-        public static void Initialize()
-        {
-            MouseDevice = new MouseDevice();
-            KeyboardDevice = new KeyboardDevice();
-
-            AvaloniaLocator.CurrentMutable
-                .Bind<IRuntimePlatform>().ToSingleton<StandardRuntimePlatform>()
-                .Bind<IClipboard>().ToTransient<Clipboard>()
-                // TODO: what does this look like for iOS??
-                //.Bind<ISystemDialogImpl>().ToTransient<SystemDialogImpl>()
-                .Bind<IStandardCursorFactory>().ToTransient<CursorFactory>()
-                .Bind<IKeyboardDevice>().ToConstant(KeyboardDevice)
-                .Bind<IPlatformSettings>().ToSingleton<PlatformSettings>()
-                .Bind<IPlatformThreadingInterface>().ToConstant(PlatformThreadingInterface.Instance)
-                .Bind<IPlatformIconLoader>().ToSingleton<PlatformIconLoader>()
-                .Bind<IWindowingPlatform>().ToSingleton<WindowingPlatformImpl>()
-                .Bind<IRenderTimer>().ToSingleton<DisplayLinkRenderTimer>()
-                .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>()
-                .Bind<IRenderLoop>().ToSingleton<RenderLoop>();
-        }
-    }
-}
diff --git a/src/iOS/Avalonia.iOSTestApplication/AppDelegate.cs b/src/iOS/Avalonia.iOSTestApplication/AppDelegate.cs
deleted file mode 100644
index 4591fb2ae8..0000000000
--- a/src/iOS/Avalonia.iOSTestApplication/AppDelegate.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Foundation;
-using Avalonia.Controls;
-using Avalonia.iOS;
-using Avalonia.Media;
-using Avalonia.Threading;
-using UIKit;
-
-namespace Avalonia.iOSTestApplication
-{
-    // 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 : UIApplicationDelegate
-    {
-        public override UIWindow Window { get; set; }
-
-        //
-        // This method is invoked when the application has loaded and is ready to run. In this 
-        // method you should instantiate the window, load the UI into it and then make the window
-        // visible.
-        //
-        // You have 17 seconds to return from this method, or iOS will terminate your application.
-        //
-        public override bool FinishedLaunching(UIApplication uiapp, NSDictionary options)
-        {
-            AppBuilder.Configure<SimpleApp>().UseSkia().UseiOS().SetupWithoutStarting();
-            Window  = new AvaloniaWindow { Content = new SimpleControl()};
-            Window.MakeKeyAndVisible();
-            return true;
-        }
-    }
-
-
-}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj b/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj
deleted file mode 100644
index 34c8ae7605..0000000000
--- a/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
-    <ProjectGuid>{8C923867-8A8F-4F6B-8B80-47D9E8436166}</ProjectGuid>
-    <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>Avalonia.iOSTestApplication</RootNamespace>
-    <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <AssemblyName>AvaloniaiOSTestApplication</AssemblyName>
-  </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>i386</MtouchArch>
-    <MtouchLink>SdkOnly</MtouchLink>
-    <MtouchDebug>true</MtouchDebug>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <MtouchLink>None</MtouchLink>
-    <MtouchArch>i386</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>
-    <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchDebug>True</MtouchDebug>
-    <MtouchSdkVersion>9.1</MtouchSdkVersion>
-    <MtouchLink>None</MtouchLink>
-    <MtouchProfiling>False</MtouchProfiling>
-    <MtouchFastDev>False</MtouchFastDev>
-    <MtouchUseLlvm>False</MtouchUseLlvm>
-    <MtouchUseThumb>False</MtouchUseThumb>
-    <MtouchUseSGen>True</MtouchUseSGen>
-    <MtouchUseRefCounting>True</MtouchUseRefCounting>
-    <MtouchOptimizePNGs>True</MtouchOptimizePNGs>
-    <DeviceSpecificBuild>False</DeviceSpecificBuild>
-    <MtouchI18n />
-  </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>
-  <PropertyGroup>
-    <DisableSourceLink>true</DisableSourceLink>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Main.cs" />
-    <Compile Include="AppDelegate.cs" />
-    <Compile Include="SimpleApp.xaml.cs" />
-    <Compile Include="SimpleControl.cs" />
-    <None Include="GettingStarted.Xamarin" />
-    <None Include="Info.plist" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\Default-568h%402x.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Xamarin.iOS" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Entitlements.plist" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj">
-      <Project>{3e53a01a-b331-47f3-b828-4a5717e77a24}</Project>
-      <Name>Avalonia.Markup.Xaml</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Markup\Avalonia.Markup\Avalonia.Markup.csproj">
-      <Project>{6417e941-21bc-467b-a771-0de389353ce6}</Project>
-      <Name>Avalonia.Markup</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj">
-      <Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
-      <Name>Avalonia.Animation</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj">
-      <Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
-      <Name>Avalonia.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj">
-      <Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
-      <Name>Avalonia.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj">
-      <Project>{7062ae20-5dcc-4442-9645-8195bdece63e}</Project>
-      <Name>Avalonia.Diagnostics</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj">
-      <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
-      <Name>Avalonia.Input</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj">
-      <Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
-      <Name>Avalonia.Interactivity</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Layout\Avalonia.Layout.csproj">
-      <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
-      <Name>Avalonia.Layout</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj">
-      <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
-      <Name>Avalonia.Visuals</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj">
-      <Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
-      <Name>Avalonia.Styling</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj">
-      <Project>{3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f}</Project>
-      <Name>Avalonia.Themes.Default</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj">
-      <Project>{7d2d3083-71dd-4cc9-8907-39a0d86fb322}</Project>
-      <Name>Avalonia.Skia</Name>
-      <IsAppExtension>false</IsAppExtension>
-      <IsWatchApp>false</IsWatchApp>
-    </ProjectReference>
-    <ProjectReference Include="..\Avalonia.iOS\Avalonia.iOS.csproj">
-      <Project>{4488ad85-1495-4809-9aa4-ddfe0a48527e}</Project>
-      <Name>Avalonia.iOS</Name>
-      <IsAppExtension>false</IsAppExtension>
-      <IsWatchApp>false</IsWatchApp>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="SimpleApp.xaml">
-    </EmbeddedResource>
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <Import Project="..\..\..\build\Rx.props" />
-  <Import Project="..\..\..\build\iOSWorkarounds.props" />
-  <Import Project="..\..\..\build\LegacyProject.targets" />
-</Project>
diff --git a/src/iOS/Avalonia.iOSTestApplication/Entitlements.plist b/src/iOS/Avalonia.iOSTestApplication/Entitlements.plist
deleted file mode 100644
index 0c67376eba..0000000000
--- a/src/iOS/Avalonia.iOSTestApplication/Entitlements.plist
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict/>
-</plist>
diff --git a/src/iOS/Avalonia.iOSTestApplication/GettingStarted.Xamarin b/src/iOS/Avalonia.iOSTestApplication/GettingStarted.Xamarin
deleted file mode 100644
index 810f716685..0000000000
--- a/src/iOS/Avalonia.iOSTestApplication/GettingStarted.Xamarin
+++ /dev/null
@@ -1,4 +0,0 @@
-<GettingStarted>
-	<LocalContent>GS\iOS\CS\iOSApp\GettingStarted.html</LocalContent>
-	<EmbeddedNavigation>false</EmbeddedNavigation>
-</GettingStarted>
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOSTestApplication/Info.plist b/src/iOS/Avalonia.iOSTestApplication/Info.plist
deleted file mode 100644
index 44e29bed12..0000000000
--- a/src/iOS/Avalonia.iOSTestApplication/Info.plist
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDisplayName</key>
-	<string>Avalonia.iOSTestApplication</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.your-company.Avalonia.iOSTestApplication</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>UIDeviceFamily</key>
-	<array>
-		<integer>1</integer>
-		<integer>2</integer>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>MinimumOSVersion</key>
-	<string>8.0</string>
-	<key>CFBundleIconFiles</key>
-	<array>
-		<string>Default-568h@2x.png</string>
-	</array>
-</dict>
-</plist>
diff --git a/src/iOS/Avalonia.iOSTestApplication/Main.cs b/src/iOS/Avalonia.iOSTestApplication/Main.cs
deleted file mode 100644
index a2e0d635cc..0000000000
--- a/src/iOS/Avalonia.iOSTestApplication/Main.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using Foundation;
-using UIKit;
-
-namespace Avalonia.iOSTestApplication
-{
-    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, "AppDelegate");
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOSTestApplication/Properties/AssemblyInfo.cs b/src/iOS/Avalonia.iOSTestApplication/Properties/AssemblyInfo.cs
deleted file mode 100644
index 9154e2a135..0000000000
--- a/src/iOS/Avalonia.iOSTestApplication/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("Avalonia.iOSTestApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Avalonia.iOSTestApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[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("8c923867-8a8f-4f6b-8b80-47d9e8436166")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/iOS/Avalonia.iOSTestApplication/Resources/Default-568h@2x.png b/src/iOS/Avalonia.iOSTestApplication/Resources/Default-568h@2x.png
deleted file mode 100644
index 29973dcbed..0000000000
Binary files a/src/iOS/Avalonia.iOSTestApplication/Resources/Default-568h@2x.png and /dev/null differ
diff --git a/src/iOS/Avalonia.iOSTestApplication/SimpleApp.xaml b/src/iOS/Avalonia.iOSTestApplication/SimpleApp.xaml
deleted file mode 100644
index 214bcd8797..0000000000
--- a/src/iOS/Avalonia.iOSTestApplication/SimpleApp.xaml
+++ /dev/null
@@ -1,6 +0,0 @@
-<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"/>
-    </Application.Styles>
-</Application>
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOSTestApplication/SimpleApp.xaml.cs b/src/iOS/Avalonia.iOSTestApplication/SimpleApp.xaml.cs
deleted file mode 100644
index b287755ef6..0000000000
--- a/src/iOS/Avalonia.iOSTestApplication/SimpleApp.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Avalonia.Markup.Xaml;
-using Foundation;
-using UIKit;
-
-namespace Avalonia.iOSTestApplication
-{
-    public class SimpleApp : Avalonia.Application
-    {
-        public override void Initialize()
-        {
-            //Enforce load
-            new Avalonia.Themes.Default.DefaultTheme();
-            AvaloniaXamlLoader.Load(this);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOSTestApplication/SimpleControl.cs b/src/iOS/Avalonia.iOSTestApplication/SimpleControl.cs
deleted file mode 100644
index 7e888f65bc..0000000000
--- a/src/iOS/Avalonia.iOSTestApplication/SimpleControl.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Avalonia.Controls;
-using Avalonia.Media;
-
-namespace Avalonia.iOSTestApplication
-{
-    class SimpleControl : ContentControl
-    {
-        public SimpleControl()
-        {
-            Content = new Button() {Content = "WAT"};
-            MinWidth = 100;
-            MinHeight = 200;
-            Background = Brushes.CadetBlue;
-        }
-    }
-}
\ 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 1c7077870a..a2d27fd579 100644
--- a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
+++ b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
@@ -18,6 +18,13 @@
     <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\Avalonia.Themes.Default\Avalonia.Themes.Default.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" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2020091801" />
+  </ItemGroup>
   <Import Project="..\..\..\build\NetFX.props" />
 </Project>
diff --git a/src/tools/Avalonia.Designer.HostApp/DesignXamlLoader.cs b/src/tools/Avalonia.Designer.HostApp/DesignXamlLoader.cs
new file mode 100644
index 0000000000..7af29a56a1
--- /dev/null
+++ b/src/tools/Avalonia.Designer.HostApp/DesignXamlLoader.cs
@@ -0,0 +1,16 @@
+using System;
+using System.IO;
+using System.Reflection;
+using Avalonia.Markup.Xaml;
+using Avalonia.Markup.Xaml.XamlIl;
+
+namespace Avalonia.Designer.HostApp
+{
+    class DesignXamlLoader : AvaloniaXamlLoader.IRuntimeXamlLoader
+    {
+        public object Load(Stream stream, Assembly localAsm, object o, Uri baseUri, bool designMode)
+        {
+            return AvaloniaXamlIlRuntimeCompiler.Load(stream, localAsm, o, baseUri, designMode);
+        }
+    }
+}
diff --git a/src/tools/Avalonia.Designer.HostApp/Program.cs b/src/tools/Avalonia.Designer.HostApp/Program.cs
index 3163e1fbc3..4472dac4e3 100644
--- a/src/tools/Avalonia.Designer.HostApp/Program.cs
+++ b/src/tools/Avalonia.Designer.HostApp/Program.cs
@@ -1,6 +1,8 @@
 using System;
 using System.IO;
 using System.Reflection;
+using Avalonia.DesignerSupport;
+using Avalonia.Markup.Xaml;
 
 namespace Avalonia.Designer.HostApp
 {
@@ -40,8 +42,9 @@ namespace Avalonia.Designer.HostApp
         public static void Main(string[] args)
 #endif
         {
+            AvaloniaLocator.CurrentMutable.Bind<AvaloniaXamlLoader.IRuntimeXamlLoader>()
+                .ToConstant(new DesignXamlLoader());
             Avalonia.DesignerSupport.Remote.RemoteDesignerEntryPoint.Main(args);
         }
-
     }
 }
diff --git a/src/tools/MicroComGenerator/Ast.cs b/src/tools/MicroComGenerator/Ast.cs
new file mode 100644
index 0000000000..e9a55308be
--- /dev/null
+++ b/src/tools/MicroComGenerator/Ast.cs
@@ -0,0 +1,241 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MicroComGenerator.Ast
+{
+    public class AstAttributeNode
+    {
+        public string Name { get; set; }
+        public string Value { get; set; }
+
+        public AstAttributeNode(string name, string value)
+        {
+            Name = name;
+            Value = value;
+        }
+
+        public override string ToString() => $"{Name} = {Value}";
+        public AstAttributeNode Clone() => new AstAttributeNode(Name, Value);
+    }
+
+    public class AstAttributes : List<AstAttributeNode>
+    {
+        public bool HasAttribute(string a) => this.Any(x => x.Name == a);
+        
+        public AstAttributes Clone()
+        {
+            var rv= new AstAttributes();
+            rv.AddRange(this.Select(x => x.Clone()));
+            return rv;
+        }
+    }
+
+    public interface IAstNodeWithAttributes
+    {
+        public AstAttributes Attributes { get; set; }
+    }
+    
+    public class AstEnumNode : List<AstEnumMemberNode>, IAstNodeWithAttributes
+    {
+        public AstAttributes Attributes { get; set; } = new AstAttributes();
+        public string Name { get; set; }
+        public override string ToString() => "Enum " + Name;
+
+        public AstEnumNode Clone()
+        {
+            var rv = new AstEnumNode { Name = Name, Attributes = Attributes.Clone() };
+            rv.AddRange(this.Select(x => x.Clone()));
+            return rv;
+        }
+    }
+
+    public class AstEnumMemberNode
+    {
+        public string Name { get; set; }
+        public string Value { get; set; }
+
+        public AstEnumMemberNode(string name, string value)
+        {
+            Name = name;
+            Value = value;
+        }
+        
+        public override string ToString() => $"Enum member {Name} = {Value}";
+        public AstEnumMemberNode Clone() => new AstEnumMemberNode(Name, Value);
+    }
+
+    public class AstStructNode : List<AstStructMemberNode>, IAstNodeWithAttributes
+    {
+        public AstAttributes Attributes { get; set; } = new AstAttributes();
+        public string Name { get; set; }
+        public override string ToString() => "Struct " + Name;
+        
+        public AstStructNode Clone()
+        {
+            var rv = new AstStructNode { Name = Name, Attributes = Attributes.Clone() };
+            rv.AddRange(this.Select(x => x.Clone()));
+            return rv;
+        }
+    }
+
+    public class AstTypeNode
+    {
+        public string Name { get; set; }
+        public int PointerLevel { get; set; }
+        public bool IsLink { get; set; }
+
+        public string Format() => Name + new string('*', PointerLevel)
+                                       + (IsLink ? "&" : "");
+        public override string ToString() => Format();
+        public AstTypeNode Clone() => new AstTypeNode() { 
+            Name = Name,
+            PointerLevel = PointerLevel,
+            IsLink = IsLink
+        };
+    }
+
+    public class AstStructMemberNode : IAstNodeWithAttributes
+    {
+        public string Name { get; set; }
+        public AstTypeNode Type { get; set; }
+
+        public override string ToString() => $"Struct member {Type.Format()} {Name}";
+        public AstStructMemberNode Clone() => new AstStructMemberNode() { Name = Name, Type = Type.Clone() };
+        public AstAttributes Attributes { get; set; } = new AstAttributes();
+    }
+
+    public class AstInterfaceNode : List<AstInterfaceMemberNode>, IAstNodeWithAttributes
+    {
+        public AstAttributes Attributes { get; set; } = new AstAttributes();
+        public string Name { get; set; }
+        public string Inherits { get; set; }
+        
+        public override string ToString()
+        {
+            if (Inherits == null)
+                return Name;
+            return $"Interface {Name} : {Inherits}";
+        }
+        public AstInterfaceNode Clone()
+        {
+            var rv = new AstInterfaceNode { Name = Name, Inherits = Inherits, Attributes = Attributes.Clone() };
+            rv.AddRange(this.Select(x => x.Clone()));
+            return rv;
+        }
+    }
+
+    public class AstInterfaceMemberNode : List<AstInterfaceMemberArgumentNode>, IAstNodeWithAttributes
+    {
+        public string Name { get; set; }
+        public AstTypeNode ReturnType { get; set; }
+        public AstAttributes Attributes { get; set; } = new AstAttributes();
+
+        public AstInterfaceMemberNode Clone()
+        {
+            var rv = new AstInterfaceMemberNode()
+            {
+                Name = Name, Attributes = Attributes.Clone(), ReturnType = ReturnType
+            };
+            rv.AddRange(this.Select(x => x.Clone()));
+            return rv;
+        }
+
+        public override string ToString() =>
+            $"Interface member {ReturnType.Format()} {Name} ({string.Join(", ", this.Select(x => x.Format()))})";
+    }
+
+    public class AstInterfaceMemberArgumentNode : IAstNodeWithAttributes
+    {
+        public string Name { get; set; }
+        public AstTypeNode Type { get; set; }
+        public AstAttributes Attributes { get; set; } = new AstAttributes();
+
+        
+        public  string Format() => $"{Type.Format()} {Name}";
+        public override string ToString() => "Argument " + Format();
+
+        public AstInterfaceMemberArgumentNode Clone() => new AstInterfaceMemberArgumentNode
+        {
+            Name = Name, Type = Type.Clone(), Attributes = Attributes.Clone()
+        };
+    }
+
+    public static class AstExtensions
+    {
+        public static bool HasAttribute(this IAstNodeWithAttributes node, string s) => node.Attributes.HasAttribute(s);
+
+        public static string GetAttribute(this IAstNodeWithAttributes node, string s)
+        {
+            var value = node.Attributes.FirstOrDefault(a => a.Name == s)?.Value;
+            if (value == null)
+                throw new CodeGenException("Expected attribute " + s + " for node " + node);
+            return value;
+        }
+        
+        public static string GetAttributeOrDefault(this IAstNodeWithAttributes node, string s) 
+            => node.Attributes.FirstOrDefault(a => a.Name == s)?.Value;
+    }
+
+    class AstVisitor
+    {
+        protected virtual void VisitType(AstTypeNode type)
+        {
+        }
+        
+        protected virtual void VisitArgument(AstInterfaceMemberArgumentNode argument)
+        {
+            VisitType(argument.Type);
+        }
+
+        protected virtual void VisitInterfaceMember(AstInterfaceMemberNode member)
+        {
+            foreach(var a in member)
+                VisitArgument(a);
+            VisitType(member.ReturnType);
+        }
+
+        protected virtual void VisitInterface(AstInterfaceNode iface)
+        {
+            foreach(var m in iface)
+                VisitInterfaceMember(m);
+        }
+
+        protected virtual void VisitStructMember(AstStructMemberNode member)
+        {
+            VisitType(member.Type);
+        }
+
+        protected virtual void VisitStruct(AstStructNode node)
+        {
+            foreach(var m in node)
+                VisitStructMember(m);
+        }
+        
+        public virtual void VisitAst(AstIdlNode ast)
+        {
+            foreach(var iface in ast.Interfaces)
+                VisitInterface(iface);
+            foreach (var s in ast.Structs)
+                VisitStruct(s);
+        }
+        
+        
+    }
+
+    public class AstIdlNode : IAstNodeWithAttributes
+    {
+        public AstAttributes Attributes { get; set; } = new AstAttributes();
+        public List<AstEnumNode> Enums { get; set; } = new List<AstEnumNode>();
+        public List<AstStructNode> Structs { get; set; } = new List<AstStructNode>();
+        public List<AstInterfaceNode> Interfaces { get; set; } = new List<AstInterfaceNode>();
+
+        public AstIdlNode Clone() => new AstIdlNode()
+        {
+            Attributes = Attributes.Clone(),
+            Enums = Enums.Select(x => x.Clone()).ToList(),
+            Structs = Structs.Select(x => x.Clone()).ToList(),
+            Interfaces = Interfaces.Select(x => x.Clone()).ToList()
+        };
+    }
+}
diff --git a/src/tools/MicroComGenerator/AstParser.cs b/src/tools/MicroComGenerator/AstParser.cs
new file mode 100644
index 0000000000..388a8eb018
--- /dev/null
+++ b/src/tools/MicroComGenerator/AstParser.cs
@@ -0,0 +1,232 @@
+using System.Collections.Generic;
+using MicroComGenerator.Ast;
+
+namespace MicroComGenerator
+{
+    public class AstParser
+    {
+        public static AstIdlNode Parse(string source)
+        {
+            var parser = new TokenParser(source);
+            var idl = new AstIdlNode { Attributes = ParseGlobalAttributes(ref parser) };
+
+            while (!parser.Eof)
+            {
+                var attrs = ParseLocalAttributes(ref parser);
+                if (parser.TryConsume(";"))
+                    continue;
+                if (parser.TryParseKeyword("enum"))
+                    idl.Enums.Add(ParseEnum(attrs, ref parser));
+                else if (parser.TryParseKeyword("struct"))
+                    idl.Structs.Add(ParseStruct(attrs, ref parser));
+                else if (parser.TryParseKeyword("interface"))
+                    idl.Interfaces.Add(ParseInterface(attrs, ref parser));
+                else
+                    throw new ParseException("Unexpected character", ref parser);
+            }
+
+            return idl;
+        }
+
+        static AstAttributes ParseGlobalAttributes(ref TokenParser parser)
+        {
+            var rv = new AstAttributes();
+            while (!parser.Eof)
+            {
+                parser.SkipWhitespace();
+                if (parser.TryConsume('@'))
+                {
+                    var ident = parser.ParseIdentifier("-");
+                    var value = parser.ReadToEol().Trim();
+                    if (value == "@@")
+                    {
+                        parser.Advance(1);
+                        value = "";
+                        while (true)
+                        {
+                            var l = parser.ReadToEol();
+                            if (l == "@@")
+                                break;
+                            else
+                                value = value.Length == 0 ? l : (value + "\n" + l);
+                            parser.Advance(1);
+                        }
+
+                    }
+                    rv.Add(new AstAttributeNode(ident, value));
+                }
+                else
+                    return rv;
+            }
+
+            return rv;
+        }
+
+        static AstAttributes ParseLocalAttributes(ref TokenParser parser)
+        {
+            var rv = new AstAttributes();
+            while (parser.TryConsume("["))
+            {
+                while (!parser.TryConsume("]") && !parser.Eof)
+                {
+                    if (parser.TryConsume(','))
+                        continue;
+
+                    // Get identifier
+                    var ident = parser.ParseIdentifier("-");
+
+                    // No value, end of attribute list
+                    if (parser.TryConsume(']'))
+                    {
+                        rv.Add(new AstAttributeNode(ident, null));
+                        break;
+                    }
+                    // No value, next attribute
+                    else if (parser.TryConsume(','))
+                        rv.Add(new AstAttributeNode(ident, null));
+                    // Has value
+                    else if (parser.TryConsume('('))
+                    {
+                        var value = parser.ReadTo(')');
+                        parser.Consume(')');
+                        rv.Add(new AstAttributeNode(ident, value));
+                    }
+                    else
+                        throw new ParseException("Unexpected character", ref parser);
+                }
+
+                if (parser.Eof)
+                    throw new ParseException("Unexpected EOF", ref parser);
+            }
+
+            return rv;
+        }
+
+        static void EnsureOpenBracket(ref TokenParser parser)
+        {
+            if (!parser.TryConsume('{'))
+                throw new ParseException("{ expected", ref parser);
+        }
+
+        static AstEnumNode ParseEnum(AstAttributes attrs, ref TokenParser parser)
+        {
+            var name = parser.ParseIdentifier();
+            EnsureOpenBracket(ref parser);
+            var rv = new AstEnumNode { Name = name, Attributes = attrs };
+            while (!parser.TryConsume('}') && !parser.Eof)
+            {
+                if (parser.TryConsume(','))
+                    continue;
+
+                var ident = parser.ParseIdentifier();
+
+                // Automatic value
+                if (parser.TryConsume(',') || parser.Peek == '}')
+                {
+                    rv.Add(new AstEnumMemberNode(ident, null));
+                    continue;
+                }
+
+                if (!parser.TryConsume('='))
+                    throw new ParseException("Unexpected character", ref parser);
+
+                var value = parser.ReadToAny(",}").Trim();
+                rv.Add(new AstEnumMemberNode(ident, value));
+                
+                if (parser.Eof)
+                    throw new ParseException("Unexpected EOF", ref parser);
+            }
+
+
+            return rv;
+        }
+
+        static AstTypeNode ParseType(ref TokenParser parser)
+        {
+            var ident = parser.ParseIdentifier();
+            var t = new AstTypeNode { Name = ident };
+            while (parser.TryConsume('*'))
+                t.PointerLevel++;
+            if (parser.TryConsume("&"))
+                t.IsLink = true;
+            return t;
+        }
+
+        static AstStructNode ParseStruct(AstAttributes attrs, ref TokenParser parser)
+        {
+            var name = parser.ParseIdentifier();
+            EnsureOpenBracket(ref parser);
+            var rv = new AstStructNode { Name = name, Attributes = attrs };
+            while (!parser.TryConsume('}') && !parser.Eof)
+            {
+                var memberAttrs = ParseLocalAttributes(ref parser);
+                var t = ParseType(ref parser);
+                bool parsedAtLeastOneMember = false;
+                while (!parser.TryConsume(';'))
+                {
+                    // Skip any ,
+                    while (parser.TryConsume(',')) { }
+
+                    var ident = parser.ParseIdentifier();
+                    parsedAtLeastOneMember = true;
+                    rv.Add(new AstStructMemberNode { Name = ident, Type = t, Attributes = memberAttrs});
+                }
+
+                if (!parsedAtLeastOneMember)
+                    throw new ParseException("Expected at least one enum member with declared type " + t, ref parser);
+            }
+
+            return rv;
+        }
+
+        static AstInterfaceNode ParseInterface(AstAttributes interfaceAttrs, ref TokenParser parser)
+        {
+            var interfaceName = parser.ParseIdentifier();
+            string inheritsFrom = null; 
+            if (parser.TryConsume(":")) 
+                inheritsFrom = parser.ParseIdentifier();
+
+            EnsureOpenBracket(ref parser);
+            var rv = new AstInterfaceNode
+            {
+                Name = interfaceName, Attributes = interfaceAttrs, Inherits = inheritsFrom
+            };
+            while (!parser.TryConsume('}') && !parser.Eof)
+            {
+                var memberAttrs = ParseLocalAttributes(ref parser);
+                var returnType = ParseType(ref parser);
+                var name = parser.ParseIdentifier();
+                var member = new AstInterfaceMemberNode
+                {
+                    Name = name, ReturnType = returnType, Attributes = memberAttrs
+                };
+                rv.Add(member);
+
+                parser.Consume('(');
+                while (true)
+                {
+                    if (parser.TryConsume(')'))
+                        break;
+                    
+                    var argumentAttrs = ParseLocalAttributes(ref parser);
+                    var type = ParseType(ref parser);
+                    var argName = parser.ParseIdentifier();
+                    member.Add(new AstInterfaceMemberArgumentNode
+                    {
+                        Name = argName, Type = type, Attributes = argumentAttrs
+                    });
+
+                    if (parser.TryConsume(')'))
+                        break;
+                    if (parser.TryConsume(','))
+                        continue;
+                    throw new ParseException("Unexpected character", ref parser);
+                }
+
+                parser.Consume(';');
+            }
+
+            return rv;
+        }
+    }
+}
diff --git a/src/tools/MicroComGenerator/CSharpGen.InterfaceGen.cs b/src/tools/MicroComGenerator/CSharpGen.InterfaceGen.cs
new file mode 100644
index 0000000000..adb8faf938
--- /dev/null
+++ b/src/tools/MicroComGenerator/CSharpGen.InterfaceGen.cs
@@ -0,0 +1,484 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using MicroComGenerator.Ast;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
+
+// ReSharper disable CoVariantArrayConversion
+
+// HERE BE DRAGONS
+
+namespace MicroComGenerator
+{
+    public partial class CSharpGen
+    {
+        abstract class Arg
+        {
+            public string Name;
+            public string NativeType;
+            public AstAttributes Attributes { get; set; }
+            public virtual StatementSyntax CreateFixed(StatementSyntax inner) => inner;
+
+            public virtual void PreMarshal(List<StatementSyntax> body)
+            {
+            }
+
+            public virtual void PreMarshalForReturn(List<StatementSyntax> body) =>
+                throw new InvalidOperationException("Don't know how to use " + NativeType + " as HRESULT-return");
+
+            public virtual ExpressionSyntax Value(bool isHresultReturn) => ParseExpression(Name);
+            public abstract string ManagedType { get; }
+            public virtual string ReturnManagedType => ManagedType;
+
+            public virtual StatementSyntax[] ReturnMarshalResult() => new[] { ParseStatement("return " + Name + ";") };
+
+
+            public virtual void BackPreMarshal(List<StatementSyntax> body)
+            {
+            }
+            
+            public virtual ExpressionSyntax BackMarshalValue() => ParseExpression(Name);
+            public virtual ExpressionSyntax BackMarshalReturn(string resultVar) => ParseExpression(resultVar);
+            
+        }
+
+        class InterfaceReturnArg : Arg
+        {
+            public string InterfaceType;
+            public override ExpressionSyntax Value(bool isHresultReturn) => ParseExpression("&" + PName);
+            public override string ManagedType => InterfaceType;
+
+            private string PName => "__marshal_" + Name;
+
+            public override void PreMarshalForReturn(List<StatementSyntax> body)
+            {
+                body.Add(ParseStatement("void* " + PName + " = null;"));
+            }
+
+            public override StatementSyntax[] ReturnMarshalResult() => new[]
+            {
+                ParseStatement("return Avalonia.MicroCom.MicroComRuntime.CreateProxyFor<" + InterfaceType + ">(" +
+                               PName + ", true);")
+            };
+
+            public override ExpressionSyntax BackMarshalValue()
+            {
+                return ParseExpression("INVALID");
+            }
+
+            public override ExpressionSyntax BackMarshalReturn(string resultVar)
+            {
+                return ParseExpression($"Avalonia.MicroCom.MicroComRuntime.GetNativePointer({resultVar}, true)");
+            }
+        }
+
+        class InterfaceArg : Arg
+        {
+            public string InterfaceType;
+
+            public override ExpressionSyntax Value(bool isHresultReturn) =>
+                ParseExpression("Avalonia.MicroCom.MicroComRuntime.GetNativePointer(" + Name + ")");
+
+            public override string ManagedType => InterfaceType;
+
+            public override StatementSyntax[] ReturnMarshalResult() => new[]
+            {
+                ParseStatement("return Avalonia.MicroCom.MicroComRuntime.CreateProxyFor<" + InterfaceType + ">(" +
+                               Name + ", true);")
+            };
+
+            public override ExpressionSyntax BackMarshalValue()
+            {
+                return ParseExpression("Avalonia.MicroCom.MicroComRuntime.CreateProxyFor<" + InterfaceType + ">(" +
+                                       Name + ", false)");
+            }
+            
+            public override ExpressionSyntax BackMarshalReturn(string resultVar)
+            {
+                return ParseExpression($"Avalonia.MicroCom.MicroComRuntime.GetNativePointer({resultVar}, true)");
+            }
+        }
+
+        class BypassArg : Arg
+        {
+            public string Type { get; set; }
+            public int PointerLevel;
+            public override string ManagedType => Type + new string('*', PointerLevel);
+            public override string ReturnManagedType => Type + new string('*', PointerLevel - 1);
+
+            public override ExpressionSyntax Value(bool isHresultReturn)
+            {
+                if (isHresultReturn)
+                    return ParseExpression("&" + Name);
+                return base.Value(false);
+            }
+
+            public override void PreMarshalForReturn(List<StatementSyntax> body)
+            {
+                if (PointerLevel == 0)
+                    base.PreMarshalForReturn(body);
+                else
+                    body.Add(ParseStatement(Type + new string('*', PointerLevel - 1) + " " + Name + "=default;"));
+            }
+        }
+
+        class StringArg : Arg
+        {
+            private string BName => "__bytemarshal_" + Name;
+            private string FName => "__fixedmarshal_" + Name;
+
+            public override void PreMarshal(List<StatementSyntax> body)
+            {
+                body.Add(ParseStatement($"var {BName} = new byte[System.Text.Encoding.UTF8.GetByteCount({Name})+1];"));
+                body.Add(ParseStatement($"System.Text.Encoding.UTF8.GetBytes({Name}, 0, {Name}.Length, {BName}, 0);"));
+            }
+
+            public override StatementSyntax CreateFixed(StatementSyntax inner)
+            {
+                return FixedStatement(DeclareVar("byte*", FName, ParseExpression(BName)), inner);
+            }
+
+            public override ExpressionSyntax Value(bool isHresultReturn) => ParseExpression(FName);
+            public override string ManagedType => "string";
+            public override ExpressionSyntax BackMarshalValue()
+            {
+                return ParseExpression(
+                    $"({Name} == null ? null : System.Runtime.InteropServices.Marshal.PtrToStringAnsi(new IntPtr(" + Name + ")))");
+            }
+        }
+
+        string ConvertNativeType(string type)
+        {
+            if (type == "size_t")
+                return "System.IntPtr";
+            if (type == "HRESULT")
+                return "int";
+            return type;
+        }
+
+        Arg ConvertArg(AstInterfaceMemberArgumentNode node)
+        {
+            var arg = ConvertArg(node.Name, node.Type);
+            arg.Attributes = node.Attributes.Clone();
+            return arg;
+        }
+        
+        Arg ConvertArg(string name, AstTypeNode type)
+        {
+            type = new AstTypeNode { Name = ConvertNativeType(type.Name), PointerLevel = type.PointerLevel };
+
+            if (type.PointerLevel == 2)
+            {
+                if (IsInterface(type))
+                    return new InterfaceReturnArg { Name = name, InterfaceType = type.Name, NativeType = "void**" };
+            }
+            else if (type.PointerLevel == 1)
+            {
+                if (IsInterface(type))
+                    return new InterfaceArg { Name = name, InterfaceType = type.Name, NativeType = "void*" };
+                if (type.Name == "char")
+                    return new StringArg { Name = name, NativeType = "byte*" };
+            }
+
+            return new BypassArg
+            {
+                Name = name, Type = type.Name, PointerLevel = type.PointerLevel, NativeType = type.ToString()
+            };
+        }
+
+
+        void GenerateInterfaceMember(AstInterfaceMemberNode member, ref InterfaceDeclarationSyntax iface,
+            ref ClassDeclarationSyntax proxy, ref ClassDeclarationSyntax vtbl,
+            List<StatementSyntax> vtblCtor, int num)
+        {
+            // Prepare method information
+            if (member.Name == "GetRenderingDevice")
+                Console.WriteLine();
+            var args = member.Select(ConvertArg).ToList();
+            var returnArg = ConvertArg("__result", member.ReturnType);
+            bool isHresult = member.ReturnType.Name == "HRESULT";
+            bool isHresultLastArgumentReturn = isHresult
+                                               && args.Count > 0
+                                               && (args.Last().Name == "ppv" 
+                                                   || args.Last().Name == "retOut" 
+                                                   || args.Last().Name == "ret"
+                                                   || args.Last().Attributes.HasAttribute("out")
+                                                   || args.Last().Attributes.HasAttribute("retval")
+                                                   )
+                                               && ((member.Last().Type.PointerLevel > 0
+                                                    && !IsInterface(member.Last().Type))
+                                                   || member.Last().Type.PointerLevel == 2);
+
+            bool isVoidReturn = member.ReturnType.Name == "void" && member.ReturnType.PointerLevel == 0;
+
+
+            // Generate method signature
+            MethodDeclarationSyntax GenerateManagedSig(string returnType, string name,
+                IEnumerable<(string n, string t)> args)
+                => MethodDeclaration(ParseTypeName(returnType), name).WithParameterList(
+                    ParameterList(
+                        SeparatedList(args.Select(x => Parameter(Identifier(x.n)).WithType(ParseTypeName(x.t))))));
+
+            var managedSig =
+                isHresult ?
+                    GenerateManagedSig(isHresultLastArgumentReturn ? args.Last().ReturnManagedType : "void",
+                        member.Name,
+                        (isHresultLastArgumentReturn ? args.SkipLast(1) : args).Select(a => (a.Name, a.ManagedType))) :
+                    GenerateManagedSig(returnArg.ManagedType, member.Name, args.Select(a => (a.Name, a.ManagedType)));
+
+            iface = iface.AddMembers(managedSig.WithSemicolonToken(Semicolon()));
+
+            // Prepare args for marshaling
+            var preMarshal = new List<StatementSyntax>();
+            if (!isVoidReturn)
+                preMarshal.Add(ParseStatement(returnArg.NativeType + " __result;"));
+
+            for (var idx = 0; idx < args.Count; idx++)
+            {
+                if (isHresultLastArgumentReturn && idx == args.Count - 1)
+                    args[idx].PreMarshalForReturn(preMarshal);
+                else
+                    args[idx].PreMarshal(preMarshal);
+            }
+
+            // Generate call expression
+            ExpressionSyntax callExpr = InvocationExpression(_localInterop.GetCaller(returnArg.NativeType,
+                    args.Select(x => x.NativeType).ToList()))
+                .AddArgumentListArguments(Argument(ParseExpression("PPV")))
+                .AddArgumentListArguments(args
+                    .Select((a, i) => Argument(a.Value(isHresultLastArgumentReturn && i == args.Count - 1))).ToArray())
+                .AddArgumentListArguments(Argument(ParseExpression("(*PPV)[base.VTableSize + " + num + "]")));
+
+            if (!isVoidReturn)
+                callExpr = CastExpression(ParseTypeName(returnArg.NativeType), callExpr);
+            
+            // Save call result if needed
+            if (!isVoidReturn)
+                callExpr = AssignmentExpression(SyntaxKind.SimpleAssignmentExpression, ParseExpression("__result"),
+                    callExpr);
+
+
+            // Wrap call into fixed() blocks
+            StatementSyntax callStatement = ExpressionStatement(callExpr);
+            foreach (var arg in args)
+                callStatement = arg.CreateFixed(callStatement);
+
+            // Build proxy body
+            var proxyBody = Block()
+                .AddStatements(preMarshal.ToArray())
+                .AddStatements(callStatement);
+
+            // Process return value
+            if (!isVoidReturn)
+            {
+                if (isHresult)
+                {
+                    proxyBody = proxyBody.AddStatements(
+                        ParseStatement(
+                            $"if(__result != 0) throw new System.Runtime.InteropServices.COMException(\"{member.Name} failed\", __result);"));
+
+                    if (isHresultLastArgumentReturn)
+                        proxyBody = proxyBody.AddStatements(args.Last().ReturnMarshalResult());
+                }
+                else
+                    proxyBody = proxyBody.AddStatements(returnArg.ReturnMarshalResult());
+            }
+
+            // Add the proxy method
+            proxy = proxy.AddMembers(managedSig.AddModifiers(SyntaxKind.PublicKeyword)
+                .WithBody(proxyBody));
+
+            
+            // Generate VTable method
+            var shadowDelegate = DelegateDeclaration(ParseTypeName(returnArg.NativeType), member.Name + "Delegate")
+                .AddParameterListParameters(Parameter(Identifier("@this")).WithType(ParseTypeName("IntPtr")))
+                .AddParameterListParameters(args.Select(x =>
+                    Parameter(Identifier(x.Name)).WithType(ParseTypeName(x.NativeType))).ToArray())
+                .AddAttribute("System.Runtime.InteropServices.UnmanagedFunctionPointer",
+                    "System.Runtime.InteropServices.CallingConvention.StdCall");
+
+            var shadowMethod = MethodDeclaration(shadowDelegate.ReturnType, member.Name)
+                .WithParameterList(shadowDelegate.ParameterList)
+                .AddModifiers(Token(SyntaxKind.StaticKeyword));
+
+            var backPreMarshal = new List<StatementSyntax>();
+            foreach (var arg in args)
+                arg.BackPreMarshal(backPreMarshal);
+
+            backPreMarshal.Add(
+                ParseStatement($"__target = ({iface.Identifier.Text})Avalonia.MicroCom.MicroComRuntime.GetObjectFromCcw(@this);"));
+
+            var isBackVoidReturn = isVoidReturn || (isHresult && !isHresultLastArgumentReturn);
+
+            StatementSyntax backCallStatement;
+
+            var backCallExpr =
+                IsPropertyRewriteCandidate(managedSig) ?
+                    ParseExpression("__target." + member.Name.Substring(3)) :
+                    InvocationExpression(ParseExpression("__target." + member.Name))
+                        .WithArgumentList(ArgumentList(SeparatedList(
+                            (isHresultLastArgumentReturn ? args.SkipLast(1) : args)
+                            .Select(a =>
+                                Argument(a.BackMarshalValue())))));
+
+            if (isBackVoidReturn)
+                backCallStatement = ExpressionStatement(backCallExpr);
+            else
+            {
+                backCallStatement = LocalDeclarationStatement(DeclareVar("var", "__result", backCallExpr));
+                if (isHresultLastArgumentReturn)
+                {
+                    backCallStatement = Block(backCallStatement,
+                        ExpressionStatement(AssignmentExpression(SyntaxKind.SimpleAssignmentExpression,
+                            ParseExpression("*" + args.Last().Name),
+                            args.Last().BackMarshalReturn("__result")
+                        )));
+
+                }
+                else
+                    backCallStatement = Block(backCallStatement,
+                        ReturnStatement(returnArg.BackMarshalReturn("__result")));
+            }
+
+            BlockSyntax backBodyBlock = Block().AddStatements(backPreMarshal.ToArray()).AddStatements(backCallStatement);
+
+
+            var exceptions = new List<CatchClauseSyntax>()
+            {
+                CatchClause(
+                    CatchDeclaration(ParseTypeName("System.Exception"), Identifier("__exception__")), null,
+                    Block(
+                        ParseStatement(
+                            "Avalonia.MicroCom.MicroComRuntime.UnhandledException(__target, __exception__);"),
+                        isHresult ? ParseStatement("return unchecked((int)0x80004005u);")
+                        : isVoidReturn ? EmptyStatement() : ParseStatement("return default;")
+                    ))
+            };
+            
+            if (isHresult)
+                exceptions.Insert(0, CatchClause(
+                    CatchDeclaration(ParseTypeName("System.Runtime.InteropServices.COMException"),
+                        Identifier("__com_exception__")),
+                    null, Block(ParseStatement("return __com_exception__.ErrorCode;"))));
+
+            backBodyBlock = Block(
+                TryStatement(
+                        List(exceptions))
+                    .WithBlock(Block(backBodyBlock))
+            );
+            if (isHresult)
+                backBodyBlock = backBodyBlock.AddStatements(ParseStatement("return 0;"));
+            
+
+            backBodyBlock = Block()
+                .AddStatements(ParseStatement($"{iface.Identifier.Text} __target = null;"))
+                .AddStatements(backBodyBlock.Statements.ToArray());
+
+            shadowMethod = shadowMethod.WithBody(backBodyBlock);
+
+            vtbl = vtbl.AddMembers(shadowDelegate).AddMembers(shadowMethod);
+            vtblCtor.Add(ParseStatement("base.AddMethod((" + shadowDelegate.Identifier.Text + ")" +
+                                        shadowMethod.Identifier.Text + ");"));
+
+
+
+
+        }
+
+        class LocalInteropHelper
+        {
+            public ClassDeclarationSyntax Class { get; private set; } = ClassDeclaration("LocalInterop");
+            private HashSet<string> _existing = new HashSet<string>();
+
+            public ExpressionSyntax GetCaller(string returnType, List<string> args)
+            {
+                string ConvertType(string t) => t.EndsWith("*") ? "void*" : t;
+                returnType = ConvertType(returnType);
+                args = args.Select(ConvertType).ToList();
+                
+                var name = "CalliStdCall" + returnType.Replace("*", "_ptr");
+                var signature = returnType + "::" + name + "::" + string.Join("::", args);
+                if (_existing.Add(signature))
+                {
+                    Class = Class.AddMembers(MethodDeclaration(ParseTypeName(returnType), name)
+                        .AddModifiers(SyntaxKind.StaticKeyword, SyntaxKind.UnsafeKeyword, SyntaxKind.PublicKeyword)
+                        .AddParameterListParameters(Parameter(Identifier("thisObj")).WithType(ParseTypeName("void*")))
+                        .AddParameterListParameters(args.Select((x, i) =>
+                            Parameter(Identifier("arg" + i)).WithType(ParseTypeName(x))).ToArray())
+                        .AddParameterListParameters(Parameter(Identifier("methodPtr")).WithType(ParseTypeName("void*")))
+                        .WithBody(Block(ExpressionStatement(ThrowExpression(ParseExpression("null"))))));
+                }
+
+                return ParseExpression("LocalInterop." + name);
+            }
+        }
+
+
+        void GenerateInterface(ref NamespaceDeclarationSyntax ns, ref NamespaceDeclarationSyntax implNs,
+            AstInterfaceNode iface)
+        {
+            var guidString = iface.GetAttribute("uuid");
+            var inheritsUnknown = iface.Inherits == null || iface.Inherits == "IUnknown";
+
+            var ifaceDec = InterfaceDeclaration(iface.Name)
+                .WithBaseType(inheritsUnknown ? "Avalonia.MicroCom.IUnknown" : iface.Inherits)
+                .AddModifiers(Token(_visibility), Token(SyntaxKind.UnsafeKeyword), Token(SyntaxKind.PartialKeyword));
+
+            var proxyClassName = "__MicroCom" + iface.Name + "Proxy";
+            var proxy = ClassDeclaration(proxyClassName)
+                .AddModifiers(Token(SyntaxKind.UnsafeKeyword), Token(_visibility), Token(SyntaxKind.PartialKeyword))
+                .WithBaseType(inheritsUnknown ?
+                    "Avalonia.MicroCom.MicroComProxyBase" :
+                    ("__MicroCom" + iface.Inherits + "Proxy"))
+                .AddBaseListTypes(SimpleBaseType(ParseTypeName(iface.Name)));
+
+
+            // Generate vtable
+            var vtbl = ClassDeclaration("__MicroCom" + iface.Name + "VTable")
+                .AddModifiers(Token(SyntaxKind.UnsafeKeyword));
+
+            vtbl = vtbl.WithBaseType(inheritsUnknown ?
+                "Avalonia.MicroCom.MicroComVtblBase" :
+                "__MicroCom" + iface.Inherits + "VTable");
+            
+            var vtblCtor = new List<StatementSyntax>();
+            for (var idx = 0; idx < iface.Count; idx++)
+                GenerateInterfaceMember(iface[idx], ref ifaceDec, ref proxy, ref vtbl, vtblCtor, idx);
+
+            vtbl = vtbl.AddMembers(
+                    ConstructorDeclaration(vtbl.Identifier.Text)
+                        .AddModifiers(Token(SyntaxKind.PublicKeyword))
+                        .WithBody(Block(vtblCtor))
+                )
+                .AddMembers(MethodDeclaration(ParseTypeName("void"), "__MicroComModuleInit")
+                    .AddModifiers(Token(SyntaxKind.StaticKeyword), Token(SyntaxKind.InternalKeyword))
+                    .WithExpressionBody(ArrowExpressionClause(
+                        ParseExpression("Avalonia.MicroCom.MicroComRuntime.RegisterVTable(typeof(" +
+                                        iface.Name + "), new " + vtbl.Identifier.Text + "().CreateVTable())")))
+                    .WithSemicolonToken(Semicolon()));
+                
+            
+            // Finalize proxy code
+            proxy = proxy.AddMembers(
+                    MethodDeclaration(ParseTypeName("void"), "__MicroComModuleInit")
+                        .AddModifiers(Token(SyntaxKind.StaticKeyword), Token(SyntaxKind.InternalKeyword))
+                        .WithBody(Block(
+                            ParseStatement("Avalonia.MicroCom.MicroComRuntime.Register(typeof(" +
+                                           iface.Name + "), new Guid(\"" + guidString + "\"), (p, owns) => new " +
+                                           proxyClassName + "(p, owns));")
+                        )))
+                .AddMembers(ParseMemberDeclaration("public " + proxyClassName +
+                                                   "(IntPtr nativePointer, bool ownsHandle) : base(nativePointer, ownsHandle) {}"))
+                .AddMembers(ParseMemberDeclaration("protected override int VTableSize => base.VTableSize + " +
+                                                   iface.Count + ";"));
+            
+            ns = ns.AddMembers(RewriteMethodsToProperties(ifaceDec));
+            implNs = implNs.AddMembers(RewriteMethodsToProperties(proxy), RewriteMethodsToProperties(vtbl));
+        }
+    }
+}
diff --git a/src/tools/MicroComGenerator/CSharpGen.Utils.cs b/src/tools/MicroComGenerator/CSharpGen.Utils.cs
new file mode 100644
index 0000000000..da845b0ecd
--- /dev/null
+++ b/src/tools/MicroComGenerator/CSharpGen.Utils.cs
@@ -0,0 +1,111 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using MicroComGenerator.Ast;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Formatting;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
+namespace MicroComGenerator
+{
+    public partial class CSharpGen
+    {
+
+        CompilationUnitSyntax Unit()
+            => CompilationUnit().WithUsings(List(new[]
+                {
+                    "System", "System.Text", "System.Collections", "System.Collections.Generic", "Avalonia.MicroCom"
+                }
+                .Concat(_extraUsings).Select(u => UsingDirective(IdentifierName(u)))));
+        
+        string Format(CompilationUnitSyntax unit)
+        {
+            var cw = new AdhocWorkspace();
+            return
+                "#pragma warning disable 108\n" +
+                Microsoft.CodeAnalysis.Formatting.Formatter.Format(unit.NormalizeWhitespace(), cw, cw.Options
+                    .WithChangedOption(CSharpFormattingOptions.NewLineForMembersInObjectInit, true)
+                    .WithChangedOption(CSharpFormattingOptions.NewLinesForBracesInObjectCollectionArrayInitializers,
+                        true)
+                    .WithChangedOption(CSharpFormattingOptions.NewLineForMembersInAnonymousTypes, true)
+                    .WithChangedOption(CSharpFormattingOptions.NewLinesForBracesInMethods, true)
+
+                ).ToFullString();
+        }
+        
+        
+        SyntaxToken Semicolon() => Token(SyntaxKind.SemicolonToken);
+
+        static VariableDeclarationSyntax DeclareVar(string type, string name,
+            ExpressionSyntax? initializer = null)
+            => VariableDeclaration(ParseTypeName(type),
+                SingletonSeparatedList(VariableDeclarator(name)
+                    .WithInitializer(initializer == null ? null : EqualsValueClause(initializer))));
+        
+        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))));
+
+        bool IsPropertyRewriteCandidate(MethodDeclarationSyntax method)
+        {
+
+            return
+                method.ReturnType.ToFullString() != "void"
+                && method.Identifier.Text.StartsWith("Get")
+                && method.ParameterList.Parameters.Count == 0;
+        }
+
+        TypeDeclarationSyntax RewriteMethodsToProperties<T>(T decl) where T : TypeDeclarationSyntax
+        {
+            var replace = new Dictionary<MethodDeclarationSyntax, PropertyDeclarationSyntax>();
+            foreach (var method in decl.Members.OfType<MethodDeclarationSyntax>().ToList())
+            {
+                if (IsPropertyRewriteCandidate(method))
+                {
+                    var getter = AccessorDeclaration(SyntaxKind.GetAccessorDeclaration);
+                    if (method.Body != null)
+                        getter = getter.WithBody(method.Body);
+                    else
+                        getter = getter.WithSemicolonToken(Semicolon());
+
+                    replace[method] = PropertyDeclaration(method.ReturnType,
+                            method.Identifier.Text.Substring(3))
+                        .WithModifiers(method.Modifiers).AddAccessorListAccessors(getter);
+
+                }
+            }
+
+            return decl.ReplaceNodes(replace.Keys, (m, m2) => replace[m]);
+        }
+
+        bool IsInterface(string name)
+        {
+            if (name == "IUnknown")
+                return true;
+            return _idl.Interfaces.Any(i => i.Name == name);
+        }
+
+        private bool IsInterface(AstTypeNode type) => IsInterface(type.Name);
+    
+    }
+}
diff --git a/src/tools/MicroComGenerator/CSharpGen.cs b/src/tools/MicroComGenerator/CSharpGen.cs
new file mode 100644
index 0000000000..ff4c351fd9
--- /dev/null
+++ b/src/tools/MicroComGenerator/CSharpGen.cs
@@ -0,0 +1,155 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using MicroComGenerator.Ast;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
+// ReSharper disable CoVariantArrayConversion
+
+namespace MicroComGenerator
+{
+    public partial class CSharpGen
+    {
+        private readonly AstIdlNode _idl;
+        private List<string> _extraUsings;
+        private string _namespace;
+        private SyntaxKind _visibility;
+        private LocalInteropHelper _localInterop = new LocalInteropHelper();
+
+        public CSharpGen(AstIdlNode idl)
+        {
+            _idl = idl.Clone();
+            new AstRewriter(_idl.Attributes.Where(a => a.Name == "clr-map")
+                .Select(x => x.Value.Trim().Split(' '))
+                .ToDictionary(x => x[0], x => x[1])
+            ).VisitAst(_idl);
+            
+            _extraUsings = _idl.Attributes.Where(u => u.Name == "clr-using").Select(u => u.Value).ToList();
+            _namespace = _idl.GetAttribute("clr-namespace");
+            var visibilityString = _idl.GetAttribute("clr-access");
+
+            if (visibilityString == "internal")
+                _visibility = SyntaxKind.InternalKeyword;
+            else if (visibilityString == "public")
+                _visibility = SyntaxKind.PublicKeyword;
+            else
+                throw new CodeGenException("Invalid clr-access attribute");
+        }
+
+        class AstRewriter : AstVisitor
+        {
+            private readonly Dictionary<string, string> _typeMap = new Dictionary<string, string>();
+
+            public AstRewriter(Dictionary<string, string> typeMap)
+            {
+                _typeMap = typeMap;
+            }
+
+            void ConvertIntPtr(AstTypeNode type)
+            {
+                if (type.Name == "void" && type.PointerLevel > 0)
+                {
+                    type.Name = "IntPtr";
+                    type.PointerLevel--;
+                }
+            }
+            
+            protected override void VisitStructMember(AstStructMemberNode member)
+            {
+                if (member.HasAttribute("intptr"))
+                    ConvertIntPtr(member.Type);
+                base.VisitStructMember(member);
+            }
+
+            protected override void VisitType(AstTypeNode type)
+            {
+                if (type.IsLink)
+                {
+                    type.PointerLevel++;
+                    type.IsLink = false;
+                }
+
+                if (_typeMap.TryGetValue(type.Name, out var mapped))
+                    type.Name = mapped;
+                
+                base.VisitType(type);
+            }
+
+            protected override void VisitArgument(AstInterfaceMemberArgumentNode argument)
+            {
+                if (argument.HasAttribute("intptr"))
+                {
+                    if(argument.Name == "retOut")
+                        Console.WriteLine();
+                    ConvertIntPtr(argument.Type);
+                }
+
+                base.VisitArgument(argument);
+            }
+
+            protected override void VisitInterfaceMember(AstInterfaceMemberNode member)
+            {
+                if (member.HasAttribute("intptr"))
+                    ConvertIntPtr(member.ReturnType);
+                if (member.HasAttribute("propget") && !member.Name.StartsWith("Get"))
+                    member.Name = "Get" + member.Name;
+                if (member.HasAttribute("propput") && !member.Name.StartsWith("Set"))
+                    member.Name = "Set" + member.Name;
+                base.VisitInterfaceMember(member);
+            }
+        }
+        
+
+        public string Generate()
+        {
+            var ns = NamespaceDeclaration(ParseName(_namespace));
+            var implNs = NamespaceDeclaration(ParseName(_namespace + ".Impl"));
+            ns = GenerateEnums(ns);
+            ns = GenerateStructs(ns);
+            foreach (var i in _idl.Interfaces)
+                GenerateInterface(ref ns, ref implNs, i);
+
+            implNs = implNs.AddMembers(_localInterop.Class);
+            var unit = Unit().AddMembers(ns, implNs);
+
+            return Format(unit);
+        }
+
+        NamespaceDeclarationSyntax GenerateEnums(NamespaceDeclarationSyntax ns)
+        {
+            return ns.AddMembers(_idl.Enums.Select(e =>
+            {
+                var dec =  EnumDeclaration(e.Name)
+                    .WithModifiers(TokenList(Token(_visibility)))
+                    .WithMembers(SeparatedList(e.Select(m =>
+                    {
+                        var member = EnumMemberDeclaration(m.Name);
+                        if (m.Value != null)
+                            return member.WithEqualsValue(EqualsValueClause(ParseExpression(m.Value)));
+                        return member;
+                    })));
+                if (e.HasAttribute("flags"))
+                    dec = dec.AddAttribute("System.Flags");
+                return dec;
+            }).ToArray());
+        }
+        
+        NamespaceDeclarationSyntax GenerateStructs(NamespaceDeclarationSyntax ns)
+        {
+            return ns.AddMembers(_idl.Structs.Select(e =>
+                StructDeclaration(e.Name)
+                    .WithModifiers(TokenList(Token(_visibility)))
+                    .AddAttribute("System.Runtime.InteropServices.StructLayout", "System.Runtime.InteropServices.LayoutKind.Sequential")
+                    .AddModifiers(Token(SyntaxKind.UnsafeKeyword))
+                    .WithMembers(new SyntaxList<MemberDeclarationSyntax>(SeparatedList(e.Select(m =>
+                        DeclareField(m.Type.ToString(), m.Name, SyntaxKind.PublicKeyword)))))
+            ).ToArray());
+        }
+
+
+        
+    }
+}
diff --git a/src/tools/MicroComGenerator/CppGen.cs b/src/tools/MicroComGenerator/CppGen.cs
new file mode 100644
index 0000000000..b053088ca9
--- /dev/null
+++ b/src/tools/MicroComGenerator/CppGen.cs
@@ -0,0 +1,119 @@
+using System;
+using System.Linq;
+using System.Text;
+using MicroComGenerator.Ast;
+
+namespace MicroComGenerator
+{
+    public class CppGen
+    {
+        static string ConvertType(AstTypeNode type)
+        {
+            var name = type.Name;
+            if (name == "byte")
+                name = "unsigned char";
+            else if(name == "uint")
+                name = "unsigned int";
+
+            type = type.Clone();
+            type.Name = name;
+            return type.Format();
+        }
+        
+        public static string GenerateCpp(AstIdlNode idl)
+        {
+            var sb = new StringBuilder();
+            var preamble = idl.GetAttributeOrDefault("cpp-preamble");
+            if (preamble != null)
+                sb.AppendLine(preamble);
+
+            foreach (var s in idl.Structs)
+                sb.AppendLine("struct " + s.Name + ";");
+            
+            foreach (var s in idl.Interfaces)
+                sb.AppendLine("struct " + s.Name + ";");
+
+            foreach (var en in idl.Enums)
+            {
+                sb.Append("enum ");
+                if (en.Attributes.Any(a => a.Name == "class-enum"))
+                    sb.Append("class ");
+                sb.AppendLine(en.Name).AppendLine("{");
+
+                foreach (var m in en)
+                {
+                    sb.Append("    ").Append(m.Name);
+                    if (m.Value != null)
+                        sb.Append(" = ").Append(m.Value);
+                    sb.AppendLine(",");
+                }
+
+                sb.AppendLine("};");
+            }
+
+            foreach (var s in idl.Structs)
+            {
+                sb.Append("struct ").AppendLine(s.Name).AppendLine("{");
+                foreach (var m in s) 
+                    sb.Append("    ").Append(ConvertType(m.Type)).Append(" ").Append(m.Name).AppendLine(";");
+
+                sb.AppendLine("};");
+            }
+
+            foreach (var i in idl.Interfaces)
+            {
+                var guidString = i.GetAttribute("uuid");
+                var guid = Guid.Parse(guidString).ToString().Replace("-", "");
+
+
+                sb.Append("COMINTERFACE(").Append(i.Name).Append(", ")
+                    .Append(guid.Substring(0, 8)).Append(", ")
+                    .Append(guid.Substring(8, 4)).Append(", ")
+                    .Append(guid.Substring(12, 4));
+                for (var c = 0; c < 8; c++)
+                {
+                    sb.Append(", ").Append(guid.Substring(16 + c * 2, 2));
+                }
+
+                sb.Append(") : ");
+                if (i.HasAttribute("cpp-virtual-inherits"))
+                    sb.Append("virtual ");
+                sb.AppendLine(i.Inherits ?? "IUnknown")
+                    .AppendLine("{");
+
+                foreach (var m in i)
+                {
+                    sb.Append("    ")
+                        .Append("virtual ")
+                        .Append(ConvertType(m.ReturnType))
+                        .Append(" ").Append(m.Name).Append(" (");
+                    if (m.Count == 0)
+                        sb.AppendLine(") = 0;");
+                    else
+                    {
+                        sb.AppendLine();
+                        for (var c = 0; c < m.Count; c++)
+                        {
+                            var arg = m[c];
+                            sb.Append("        ");
+                            if (arg.Attributes.Any(a => a.Name == "const"))
+                                sb.Append("const ");
+                            sb.Append(ConvertType(arg.Type))
+                                .Append(" ")
+                                .Append(arg.Name);
+                            if (c != m.Count - 1)
+                                sb.Append(", ");
+                            sb.AppendLine();
+                        }
+
+                        sb.AppendLine("    ) = 0;");
+                    }
+                }
+
+                sb.AppendLine("};");
+            }
+            
+            return sb.ToString();
+        }
+    }
+}
diff --git a/src/tools/MicroComGenerator/Extensions.cs b/src/tools/MicroComGenerator/Extensions.cs
new file mode 100644
index 0000000000..c8a4c8f45c
--- /dev/null
+++ b/src/tools/MicroComGenerator/Extensions.cs
@@ -0,0 +1,97 @@
+
+using System;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
+namespace MicroComGenerator
+{
+    public static class Extensions
+    {
+        public static ClassDeclarationSyntax AddModifiers(this ClassDeclarationSyntax cl, params SyntaxKind[] modifiers)
+        {
+            if (modifiers == 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 == 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 == 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 == 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 == 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 ClassDeclarationSyntax WithBaseType(this ClassDeclarationSyntax cl, string bt)
+        {
+            return cl.AddBaseListTypes(SimpleBaseType(SyntaxFactory.ParseTypeName(bt)));
+        }
+        
+        public static InterfaceDeclarationSyntax WithBaseType(this InterfaceDeclarationSyntax cl, string bt)
+        {
+            return cl.AddBaseListTypes(SimpleBaseType(SyntaxFactory.ParseTypeName(bt)));
+        }
+
+        public static T AddAttribute<T>(this T member, string attribute, params string[] args) where T : MemberDeclarationSyntax
+        {
+            return (T)member.AddAttributeLists(AttributeList(SingletonSeparatedList(
+                Attribute(ParseName(attribute), AttributeArgumentList(
+                    SeparatedList(args.Select(a => AttributeArgument(ParseExpression(a)))))))));
+        }
+
+        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/MicroComGenerator/MicroComGenerator.csproj b/src/tools/MicroComGenerator/MicroComGenerator.csproj
new file mode 100644
index 0000000000..5ae431b4b9
--- /dev/null
+++ b/src/tools/MicroComGenerator/MicroComGenerator.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+    </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="CommandLineParser" Version="2.8.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.7.0" />
+  </ItemGroup>
+</Project>
diff --git a/src/tools/MicroComGenerator/ParseException.cs b/src/tools/MicroComGenerator/ParseException.cs
new file mode 100644
index 0000000000..dfa8dcfe54
--- /dev/null
+++ b/src/tools/MicroComGenerator/ParseException.cs
@@ -0,0 +1,27 @@
+using System;
+
+namespace MicroComGenerator
+{
+    class ParseException : Exception
+    {
+        public int Line { get; }
+        public int Position { get; }
+
+        public ParseException(string message, int line, int position) : base(message)
+        {
+            Line = line;
+            Position = position;
+        }
+
+        public ParseException(string message, ref TokenParser parser) : this(message, parser.Line, parser.Position)
+        {
+        }
+    }
+
+    class CodeGenException : Exception
+    {
+        public CodeGenException(string message) : base(message)
+        {
+        }
+    }
+}
diff --git a/src/tools/MicroComGenerator/Program.cs b/src/tools/MicroComGenerator/Program.cs
new file mode 100644
index 0000000000..578ba1465d
--- /dev/null
+++ b/src/tools/MicroComGenerator/Program.cs
@@ -0,0 +1,44 @@
+using System;
+using System.IO;
+using System.Linq;
+using CommandLine;
+
+namespace MicroComGenerator
+{
+    class Program
+    {
+        public class Options
+        {
+            [Option('i', "input", Required = true, HelpText = "Input IDL file")]
+            public string Input { get; set; }
+            
+            [Option("cpp", Required = false, HelpText = "C++ output file")]
+            public string CppOutput { get; set; }
+            
+            [Option("cs", Required = false, HelpText = "C# output file")]
+            public string CSharpOutput { get; set; }
+
+        }
+        
+        static int Main(string[] args)
+        {
+            var p = Parser.Default.ParseArguments<Options>(args);
+            if (p is NotParsed<Options>)
+            {
+                return 1;
+            }
+
+            var opts = ((Parsed<Options>)p).Value;
+            
+            var text = File.ReadAllText(opts.Input);
+            var ast = AstParser.Parse(text);
+
+            if (opts.CppOutput != null)
+                File.WriteAllText(opts.CppOutput, CppGen.GenerateCpp(ast));
+            if (opts.CSharpOutput != null)
+                File.WriteAllText(opts.CSharpOutput, new CSharpGen(ast).Generate());
+            
+            return 0;
+        }
+    }
+}
diff --git a/src/tools/MicroComGenerator/TokenParser.cs b/src/tools/MicroComGenerator/TokenParser.cs
new file mode 100644
index 0000000000..ea8850b8e4
--- /dev/null
+++ b/src/tools/MicroComGenerator/TokenParser.cs
@@ -0,0 +1,417 @@
+using System;
+using System.Globalization;
+using System.IO;
+
+namespace MicroComGenerator
+{
+    internal ref struct TokenParser
+    {
+        private ReadOnlySpan<char> _s;
+        public int Position { get; private set; }
+        public int Line { get; private set; }
+        public TokenParser(ReadOnlySpan<char> s)
+        {
+            _s = s;
+            Position = 0;
+            Line = 0;
+        }
+
+        public void SkipWhitespace()
+        {
+            while (true)
+            {
+                if(_s.Length == 0)
+                    return;
+                if (char.IsWhiteSpace(_s[0]))
+                    Advance(1);
+                else if (_s[0] == '/' && _s.Length>1)
+                {
+                    if (_s[1] == '/')
+                        SkipOneLineComment();
+                    else if (_s[1] == '*')
+                        SkipMultiLineComment();
+                    else
+                        return;
+                }
+                else
+                    return;
+            }
+        }
+
+        void SkipOneLineComment()
+        {
+            while (true)
+            {
+                if (_s.Length > 0 && _s[0] != '\n' && _s[0] != '\r')
+                    Advance(1);
+                else
+                    return;
+            }
+        }
+        
+        void SkipMultiLineComment()
+        {
+            var l = Line;
+            var p = Position;
+            while (true)
+            {
+                if (_s.Length == 0)
+                    throw new ParseException("No matched */ found for /*", l, p);
+
+                if (_s[0] == '*' && _s.Length > 1 && _s[1] == '/')
+                {
+                    Advance(2);
+                    return;
+                }
+
+                Advance(1);
+            }
+        }
+
+        static bool IsAlphaNumeric(char ch) => (ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'z') ||
+                                               (ch >= 'A' && ch <= 'Z');
+
+        public void Consume(char c)
+        {
+            if (!TryConsume(c))
+                throw new ParseException("Expected " + c, Line, Position);
+        }
+        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)
+        {
+            while (c > 0)
+            {
+                if (_s[0] == '\n')
+                {
+                    Line++;
+                    Position = 0;
+                }
+                else
+                    Position++;
+
+                _s = _s.Slice(1);
+                c--;
+            }
+        }
+
+        public int Length => _s.Length;
+        public bool Eof
+        {
+            get
+            {
+                SkipWhitespace();
+                return Length == 0;
+            }
+        }
+
+        public char Peek
+        {
+            get
+            {
+                if (_s.Length == 0)
+                    throw new ParseException("Unexpected EOF", Line, Position);
+                return _s[0];
+            }
+        }
+
+        public string ParseIdentifier(ReadOnlySpan<char> extraValidChars)
+        {
+            if (!TryParseIdentifier(extraValidChars, out var ident))
+                throw new ParseException("Identifier expected", Line, Position);
+            return ident.ToString();
+        }
+        
+        public string ParseIdentifier()
+        {
+            if (!TryParseIdentifier(out var ident))
+                throw new ParseException("Identifier expected", Line, Position);
+            return ident.ToString();
+        }
+        
+        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') || first == '_'))
+                return false;
+            int len = 1;
+            for (var c = 1; c < _s.Length; c++)
+            {
+                var ch = _s[c];
+                if (IsAlphaNumeric(ch) || 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') || first == '_'))
+                return false;
+            int len = 1;
+            for (var c = 1; c < _s.Length; c++)
+            {
+                var ch = _s[c];
+                if (IsAlphaNumeric(ch) || ch == '_')
+                    len++;
+                else
+                    break;
+            }
+
+            res = _s.Slice(0, len);
+            Advance(len);
+            return true;
+        }
+
+        public string ReadToEol()
+        {
+            var initial = _s;
+            var len = 0;
+            while (true)
+            {
+                if (_s.Length > 0 && _s[0] != '\n' && _s[0] != '\r')
+                {
+                    len++;
+                    Advance(1);
+                }
+                else
+                    return initial.Slice(0, len).ToString();
+            }
+        }
+        
+        public string ReadTo(char c)
+        {
+            var initial = _s;
+            var len = 0;
+            var l = Line;
+            var p = Position;
+            while (true)
+            {
+                if (_s.Length == 0)
+                    throw new ParseException("Expected " + c + " before EOF", l, p);
+                
+                if (_s[0] != c)
+                {
+                    len++;
+                    Advance(1);
+                }
+                else
+                    return initial.Slice(0, len).ToString();
+            }
+        }
+        
+        public string ReadToAny(ReadOnlySpan<char> chars)
+        {
+            var initial = _s;
+            var len = 0;
+            var l = Line;
+            var p = Position;
+            while (true)
+            {
+                if (_s.Length == 0)
+                    throw new ParseException("Expected any of '" + chars.ToString() + "' before EOF", l, p);
+
+                var foundTerminator = false;
+                foreach (var term in chars)
+                {
+                    if (_s[0] == term)
+                    {
+                        foundTerminator = true;
+                        break;
+                    }
+                }
+                
+                if (!foundTerminator)
+                {
+                    len++;
+                    Advance(1);
+                }
+                else
+                    return initial.Slice(0, len).ToString();
+            }
+        }
+        
+        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/tests/Avalonia.Animation.UnitTests/AnimatableTests.cs b/tests/Avalonia.Animation.UnitTests/AnimatableTests.cs
new file mode 100644
index 0000000000..7633a761a3
--- /dev/null
+++ b/tests/Avalonia.Animation.UnitTests/AnimatableTests.cs
@@ -0,0 +1,404 @@
+using System;
+using Avalonia.Controls;
+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 (UnitTestApplication.Start(TestServices.RealStyler))
+            {
+                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()
+        {
+            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);
+        }
+
+        [Fact]
+        public void Transition_Is_Not_Applied_When_StyleTrigger_Changes_With_LocalValue_Present()
+        {
+            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()
+        {
+            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()
+        {
+            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()
+        {
+            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()
+        {
+            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 (UnitTestApplication.Start(TestServices.RealStyler))
+            {
+                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<Clock>(),
+                    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 (UnitTestApplication.Start(TestServices.RealStyler))
+            {
+                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<Clock>(),
+                    double.NaN,
+                    100.0),
+                    Times.Once);
+            }
+        }
+
+        [Fact]
+        public void Replacing_Transitions_During_Animation_Does_Not_Throw_KeyNotFound()
+        {
+            // Issue #4059
+            using (UnitTestApplication.Start(TestServices.RealStyler))
+            {
+                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");
+            }
+        }
+
+        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
index f7a8774689..fe718ec32b 100644
--- a/tests/Avalonia.Animation.UnitTests/AnimationIterationTests.cs
+++ b/tests/Avalonia.Animation.UnitTests/AnimationIterationTests.cs
@@ -14,6 +14,55 @@ 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()
         {
diff --git a/tests/Avalonia.Animation.UnitTests/Avalonia.Animation.UnitTests.csproj b/tests/Avalonia.Animation.UnitTests/Avalonia.Animation.UnitTests.csproj
index ef515ce155..5b686dea4c 100644
--- a/tests/Avalonia.Animation.UnitTests/Avalonia.Animation.UnitTests.csproj
+++ b/tests/Avalonia.Animation.UnitTests/Avalonia.Animation.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net47</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net47</TargetFrameworks>
     <OutputType>Library</OutputType>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
@@ -10,6 +10,7 @@
   <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" />
diff --git a/tests/Avalonia.Animation.UnitTests/KeySplineTests.cs b/tests/Avalonia.Animation.UnitTests/KeySplineTests.cs
new file mode 100644
index 0000000000..fa2ed61e65
--- /dev/null
+++ b/tests/Avalonia.Animation.UnitTests/KeySplineTests.cs
@@ -0,0 +1,240 @@
+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
index b00c205f10..b57cd55868 100644
--- a/tests/Avalonia.Animation.UnitTests/Properties/AssemblyInfo.cs
+++ b/tests/Avalonia.Animation.UnitTests/Properties/AssemblyInfo.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reflection;
 using Xunit;
 
diff --git a/tests/Avalonia.Animation.UnitTests/TestClock.cs b/tests/Avalonia.Animation.UnitTests/TestClock.cs
index a1c4ff9277..4812880c03 100644
--- a/tests/Avalonia.Animation.UnitTests/TestClock.cs
+++ b/tests/Avalonia.Animation.UnitTests/TestClock.cs
@@ -5,10 +5,12 @@ 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();
@@ -19,6 +21,12 @@ namespace Avalonia.Animation.UnitTests
             _observer?.OnNext(time);
         }
 
+        public void Pulse(TimeSpan time)
+        {
+            _curTime += time;
+            _observer?.OnNext(_curTime);
+        }
+
         public IDisposable Subscribe(IObserver<TimeSpan> observer)
         {
             _observer = observer;
diff --git a/tests/Avalonia.Animation.UnitTests/TransitionsTests.cs b/tests/Avalonia.Animation.UnitTests/TransitionsTests.cs
index 22f3b4f501..640013dedd 100644
--- a/tests/Avalonia.Animation.UnitTests/TransitionsTests.cs
+++ b/tests/Avalonia.Animation.UnitTests/TransitionsTests.cs
@@ -10,13 +10,11 @@ namespace Avalonia.Animation.UnitTests
         [Fact]
         public void Check_Transitions_Interpolation_Negative_Bounds_Clamp()
         {
-            var clock = new MockGlobalClock();
+            var clock = new TestClock();
 
-            using (UnitTestApplication.Start(new TestServices(globalClock: clock)))
+            var border = new Border
             {
-                var border = new Border
-                {
-                    Transitions =
+                Transitions = new Transitions
                     {
                         new DoubleTransition
                         {
@@ -24,27 +22,25 @@ namespace Avalonia.Animation.UnitTests
                             Property = Border.OpacityProperty,
                         }
                     }
-                };
+            };
 
-                border.Opacity = 0;
+            border.Opacity = 0;
 
-                clock.Pulse(TimeSpan.FromSeconds(0));
-                clock.Pulse(TimeSpan.FromSeconds(-0.5));
+            clock.Pulse(TimeSpan.FromSeconds(0));
+            clock.Pulse(TimeSpan.FromSeconds(-0.5));
+
+            Assert.Equal(0, border.Opacity);
 
-                Assert.Equal(0, border.Opacity);
-            }
         }
 
         [Fact]
         public void Check_Transitions_Interpolation_Positive_Bounds_Clamp()
         {
-            var clock = new MockGlobalClock();
+            var clock = new TestClock();
 
-            using (UnitTestApplication.Start(new TestServices(globalClock: clock)))
+            var border = new Border
             {
-                var border = new Border
-                {
-                    Transitions =
+                Transitions = new Transitions
                     {
                         new DoubleTransition
                         {
@@ -52,34 +48,62 @@ namespace Avalonia.Animation.UnitTests
                             Property = Border.OpacityProperty,
                         }
                     }
-                };
+            };
 
-                border.Opacity = 0;
+            border.Opacity = 0;
 
-                clock.Pulse(TimeSpan.FromSeconds(0));
-                clock.Pulse(TimeSpan.FromMilliseconds(1001));
+            clock.Pulse(TimeSpan.FromSeconds(0));
+            clock.Pulse(TimeSpan.FromMilliseconds(1001));
+
+            Assert.Equal(0, border.Opacity);
 
-                Assert.Equal(0, border.Opacity);
-            }
         }
 
         [Fact]
         public void TransitionInstance_With_Zero_Duration_Is_Completed_On_First_Tick()
         {
-            var clock = new MockGlobalClock();
+            var clock = new TestClock();
 
-            using (UnitTestApplication.Start(new TestServices(globalClock: clock)))
+            int i = 0;
+            var inst = new TransitionInstance(clock, TimeSpan.Zero, TimeSpan.Zero).Subscribe(nextValue =>
             {
-                int i = 0;
-                var inst = new TransitionInstance(clock, TimeSpan.Zero).Subscribe(nextValue =>
+                switch (i++)
                 {
-                    switch (i++)
-                    {
-                        case 0: Assert.Equal(0, nextValue); break;
-                        case 1: Assert.Equal(1d, nextValue); break;
-                    }
-                });
+                    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/AttachedPropertyTests.cs b/tests/Avalonia.Base.UnitTests/AttachedPropertyTests.cs
index 97f2e4e1dc..f461240d68 100644
--- a/tests/Avalonia.Base.UnitTests/AttachedPropertyTests.cs
+++ b/tests/Avalonia.Base.UnitTests/AttachedPropertyTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Xunit;
 
 namespace Avalonia.Base.UnitTests
diff --git a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
index 6e885f33be..badfd09430 100644
--- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
+++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net47</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net47</TargetFrameworks>
     <OutputType>Library</OutputType>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
@@ -10,6 +10,7 @@
   <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.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
@@ -17,4 +18,4 @@
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_AddOwner.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_AddOwner.cs
index 4e033be3fb..e8bb7002e4 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_AddOwner.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_AddOwner.cs
@@ -1,7 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
 using Xunit;
 
 namespace Avalonia.Base.UnitTests
@@ -16,31 +12,12 @@ namespace Avalonia.Base.UnitTests
             Assert.Equal("foodefault", target.GetValue(Class2.FooProperty));
         }
 
-        [Fact]
-        public void AddOwnered_Property_Does_Not_Retain_Validation()
-        {
-            var target = new Class2();
-
-            target.SetValue(Class2.FooProperty, "throw");
-        }
-
         private class Class1 : AvaloniaObject
         {
             public static readonly StyledProperty<string> FooProperty =
                 AvaloniaProperty.Register<Class1, string>(
                     "Foo",
-                    "foodefault",
-                    validate: ValidateFoo);
-
-            private static string ValidateFoo(AvaloniaObject arg1, string arg2)
-            {
-                if (arg2 == "throw")
-                {
-                    throw new IndexOutOfRangeException();
-                }
-
-                return arg2;
-            }
+                    "foodefault");
         }
 
         private class Class2 : AvaloniaObject
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Attached.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Attached.cs
index 02600f5e00..3c22457b72 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Attached.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Attached.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Xunit;
 
@@ -16,27 +13,6 @@ namespace Avalonia.Base.UnitTests
             Assert.Equal("foodefault", target.GetValue(Class2.FooProperty));
         }
 
-        [Fact]
-        public void AddOwnered_Property_Retains_Validation()
-        {
-            var target = new Class2();
-
-            Assert.Throws<IndexOutOfRangeException>(() => target.SetValue(Class2.FooProperty, "throw"));
-        }
-
-        [Fact]
-        public void AvaloniaProperty_Initialized_Is_Called_For_Attached_Property()
-        {
-            bool raised = false;
-
-            using (Class1.FooProperty.Initialized.Subscribe(x => raised = true))
-            {
-                new Class3();
-            }
-
-            Assert.True(raised);
-        }
-
         private class Base : AvaloniaObject
         {
         }
@@ -46,18 +22,7 @@ namespace Avalonia.Base.UnitTests
             public static readonly AttachedProperty<string> FooProperty =
                 AvaloniaProperty.RegisterAttached<Class1, Base, string>(
                     "Foo",
-                    "foodefault",
-                    validate: ValidateFoo);
-
-            private static string ValidateFoo(AvaloniaObject arg1, string arg2)
-            {
-                if (arg2 == "throw")
-                {
-                    throw new IndexOutOfRangeException();
-                }
-
-                return arg2;
-            }
+                    "foodefault");
         }
 
         private class Class2 : Base
@@ -65,9 +30,5 @@ namespace Avalonia.Base.UnitTests
             public static readonly AttachedProperty<string> FooProperty =
                 Class1.FooProperty.AddOwner<Class2>();
         }
-
-        private class Class3 : Base
-        {
-        }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
index 23984a7c8d..7fc0d52be6 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
@@ -1,20 +1,14 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.ComponentModel;
-using System.Reactive.Concurrency;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Data;
 using Avalonia.Logging;
-using Avalonia.Markup.Data;
 using Avalonia.Platform;
 using Avalonia.Threading;
 using Avalonia.UnitTests;
-using Avalonia.Diagnostics;
 using Microsoft.Reactive.Testing;
 using Moq;
 using Xunit;
@@ -26,13 +20,294 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void Bind_Sets_Current_Value()
         {
-            Class1 target = new Class1();
-            Class1 source = new Class1();
+            var target = new Class1();
+            var source = new Class1();
+            var property = Class1.FooProperty;
 
-            source.SetValue(Class1.FooProperty, "initial");
-            target.Bind(Class1.FooProperty, source.GetObservable(Class1.FooProperty));
+            source.SetValue(property, "initial");
+            target.Bind(property, source.GetObservable(property));
 
-            Assert.Equal("initial", target.GetValue(Class1.FooProperty));
+            Assert.Equal("initial", target.GetValue(property));
+        }
+
+        [Fact]
+        public void Bind_Raises_PropertyChanged()
+        {
+            var target = new Class1();
+            var source = new Subject<BindingValue<string>>();
+            bool raised = false;
+
+            target.PropertyChanged += (s, e) =>
+                raised = e.Property == Class1.FooProperty &&
+                         (string)e.OldValue == "foodefault" &&
+                         (string)e.NewValue == "newvalue" &&
+                         e.Priority == BindingPriority.LocalValue;
+
+            target.Bind(Class1.FooProperty, source);
+            source.OnNext("newvalue");
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void PropertyChanged_Not_Raised_When_Value_Unchanged()
+        {
+            var target = new Class1();
+            var source = new Subject<BindingValue<string>>();
+            var raised = 0;
+
+            target.PropertyChanged += (s, e) => ++raised;
+            target.Bind(Class1.FooProperty, source);
+            source.OnNext("newvalue");
+            source.OnNext("newvalue");
+
+            Assert.Equal(1, raised);
+        }
+
+        [Fact]
+        public void Setting_LocalValue_Overrides_Binding_Until_Binding_Produces_Next_Value()
+        {
+            var target = new Class1();
+            var source = new Subject<string>();
+            var property = Class1.FooProperty;
+
+            target.Bind(property, source);
+            source.OnNext("foo");
+            Assert.Equal("foo", target.GetValue(property));
+
+            target.SetValue(property, "bar");
+            Assert.Equal("bar", target.GetValue(property));
+
+            source.OnNext("baz"); 
+            Assert.Equal("baz", target.GetValue(property));
+        }
+
+        [Fact]
+        public void Completing_LocalValue_Binding_Reverts_To_Default_Value_Even_When_Local_Value_Set_Earlier()
+        {
+            var target = new Class1();
+            var source = new Subject<string>();
+            var property = Class1.FooProperty;
+
+            target.Bind(property, source);
+            source.OnNext("foo");
+            target.SetValue(property, "bar");
+            source.OnNext("baz");
+            source.OnCompleted();
+
+            Assert.Equal("foodefault", target.GetValue(property));
+        }
+
+        [Fact]
+        public void Completing_LocalValue_Binding_Should_Not_Revert_To_Set_LocalValue()
+        {
+            var target = new Class1();
+            var source = new BehaviorSubject<string>("bar");
+
+            target.SetValue(Class1.FooProperty, "foo");
+            var sub = target.Bind(Class1.FooProperty, source);
+
+            Assert.Equal("bar", target.GetValue(Class1.FooProperty));
+
+            sub.Dispose();
+
+            Assert.Equal("foodefault", target.GetValue(Class1.FooProperty));
+        }
+
+        [Fact]
+        public void Completing_Animation_Binding_Reverts_To_Set_LocalValue()
+        {
+            var target = new Class1();
+            var source = new Subject<string>();
+            var property = Class1.FooProperty;
+
+            target.SetValue(property, "foo");
+            target.Bind(property, source, BindingPriority.Animation);
+            source.OnNext("bar");
+            source.OnCompleted();
+
+            Assert.Equal("foo", target.GetValue(property));
+        }
+
+        [Fact]
+        public void Completing_LocalValue_Binding_Raises_PropertyChanged()
+        {
+            var target = new Class1();
+            var source = new BehaviorSubject<BindingValue<string>>("foo");
+            var property = Class1.FooProperty;
+            var raised = 0;
+
+            target.Bind(property, source);
+            Assert.Equal("foo", target.GetValue(property));
+
+            target.PropertyChanged += (s, e) =>
+            {
+                Assert.Equal(BindingPriority.Unset, e.Priority);
+                Assert.Equal(property, e.Property);
+                Assert.Equal("foo", e.OldValue as string);
+                Assert.Equal("foodefault", e.NewValue as string);
+                ++raised;
+            };
+
+            source.OnCompleted();
+
+            Assert.Equal("foodefault", target.GetValue(property));
+            Assert.Equal(1, raised);
+        }
+
+        [Fact]
+        public void Completing_Style_Binding_Raises_PropertyChanged()
+        {
+            var target = new Class1();
+            var source = new BehaviorSubject<BindingValue<string>>("foo");
+            var property = Class1.FooProperty;
+            var raised = 0;
+
+            target.Bind(property, source, BindingPriority.Style);
+            Assert.Equal("foo", target.GetValue(property));
+
+            target.PropertyChanged += (s, e) =>
+            {
+                Assert.Equal(BindingPriority.Unset, e.Priority);
+                Assert.Equal(property, e.Property);
+                Assert.Equal("foo", e.OldValue as string);
+                Assert.Equal("foodefault", e.NewValue as string);
+                ++raised;
+            };
+
+            source.OnCompleted();
+
+            Assert.Equal("foodefault", target.GetValue(property));
+            Assert.Equal(1, raised);
+        }
+
+        [Fact]
+        public void Completing_LocalValue_Binding_With_Style_Binding_Raises_PropertyChanged()
+        {
+            var target = new Class1();
+            var source = new BehaviorSubject<BindingValue<string>>("foo");
+            var property = Class1.FooProperty;
+            var raised = 0;
+
+            target.Bind(property, new BehaviorSubject<string>("bar"), BindingPriority.Style);
+            target.Bind(property, source);
+            Assert.Equal("foo", target.GetValue(property));
+
+            target.PropertyChanged += (s, e) =>
+            {
+                Assert.Equal(BindingPriority.Style, e.Priority);
+                Assert.Equal(property, e.Property);
+                Assert.Equal("foo", e.OldValue as string);
+                Assert.Equal("bar", e.NewValue as string);
+                ++raised;
+            };
+
+            source.OnCompleted();
+
+            Assert.Equal("bar", target.GetValue(property));
+            Assert.Equal(1, raised);
+        }
+
+        [Fact]
+        public void Disposing_LocalValue_Binding_Raises_PropertyChanged()
+        {
+            var target = new Class1();
+            var source = new BehaviorSubject<BindingValue<string>>("foo");
+            var property = Class1.FooProperty;
+            var raised = 0;
+
+            var sub = target.Bind(property, source);
+            Assert.Equal("foo", target.GetValue(property));
+
+            target.PropertyChanged += (s, e) =>
+            {
+                Assert.Equal(BindingPriority.Unset, e.Priority);
+                Assert.Equal(property, e.Property);
+                Assert.Equal("foo", e.OldValue as string);
+                Assert.Equal("foodefault", e.NewValue as string);
+                ++raised;
+            };
+
+            sub.Dispose();
+
+            Assert.Equal("foodefault", target.GetValue(property));
+            Assert.Equal(1, raised);
+        }
+
+        [Fact]
+        public void Setting_Style_Value_Overrides_Binding_Permanently()
+        {
+            var target = new Class1();
+            var source = new Subject<string>();
+
+            target.Bind(Class1.FooProperty, source, BindingPriority.Style);
+            source.OnNext("foo");
+            Assert.Equal("foo", target.GetValue(Class1.FooProperty));
+
+            target.SetValue(Class1.FooProperty, "bar", BindingPriority.Style);
+            Assert.Equal("bar", target.GetValue(Class1.FooProperty));
+
+            source.OnNext("baz");
+            Assert.Equal("bar", target.GetValue(Class1.FooProperty));
+        }
+
+        [Fact]
+        public void Second_LocalValue_Binding_Overrides_First()
+        {
+            var property = Class1.FooProperty;
+            var target = new Class1();
+            var source1 = new Subject<string>();
+            var source2 = new Subject<string>();
+
+            target.Bind(property, source1, BindingPriority.LocalValue);
+            target.Bind(property, source2, BindingPriority.LocalValue);
+
+            source1.OnNext("foo");
+            Assert.Equal("foo", target.GetValue(property));
+
+            source2.OnNext("bar");
+            Assert.Equal("bar", target.GetValue(property));
+
+            source1.OnNext("baz");
+            Assert.Equal("bar", target.GetValue(property));
+        }
+
+        [Fact]
+        public void Completing_Second_LocalValue_Binding_Reverts_To_First()
+        {
+            var property = Class1.FooProperty;
+            var target = new Class1();
+            var source1 = new Subject<string>();
+            var source2 = new Subject<string>();
+
+            target.Bind(property, source1, BindingPriority.LocalValue);
+            target.Bind(property, source2, BindingPriority.LocalValue);
+
+            source1.OnNext("foo");
+            source2.OnNext("bar");
+            source1.OnNext("baz");
+            source2.OnCompleted();
+
+            Assert.Equal("baz", target.GetValue(property));
+        }
+
+        [Fact]
+        public void Completing_StyleTrigger_Binding_Reverts_To_StyleBinding()
+        {
+            var property = Class1.FooProperty;
+            var target = new Class1();
+            var source1 = new Subject<string>();
+            var source2 = new Subject<string>();
+
+            target.Bind(property, source1, BindingPriority.Style);
+            target.Bind(property, source2, BindingPriority.StyleTrigger);
+
+            source1.OnNext("foo");
+            source2.OnNext("bar");
+            source2.OnCompleted();
+            source1.OnNext("baz");
+
+            Assert.Equal("baz", target.GetValue(property));
         }
 
         [Fact]
@@ -126,7 +401,7 @@ namespace Avalonia.Base.UnitTests
         public void Observable_Is_Unsubscribed_When_Subscription_Disposed()
         {
             var scheduler = new TestScheduler();
-            var source = scheduler.CreateColdObservable<object>();
+            var source = scheduler.CreateColdObservable<string>();
             var target = new Class1();
 
             var subscription = target.Bind(Class1.FooProperty, source);
@@ -191,13 +466,13 @@ namespace Avalonia.Base.UnitTests
 
             obj2.SetValue(Class1.FooProperty, "second", BindingPriority.Style);
 
-            Assert.Equal("second", obj1.GetValue(Class1.FooProperty));
+            Assert.Equal("first", obj1.GetValue(Class1.FooProperty));
             Assert.Equal("second", obj2.GetValue(Class1.FooProperty));
 
             obj1.SetValue(Class1.FooProperty, "third", BindingPriority.Style);
 
             Assert.Equal("third", obj1.GetValue(Class1.FooProperty));
-            Assert.Equal("third", obj2.GetValue(Class1.FooProperty));
+            Assert.Equal("second", obj2.GetValue(Class1.FooProperty));
         }
 
         [Fact]
@@ -302,41 +577,62 @@ namespace Avalonia.Base.UnitTests
         }
 
         [Fact]
-        public void BindingError_Does_Not_Cause_Target_Update()
+        public void Binding_Error_Reverts_To_Default_Value()
         {
             var target = new Class1();
-            var source = new Subject<object>();
+            var source = new Subject<BindingValue<string>>();
 
-            target.Bind(Class1.QuxProperty, source);
-            source.OnNext(6.7);
-            source.OnNext(new BindingNotification(
-                new InvalidOperationException("Foo"),
-                BindingErrorType.Error));
+            target.Bind(Class1.FooProperty, source);
+            source.OnNext("initial");
+            source.OnNext(BindingValue<string>.BindingError(new InvalidOperationException("Foo")));
 
-            Assert.Equal(5.6, target.GetValue(Class1.QuxProperty));
+            Assert.Equal("foodefault", target.GetValue(Class1.FooProperty));
         }
 
         [Fact]
-        public void BindingNotification_With_FallbackValue_Causes_Target_Update()
+        public void Binding_Error_With_FallbackValue_Causes_Target_Update()
         {
             var target = new Class1();
-            var source = new Subject<object>();
+            var source = new Subject<BindingValue<string>>();
 
-            target.Bind(Class1.QuxProperty, source);
-            source.OnNext(6.7);
-            source.OnNext(new BindingNotification(
-                new InvalidOperationException("Foo"),
-                BindingErrorType.Error,
-                8.9));
+            target.Bind(Class1.FooProperty, source);
+            source.OnNext("initial");
+            source.OnNext(BindingValue<string>.BindingError(new InvalidOperationException("Foo"), "bar"));
+
+            Assert.Equal("bar", target.GetValue(Class1.FooProperty));
+        }
+
+        [Fact]
+        public void DataValidationError_Does_Not_Cause_Target_Update()
+        {
+            var target = new Class1();
+            var source = new Subject<BindingValue<string>>();
+
+            target.Bind(Class1.FooProperty, source);
+            source.OnNext("initial");
+            source.OnNext(BindingValue<string>.DataValidationError(new InvalidOperationException("Foo")));
+
+            Assert.Equal("initial", target.GetValue(Class1.FooProperty));
+        }
 
-            Assert.Equal(8.9, target.GetValue(Class1.QuxProperty));
+        [Fact]
+        public void DataValidationError_With_FallbackValue_Causes_Target_Update()
+        {
+            var target = new Class1();
+            var source = new Subject<BindingValue<string>>();
+
+            target.Bind(Class1.FooProperty, source);
+            source.OnNext("initial");
+            source.OnNext(BindingValue<string>.DataValidationError(new InvalidOperationException("Foo"), "bar"));
+
+            Assert.Equal("bar", target.GetValue(Class1.FooProperty));
         }
 
         [Fact]
         public void Bind_Logs_Binding_Error()
         {
             var target = new Class1();
-            var source = new Subject<object>();
+            var source = new Subject<BindingValue<double>>();
             var called = false;
             var expectedMessageTemplate = "Error in binding to {Target}.{Property}: {Message}";
 
@@ -354,9 +650,7 @@ namespace Avalonia.Base.UnitTests
             {
                 target.Bind(Class1.QuxProperty, source);
                 source.OnNext(6.7);
-                source.OnNext(new BindingNotification(
-                    new InvalidOperationException("Foo"),
-                    BindingErrorType.Error));
+                source.OnNext(BindingValue<double>.BindingError(new InvalidOperationException("Foo")));
 
                 Assert.Equal(5.6, target.GetValue(Class1.QuxProperty));
                 Assert.True(called);
@@ -367,7 +661,7 @@ namespace Avalonia.Base.UnitTests
         public async Task Bind_With_Scheduler_Executes_On_Scheduler()
         {
             var target = new Class1();
-            var source = new Subject<object>();
+            var source = new Subject<double>();
             var currentThreadId = Thread.CurrentThread.ManagedThreadId;
 
             var threadingInterfaceMock = new Mock<IPlatformThreadingInterface>();
@@ -426,13 +720,13 @@ namespace Avalonia.Base.UnitTests
         }
 
         [Fact]
-        public void IsAnimating_On_Property_With_Animation_Value_Returns_False()
+        public void IsAnimating_On_Property_With_Animation_Value_Returns_True()
         {
             var target = new Class1();
 
             target.SetValue(Class1.FooProperty, "foo", BindingPriority.Animation);
 
-            Assert.False(target.IsAnimating(Class1.FooProperty));
+            Assert.True(target.IsAnimating(Class1.FooProperty));
         }
 
         [Fact]
@@ -457,6 +751,30 @@ namespace Avalonia.Base.UnitTests
             Assert.True(target.IsAnimating(Class1.FooProperty));
         }
 
+        [Fact]
+        public void IsAnimating_On_Property_With_Local_Value_And_Animation_Binding_Returns_True()
+        {
+            var target = new Class1();
+            var source = new BehaviorSubject<string>("foo");
+
+            target.SetValue(Class1.FooProperty, "bar");
+            target.Bind(Class1.FooProperty, source, BindingPriority.Animation);
+
+            Assert.True(target.IsAnimating(Class1.FooProperty));
+        }
+
+        [Fact]
+        public void IsAnimating_Returns_True_When_Animated_Value_Is_Same_As_Local_Value()
+        {
+            var target = new Class1();
+            var source = new BehaviorSubject<string>("foo");
+
+            target.SetValue(Class1.FooProperty, "foo");
+            target.Bind(Class1.FooProperty, source, BindingPriority.Animation);
+
+            Assert.True(target.IsAnimating(Class1.FooProperty));
+        }
+
         [Fact]
         public void TwoWay_Binding_Should_Not_Call_Setter_On_Creation()
         {
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Coercion.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Coercion.cs
new file mode 100644
index 0000000000..e2e87d4dfa
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Coercion.cs
@@ -0,0 +1,152 @@
+using System;
+using System.Reactive.Subjects;
+using Avalonia.Data;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class AvaloniaObjectTests_Coercion
+    {
+        [Fact]
+        public void Coerces_Set_Value()
+        {
+            var target = new Class1();
+
+            target.Foo = 150;
+
+            Assert.Equal(100, target.Foo);
+        }
+
+        [Fact]
+        public void Coerces_Set_Value_Attached()
+        {
+            var target = new Class1();
+
+            target.SetValue(Class1.AttachedProperty, 150);
+
+            Assert.Equal(100, target.GetValue(Class1.AttachedProperty));
+        }
+
+        [Fact]
+        public void Coerces_Bound_Value()
+        {
+            var target = new Class1();
+            var source = new Subject<BindingValue<int>>();
+
+            target.Bind(Class1.FooProperty, source);
+            source.OnNext(150);
+
+            Assert.Equal(100, target.Foo);
+        }
+
+        [Fact]
+        public void CoerceValue_Updates_Value()
+        {
+            var target = new Class1 { Foo = 99 };
+
+            Assert.Equal(99, target.Foo);
+
+            target.MaxFoo = 50;
+            target.CoerceValue(Class1.FooProperty);
+
+            Assert.Equal(50, target.Foo);
+        }
+
+        [Fact]
+        public void Coerced_Value_Can_Be_Restored_If_Limit_Changed()
+        {
+            var target = new Class1();
+
+            target.Foo = 150;
+            Assert.Equal(100, target.Foo);
+
+            target.MaxFoo = 200;
+            target.CoerceValue(Class1.FooProperty);
+
+            Assert.Equal(150, target.Foo);
+        }
+
+        [Fact]
+        public void Coerced_Value_Can_Be_Restored_From_Previously_Active_Binding()
+        {
+            var target = new Class1();
+            var source1 = new Subject<BindingValue<int>>();
+            var source2 = new Subject<BindingValue<int>>();
+
+            target.Bind(Class1.FooProperty, source1);
+            source1.OnNext(150);
+
+            target.Bind(Class1.FooProperty, source2);
+            source2.OnNext(160);
+
+            Assert.Equal(100, target.Foo);
+
+            target.MaxFoo = 200;
+            source2.OnCompleted();
+
+            Assert.Equal(150, target.Foo);
+        }
+
+        [Fact]
+        public void Coercion_Can_Be_Overridden()
+        {
+            var target = new Class2();
+
+            target.Foo = 150;
+
+            Assert.Equal(-150, target.Foo);
+        }
+
+        private class Class1 : AvaloniaObject
+        {
+            public static readonly StyledProperty<int> FooProperty =
+                AvaloniaProperty.Register<Class1, int>(
+                    "Qux",
+                    defaultValue: 11,
+                    coerce: CoerceFoo);
+
+            public static readonly AttachedProperty<int> AttachedProperty =
+                AvaloniaProperty.RegisterAttached<Class1, Class1, int>(
+                    "Attached",
+                    defaultValue: 11,
+                    coerce: CoerceFoo);
+
+            public int Foo
+            {
+                get => GetValue(FooProperty);
+                set => SetValue(FooProperty, value);
+            }
+
+            public int MaxFoo { get; set; } = 100;
+
+            public static int CoerceFoo(IAvaloniaObject instance, int value)
+            {
+                return Math.Min(((Class1)instance).MaxFoo, value);
+            }
+        }
+
+        private class Class2 : AvaloniaObject
+        {
+            public static readonly StyledProperty<int> FooProperty =
+                Class1.FooProperty.AddOwner<Class2>();
+
+            static Class2()
+            {
+                FooProperty.OverrideMetadata<Class2>(
+                    new StyledPropertyMetadata<int>(
+                        coerce: CoerceFoo));
+            }
+
+            public int Foo
+            {
+                get => GetValue(FooProperty);
+                set => SetValue(FooProperty, value);
+            }
+
+            public static int CoerceFoo(IAvaloniaObject instance, int value)
+            {
+                return -value;
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_DataValidation.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_DataValidation.cs
index 428f878945..65f03b3eca 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_DataValidation.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_DataValidation.cs
@@ -11,86 +11,69 @@ namespace Avalonia.Base.UnitTests
     public class AvaloniaObjectTests_DataValidation
     {
         [Fact]
-        public void Setting_Non_Validated_Property_Does_Not_Call_UpdateDataValidation()
+        public void Binding_Non_Validated_Styled_Property_Does_Not_Call_UpdateDataValidation()
         {
             var target = new Class1();
+            var source = new Subject<BindingValue<int>>();
 
-            target.SetValue(Class1.NonValidatedDirectProperty, 6);
+            target.Bind(Class1.NonValidatedProperty, source);
+            source.OnNext(6);
+            source.OnNext(BindingValue<int>.BindingError(new Exception()));
+            source.OnNext(BindingValue<int>.DataValidationError(new Exception()));
+            source.OnNext(6);
 
             Assert.Empty(target.Notifications);
         }
 
         [Fact]
-        public void Setting_Non_Validated_Direct_Property_Does_Not_Call_UpdateDataValidation()
+        public void Binding_Non_Validated_Direct_Property_Does_Not_Call_UpdateDataValidation()
         {
             var target = new Class1();
+            var source = new Subject<BindingValue<int>>();
 
-            target.SetValue(Class1.NonValidatedDirectProperty, 6);
+            target.Bind(Class1.NonValidatedDirectProperty, source);
+            source.OnNext(6);
+            source.OnNext(BindingValue<int>.BindingError(new Exception()));
+            source.OnNext(BindingValue<int>.DataValidationError(new Exception()));
+            source.OnNext(6);
 
             Assert.Empty(target.Notifications);
         }
 
         [Fact]
-        public void Setting_Validated_Direct_Property_Calls_UpdateDataValidation()
+        public void Binding_Validated_Direct_Property_Calls_UpdateDataValidation()
         {
             var target = new Class1();
-
-            target.SetValue(Class1.ValidatedDirectIntProperty, new BindingNotification(6));
-            target.SetValue(Class1.ValidatedDirectIntProperty, new BindingNotification(new Exception(), BindingErrorType.Error));
-            target.SetValue(Class1.ValidatedDirectIntProperty, new BindingNotification(new Exception(), BindingErrorType.DataValidationError));
-            target.SetValue(Class1.ValidatedDirectIntProperty, new BindingNotification(7));
-
-            Assert.Equal(
-                new[]
-                {
-                    new BindingNotification(6),
-                    new BindingNotification(new Exception(), BindingErrorType.Error),
-                    new BindingNotification(new Exception(), BindingErrorType.DataValidationError),
-                    new BindingNotification(7),
-                },
-                target.Notifications.AsEnumerable());
-        }
-
-        [Fact]
-        public void Binding_Non_Validated_Property_Does_Not_Call_UpdateDataValidation()
-        {
-            var source = new Subject<object>();
-            var target = new Class1
-            {
-                [!Class1.NonValidatedProperty] = source.ToBinding(),
-            };
-
-            source.OnNext(new BindingNotification(6));
-            source.OnNext(new BindingNotification(new Exception(), BindingErrorType.Error));
-            source.OnNext(new BindingNotification(new Exception(), BindingErrorType.DataValidationError));
-            source.OnNext(new BindingNotification(7));
-
-            Assert.Empty(target.Notifications);
+            var source = new Subject<BindingValue<int>>();
+
+            target.Bind(Class1.ValidatedDirectIntProperty, source);
+            source.OnNext(6);
+            source.OnNext(BindingValue<int>.BindingError(new Exception()));
+            source.OnNext(BindingValue<int>.DataValidationError(new Exception()));
+            source.OnNext(7);
+
+            var result = target.Notifications.Cast<BindingValue<int>>().ToList();
+            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);
         }
 
         [Fact]
-        public void Binding_Validated_Direct_Property_Calls_UpdateDataValidation()
+        public void Binding_Overridden_Validated_Direct_Property_Calls_UpdateDataValidation()
         {
-            var source = new Subject<object>();
-            var target = new Class1
-            {
-                [!Class1.ValidatedDirectIntProperty] = source.ToBinding(),
-            };
+            var target = new Class2();
+            var source = new Subject<BindingValue<int>>();
 
-            source.OnNext(new BindingNotification(6));
-            source.OnNext(new BindingNotification(new Exception(), BindingErrorType.Error));
-            source.OnNext(new BindingNotification(new Exception(), BindingErrorType.DataValidationError));
-            source.OnNext(new BindingNotification(7));
+            // Class2 overrides `NonValidatedDirectProperty`'s metadata to enable data validation.
+            target.Bind(Class1.NonValidatedDirectProperty, source);
+            source.OnNext(1);
 
-            Assert.Equal(
-                new[]
-                {
-                    new BindingNotification(6),
-                    new BindingNotification(new Exception(), BindingErrorType.Error),
-                    new BindingNotification(new Exception(), BindingErrorType.DataValidationError),
-                    new BindingNotification(7),
-                },
-                target.Notifications.AsEnumerable());
+            var result = target.Notifications.Cast<BindingValue<int>>().ToList();
+            Assert.Equal(1, result.Count);
         }
 
         [Fact]
@@ -171,11 +154,22 @@ namespace Avalonia.Base.UnitTests
                 set { SetAndRaise(ValidatedDirectStringProperty, ref _directString, value); }
             }
 
-            public IList<BindingNotification> Notifications { get; } = new List<BindingNotification>();
+            public IList<object> Notifications { get; } = new List<object>();
+
+            protected override void UpdateDataValidation<T>(
+                AvaloniaProperty<T> property,
+                BindingValue<T> value)
+            {
+                Notifications.Add(value);
+            }
+        }
 
-            protected override void UpdateDataValidation(AvaloniaProperty property, BindingNotification notification)
+        private class Class2 : Class1
+        {
+            static Class2()
             {
-                Notifications.Add(notification);
+                NonValidatedDirectProperty.OverrideMetadata<Class2>(
+                    new DirectPropertyMetadata<int>(enableDataValidation: true));
             }
         }
 
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
index 980cbfaaf8..20172eea88 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
@@ -1,18 +1,12 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Reactive.Subjects;
 using System.Threading;
 using System.Threading.Tasks;
-using Avalonia;
 using Avalonia.Data;
 using Avalonia.Logging;
 using Avalonia.Platform;
-using Avalonia.Threading;
-using Avalonia.Markup.Data;
 using Avalonia.UnitTests;
 using Moq;
 using Xunit;
@@ -22,7 +16,7 @@ namespace Avalonia.Base.UnitTests
     public class AvaloniaObjectTests_Direct
     {
         [Fact]
-        public void GetValue_Gets_Value()
+        public void GetValue_Gets_Default_Value()
         {
             var target = new Class1();
 
@@ -100,8 +94,8 @@ namespace Avalonia.Base.UnitTests
 
             Class1.FooProperty.Changed.Subscribe(e =>
                 raised = e.Property == Class1.FooProperty &&
-                         (string)e.OldValue == "initial" &&
-                         (string)e.NewValue == "newvalue" &&
+                         e.OldValue.GetValueOrDefault() == "initial" &&
+                         e.NewValue.GetValueOrDefault() == "newvalue" &&
                          e.Priority == BindingPriority.LocalValue);
 
             target.SetValue(Class1.FooProperty, "newvalue");
@@ -109,6 +103,62 @@ namespace Avalonia.Base.UnitTests
             Assert.True(raised);
         }
 
+        [Fact]
+        public void Setting_Object_Property_To_UnsetValue_Reverts_To_Default_Value()
+        {
+            Class1 target = new Class1();
+
+            target.SetValue(Class1.FrankProperty, "newvalue");
+            target.SetValue(Class1.FrankProperty, AvaloniaProperty.UnsetValue);
+
+            Assert.Equal("Kups", target.GetValue(Class1.FrankProperty));
+        }
+
+        [Fact]
+        public void Setting_Object_Property_To_DoNothing_Does_Nothing()
+        {
+            Class1 target = new Class1();
+
+            target.SetValue(Class1.FrankProperty, "newvalue");
+            target.SetValue(Class1.FrankProperty, BindingOperations.DoNothing);
+
+            Assert.Equal("newvalue", target.GetValue(Class1.FrankProperty));
+        }
+
+        [Fact]
+        public void Bind_Raises_PropertyChanged()
+        {
+            var target = new Class1();
+            var source = new Subject<BindingValue<string>>();
+            bool raised = false;
+
+            target.PropertyChanged += (s, e) =>
+                raised = e.Property == Class1.FooProperty &&
+                         (string)e.OldValue == "initial" &&
+                         (string)e.NewValue == "newvalue" &&
+                         e.Priority == BindingPriority.LocalValue;
+
+            target.Bind(Class1.FooProperty, source);
+            source.OnNext("newvalue");
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void PropertyChanged_Not_Raised_When_Value_Unchanged()
+        {
+            var target = new Class1();
+            var source = new Subject<BindingValue<string>>();
+            var raised = 0;
+
+            target.PropertyChanged += (s, e) => ++raised;
+            target.Bind(Class1.FooProperty, source);
+            source.OnNext("newvalue");
+            source.OnNext("newvalue");
+
+            Assert.Equal(1, raised);
+        }
+
         [Fact]
         public void SetValue_On_Unregistered_Property_Throws_Exception()
         {
@@ -117,6 +167,36 @@ namespace Avalonia.Base.UnitTests
             Assert.Throws<ArgumentException>(() => target.SetValue(Class1.BarProperty, "value"));
         }
 
+        [Fact]
+        public void ClearValue_Restores_Default_value()
+        {
+            var target = new Class1();
+
+            Assert.Equal("initial", target.GetValue(Class1.FooProperty));
+        }
+
+        [Fact]
+        public void ClearValue_Raises_PropertyChanged()
+        {
+            Class1 target = new Class1();
+            var raised = 0;
+
+            target.SetValue(Class1.FooProperty, "newvalue");
+            target.PropertyChanged += (s, e) =>
+            {
+                Assert.Same(target, s);
+                Assert.Equal(BindingPriority.LocalValue, e.Priority);
+                Assert.Equal(Class1.FooProperty, e.Property);
+                Assert.Equal("newvalue", (string)e.OldValue);
+                Assert.Equal("unset", (string)e.NewValue);
+                ++raised;
+            };
+
+            target.ClearValue(Class1.FooProperty);
+
+            Assert.Equal(1, raised);
+        }
+
         [Fact]
         public void GetObservable_Returns_Values()
         {
@@ -170,7 +250,7 @@ namespace Avalonia.Base.UnitTests
         }
 
         [Fact]
-        public void Bind_NonGeneric_Uses_UnsetValue()
+        public void Bind_NonGeneric_Accepts_UnsetValue()
         {
             var target = new Class1();
             var source = new Subject<object>();
@@ -194,7 +274,7 @@ namespace Avalonia.Base.UnitTests
 
             source.OnNext(45);
 
-            Assert.Null(target.Foo);
+            Assert.Equal("unset", target.Foo);
         }
 
         [Fact]
@@ -207,7 +287,7 @@ namespace Avalonia.Base.UnitTests
 
             source.OnNext("foo");
 
-            Assert.Equal(0, target.Baz);
+            Assert.Equal(-1, target.Baz);
         }
 
         [Fact]
@@ -343,46 +423,66 @@ namespace Avalonia.Base.UnitTests
         }
 
         [Fact]
-        public void Property_Notifies_Initialized()
+        public void Binding_Error_Reverts_To_Default_Value()
         {
-            bool raised = false;
+            var target = new Class1();
+            var source = new Subject<BindingValue<string>>();
 
-            Class1.FooProperty.Initialized.Subscribe(e =>
-                raised = e.Property == Class1.FooProperty &&
-                         e.OldValue == AvaloniaProperty.UnsetValue &&
-                         (string)e.NewValue == "initial" &&
-                         e.Priority == BindingPriority.Unset);
+            target.Bind(Class1.FooProperty, source);
+            source.OnNext("initial");
+            source.OnNext(BindingValue<string>.BindingError(new InvalidOperationException("Foo")));
+
+            Assert.Equal("unset", target.GetValue(Class1.FooProperty));
+        }
 
+        [Fact]
+        public void Binding_Error_With_FallbackValue_Causes_Target_Update()
+        {
             var target = new Class1();
+            var source = new Subject<BindingValue<string>>();
 
-            Assert.True(raised);
+            target.Bind(Class1.FooProperty, source);
+            source.OnNext("initial");
+            source.OnNext(BindingValue<string>.BindingError(new InvalidOperationException("Foo"), "bar"));
+
+            Assert.Equal("bar", target.GetValue(Class1.FooProperty));
         }
 
         [Fact]
         public void DataValidationError_Does_Not_Cause_Target_Update()
         {
             var target = new Class1();
-            var source = new Subject<object>();
+            var source = new Subject<BindingValue<string>>();
 
             target.Bind(Class1.FooProperty, source);
             source.OnNext("initial");
-            source.OnNext(new BindingNotification(new InvalidOperationException("Foo"), BindingErrorType.DataValidationError));
+            source.OnNext(BindingValue<string>.DataValidationError(new InvalidOperationException("Foo")));
 
             Assert.Equal("initial", target.GetValue(Class1.FooProperty));
         }
 
+        [Fact]
+        public void DataValidationError_With_FallbackValue_Causes_Target_Update()
+        {
+            var target = new Class1();
+            var source = new Subject<BindingValue<string>>();
+
+            target.Bind(Class1.FooProperty, source);
+            source.OnNext("initial");
+            source.OnNext(BindingValue<string>.DataValidationError(new InvalidOperationException("Foo"), "bar"));
+
+            Assert.Equal("bar", target.GetValue(Class1.FooProperty));
+        }
+
         [Fact]
         public void BindingError_With_FallbackValue_Causes_Target_Update()
         {
             var target = new Class1();
-            var source = new Subject<object>();
+            var source = new Subject<BindingValue<string>>();
 
             target.Bind(Class1.FooProperty, source);
             source.OnNext("initial");
-            source.OnNext(new BindingNotification(
-                new InvalidOperationException("Foo"),
-                BindingErrorType.Error,
-                "fallback"));
+            source.OnNext(BindingValue<string>.BindingError(new InvalidOperationException("Foo"), "fallback"));
 
             Assert.Equal("fallback", target.GetValue(Class1.FooProperty));
         }
@@ -391,7 +491,7 @@ namespace Avalonia.Base.UnitTests
         public void Binding_To_Direct_Property_Logs_BindingError()
         {
             var target = new Class1();
-            var source = new Subject<object>();
+            var source = new Subject<BindingValue<string>>();
             var called = false;
 
             LogCallback checkLogMessage = (level, area, src, mt, pv) =>
@@ -412,7 +512,7 @@ namespace Avalonia.Base.UnitTests
             {
                 target.Bind(Class1.FooProperty, source);
                 source.OnNext("baz");
-                source.OnNext(new BindingNotification(new InvalidOperationException("Binding Error Message"), BindingErrorType.Error));
+                source.OnNext(BindingValue<string>.BindingError(new InvalidOperationException("Binding Error Message")));
             }
 
             Assert.True(called);
@@ -527,10 +627,18 @@ namespace Avalonia.Base.UnitTests
                     o => o.DoubleValue,
                     (o, v) => o.DoubleValue = v);
 
+            public static readonly DirectProperty<Class1, object> FrankProperty =
+                AvaloniaProperty.RegisterDirect<Class1, object>(
+                    nameof(Frank),
+                    o => o.Frank,
+                    (o, v) => o.Frank = v,
+                    unsetValue: "Kups");
+
             private string _foo = "initial";
             private readonly string _bar = "bar";
             private int _baz = 5;
             private double _doubleValue;
+            private object _frank;
 
             public string Foo
             {
@@ -554,6 +662,12 @@ namespace Avalonia.Base.UnitTests
                 get { return _doubleValue; }
                 set { SetAndRaise(DoubleValueProperty, ref _doubleValue, value); }
             }
+
+            public object Frank
+            {
+                get { return _frank; }
+                set { SetAndRaise(FrankProperty, ref _frank, value); }
+            }
         }
 
         private class Class2 : AvaloniaObject
@@ -609,4 +723,4 @@ namespace Avalonia.Base.UnitTests
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_GetObservable.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_GetObservable.cs
index 9dcc69a565..5b50cda76b 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_GetObservable.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_GetObservable.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
 using Xunit;
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_GetSubject.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_GetSubject.cs
index bb6df0e4fb..0f2e8ebc21 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_GetSubject.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_GetSubject.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Reactive.Linq;
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_GetValue.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_GetValue.cs
index 740023fd37..6bd29a1577 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_GetValue.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_GetValue.cs
@@ -1,7 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using System.Reactive.Subjects;
+using Avalonia.Data;
 using Xunit;
 
 namespace Avalonia.Base.UnitTests
@@ -27,11 +26,23 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void GetValue_Returns_Set_Value()
         {
-            Class1 target = new Class1();
+            var target = new Class1();
+            var property = Class1.FooProperty;
+
+            target.SetValue(property, "newvalue");
+
+            Assert.Equal("newvalue", target.GetValue(property));
+        }
 
-            target.SetValue(Class1.FooProperty, "newvalue");
+        [Fact]
+        public void GetValue_Returns_Bound_Value()
+        {
+            var target = new Class1();
+            var property = Class1.FooProperty;
+
+            target.Bind(property, new BehaviorSubject<string>("newvalue"));
 
-            Assert.Equal("newvalue", target.GetValue(Class1.FooProperty));
+            Assert.Equal("newvalue", target.GetValue(property));
         }
 
         [Fact]
@@ -53,6 +64,56 @@ namespace Avalonia.Base.UnitTests
             Assert.Equal("foodefault", target.GetValue(Class1.FooProperty));
         }
 
+        [Fact]
+        public void GetBaseValue_LocalValue_Ignores_Default_Value()
+        {
+            var target = new Class3();
+
+            target.SetValue(Class1.FooProperty, "animated", BindingPriority.Animation);
+            Assert.False(target.GetBaseValue(Class1.FooProperty, BindingPriority.LocalValue).HasValue);
+        }
+
+        [Fact]
+        public void GetBaseValue_LocalValue_Returns_Local_Value()
+        {
+            var target = new Class3();
+
+            target.SetValue(Class1.FooProperty, "local");
+            target.SetValue(Class1.FooProperty, "animated", BindingPriority.Animation);
+            Assert.Equal("local", target.GetBaseValue(Class1.FooProperty, BindingPriority.LocalValue).Value);
+        }
+
+        [Fact]
+        public void GetBaseValue_LocalValue_Returns_Style_Value()
+        {
+            var target = new Class3();
+
+            target.SetValue(Class1.FooProperty, "style", BindingPriority.Style);
+            target.SetValue(Class1.FooProperty, "animated", BindingPriority.Animation);
+            Assert.Equal("style", target.GetBaseValue(Class1.FooProperty, BindingPriority.LocalValue).Value);
+        }
+
+        [Fact]
+        public void GetBaseValue_Style_Ignores_LocalValue_Animated_Value()
+        {
+            var target = new Class3();
+
+            target.Bind(Class1.FooProperty, new BehaviorSubject<string>("animated"), BindingPriority.Animation);
+            target.SetValue(Class1.FooProperty, "local");
+            Assert.False(target.GetBaseValue(Class1.FooProperty, BindingPriority.Style).HasValue);
+        }
+
+        [Fact]
+        public void GetBaseValue_Style_Returns_Style_Value()
+        {
+            var target = new Class3();
+
+            target.SetValue(Class1.FooProperty, "local");
+            target.SetValue(Class1.FooProperty, "style", BindingPriority.Style);
+            target.Bind(Class1.FooProperty, new BehaviorSubject<string>("animated"), BindingPriority.Animation);
+            Assert.Equal("style", target.GetBaseValue(Class1.FooProperty, BindingPriority.Style));
+        }
+
         private class Class1 : AvaloniaObject
         {
             public static readonly StyledProperty<string> FooProperty =
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Inheritance.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Inheritance.cs
index c465db50fb..9e9ae4ec74 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Inheritance.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Inheritance.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Generic;
 using Xunit;
 
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Metadata.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Metadata.cs
index f2fad9090a..2edb3deff0 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Metadata.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Metadata.cs
@@ -1,8 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.Linq;
-using System.Reactive.Linq;
+using System.Runtime.CompilerServices;
 using Xunit;
 
 namespace Avalonia.Base.UnitTests
@@ -12,57 +8,101 @@ namespace Avalonia.Base.UnitTests
         public AvaloniaObjectTests_Metadata()
         {
             // Ensure properties are registered.
-            AvaloniaProperty p;
-            p = Class1.FooProperty;
-            p = Class2.BarProperty;
-            p = AttachedOwner.AttachedProperty;
+            RuntimeHelpers.RunClassConstructor(typeof(Class1).TypeHandle);
+            RuntimeHelpers.RunClassConstructor(typeof(Class2).TypeHandle);
+            RuntimeHelpers.RunClassConstructor(typeof(Class3).TypeHandle);
         }
 
-        [Fact]
-        public void IsSet_Returns_False_For_Unset_Property()
+        public class StyledProperty : AvaloniaObjectTests_Metadata
         {
-            var target = new Class1();
-
-            Assert.False(target.IsSet(Class1.FooProperty));
-        }
+            [Fact]
+            public void Default_Value_Can_Be_Overridden_In_Derived_Class()
+            {
+                var baseValue = Class1.StyledProperty.GetDefaultValue(typeof(Class1));
+                var derivedValue = Class1.StyledProperty.GetDefaultValue(typeof(Class2));
 
-        [Fact]
-        public void IsSet_Returns_False_For_Set_Property()
-        {
-            var target = new Class1();
+                Assert.Equal("foo", baseValue);
+                Assert.Equal("bar", derivedValue);
+            }
 
-            target.SetValue(Class1.FooProperty, "foo");
+            [Fact]
+            public void Default_Value_Can_Be_Overridden_In_AddOwnered_Property()
+            {
+                var baseValue = Class1.StyledProperty.GetDefaultValue(typeof(Class1));
+                var addOwneredValue = Class1.StyledProperty.GetDefaultValue(typeof(Class3));
 
-            Assert.True(target.IsSet(Class1.FooProperty));
+                Assert.Equal("foo", baseValue);
+                Assert.Equal("baz", addOwneredValue);
+            }
         }
 
-        [Fact]
-        public void IsSet_Returns_False_For_Cleared_Property()
+        public class DirectProperty : AvaloniaObjectTests_Metadata
         {
-            var target = new Class1();
+            [Fact]
+            public void Unset_Value_Can_Be_Overridden_In_Derived_Class()
+            {
+                var baseValue = Class1.DirectProperty.GetUnsetValue(typeof(Class1));
+                var derivedValue = Class1.DirectProperty.GetUnsetValue(typeof(Class2));
+
+                Assert.Equal("foo", baseValue);
+                Assert.Equal("bar", derivedValue);
+            }
 
-            target.SetValue(Class1.FooProperty, "foo");
-            target.SetValue(Class1.FooProperty, AvaloniaProperty.UnsetValue);
+            [Fact]
+            public void Unset_Value_Can_Be_Overridden_In_AddOwnered_Property()
+            {
+                var baseValue = Class1.DirectProperty.GetUnsetValue(typeof(Class1));
+                var addOwneredValue = Class3.DirectProperty.GetUnsetValue(typeof(Class3));
 
-            Assert.False(target.IsSet(Class1.FooProperty));
+                Assert.Equal("foo", baseValue);
+                Assert.Equal("baz", addOwneredValue);
+            }
         }
 
         private class Class1 : AvaloniaObject
         {
-            public static readonly StyledProperty<string> FooProperty =
-                AvaloniaProperty.Register<Class1, string>("Foo");
+            public static readonly StyledProperty<string> StyledProperty =
+                AvaloniaProperty.Register<Class1, string>("Styled", "foo");
+
+            public static readonly DirectProperty<Class1, string> DirectProperty =
+                AvaloniaProperty.RegisterDirect<Class1, string>("Styled", o => o.Direct, unsetValue: "foo");
+
+            private string _direct = default;
+
+            public string Direct
+            {
+                get => _direct;
+            }
         }
 
         private class Class2 : Class1
         {
-            public static readonly StyledProperty<string> BarProperty =
-                AvaloniaProperty.Register<Class2, string>("Bar");
+            static Class2()
+            {
+                StyledProperty.OverrideDefaultValue<Class2>("bar");
+                DirectProperty.OverrideMetadata<Class2>(new DirectPropertyMetadata<string>("bar"));
+            }
         }
 
-        private class AttachedOwner
+        private class Class3 : AvaloniaObject
         {
-            public static readonly AttachedProperty<string> AttachedProperty =
-                AvaloniaProperty.RegisterAttached<AttachedOwner, Class1, string>("Attached");
+            public static readonly StyledProperty<string> StyledProperty =
+                Class1.StyledProperty.AddOwner<Class3>();
+
+            public static readonly DirectProperty<Class3, string> DirectProperty =
+                Class1.DirectProperty.AddOwner<Class3>(o => o.Direct, unsetValue: "baz");
+
+            private string _direct = default;
+
+            static Class3()
+            {
+                StyledProperty.OverrideDefaultValue<Class3>("baz");
+            }
+
+            public string Direct
+            {
+                get => _direct;
+            }
         }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_MultiBinding.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_MultiBinding.cs
new file mode 100644
index 0000000000..757160a0a4
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_MultiBinding.cs
@@ -0,0 +1,178 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Reactive.Subjects;
+using Avalonia.Data;
+using Avalonia.Data.Converters;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class AvaloniaObjectTests_MultiBinding
+    {
+        [Fact]
+        public void Should_Update()
+        {
+            var target = new Class1();
+
+            var b = new Subject<object>();
+
+            var mb = new MultiBinding()
+            {
+                Converter = StringJoinConverter,
+                Bindings = new[]
+                {
+                    b.ToBinding()
+                }
+            };
+            target.Bind(Class1.FooProperty, mb);
+
+            Assert.Equal(null, target.Foo);
+
+            b.OnNext("Foo");
+
+            Assert.Equal("Foo", target.Foo);
+
+            b.OnNext("Bar");
+
+            Assert.Equal("Bar", target.Foo);
+        }
+
+        [Fact]
+        public void Should_Update_With_Multiple_Bindings()
+        {
+            var target = new Class1();
+
+            var bindings = Enumerable.Range(0, 3).Select(i => new BehaviorSubject<object>("Empty")).ToArray();
+
+            var mb = new MultiBinding()
+            {
+                Converter = StringJoinConverter,
+                Bindings = bindings.Select(b => b.ToBinding()).ToArray()
+            };
+            target.Bind(Class1.FooProperty, mb);
+
+            Assert.Equal("Empty,Empty,Empty", target.Foo);
+
+            bindings[0].OnNext("Foo");
+
+            Assert.Equal("Foo,Empty,Empty", target.Foo);
+
+            bindings[1].OnNext("Bar");
+
+            Assert.Equal("Foo,Bar,Empty", target.Foo);
+
+            bindings[2].OnNext("Baz");
+
+            Assert.Equal("Foo,Bar,Baz", target.Foo);
+        }
+
+        [Fact]
+        public void Should_Update_When_Null_Value_In_Bindings()
+        {
+            var target = new Class1();
+
+            var b = new Subject<object>();
+
+            var mb = new MultiBinding()
+            {
+                Converter = StringJoinConverter,
+                Bindings = new[]
+                {
+                    b.ToBinding()
+                }
+            };
+            target.Bind(Class1.FooProperty, mb);
+
+            Assert.Equal(null, target.Foo);
+
+            b.OnNext("Foo");
+
+            Assert.Equal("Foo", target.Foo);
+
+            b.OnNext(null);
+
+            Assert.Equal("", target.Foo);
+        }
+
+        [Fact]
+        public void Should_Update_When_Null_Value_In_Bindings_With_StringFormat()
+        {
+            var target = new Class1();
+
+            var b = new Subject<object>();
+
+            var mb = new MultiBinding()
+            {
+                StringFormat = "Converted: {0}",
+                Bindings = new[]
+                {
+                    b.ToBinding()
+                }
+            };
+            target.Bind(Class1.FooProperty, mb);
+
+            Assert.Equal(null, target.Foo);
+            b.OnNext("Foo");
+            Assert.Equal("Converted: Foo", target.Foo);
+            b.OnNext(null);
+            Assert.Equal("Converted: ", target.Foo);
+        }
+
+        [Fact]
+        public void MultiValueConverter_Should_Not_Skip_Valid_Null_ReferenceType_Value()
+        {
+            var target = new FuncMultiValueConverter<string, string>(v => string.Join(",", v.ToArray()));
+
+            object value = target.Convert(new[] { "Foo", "Bar", "Baz" }, typeof(string), null, CultureInfo.InvariantCulture);
+
+            Assert.Equal("Foo,Bar,Baz", value);
+
+            value = target.Convert(new[] { null, "Bar", "Baz" }, typeof(string), null, CultureInfo.InvariantCulture);
+
+            Assert.Equal(",Bar,Baz", value);
+        }
+
+        [Fact]
+        public void MultiValueConverter_Should_Not_Skip_Valid_Default_ValueType_Value()
+        {
+            var target = new FuncMultiValueConverter<StringValueTypeWrapper, string>(v => string.Join(",", v.ToArray()));
+
+            IList<object> create(string[] values) =>
+                values.Select(v => (object)(v != null ? new StringValueTypeWrapper() { Value = v } : default)).ToList();
+
+            object value = target.Convert(create(new[] { "Foo", "Bar", "Baz" }), typeof(string), null, CultureInfo.InvariantCulture);
+
+            Assert.Equal("Foo,Bar,Baz", value);
+
+            value = target.Convert(create(new[] { null, "Bar", "Baz" }), typeof(string), null, CultureInfo.InvariantCulture);
+
+            Assert.Equal(",Bar,Baz", value);
+        }
+
+        private struct StringValueTypeWrapper
+        {
+            public string Value;
+
+            public override string ToString() => Value;
+        }
+
+        private static IMultiValueConverter StringJoinConverter = new FuncMultiValueConverter<object, string>(v => string.Join(",", v.ToArray()));
+
+        private class Class1 : AvaloniaObject
+        {
+            public static readonly StyledProperty<string> FooProperty =
+                AvaloniaProperty.Register<Class1, string>("Foo");
+
+            public string Foo
+            {
+                get => GetValue(FooProperty);
+                set => SetValue(FooProperty, value);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_OnPropertyChanged.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_OnPropertyChanged.cs
new file mode 100644
index 0000000000..e8fc3f9f40
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_OnPropertyChanged.cs
@@ -0,0 +1,142 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Reactive.Subjects;
+using Avalonia.Data;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class AvaloniaObjectTests_OnPropertyChanged
+    {
+        [Fact]
+        public void OnPropertyChangedCore_Is_Called_On_Property_Change()
+        {
+            var target = new Class1();
+
+            target.SetValue(Class1.FooProperty, "newvalue");
+
+            Assert.Equal(1, target.CoreChanges.Count);
+
+            var change = (AvaloniaPropertyChangedEventArgs<string>)target.CoreChanges[0];
+
+            Assert.Equal("newvalue", change.NewValue.Value);
+            Assert.Equal("foodefault", change.OldValue.Value);
+            Assert.Equal(BindingPriority.LocalValue, change.Priority);
+            Assert.True(change.IsEffectiveValueChange);
+        }
+
+        [Fact]
+        public void OnPropertyChangedCore_Is_Called_On_Non_Effective_Property_Value_Change()
+        {
+            var target = new Class1();
+
+            target.SetValue(Class1.FooProperty, "newvalue");
+            target.SetValue(Class1.FooProperty, "styled", BindingPriority.Style);
+
+            Assert.Equal(2, target.CoreChanges.Count);
+
+            var change = (AvaloniaPropertyChangedEventArgs<string>)target.CoreChanges[1];
+
+            Assert.Equal("styled", change.NewValue.Value);
+            Assert.False(change.OldValue.HasValue);
+            Assert.Equal(BindingPriority.Style, change.Priority);
+            Assert.False(change.IsEffectiveValueChange);
+        }
+
+        [Fact]
+        public void OnPropertyChangedCore_Is_Called_On_All_Binding_Property_Changes()
+        {
+            var target = new Class1();
+            var style = new Subject<BindingValue<string>>();
+            var animation = new Subject<BindingValue<string>>();
+            var templatedParent = new Subject<BindingValue<string>>();
+
+            target.Bind(Class1.FooProperty, style, BindingPriority.Style);
+            target.Bind(Class1.FooProperty, animation, BindingPriority.Animation);
+            target.Bind(Class1.FooProperty, templatedParent, BindingPriority.TemplatedParent);
+
+            style.OnNext("style1");
+            templatedParent.OnNext("tp1");
+            animation.OnNext("a1");
+            templatedParent.OnNext("tp2");
+            templatedParent.OnCompleted();
+            animation.OnNext("a2");
+            style.OnNext("style2");
+            style.OnCompleted();
+            animation.OnCompleted();
+
+            var changes = target.CoreChanges.Cast<AvaloniaPropertyChangedEventArgs<string>>();
+
+            Assert.Equal(
+                new[] { true, true, true, false, false, true, false, false, true },
+                changes.Select(x => x.IsEffectiveValueChange).ToList());
+            Assert.Equal(
+                new[] { "style1", "tp1", "a1", "tp2", "$unset", "a2", "style2", "$unset", "foodefault" },
+                changes.Select(x => x.NewValue.GetValueOrDefault("$unset")).ToList());
+            Assert.Equal(
+                new[] { "foodefault", "style1", "tp1", "$unset", "$unset", "a1", "$unset", "$unset", "a2" },
+                changes.Select(x => x.OldValue.GetValueOrDefault("$unset")).ToList());
+        }
+
+        [Fact]
+        public void OnPropertyChanged_Is_Called_Only_For_Effective_Value_Changes()
+        {
+            var target = new Class1();
+
+            target.SetValue(Class1.FooProperty, "newvalue");
+            target.SetValue(Class1.FooProperty, "styled", BindingPriority.Style);
+
+            Assert.Equal(1, target.Changes.Count);
+            Assert.Equal(2, target.CoreChanges.Count);
+        }
+
+        private class Class1 : AvaloniaObject
+        {
+            public static readonly StyledProperty<string> FooProperty =
+                AvaloniaProperty.Register<Class1, string>("Foo", "foodefault");
+
+            public Class1()
+            {
+                Changes = new List<AvaloniaPropertyChangedEventArgs>();
+                CoreChanges = new List<AvaloniaPropertyChangedEventArgs>();
+            }
+
+            public List<AvaloniaPropertyChangedEventArgs> Changes { get; }
+            public List<AvaloniaPropertyChangedEventArgs> CoreChanges { get; }
+
+            protected override void OnPropertyChangedCore<T>(AvaloniaPropertyChangedEventArgs<T> change)
+            {
+                CoreChanges.Add(Clone(change));
+                base.OnPropertyChangedCore(change);
+            }
+
+            protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+            {
+                Changes.Add(Clone(change));
+                base.OnPropertyChanged(change);
+            }
+
+            private static AvaloniaPropertyChangedEventArgs<T> Clone<T>(AvaloniaPropertyChangedEventArgs<T> change)
+            {
+                var result = new AvaloniaPropertyChangedEventArgs<T>(
+                    change.Sender,
+                    change.Property,
+                    change.OldValue,
+                    change.NewValue,
+                    change.Priority);
+
+                if (!change.IsEffectiveValueChange)
+                {
+                    result.MarkNonEffectiveValue();
+                }
+
+                return result;
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_SetValue.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_SetValue.cs
index a56cd717b9..954a609315 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_SetValue.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_SetValue.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Data;
 using Xunit;
@@ -20,6 +17,57 @@ namespace Avalonia.Base.UnitTests
             Assert.Equal("foodefault", target.GetValue(Class1.FooProperty));
         }
 
+        [Fact]
+        public void ClearValue_Raises_PropertyChanged()
+        {
+            Class1 target = new Class1();
+            var raised = 0;
+
+            target.SetValue(Class1.FooProperty, "newvalue");
+            target.PropertyChanged += (s, e) =>
+            {
+                Assert.Same(target, s);
+                Assert.Equal(BindingPriority.Unset, e.Priority);
+                Assert.Equal(Class1.FooProperty, e.Property);
+                Assert.Equal("newvalue", (string)e.OldValue);
+                Assert.Equal("foodefault", (string)e.NewValue);
+                ++raised;
+            };
+
+            target.ClearValue(Class1.FooProperty);
+
+            Assert.Equal(1, raised);
+        }
+
+        [Fact]
+        public void IsSet_Returns_False_For_Unset_Property()
+        {
+            var target = new Class1();
+
+            Assert.False(target.IsSet(Class1.FooProperty));
+        }
+
+        [Fact]
+        public void IsSet_Returns_False_For_Set_Property()
+        {
+            var target = new Class1();
+
+            target.SetValue(Class1.FooProperty, "foo");
+
+            Assert.True(target.IsSet(Class1.FooProperty));
+        }
+
+        [Fact]
+        public void IsSet_Returns_False_For_Cleared_Property()
+        {
+            var target = new Class1();
+
+            target.SetValue(Class1.FooProperty, "foo");
+            target.SetValue(Class1.FooProperty, AvaloniaProperty.UnsetValue);
+
+            Assert.False(target.IsSet(Class1.FooProperty));
+        }
+
         [Fact]
         public void SetValue_Sets_Value()
         {
@@ -59,6 +107,25 @@ namespace Avalonia.Base.UnitTests
             Assert.True(raised);
         }
 
+        [Fact]
+        public void SetValue_Style_Priority_Raises_PropertyChanged()
+        {
+            Class1 target = new Class1();
+            bool raised = false;
+
+            target.PropertyChanged += (s, e) =>
+            {
+                raised = s == target &&
+                         e.Property == Class1.FooProperty &&
+                         (string)e.OldValue == "foodefault" &&
+                         (string)e.NewValue == "newvalue";
+            };
+
+            target.SetValue(Class1.FooProperty, "newvalue", BindingPriority.Style);
+
+            Assert.True(raised);
+        }
+
         [Fact]
         public void SetValue_Doesnt_Raise_PropertyChanged_If_Value_Not_Changed()
         {
@@ -177,6 +244,39 @@ namespace Avalonia.Base.UnitTests
             Assert.Equal("three", target.GetValue(Class1.FooProperty));
         }
 
+        [Fact]
+        public void SetValue_Style_Doesnt_Override_LocalValue()
+        {
+            Class1 target = new Class1();
+
+            target.SetValue(Class1.FooProperty, "one", BindingPriority.LocalValue);
+            Assert.Equal("one", target.GetValue(Class1.FooProperty));
+            target.SetValue(Class1.FooProperty, "two", BindingPriority.Style);
+            Assert.Equal("one", target.GetValue(Class1.FooProperty));
+        }
+
+        [Fact]
+        public void SetValue_LocalValue_Overrides_Style()
+        {
+            Class1 target = new Class1();
+
+            target.SetValue(Class1.FooProperty, "one", BindingPriority.Style);
+            Assert.Equal("one", target.GetValue(Class1.FooProperty));
+            target.SetValue(Class1.FooProperty, "two", BindingPriority.LocalValue);
+            Assert.Equal("two", target.GetValue(Class1.FooProperty));
+        }
+
+        [Fact]
+        public void SetValue_Animation_Overrides_LocalValue()
+        {
+            Class1 target = new Class1();
+
+            target.SetValue(Class1.FooProperty, "one", BindingPriority.LocalValue);
+            Assert.Equal("one", target.GetValue(Class1.FooProperty));
+            target.SetValue(Class1.FooProperty, "two", BindingPriority.Animation);
+            Assert.Equal("two", target.GetValue(Class1.FooProperty));
+        }
+
         [Fact]
         public void Setting_UnsetValue_Reverts_To_Default_Value()
         {
@@ -188,10 +288,70 @@ namespace Avalonia.Base.UnitTests
             Assert.Equal("foodefault", target.GetValue(Class1.FooProperty));
         }
 
+        [Fact]
+        public void Setting_Object_Property_To_UnsetValue_Reverts_To_Default_Value()
+        {
+            Class1 target = new Class1();
+
+            target.SetValue(Class1.FrankProperty, "newvalue");
+            target.SetValue(Class1.FrankProperty, AvaloniaProperty.UnsetValue);
+
+            Assert.Equal("Kups", target.GetValue(Class1.FrankProperty));
+        }
+
+        [Fact]
+        public void Setting_Object_Property_To_DoNothing_Does_Nothing()
+        {
+            Class1 target = new Class1();
+
+            target.SetValue(Class1.FrankProperty, "newvalue");
+            target.SetValue(Class1.FrankProperty, BindingOperations.DoNothing);
+
+            Assert.Equal("newvalue", target.GetValue(Class1.FrankProperty));
+        }
+
+        [Fact]
+        public void Disposing_Style_SetValue_Reverts_To_DefaultValue()
+        {
+            Class1 target = new Class1();
+
+            var d = target.SetValue(Class1.FooProperty, "foo", BindingPriority.Style);
+            d.Dispose();
+
+            Assert.Equal("foodefault", target.GetValue(Class1.FooProperty));
+        }
+
+        [Fact]
+        public void Disposing_Style_SetValue_Reverts_To_Previous_Style_Value()
+        {
+            Class1 target = new Class1();
+
+            target.SetValue(Class1.FooProperty, "foo", BindingPriority.Style);
+            var d = target.SetValue(Class1.FooProperty, "bar", BindingPriority.Style);
+            d.Dispose();
+
+            Assert.Equal("foo", target.GetValue(Class1.FooProperty));
+        }
+
+        [Fact]
+        public void Disposing_Animation_SetValue_Reverts_To_Previous_Local_Value()
+        {
+            Class1 target = new Class1();
+
+            target.SetValue(Class1.FooProperty, "foo", BindingPriority.LocalValue);
+            var d = target.SetValue(Class1.FooProperty, "bar", BindingPriority.Animation);
+            d.Dispose();
+
+            Assert.Equal("foo", target.GetValue(Class1.FooProperty));
+        }
+
         private class Class1 : AvaloniaObject
         {
             public static readonly StyledProperty<string> FooProperty =
                 AvaloniaProperty.Register<Class1, string>("Foo", "foodefault");
+
+            public static readonly StyledProperty<object> FrankProperty =
+                AvaloniaProperty.Register<Class1, object>("Frank", "Kups");
         }
 
         private class Class2 : Class1
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Threading.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Threading.cs
index e067886742..7b68852f03 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Threading.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Threading.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Subjects;
 using System.Threading;
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Validation.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Validation.cs
index f0e93dbb3a..c14332e1fe 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Validation.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Validation.cs
@@ -1,8 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Subjects;
+using Avalonia.Controls;
 using Xunit;
 
 namespace Avalonia.Base.UnitTests
@@ -10,147 +8,87 @@ namespace Avalonia.Base.UnitTests
     public class AvaloniaObjectTests_Validation
     {
         [Fact]
-        public void SetValue_Causes_Validation()
+        public void Registration_Throws_If_DefaultValue_Fails_Validation()
         {
-            var target = new Class1();
-
-            target.SetValue(Class1.QuxProperty, 5);
-            Assert.Throws<ArgumentOutOfRangeException>(() => target.SetValue(Class1.QuxProperty, 25));
-            Assert.Equal(5, target.GetValue(Class1.QuxProperty));
+            Assert.Throws<ArgumentException>(() =>
+                new StyledProperty<int>(
+                    "BadDefault",
+                    typeof(Class1),
+                    new StyledPropertyMetadata<int>(101),
+                    validate: Class1.ValidateFoo));
         }
 
         [Fact]
-        public void SetValue_Causes_Coercion()
+        public void Metadata_Override_Throws_If_DefaultValue_Fails_Validation()
         {
-            var target = new Class1();
-
-            target.SetValue(Class1.QuxProperty, 5);
-            Assert.Equal(5, target.GetValue(Class1.QuxProperty));
-            target.SetValue(Class1.QuxProperty, -5);
-            Assert.Equal(0, target.GetValue(Class1.QuxProperty));
-            target.SetValue(Class1.QuxProperty, 15);
-            Assert.Equal(10, target.GetValue(Class1.QuxProperty));
+            Assert.Throws<ArgumentException>(() => Class1.FooProperty.OverrideDefaultValue<Class2>(101));
         }
 
         [Fact]
-        public void Revalidate_Causes_Recoercion()
+        public void SetValue_Throws_If_Fails_Validation()
         {
             var target = new Class1();
 
-            target.SetValue(Class1.QuxProperty, 7);
-            Assert.Equal(7, target.GetValue(Class1.QuxProperty));
-            target.MaxQux = 5;
-            target.Revalidate(Class1.QuxProperty);
+            Assert.Throws<ArgumentException>(() => target.SetValue(Class1.FooProperty, 101));
         }
 
         [Fact]
-        public void Validation_Can_Be_Overridden()
+        public void SetValue_Throws_If_Fails_Validation_Attached()
         {
-            var target = new Class2();
-            Assert.Throws<ArgumentOutOfRangeException>(() => target.SetValue(Class1.QuxProperty, 5));
-        }
+            var target = new Class1();
 
-        [Fact]
-        public void Validation_Can_Be_Overridden_With_Null()
-        {
-            var target = new Class3();
-            target.SetValue(Class1.QuxProperty, 50);
-            Assert.Equal(50, target.GetValue(Class1.QuxProperty));
+            Assert.Throws<ArgumentException>(() => target.SetValue(Class1.AttachedProperty, 101));
         }
 
         [Fact]
-        public void Binding_To_UnsetValue_Doesnt_Throw()
+        public void Reverts_To_DefaultValue_If_Binding_Fails_Validation()
         {
             var target = new Class1();
-            var source = new Subject<object>();
+            var source = new Subject<int>();
 
-            target.Bind(Class1.QuxProperty, source);
+            target.Bind(Class1.FooProperty, source);
+            source.OnNext(150);
 
-            source.OnNext(AvaloniaProperty.UnsetValue);
+            Assert.Equal(11, target.GetValue(Class1.FooProperty));
         }
 
         [Fact]
-        public void Attached_Property_Should_Be_Validated()
+        public void Reverts_To_DefaultValue_Even_In_Presence_Of_Other_Bindings()
         {
-            var target = new Class2();
+            var target = new Class1();
+            var source1 = new Subject<int>();
+            var source2 = new Subject<int>();
 
-            target.SetValue(Class1.AttachedProperty, 15);
-            Assert.Equal(10, target.GetValue(Class1.AttachedProperty));
-        }
+            target.Bind(Class1.FooProperty, source1);
+            target.Bind(Class1.FooProperty, source2);
+            source1.OnNext(42);
+            source2.OnNext(150);
 
-        [Fact]
-        public void PropertyChanged_Event_Uses_Coerced_Value()
-        {
-            var inst = new Class1();
-            inst.PropertyChanged += (sender, e) =>
-            {
-                Assert.Equal(10, e.NewValue);
-            };
-
-            inst.SetValue(Class1.QuxProperty, 15);
+            Assert.Equal(11, target.GetValue(Class1.FooProperty));
         }
 
         private class Class1 : AvaloniaObject
         {
-            public static readonly StyledProperty<int> QuxProperty =
-                AvaloniaProperty.Register<Class1, int>("Qux", validate: Validate);
+            public static readonly StyledProperty<int> FooProperty =
+                AvaloniaProperty.Register<Class1, int>(
+                    "Qux",
+                    defaultValue: 11,
+                    validate: ValidateFoo);
 
             public static readonly AttachedProperty<int> AttachedProperty =
-            AvaloniaProperty.RegisterAttached<Class1, Class2, int>("Attached", validate: Validate);
-
-            public Class1()
-            {
-                MaxQux = 10;
-                ErrorQux = 20;
-            }
+                AvaloniaProperty.RegisterAttached<Class1, Class1, int>(
+                    "Attached",
+                    defaultValue: 11,
+                    validate: ValidateFoo);
 
-            public int MaxQux { get; set; }
-
-            public int ErrorQux { get; }
-
-            private static int Validate(Class1 instance, int value)
+            public static bool ValidateFoo(int value)
             {
-                if (value > instance.ErrorQux)
-                {
-                    throw new ArgumentOutOfRangeException();
-                }
-
-                return Math.Min(Math.Max(value, 0), ((Class1)instance).MaxQux);
-            }
-
-            private static int Validate(Class2 instance, int value)
-            {
-                return Math.Min(value, 10);
+                return value < 100;
             }
         }
 
         private class Class2 : AvaloniaObject
         {
-            public static readonly StyledProperty<int> QuxProperty =
-                Class1.QuxProperty.AddOwner<Class2>();
-
-            static Class2()
-            {
-                QuxProperty.OverrideValidation<Class2>(Validate);
-            }
-
-            private static int Validate(Class2 instance, int value)
-            {
-                if (value < 100)
-                {
-                    throw new ArgumentOutOfRangeException();
-                }
-
-                return value;
-            }
-        }
-
-        private class Class3 : Class2
-        {
-            static Class3()
-            {
-                QuxProperty.OverrideValidation<Class3>(null);
-            }
         }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyRegistryTests.cs b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyRegistryTests.cs
index d11319114f..7f4db23268 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyRegistryTests.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyRegistryTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Linq;
 using System.Reactive.Linq;
 using Xunit;
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs
index 2933893f7a..1adb6988a2 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs
@@ -1,8 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using System.Collections.Generic;
 using Avalonia.Data;
+using Avalonia.Utilities;
 using Xunit;
 
 namespace Avalonia.Base.UnitTests
@@ -28,7 +27,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void GetMetadata_Returns_Supplied_Value()
         {
-            var metadata = new PropertyMetadata();
+            var metadata = new AvaloniaPropertyMetadata();
             var target = new TestProperty<string>("test", typeof(Class1), metadata);
 
             Assert.Same(metadata, target.GetMetadata<Class1>());
@@ -37,7 +36,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void GetMetadata_Returns_Supplied_Value_For_Derived_Class()
         {
-            var metadata = new PropertyMetadata();
+            var metadata = new AvaloniaPropertyMetadata();
             var target = new TestProperty<string>("test", typeof(Class1), metadata);
 
             Assert.Same(metadata, target.GetMetadata<Class2>());
@@ -46,7 +45,7 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void GetMetadata_Returns_Supplied_Value_For_Unrelated_Class()
         {
-            var metadata = new PropertyMetadata();
+            var metadata = new AvaloniaPropertyMetadata();
             var target = new TestProperty<string>("test", typeof(Class3), metadata);
 
             Assert.Same(metadata, target.GetMetadata<Class2>());
@@ -55,8 +54,8 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void GetMetadata_Returns_Overridden_Value()
         {
-            var metadata = new PropertyMetadata();
-            var overridden = new PropertyMetadata();
+            var metadata = new AvaloniaPropertyMetadata();
+            var overridden = new AvaloniaPropertyMetadata();
             var target = new TestProperty<string>("test", typeof(Class1), metadata);
 
             target.OverrideMetadata<Class2>(overridden);
@@ -67,9 +66,9 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void OverrideMetadata_Should_Merge_Values()
         {
-            var metadata = new PropertyMetadata(BindingMode.TwoWay);
+            var metadata = new AvaloniaPropertyMetadata(BindingMode.TwoWay);
             var notify = (Action<IAvaloniaObject, bool>)((a, b) => { });
-            var overridden = new PropertyMetadata();
+            var overridden = new AvaloniaPropertyMetadata();
             var target = new TestProperty<string>("test", typeof(Class1), metadata);
 
             target.OverrideMetadata<Class2>(overridden);
@@ -79,33 +78,39 @@ namespace Avalonia.Base.UnitTests
         }
 
         [Fact]
-        public void Initialized_Observable_Fired()
+        public void Changed_Observable_Fired()
         {
-            bool invoked = false;
+            var target = new Class1();
+            string value = null;
 
-            Class1.FooProperty.Initialized.Subscribe(x =>
-            {
-                Assert.Equal(AvaloniaProperty.UnsetValue, x.OldValue);
-                Assert.Equal("default", x.NewValue);
-                Assert.Equal(BindingPriority.Unset, x.Priority);
-                invoked = true;
-            });
+            Class1.FooProperty.Changed.Subscribe(x => value = x.NewValue.GetValueOrDefault());
+            target.SetValue(Class1.FooProperty, "newvalue");
 
+            Assert.Equal("newvalue", value);
+        }
+
+        [Fact]
+        public void Changed_Observable_Fired_Only_On_Effective_Value_Change()
+        {
             var target = new Class1();
+            var result = new List<string>();
 
-            Assert.True(invoked);
+            Class1.FooProperty.Changed.Subscribe(x => result.Add(x.NewValue.GetValueOrDefault()));
+            target.SetValue(Class1.FooProperty, "animated", BindingPriority.Animation);
+            target.SetValue(Class1.FooProperty, "local");
+
+            Assert.Equal(new[] { "animated" }, result);
         }
 
         [Fact]
-        public void Changed_Observable_Fired()
+        public void Notify_Fired_Only_On_Effective_Value_Change()
         {
             var target = new Class1();
-            string value = null;
 
-            Class1.FooProperty.Changed.Subscribe(x => value = (string)x.NewValue);
-            target.SetValue(Class1.FooProperty, "newvalue");
+            target.SetValue(Class1.FooProperty, "animated", BindingPriority.Animation);
+            target.SetValue(Class1.FooProperty, "local");
 
-            Assert.Equal("newvalue", value);
+            Assert.Equal(2, target.NotifyCount);
         }
 
         [Fact]
@@ -124,28 +129,76 @@ namespace Avalonia.Base.UnitTests
         [Fact]
         public void PropertyMetadata_BindingMode_Default_Returns_OneWay()
         {
-            var data = new PropertyMetadata(defaultBindingMode: BindingMode.Default);
+            var data = new AvaloniaPropertyMetadata(defaultBindingMode: BindingMode.Default);
 
             Assert.Equal(BindingMode.OneWay, data.DefaultBindingMode);
         }
 
         private class TestProperty<TValue> : AvaloniaProperty<TValue>
         {
-            public TestProperty(string name, Type ownerType, PropertyMetadata metadata = null)
-                : base(name, ownerType, metadata ?? new PropertyMetadata())
+            public TestProperty(string name, Type ownerType, AvaloniaPropertyMetadata metadata = null)
+                : base(name, ownerType, metadata ?? new AvaloniaPropertyMetadata())
             {
             }
 
-            public void OverrideMetadata<T>(PropertyMetadata metadata)
+            public void OverrideMetadata<T>(AvaloniaPropertyMetadata metadata)
             {
                 OverrideMetadata(typeof(T), metadata);
             }
+
+            public override void Accept<TData>(IAvaloniaPropertyVisitor<TData> vistor, ref TData data)
+            {
+                throw new NotImplementedException();
+            }
+
+            internal override IDisposable RouteBind(
+                IAvaloniaObject o,
+                IObservable<BindingValue<object>> source,
+                BindingPriority priority)
+            {
+                throw new NotImplementedException();
+            }
+
+            internal override void RouteClearValue(IAvaloniaObject o)
+            {
+                throw new NotImplementedException();
+            }
+
+            internal override object RouteGetValue(IAvaloniaObject o)
+            {
+                throw new NotImplementedException();
+            }
+
+            internal override object RouteGetBaseValue(IAvaloniaObject o, BindingPriority maxPriority)
+            {
+                throw new NotImplementedException();
+            }
+
+            internal override void RouteInheritanceParentChanged(AvaloniaObject o, IAvaloniaObject oldParent)
+            {
+                throw new NotImplementedException();
+            }
+
+            internal override IDisposable RouteSetValue(
+                IAvaloniaObject o,
+                object value,
+                BindingPriority priority)
+            {
+                throw new NotImplementedException();
+            }
         }
 
         private class Class1 : AvaloniaObject
         {
             public static readonly StyledProperty<string> FooProperty =
-                AvaloniaProperty.Register<Class1, string>("Foo", "default");
+                AvaloniaProperty.Register<Class1, string>("Foo", "default", notifying: FooNotifying);
+
+            public int NotifyCount { get; private set; }
+
+            private static void FooNotifying(IAvaloniaObject o, bool n)
+            {
+                ++((Class1)o).NotifyCount;
+            }
         }
 
         private class Class2 : Class1
diff --git a/tests/Avalonia.Base.UnitTests/Collections/AvaloniaDictionaryTests.cs b/tests/Avalonia.Base.UnitTests/Collections/AvaloniaDictionaryTests.cs
index b6ab7dac34..df3ca4e4dc 100644
--- a/tests/Avalonia.Base.UnitTests/Collections/AvaloniaDictionaryTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Collections/AvaloniaDictionaryTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using Avalonia.Collections;
diff --git a/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListExtenionsTests.cs b/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListExtenionsTests.cs
index 7f118a2c1d..b1b2d3d8f2 100644
--- a/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListExtenionsTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListExtenionsTests.cs
@@ -6,10 +6,12 @@ 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();
 
@@ -137,6 +139,8 @@ namespace Avalonia.Base.UnitTests.Collections
 
             Assert.Equal(source, result);
         }
+#pragma warning restore CS0618 // Type or member is obsolete
+
 
         private class Wrapper
         {
diff --git a/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListTests.cs b/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListTests.cs
index 5c01e6a588..d5ac01a092 100644
--- a/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListTests.cs
@@ -1,7 +1,5 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
@@ -337,5 +335,27 @@ namespace Avalonia.Base.UnitTests.Collections
 
             Assert.True(raised);
         }
+
+        [Fact]
+        public void Can_CopyTo_Array_Of_Same_Type()
+        {
+            var target = new AvaloniaList<string> { "foo", "bar", "baz" };
+            var result = new string[3];
+
+            target.CopyTo(result, 0);
+
+            Assert.Equal(target, result);
+        }
+
+        [Fact]
+        public void Can_CopyTo_Array_Of_Base_Type()
+        {
+            var target = new AvaloniaList<string> { "foo", "bar", "baz" };
+            var result = new object[3];
+
+            ((IList)target).CopyTo(result, 0);
+
+            Assert.Equal(target, result);
+        }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/Collections/CollectionChangedTracker.cs b/tests/Avalonia.Base.UnitTests/Collections/CollectionChangedTracker.cs
index 9e495b7223..eb43aafa02 100644
--- a/tests/Avalonia.Base.UnitTests/Collections/CollectionChangedTracker.cs
+++ b/tests/Avalonia.Base.UnitTests/Collections/CollectionChangedTracker.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Specialized;
 
diff --git a/tests/Avalonia.Base.UnitTests/Collections/PropertyChangedTracker.cs b/tests/Avalonia.Base.UnitTests/Collections/PropertyChangedTracker.cs
index 5b869e366e..cb4e2fc2de 100644
--- a/tests/Avalonia.Base.UnitTests/Collections/PropertyChangedTracker.cs
+++ b/tests/Avalonia.Base.UnitTests/Collections/PropertyChangedTracker.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/BindingExpressionTests.cs b/tests/Avalonia.Base.UnitTests/Data/Core/BindingExpressionTests.cs
index d51f56f558..339cf8a334 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/BindingExpressionTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/BindingExpressionTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -139,6 +136,7 @@ namespace Avalonia.Base.UnitTests.Data.Core
                 ExpressionObserver.Create(data, o => o.StringValue),
                 typeof(int),
                 42,
+                AvaloniaProperty.UnsetValue,
                 DefaultValueConverter.Instance);
             var result = await target.Take(1);
 
@@ -160,6 +158,7 @@ namespace Avalonia.Base.UnitTests.Data.Core
                 ExpressionObserver.Create(data, o => o.StringValue, true),
                 typeof(int),
                 42,
+                AvaloniaProperty.UnsetValue,
                 DefaultValueConverter.Instance);
             var result = await target.Take(1);
 
@@ -181,6 +180,7 @@ namespace Avalonia.Base.UnitTests.Data.Core
                 ExpressionObserver.Create(data, o => o.StringValue),
                 typeof(int),
                 "bar",
+                AvaloniaProperty.UnsetValue,
                 DefaultValueConverter.Instance);
             var result = await target.Take(1);
 
@@ -203,6 +203,7 @@ namespace Avalonia.Base.UnitTests.Data.Core
                 ExpressionObserver.Create(data, o => o.StringValue, true),
                 typeof(int),
                 "bar",
+                AvaloniaProperty.UnsetValue,
                 DefaultValueConverter.Instance);
             var result = await target.Take(1);
 
@@ -238,6 +239,7 @@ namespace Avalonia.Base.UnitTests.Data.Core
                 ExpressionObserver.Create(data, o => o.DoubleValue),
                 typeof(string),
                 "9.8",
+                AvaloniaProperty.UnsetValue,
                 DefaultValueConverter.Instance);
 
             target.OnNext("foo");
@@ -353,6 +355,29 @@ namespace Avalonia.Base.UnitTests.Data.Core
             GC.KeepAlive(data);
         }
 
+        [Fact]
+        public void Null_Value_Should_Use_TargetNullValue()
+        {
+            var data = new Class1 { StringValue = "foo" };
+
+            var target = new BindingExpression(
+                ExpressionObserver.Create(data, o => o.StringValue),
+                typeof(string),
+                AvaloniaProperty.UnsetValue,
+                "bar",
+                DefaultValueConverter.Instance);
+
+            object result = null;
+            target.Subscribe(x => result = x);
+
+            Assert.Equal("foo", result);
+            
+            data.StringValue = null;
+            Assert.Equal("bar", result);
+
+            GC.KeepAlive(data);
+        }
+
         private class Class1 : NotifyingBase
         {
             private string _stringValue;
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_AttachedProperty.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_AttachedProperty.cs
index 7e47e9b1eb..c04e726a83 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_AttachedProperty.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_AttachedProperty.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Reactive.Linq;
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_AvaloniaProperty.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_AvaloniaProperty.cs
index 8d5510dd20..650e5d60ea 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_AvaloniaProperty.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_AvaloniaProperty.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Reactive.Linq;
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_DataValidation.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_DataValidation.cs
index c472fffb38..ecc43aa3a5 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_DataValidation.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_DataValidation.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -16,39 +13,39 @@ namespace Avalonia.Base.UnitTests.Data.Core
 {
     public class ExpressionObserverTests_DataValidation : IClassFixture<InvariantCultureFixture>
     {
-        [Fact]
-        public void Doesnt_Send_DataValidationError_When_DataValidatation_Not_Enabled()
-        {
-            var data = new ExceptionTest { MustBePositive = 5 };
-            var observer = ExpressionObserver.Create(data, o => o.MustBePositive, false);
-            var validationMessageFound = false;
-
-            observer.OfType<BindingNotification>()
-                .Where(x => x.ErrorType == BindingErrorType.DataValidationError)
-                .Subscribe(_ => validationMessageFound = true);
-            observer.SetValue(-5);
-
-            Assert.False(validationMessageFound);
-
-            GC.KeepAlive(data);
-        }
-
-        [Fact]
-        public void Exception_Validation_Sends_DataValidationError()
-        {
-            var data = new ExceptionTest { MustBePositive = 5 };
-            var observer = ExpressionObserver.Create(data, o => o.MustBePositive, true);
-            var validationMessageFound = false;
-
-            observer.OfType<BindingNotification>()
-                .Where(x => x.ErrorType == BindingErrorType.DataValidationError)
-                .Subscribe(_ => validationMessageFound = true);
-            observer.SetValue(-5);
-
-            Assert.True(validationMessageFound);
-
-            GC.KeepAlive(data);
-        }
+        ////[Fact]
+        ////public void Doesnt_Send_DataValidationError_When_DataValidatation_Not_Enabled()
+        ////{
+        ////    var data = new ExceptionTest { MustBePositive = 5 };
+        ////    var observer = ExpressionObserver.Create(data, o => o.MustBePositive, false);
+        ////    var validationMessageFound = false;
+
+        ////    observer.OfType<BindingNotification>()
+        ////        .Where(x => x.ErrorType == BindingErrorType.DataValidationError)
+        ////        .Subscribe(_ => validationMessageFound = true);
+        ////    observer.SetValue(-5);
+
+        ////    Assert.False(validationMessageFound);
+
+        ////    GC.KeepAlive(data);
+        ////}
+
+        ////[Fact]
+        ////public void Exception_Validation_Sends_DataValidationError()
+        ////{
+        ////    var data = new ExceptionTest { MustBePositive = 5 };
+        ////    var observer = ExpressionObserver.Create(data, o => o.MustBePositive, true);
+        ////    var validationMessageFound = false;
+
+        ////    observer.OfType<BindingNotification>()
+        ////        .Where(x => x.ErrorType == BindingErrorType.DataValidationError)
+        ////        .Subscribe(_ => validationMessageFound = true);
+        ////    observer.SetValue(-5);
+
+        ////    Assert.True(validationMessageFound);
+
+        ////    GC.KeepAlive(data);
+        ////}
 
         [Fact]
         public void Indei_Validation_Does_Not_Subscribe_When_DataValidatation_Not_Enabled()
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Indexer.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Indexer.cs
index cbbb5f4715..6289ec46c7 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Indexer.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Indexer.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Lifetime.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Lifetime.cs
index cf151f6244..d496817147 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Lifetime.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Lifetime.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Reactive;
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Negation.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Negation.cs
index 54d7e98903..2f6707058d 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Negation.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Negation.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Observable.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Observable.cs
index 4585181ab7..a70d4574a6 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Observable.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Observable.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Reactive.Linq;
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Property.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Property.cs
index a2ef8eedad..32cdd21e04 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Property.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Property.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Reactive;
@@ -325,7 +322,7 @@ namespace Avalonia.Base.UnitTests.Data.Core
                 {
                     "bar",
                     new BindingNotification(
-                        new MissingMemberException("Could not find CLR property 'Bar' on 'Avalonia.Base.UnitTests.Data.Core.ExpressionObserverTests_Property+WithoutBar'"),
+                        new MissingMemberException("Could not find a matching property accessor for 'Bar' on 'Avalonia.Base.UnitTests.Data.Core.ExpressionObserverTests_Property+WithoutBar'"),
                         BindingErrorType.Error),
                     "baz",
                 },
@@ -581,6 +578,46 @@ namespace Avalonia.Base.UnitTests.Data.Core
             Assert.True(true);
         }
 
+        [Fact]
+        public void Should_Not_Throw_Exception_When_Enabling_Data_Validation_On_Missing_Member()
+        {
+            var source = new Class1();
+            var target = new PropertyAccessorNode("NotFound", true);
+
+            target.Target = new WeakReference<object>(source);
+
+            var result = new List<object>();
+
+            target.Subscribe(x => result.Add(x));
+
+            Assert.Equal(
+                new object[]
+                {
+                    new BindingNotification(
+                        new MissingMemberException("Could not find a matching property accessor for 'NotFound' on 'Avalonia.Base.UnitTests.Data.Core.ExpressionObserverTests_Property+Class1'"),
+                        BindingErrorType.Error),
+                },
+                result);
+        }
+
+        [Fact]
+        public void Should_Not_Throw_Exception_On_Duplicate_Properties()
+        {
+            // Repro of https://github.com/AvaloniaUI/Avalonia/issues/4733.
+            var source = new MyViewModel();
+            var target = new PropertyAccessorNode("Name", false);
+            
+            target.Target = new WeakReference<object>(source);
+            
+            var result = new List<object>();
+            
+            target.Subscribe(x => result.Add(x));
+        }
+        
+        public class MyViewModelBase { public object Name => "Name"; }
+        
+        public class MyViewModel : MyViewModelBase { public new string Name => "NewName"; }
+
         private interface INext
         {
             int PropertyChangedSubscriptionCount { get; }
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_SetValue.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_SetValue.cs
index 99507a2c07..b1cc42488a 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_SetValue.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_SetValue.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Task.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Task.cs
index 9ea0a5e3e1..ca564a6809 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Task.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Task.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Reactive.Linq;
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/IndeiBase.cs b/tests/Avalonia.Base.UnitTests/Data/Core/IndeiBase.cs
index 6edcdc820d..84054e009d 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/IndeiBase.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/IndeiBase.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/DataAnnotationsValidationPluginTests.cs b/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/DataAnnotationsValidationPluginTests.cs
index 435ead0b80..1d9524a191 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/DataAnnotationsValidationPluginTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/DataAnnotationsValidationPluginTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -62,12 +59,12 @@ namespace Avalonia.Markup.UnitTests.Data.Plugins
             {
                 new BindingNotification(5),
                 new BindingNotification(
-                    new ValidationException(errmsg),
+                    new DataValidationException(errmsg),
                     BindingErrorType.DataValidationError,
                     3),
                 new BindingNotification(7),
                 new BindingNotification(
-                    new ValidationException(errmsg),
+                    new DataValidationException(errmsg),
                     BindingErrorType.DataValidationError,
                     11),
             }, result);
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/ExceptionValidationPluginTests.cs b/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/ExceptionValidationPluginTests.cs
index 6bd5fe5093..5e7de08fcd 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/ExceptionValidationPluginTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/ExceptionValidationPluginTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Reactive.Linq;
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/IndeiValidationPluginTests.cs b/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/IndeiValidationPluginTests.cs
index 26b64182e1..d8eddf6330 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/IndeiValidationPluginTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/IndeiValidationPluginTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/PropertyPathGrammarTests.cs b/tests/Avalonia.Base.UnitTests/Data/Core/PropertyPathGrammarTests.cs
new file mode 100644
index 0000000000..99144b7381
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/PropertyPathGrammarTests.cs
@@ -0,0 +1,103 @@
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Markup.Parsers;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Data.Core
+{
+    public class PropertyPathGrammarTests
+    {
+        static void Check(string s, params PropertyPathGrammar.ISyntax[] expected)
+        {
+            var parsed = PropertyPathGrammar.Parse(s).ToList();
+            Assert.Equal(expected.Length, parsed.Count);
+            for (var c = 0; c < parsed.Count; c++)
+                Assert.Equal(expected[c], parsed[c]);
+        }
+
+        [Fact]
+        public void PropertyPath_Should_Support_Simple_Properties()
+        {
+            Check("SomeProperty", new PropertyPathGrammar.PropertySyntax {Name = "SomeProperty"});
+        }
+
+        [Fact]
+        public void PropertyPath_Should_Ignore_Trailing_Whitespace()
+        {
+            Check("  SomeProperty   ", new PropertyPathGrammar.PropertySyntax {Name = "SomeProperty"});
+        }
+
+        [Fact]
+        public void PropertyPath_Should_Support_Qualified_Properties()
+        {
+            Check(" ( somens:SomeType.SomeProperty ) ",
+                new PropertyPathGrammar.TypeQualifiedPropertySyntax()
+                {
+                    Name = "SomeProperty", TypeName = "SomeType", TypeNamespace = "somens"
+                });
+        }
+        
+        [Fact]
+        public void PropertyPath_Should_Support_Property_Paths()
+        {
+            Check(" ( somens:SomeType.SomeProperty ).Child . SubChild ",
+                new PropertyPathGrammar.TypeQualifiedPropertySyntax()
+                {
+                    Name = "SomeProperty", TypeName = "SomeType", TypeNamespace = "somens"
+                },
+                PropertyPathGrammar.ChildTraversalSyntax.Instance,
+                new PropertyPathGrammar.PropertySyntax {Name = "Child"},
+                PropertyPathGrammar.ChildTraversalSyntax.Instance,
+                new PropertyPathGrammar.PropertySyntax {Name = "SubChild"}
+            );
+        }
+        
+        [Fact]
+        public void PropertyPath_Should_Support_Casts()
+        {
+            Check(" ( somens:SomeType.SomeProperty ) :> SomeType.Child as somens:SomeType . SubChild ",
+                new PropertyPathGrammar.TypeQualifiedPropertySyntax()
+                {
+                    Name = "SomeProperty", TypeName = "SomeType", TypeNamespace = "somens"
+                },
+                new PropertyPathGrammar.CastTypeSyntax
+                {
+                    TypeName = "SomeType"
+                },
+                PropertyPathGrammar.ChildTraversalSyntax.Instance,
+                new PropertyPathGrammar.PropertySyntax {Name = "Child"},
+                new PropertyPathGrammar.CastTypeSyntax
+                {
+                    TypeName = "SomeType",
+                    TypeNamespace = "somens"
+                },
+                PropertyPathGrammar.ChildTraversalSyntax.Instance,
+                new PropertyPathGrammar.PropertySyntax {Name = "SubChild"}
+            );
+        }
+        
+        [Fact]
+        public void PropertyPath_Should_Support_Ensure_Type()
+        {
+            Check(" ( somens:SomeType.SomeProperty ) := SomeType.Child := somens:SomeType . SubChild ",
+                new PropertyPathGrammar.TypeQualifiedPropertySyntax()
+                {
+                    Name = "SomeProperty", TypeName = "SomeType", TypeNamespace = "somens"
+                },
+                new PropertyPathGrammar.EnsureTypeSyntax
+                {
+                    TypeName = "SomeType"
+                },
+                PropertyPathGrammar.ChildTraversalSyntax.Instance,
+                new PropertyPathGrammar.PropertySyntax {Name = "Child"},
+                new PropertyPathGrammar.EnsureTypeSyntax
+                {
+                    TypeName = "SomeType",
+                    TypeNamespace = "somens"
+                },
+                PropertyPathGrammar.ChildTraversalSyntax.Instance,
+                new PropertyPathGrammar.PropertySyntax {Name = "SubChild"}
+            );
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/Data/DefaultValueConverterTests.cs b/tests/Avalonia.Base.UnitTests/Data/DefaultValueConverterTests.cs
index ecf559951a..f522acf9ce 100644
--- a/tests/Avalonia.Base.UnitTests/Data/DefaultValueConverterTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/DefaultValueConverterTests.cs
@@ -1,14 +1,11 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using System;
+using System.ComponentModel;
 using System.Globalization;
-using Avalonia.Controls;
-using Avalonia.Data;
-using Xunit;
 using System.Windows.Input;
-using System;
+using Avalonia.Data;
 using Avalonia.Data.Converters;
 using Avalonia.Layout;
+using Xunit;
 
 namespace Avalonia.Base.UnitTests.Data.Converters
 {
@@ -38,6 +35,54 @@ namespace Avalonia.Base.UnitTests.Data.Converters
             Assert.Equal(5.0, result);
         }
 
+        [Fact]
+        public void Do_Not_Throw_On_InvalidInput_For_NullableInt()
+        {
+            var result = DefaultValueConverter.Instance.Convert(
+                "<not-a-number>",
+                typeof(int?),
+                null,
+                CultureInfo.InvariantCulture);
+
+            Assert.IsType(typeof(BindingNotification), result);
+        }
+
+        [Fact]
+        public void Can_Convert_Decimal_To_NullableDouble()
+        {
+            var result = DefaultValueConverter.Instance.Convert(
+                5m,
+                typeof(double?),
+                null,
+                CultureInfo.InvariantCulture);
+
+            Assert.Equal(5.0, result);
+        }
+
+        [Fact]
+        public void Can_Convert_CustomType_To_Int()
+        {
+            var result = DefaultValueConverter.Instance.Convert(
+                new CustomType(123),
+                typeof(int),
+                null,
+                CultureInfo.InvariantCulture);
+
+            Assert.Equal(123, result);
+        }
+
+        [Fact]
+        public void Can_Convert_Int_To_CustomType()
+        {
+            var result = DefaultValueConverter.Instance.Convert(
+                123,
+                typeof(CustomType),
+                null,
+                CultureInfo.InvariantCulture);
+
+            Assert.Equal(new CustomType(123), result);
+        }
+
         [Fact]
         public void Can_Convert_String_To_Enum()
         {
@@ -50,6 +95,18 @@ namespace Avalonia.Base.UnitTests.Data.Converters
             Assert.Equal(TestEnum.Bar, result);
         }
 
+        [Fact]
+        public void Can_Convert_String_To_TimeSpan()
+        {
+            var result = DefaultValueConverter.Instance.Convert(
+                "00:00:10",
+                typeof(TimeSpan),
+                null,
+                CultureInfo.InvariantCulture);
+
+            Assert.Equal(TimeSpan.FromSeconds(10), result);
+        }
+
         [Fact]
         public void Can_Convert_Int_To_Enum()
         {
@@ -178,5 +235,49 @@ namespace Avalonia.Base.UnitTests.Data.Converters
                 return v.Value;
             }
         }
+
+        [TypeConverter(typeof(CustomTypeConverter))]
+        private class CustomType {
+
+            public int Value { get; }
+
+            public CustomType(int value)
+            {
+                Value = value;
+            }
+
+            public override bool Equals(object obj)
+            {
+                return obj is CustomType other && this.Value == other.Value;
+            }
+
+            public override int GetHashCode()
+            {
+                return 8399587^Value.GetHashCode();
+            }
+        }
+
+        private class CustomTypeConverter : TypeConverter
+        {
+            public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+            {
+                return destinationType == typeof(int);
+            }
+
+            public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+            {
+                return sourceType == typeof(int);
+            }
+
+            public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+            {
+                return ((CustomType)value).Value;
+            }
+
+            public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+            {
+                return new CustomType((int)value);
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/Data/UnitTestSynchronizationContext.cs b/tests/Avalonia.Base.UnitTests/Data/UnitTestSynchronizationContext.cs
index 838aee6528..71eed38a4c 100644
--- a/tests/Avalonia.Base.UnitTests/Data/UnitTestSynchronizationContext.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/UnitTestSynchronizationContext.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Reactive.Disposables;
diff --git a/tests/Avalonia.Base.UnitTests/DirectPropertyTests.cs b/tests/Avalonia.Base.UnitTests/DirectPropertyTests.cs
index fe7186e417..e7e3b5764f 100644
--- a/tests/Avalonia.Base.UnitTests/DirectPropertyTests.cs
+++ b/tests/Avalonia.Base.UnitTests/DirectPropertyTests.cs
@@ -1,40 +1,16 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Reactive.Subjects;
-using Avalonia.Data;
 using Xunit;
 
 namespace Avalonia.Base.UnitTests
 {
     public class DirectPropertyTests
     {
-        [Fact]
-        public void Initialized_Observable_Fired()
-        {
-            bool invoked = false;
-
-            Class1.FooProperty.Initialized.Subscribe(x =>
-            {
-                Assert.Equal(AvaloniaProperty.UnsetValue, x.OldValue);
-                Assert.Equal("foo", x.NewValue);
-                Assert.Equal(BindingPriority.Unset, x.Priority);
-                invoked = true;
-            });
-
-            var target = new Class1();
-
-            Assert.True(invoked);
-        }
-
         [Fact]
         public void IsDirect_Property_Returns_True()
         {
             var target = new DirectProperty<Class1, string>(
                 "test", 
                 o => null, 
-                null, 
+                null,
                 new DirectPropertyMetadata<string>());
 
             Assert.True(target.IsDirect);
@@ -68,18 +44,6 @@ namespace Avalonia.Base.UnitTests
             var p2 = p1.AddOwner<Class2>(o => null, (o, v) => { });
 
             Assert.Same(p1.Changed, p2.Changed);
-            Assert.Same(p1.Initialized, p2.Initialized);
-        }
-
-        [Fact]
-        public void IsAnimating_On_DirectProperty_With_Binding_Returns_False()
-        {
-            var target = new Class1();
-            var source = new BehaviorSubject<string>("foo");
-
-            target.Bind(Class1.FooProperty, source, BindingPriority.Animation);
-
-            Assert.False(target.IsAnimating(Class1.FooProperty));
         }
 
         private class Class1 : AvaloniaObject
diff --git a/tests/Avalonia.Base.UnitTests/PriorityValueTests.cs b/tests/Avalonia.Base.UnitTests/PriorityValueTests.cs
index 63e1790cce..0caa984a22 100644
--- a/tests/Avalonia.Base.UnitTests/PriorityValueTests.cs
+++ b/tests/Avalonia.Base.UnitTests/PriorityValueTests.cs
@@ -1,314 +1,325 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Utilities;
-using Moq;
-using System;
+using System;
 using System.Linq;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
+using System.Reactive.Disposables;
+using Avalonia.Data;
+using Avalonia.PropertyStore;
+using Moq;
 using Xunit;
 
 namespace Avalonia.Base.UnitTests
 {
     public class PriorityValueTests
     {
-        private static readonly AvaloniaProperty TestProperty = 
-            new StyledProperty<string>(
-                "Test", 
-                typeof(PriorityValueTests), 
-                new StyledPropertyMetadata<string>());
+        private static readonly IValueSink NullSink = new MockSink();
+        private static readonly IAvaloniaObject Owner = Mock.Of<IAvaloniaObject>();
+        private static readonly StyledProperty<string> TestProperty = new StyledProperty<string>(
+            "Test",
+            typeof(PriorityValueTests),
+            new StyledPropertyMetadata<string>());
 
         [Fact]
-        public void Initial_Value_Should_Be_UnsetValue()
+        public void Constructor_Should_Set_Value_Based_On_Initial_Entry()
         {
-            var target = new PriorityValue(GetMockOwner().Object, TestProperty, typeof(string));
-
-            Assert.Same(AvaloniaProperty.UnsetValue, target.Value);
+            var target = new PriorityValue<string>(
+                Owner,
+                TestProperty,
+                NullSink,
+                new ConstantValueEntry<string>(
+                    TestProperty,
+                    "1",
+                    BindingPriority.StyleTrigger,
+                    NullSink));
+
+            Assert.Equal("1", target.GetValue().Value);
+            Assert.Equal(BindingPriority.StyleTrigger, target.Priority);
         }
 
         [Fact]
-        public void First_Binding_Sets_Value()
+        public void GetValue_Should_Respect_MaxPriority()
         {
-            var target = new PriorityValue(GetMockOwner().Object, TestProperty, typeof(string));
-
-            target.Add(Single("foo"), 0);
-
-            Assert.Equal("foo", target.Value);
+            var target = new PriorityValue<string>(
+                Owner,
+                TestProperty,
+                NullSink);
+
+            target.SetValue("animation", BindingPriority.Animation);
+            target.SetValue("local", BindingPriority.LocalValue);
+            target.SetValue("styletrigger", BindingPriority.StyleTrigger);
+            target.SetValue("style", BindingPriority.Style);
+
+            Assert.Equal("animation", target.GetValue(BindingPriority.Animation));
+            Assert.Equal("local", target.GetValue(BindingPriority.LocalValue));
+            Assert.Equal("styletrigger", target.GetValue(BindingPriority.StyleTrigger));
+            Assert.Equal("style", target.GetValue(BindingPriority.TemplatedParent));
+            Assert.Equal("style", target.GetValue(BindingPriority.Style));
         }
 
         [Fact]
-        public void Changing_Binding_Should_Set_Value()
+        public void SetValue_LocalValue_Should_Not_Add_Entries()
         {
-            var target = new PriorityValue(GetMockOwner().Object, TestProperty, typeof(string));
-            var subject = new BehaviorSubject<string>("foo");
+            var target = new PriorityValue<string>(
+                Owner,
+                TestProperty,
+                NullSink);
 
-            target.Add(subject, 0);
-            Assert.Equal("foo", target.Value);
-            subject.OnNext("bar");
-            Assert.Equal("bar", target.Value);
+            target.SetValue("1", BindingPriority.LocalValue);
+            target.SetValue("2", BindingPriority.LocalValue);
+
+            Assert.Empty(target.Entries);
         }
 
         [Fact]
-        public void Setting_Direct_Value_Should_Override_Binding()
+        public void SetValue_Non_LocalValue_Should_Add_Entries()
         {
-            var target = new PriorityValue(GetMockOwner().Object, TestProperty, typeof(string));
+            var target = new PriorityValue<string>(
+                Owner,
+                TestProperty,
+                NullSink);
 
-            target.Add(Single("foo"), 0);
-            target.SetValue("bar", 0);
+            target.SetValue("1", BindingPriority.Style);
+            target.SetValue("2", BindingPriority.Animation);
 
-            Assert.Equal("bar", target.Value);
-        }
+            var result = target.Entries
+                .OfType<ConstantValueEntry<string>>()
+                .Select(x => x.GetValue().Value)
+                .ToList();
 
-        [Fact]
-        public void Binding_Firing_Should_Override_Direct_Value()
-        {
-            var target = new PriorityValue(GetMockOwner().Object, TestProperty, typeof(string));
-            var source = new BehaviorSubject<object>("initial");
-
-            target.Add(source, 0);
-            Assert.Equal("initial", target.Value);
-            target.SetValue("first", 0);
-            Assert.Equal("first", target.Value);
-            source.OnNext("second");
-            Assert.Equal("second", target.Value);
+            Assert.Equal(new[] { "1", "2" }, result);
         }
 
         [Fact]
-        public void Earlier_Binding_Firing_Should_Not_Override_Later()
+        public void Priority_Should_Be_Set()
         {
-            var target = new PriorityValue(GetMockOwner().Object, TestProperty, typeof(string));
-            var nonActive = new BehaviorSubject<object>("na");
-            var source = new BehaviorSubject<object>("initial");
-
-            target.Add(nonActive, 1);
-            target.Add(source, 1);
-            Assert.Equal("initial", target.Value);
-            target.SetValue("first", 1);
-            Assert.Equal("first", target.Value);
-            nonActive.OnNext("second");
-            Assert.Equal("first", target.Value);
+            var target = new PriorityValue<string>(
+                Owner,
+                TestProperty,
+                NullSink);
+
+            Assert.Equal(BindingPriority.Unset, target.Priority);
+            target.SetValue("style", BindingPriority.Style);
+            Assert.Equal(BindingPriority.Style, target.Priority);
+            target.SetValue("local", BindingPriority.LocalValue);
+            Assert.Equal(BindingPriority.LocalValue, target.Priority);
+            target.SetValue("animation", BindingPriority.Animation);
+            Assert.Equal(BindingPriority.Animation, target.Priority);
+            target.SetValue("local2", BindingPriority.LocalValue);
+            Assert.Equal(BindingPriority.Animation, target.Priority);
         }
 
         [Fact]
-        public void Binding_Completing_Should_Revert_To_Direct_Value()
+        public void Binding_With_Same_Priority_Should_Be_Appended()
         {
-            var target = new PriorityValue(GetMockOwner().Object, TestProperty, typeof(string));
-            var source = new BehaviorSubject<object>("initial");
-
-            target.Add(source, 0);
-            Assert.Equal("initial", target.Value);
-            target.SetValue("first", 0);
-            Assert.Equal("first", target.Value);
-            source.OnNext("second");
-            Assert.Equal("second", target.Value);
-            source.OnCompleted();
-            Assert.Equal("first", target.Value);
-        }
+            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var source1 = new Source("1");
+            var source2 = new Source("2");
 
-        [Fact]
-        public void Binding_With_Lower_Priority_Has_Precedence()
-        {
-            var target = new PriorityValue(GetMockOwner().Object, TestProperty, typeof(string));
+            target.AddBinding(source1, BindingPriority.LocalValue);
+            target.AddBinding(source2, BindingPriority.LocalValue);
 
-            target.Add(Single("foo"), 1);
-            target.Add(Single("bar"), 0);
-            target.Add(Single("baz"), 1);
+            var result = target.Entries
+                .OfType<BindingEntry<string>>()
+                .Select(x => x.Source)
+                .OfType<Source>()
+                .Select(x => x.Id)
+                .ToList();
 
-            Assert.Equal("bar", target.Value);
+            Assert.Equal(new[] { "1", "2" }, result);
         }
 
         [Fact]
-        public void Later_Binding_With_Same_Priority_Should_Take_Precedence()
+        public void Binding_With_Higher_Priority_Should_Be_Appended()
         {
-            var target = new PriorityValue(GetMockOwner().Object, TestProperty, typeof(string));
+            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var source1 = new Source("1");
+            var source2 = new Source("2");
 
-            target.Add(Single("foo"), 1);
-            target.Add(Single("bar"), 0);
-            target.Add(Single("baz"), 0);
-            target.Add(Single("qux"), 1);
+            target.AddBinding(source1, BindingPriority.LocalValue);
+            target.AddBinding(source2, BindingPriority.Animation);
 
-            Assert.Equal("baz", target.Value);
-        }
+            var result = target.Entries
+                .OfType<BindingEntry<string>>()
+                .Select(x => x.Source)
+                .OfType<Source>()
+                .Select(x => x.Id)
+                .ToList();
 
-        [Fact]
-        public void Changing_Binding_With_Lower_Priority_Should_Set_Not_Value()
-        {
-            var target = new PriorityValue(GetMockOwner().Object, TestProperty, typeof(string));
-            var subject = new BehaviorSubject<string>("bar");
-
-            target.Add(Single("foo"), 0);
-            target.Add(subject, 1);
-            Assert.Equal("foo", target.Value);
-            subject.OnNext("baz");
-            Assert.Equal("foo", target.Value);
+            Assert.Equal(new[] { "1", "2" }, result);
         }
 
         [Fact]
-        public void UnsetValue_Should_Fall_Back_To_Next_Binding()
+        public void Binding_With_Lower_Priority_Should_Be_Prepended()
         {
-            var target = new PriorityValue(GetMockOwner().Object, TestProperty, typeof(string));
-            var subject = new BehaviorSubject<object>("bar");
-
-            target.Add(subject, 0);
-            target.Add(Single("foo"), 1);
+            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var source1 = new Source("1");
+            var source2 = new Source("2");
 
-            Assert.Equal("bar", target.Value);
+            target.AddBinding(source1, BindingPriority.LocalValue);
+            target.AddBinding(source2, BindingPriority.Style);
 
-            subject.OnNext(AvaloniaProperty.UnsetValue);
+            var result = target.Entries
+                .OfType<BindingEntry<string>>()
+                .Select(x => x.Source)
+                .OfType<Source>()
+                .Select(x => x.Id)
+                .ToList();
 
-            Assert.Equal("foo", target.Value);
+            Assert.Equal(new[] { "2", "1" }, result);
         }
 
         [Fact]
-        public void Adding_Value_Should_Call_OnNext()
+        public void Second_Binding_With_Lower_Priority_Should_Be_Inserted_In_Middle()
         {
-            var owner = GetMockOwner();
-            var target = new PriorityValue(owner.Object, TestProperty, typeof(string));
-
-            target.Add(Single("foo"), 0);
-
-            owner.Verify(x => x.Changed(target.Property, target.ValuePriority, AvaloniaProperty.UnsetValue, "foo"));
+            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var source1 = new Source("1");
+            var source2 = new Source("2");
+            var source3 = new Source("3");
+
+            target.AddBinding(source1, BindingPriority.LocalValue);
+            target.AddBinding(source2, BindingPriority.Style);
+            target.AddBinding(source3, BindingPriority.Style);
+
+            var result = target.Entries
+                .OfType<BindingEntry<string>>()
+                .Select(x => x.Source)
+                .OfType<Source>()
+                .Select(x => x.Id)
+                .ToList();
+
+            Assert.Equal(new[] { "2", "3", "1" }, result);
         }
 
         [Fact]
-        public void Changing_Value_Should_Call_OnNext()
+        public void Competed_Binding_Should_Be_Removed()
         {
-            var owner = GetMockOwner();
-            var target = new PriorityValue(owner.Object, TestProperty, typeof(string));
-            var subject = new BehaviorSubject<object>("foo");
-
-            target.Add(subject, 0);
-            subject.OnNext("bar");
-
-            owner.Verify(x => x.Changed(target.Property, target.ValuePriority, "foo", "bar"));
+            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var source1 = new Source("1");
+            var source2 = new Source("2");
+            var source3 = new Source("3");
+
+            target.AddBinding(source1, BindingPriority.LocalValue).Start();
+            target.AddBinding(source2, BindingPriority.Style).Start();
+            target.AddBinding(source3, BindingPriority.Style).Start();
+            source3.OnCompleted();
+
+            var result = target.Entries
+                .OfType<BindingEntry<string>>()
+                .Select(x => x.Source)
+                .OfType<Source>()
+                .Select(x => x.Id)
+                .ToList();
+
+            Assert.Equal(new[] { "2", "1" }, result);
         }
 
         [Fact]
-        public void Disposing_A_Binding_Should_Revert_To_Next_Value()
+        public void Value_Should_Come_From_Last_Entry()
         {
-            var target = new PriorityValue(GetMockOwner().Object, TestProperty, typeof(string));
+            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var source1 = new Source("1");
+            var source2 = new Source("2");
+            var source3 = new Source("3");
 
-            target.Add(Single("foo"), 0);
-            var disposable = target.Add(Single("bar"), 0);
+            target.AddBinding(source1, BindingPriority.LocalValue).Start();
+            target.AddBinding(source2, BindingPriority.Style).Start();
+            target.AddBinding(source3, BindingPriority.Style).Start();
 
-            Assert.Equal("bar", target.Value);
-            disposable.Dispose();
-            Assert.Equal("foo", target.Value);
+            Assert.Equal("1", target.GetValue().Value);
         }
 
         [Fact]
-        public void Disposing_A_Binding_Should_Remove_BindingEntry()
+        public void LocalValue_Should_Override_LocalValue_Binding()
         {
-            var target = new PriorityValue(GetMockOwner().Object, TestProperty, typeof(string));
+            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var source1 = new Source("1");
 
-            target.Add(Single("foo"), 0);
-            var disposable = target.Add(Single("bar"), 0);
+            target.AddBinding(source1, BindingPriority.LocalValue).Start();
+            target.SetValue("2", BindingPriority.LocalValue);
 
-            Assert.Equal(2, target.GetBindings().Count());
-            disposable.Dispose();
-            Assert.Single(target.GetBindings());
+            Assert.Equal("2", target.GetValue().Value);
         }
 
         [Fact]
-        public void Completing_A_Binding_Should_Revert_To_Previous_Binding()
+        public void LocalValue_Should_Override_Style_Binding()
         {
-            var target = new PriorityValue(GetMockOwner().Object, TestProperty, typeof(string));
-            var source = new BehaviorSubject<object>("bar");
+            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var source1 = new Source("1");
 
-            target.Add(Single("foo"), 0);
-            target.Add(source, 0);
+            target.AddBinding(source1, BindingPriority.Style).Start();
+            target.SetValue("2", BindingPriority.LocalValue);
 
-            Assert.Equal("bar", target.Value);
-            source.OnCompleted();
-            Assert.Equal("foo", target.Value);
+            Assert.Equal("2", target.GetValue().Value);
         }
 
         [Fact]
-        public void Completing_A_Binding_Should_Revert_To_Lower_Priority()
+        public void LocalValue_Should_Not_Override_Animation_Binding()
         {
-            var target = new PriorityValue(GetMockOwner().Object, TestProperty, typeof(string));
-            var source = new BehaviorSubject<object>("bar");
+            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var source1 = new Source("1");
 
-            target.Add(Single("foo"), 1);
-            target.Add(source, 0);
+            target.AddBinding(source1, BindingPriority.Animation).Start();
+            target.SetValue("2", BindingPriority.LocalValue);
 
-            Assert.Equal("bar", target.Value);
-            source.OnCompleted();
-            Assert.Equal("foo", target.Value);
+            Assert.Equal("1", target.GetValue().Value);
         }
 
         [Fact]
-        public void Completing_A_Binding_Should_Remove_BindingEntry()
+        public void NonAnimated_Value_Should_Be_Correct_1()
         {
-            var target = new PriorityValue(GetMockOwner().Object, TestProperty, typeof(string));
-            var subject = new BehaviorSubject<object>("bar");
+            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var source1 = new Source("1");
+            var source2 = new Source("2");
+            var source3 = new Source("3");
 
-            target.Add(Single("foo"), 0);
-            target.Add(subject, 0);
+            target.AddBinding(source1, BindingPriority.LocalValue).Start();
+            target.AddBinding(source2, BindingPriority.Style).Start();
+            target.AddBinding(source3, BindingPriority.Animation).Start();
 
-            Assert.Equal(2, target.GetBindings().Count());
-            subject.OnCompleted();
-            Assert.Single(target.GetBindings());
+            Assert.Equal("3", target.GetValue().Value);
+            Assert.Equal("1", target.GetValue(BindingPriority.LocalValue).Value);
         }
 
         [Fact]
-        public void Direct_Value_Should_Be_Coerced()
+        public void NonAnimated_Value_Should_Be_Correct_2()
         {
-            var target = new PriorityValue(GetMockOwner().Object, TestProperty, typeof(int), x => Math.Min((int)x, 10));
+            var target = new PriorityValue<string>(Owner, TestProperty, NullSink);
+            var source1 = new Source("1");
+            var source2 = new Source("2");
+            var source3 = new Source("3");
 
-            target.SetValue(5, 0);
-            Assert.Equal(5, target.Value);
-            target.SetValue(15, 0);
-            Assert.Equal(10, target.Value);
-        }
+            target.AddBinding(source1, BindingPriority.Animation).Start();
+            target.AddBinding(source2, BindingPriority.Style).Start();
+            target.AddBinding(source3, BindingPriority.Style).Start();
 
-        [Fact]
-        public void Bound_Value_Should_Be_Coerced()
-        {
-            var target = new PriorityValue(GetMockOwner().Object, TestProperty, typeof(int), x => Math.Min((int)x, 10));
-            var source = new Subject<object>();
-
-            target.Add(source, 0);
-            source.OnNext(5);
-            Assert.Equal(5, target.Value);
-            source.OnNext(15);
-            Assert.Equal(10, target.Value);
+            Assert.Equal("1", target.GetValue().Value);
+            Assert.Equal("3", target.GetValue(BindingPriority.LocalValue).Value);
         }
 
-        [Fact]
-        public void Revalidate_Should_ReCoerce_Value()
+        private class Source : IObservable<BindingValue<string>>
         {
-            var max = 10;
-            var target = new PriorityValue(GetMockOwner().Object, TestProperty, typeof(int), x => Math.Min((int)x, max));
-            var source = new Subject<object>();
-
-            target.Add(source, 0);
-            source.OnNext(5);
-            Assert.Equal(5, target.Value);
-            source.OnNext(15);
-            Assert.Equal(10, target.Value);
-            max = 12;
-            target.Revalidate();
-            Assert.Equal(12, target.Value);
-        }
+            private IObserver<BindingValue<string>> _observer;
 
-        /// <summary>
-        /// Returns an observable that returns a single value but does not complete.
-        /// </summary>
-        /// <typeparam name="T">The type of the observable.</typeparam>
-        /// <param name="value">The value.</param>
-        /// <returns>The observable.</returns>
-        private IObservable<T> Single<T>(T value)
-        {
-            return Observable.Never<T>().StartWith(value);
+            public Source(string id) => Id = id;
+            public string Id { get; }
+
+            public IDisposable Subscribe(IObserver<BindingValue<string>> observer)
+            {
+                _observer = observer;
+                observer.OnNext(Id);
+                return Disposable.Empty;
+            }
+
+            public void OnCompleted() => _observer.OnCompleted();
         }
 
-        private static Mock<IPriorityValueOwner> GetMockOwner()
+        private class MockSink : IValueSink
         {
-            var owner = new Mock<IPriorityValueOwner>();
-            owner.Setup(o => o.GetNonDirectDeferredSetter(It.IsAny<AvaloniaProperty>())).Returns(new DeferredSetter<object>());
-            return owner;
+            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/Properties/AssemblyInfo.cs b/tests/Avalonia.Base.UnitTests/Properties/AssemblyInfo.cs
index 4b93ea8400..7d45a770b0 100644
--- a/tests/Avalonia.Base.UnitTests/Properties/AssemblyInfo.cs
+++ b/tests/Avalonia.Base.UnitTests/Properties/AssemblyInfo.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reflection;
 using Xunit;
 
diff --git a/tests/Avalonia.Base.UnitTests/StyledPropertyTests.cs b/tests/Avalonia.Base.UnitTests/StyledPropertyTests.cs
index 3665185bc5..f0aa47784d 100644
--- a/tests/Avalonia.Base.UnitTests/StyledPropertyTests.cs
+++ b/tests/Avalonia.Base.UnitTests/StyledPropertyTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Xunit;
 
 namespace Avalonia.Base.UnitTests
diff --git a/tests/Avalonia.Base.UnitTests/Utilities/MathUtilitiesTests.cs b/tests/Avalonia.Base.UnitTests/Utilities/MathUtilitiesTests.cs
new file mode 100644
index 0000000000..de3fadd157
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Utilities/MathUtilitiesTests.cs
@@ -0,0 +1,203 @@
+using System;
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Utilities
+{
+    public class MathUtilitiesTests
+    {
+        private const double AnyValue = 42.42;
+        private readonly double _calculatedAnyValue;
+        private readonly double _one;
+        private readonly double _zero;
+
+        public MathUtilitiesTests()
+        {
+            _calculatedAnyValue = 0.0;
+            _one = 0.0;
+            _zero = 1.0;
+
+            const int N = 10;
+            var dxAny = AnyValue / N;
+            var dxOne = 1.0 / N;
+            var dxZero = _zero / N;
+
+            for (var i = 0; i < N; ++i)
+            {
+                _calculatedAnyValue += dxAny;
+                _one += dxOne;
+                _zero -= dxZero;
+            }
+        }
+
+        [Fact]
+        public void Two_Equivalent_Double_Values_Are_Close()
+        {
+            var actual = MathUtilities.AreClose(AnyValue, _calculatedAnyValue);
+
+            Assert.True(actual);
+            Assert.Equal(AnyValue, Math.Round(_calculatedAnyValue, 14));
+        }
+
+        [Fact]
+        public void Two_Equivalent_Single_Values_Are_Close()
+        {
+            var expectedValue = (float)AnyValue;
+            var actualValue = (float)_calculatedAnyValue;
+            
+            var actual = MathUtilities.AreClose(expectedValue, actualValue);
+
+            Assert.True(actual);
+            Assert.Equal((float) Math.Round(expectedValue, 5), (float) Math.Round(actualValue, 4));
+        }
+
+        [Fact]
+        public void Calculated_Double_One_Is_One()
+        {
+            var actual = MathUtilities.IsOne(_one);
+
+            Assert.True(actual);
+            Assert.Equal(1.0, Math.Round(_one, 15));
+        }
+
+        [Fact]
+        public void Calculated_Single_One_Is_One()
+        {
+            var actualValue = (float)_one;
+            
+            var actual = MathUtilities.IsOne(actualValue);
+
+            Assert.True(actual);
+            Assert.Equal(1.0f, (float) Math.Round(actualValue, 7));
+        }
+
+        [Fact]
+        public void Calculated_Double_Zero_Is_Zero()
+        {
+            var actual = MathUtilities.IsZero(_zero);
+
+            Assert.True(actual);
+            Assert.Equal(0.0, Math.Round(_zero, 15));
+        }
+
+        [Fact]
+        public void Calculated_Single_Zero_Is_Zero()
+        {
+            var actualValue = (float)_zero;
+
+            var actual = MathUtilities.IsZero(actualValue);
+
+            Assert.True(actual);
+            Assert.Equal(0.0f, (float) Math.Round(actualValue, 7));
+        }
+
+        [Fact]
+        public void Float_Clamp_Input_NaN_Return_NaN()
+        {
+            var clamp = MathUtilities.Clamp(double.NaN, 0.0, 1.0);
+            Assert.True(double.IsNaN(clamp));
+        }
+
+        [Fact]
+        public void Float_Clamp_Input_NegativeInfinity_Return_Min()
+        {
+            const double min = 0.0;
+            const double max = 1.0;
+            var actual = MathUtilities.Clamp(double.NegativeInfinity, min, max);
+            Assert.Equal(min, actual);
+        }
+
+        [Fact]
+        public void Float_Clamp_Input_PositiveInfinity_Return_Max()
+        {
+            const double min = 0.0;
+            const double max = 1.0;
+            var actual = MathUtilities.Clamp(double.PositiveInfinity, min, max);
+            Assert.Equal(max, actual);
+        }
+
+        [Fact]
+        public void Double_Float_Zero_Less_Than_One()
+        {
+            var actual = MathUtilities.LessThan(0d, 1d);
+            Assert.True(actual);
+        }
+
+        [Fact]
+        public void Single_Float_Zero_Less_Than_One()
+        {
+            var actual = MathUtilities.LessThan(0f, 1f);
+            Assert.True(actual);
+        }
+
+        [Fact]
+        public void Double_Float_One_Not_Less_Than_Zero()
+        {
+            var actual = MathUtilities.LessThan(1d, 0d);
+            Assert.False(actual);
+        }
+
+        [Fact]
+        public void Single_Float_One_Not_Less_Than_Zero()
+        {
+            var actual = MathUtilities.LessThan(1f, 0f);
+            Assert.False(actual);
+        }
+
+        [Fact]
+        public void Double_Float_Zero_Not_Greater_Than_One()
+        {
+            var actual = MathUtilities.GreaterThan(0d, 1d);
+            Assert.False(actual);
+        }
+
+        [Fact]
+        public void Single_Float_Zero_Not_Greater_Than_One()
+        {
+            var actual = MathUtilities.GreaterThan(0f, 1f);
+            Assert.False(actual);
+        }
+
+        [Fact]
+        public void Double_Float_One_Greater_Than_Zero()
+        {
+            var actual = MathUtilities.GreaterThan(1d, 0d);
+            Assert.True(actual);
+        }
+
+        [Fact]
+        public void Single_Float_One_Greater_Than_Zero()
+        {
+            var actual = MathUtilities.GreaterThan(1f, 0f);
+            Assert.True(actual);
+        }
+
+        [Fact]
+        public void Double_Float_One_Less_Than_Or_Close_One()
+        {
+            var actual = MathUtilities.LessThanOrClose(1d, 1d);
+            Assert.True(actual);
+        }
+
+        [Fact]
+        public void Single_Float_One_Less_Than_Or_Close_One()
+        {
+            var actual = MathUtilities.LessThanOrClose(1f, 1f);
+            Assert.True(actual);
+        }
+
+        [Fact]
+        public void Double_Float_One_Greater_Than_Or_Close_One()
+        {
+            var actual = MathUtilities.GreaterThanOrClose(1d, 1d);
+            Assert.True(actual);
+        }
+
+        [Fact]
+        public void Single_Float_One_Greater_Than_Or_Close_One()
+        {
+            var actual = MathUtilities.GreaterThanOrClose(1f, 1f);
+            Assert.True(actual);
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
index f503bf66a7..251894e324 100644
--- a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
+++ b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -18,7 +18,7 @@
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/tests/Avalonia.Benchmarks/Base/AvaloniaObjectInitializationBenchmark.cs b/tests/Avalonia.Benchmarks/Base/AvaloniaObjectInitializationBenchmark.cs
index 06716f7102..d2e38850f2 100644
--- a/tests/Avalonia.Benchmarks/Base/AvaloniaObjectInitializationBenchmark.cs
+++ b/tests/Avalonia.Benchmarks/Base/AvaloniaObjectInitializationBenchmark.cs
@@ -6,7 +6,7 @@ namespace Avalonia.Benchmarks.Base
     [MemoryDiagnoser]
     public class AvaloniaObjectInitializationBenchmark
     {
-        [Benchmark(OperationsPerInvoke = 1000)]
+        [Benchmark]
         public Button InitializeButton()
         {
             return new Button();
diff --git a/tests/Avalonia.Benchmarks/Base/Properties.cs b/tests/Avalonia.Benchmarks/Base/Properties.cs
index 45fc68ac96..e3650d9f4b 100644
--- a/tests/Avalonia.Benchmarks/Base/Properties.cs
+++ b/tests/Avalonia.Benchmarks/Base/Properties.cs
@@ -35,7 +35,7 @@ namespace Avalonia.Benchmarks.Base
 
         class Class1 : AvaloniaObject
         {
-            public static readonly AvaloniaProperty<int> IntProperty =
+            public static readonly StyledProperty<int> IntProperty =
                 AvaloniaProperty.Register<Class1, int>("Int");
         }
     }
diff --git a/tests/Avalonia.Benchmarks/Base/StyledPropertyBenchmark.cs b/tests/Avalonia.Benchmarks/Base/StyledPropertyBenchmark.cs
new file mode 100644
index 0000000000..b70ae19275
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Base/StyledPropertyBenchmark.cs
@@ -0,0 +1,147 @@
+using System;
+using System.Collections.Generic;
+using System.Reactive.Subjects;
+using System.Text;
+using Avalonia.Data;
+using BenchmarkDotNet.Attributes;
+
+namespace Avalonia.Benchmarks.Base
+{
+    [MemoryDiagnoser]
+    public class StyledPropertyBenchmarks
+    {
+        [Benchmark]
+        public void Set_Int_Property_LocalValue()
+        {
+            var obj = new StyledClass();
+
+            for (var i = 0; i < 100; ++i)
+            {
+                obj.IntValue += 1;
+            }
+        }
+
+        [Benchmark]
+        public void Set_Int_Property_Multiple_Priorities()
+        {
+            var obj = new StyledClass();
+            var value = 0;
+
+            for (var i = 0; i < 100; ++i)
+            {
+                for (var p = BindingPriority.Animation; p <= BindingPriority.Style; ++p)
+                {
+                    obj.SetValue(StyledClass.IntValueProperty, value++, p);
+                }
+            }
+        }
+
+        [Benchmark]
+        public void Set_Int_Property_TemplatedParent()
+        {
+            var obj = new StyledClass();
+
+            for (var i = 0; i < 100; ++i)
+            {
+                obj.SetValue(StyledClass.IntValueProperty, obj.IntValue + 1, BindingPriority.TemplatedParent);
+            }
+        }
+
+        [Benchmark]
+        public void Bind_Int_Property_LocalValue()
+        {
+            var obj = new StyledClass();
+            var source = new Subject<BindingValue<int>>();
+
+            obj.Bind(StyledClass.IntValueProperty, source);
+
+            for (var i = 0; i < 100; ++i)
+            {
+                source.OnNext(i);
+            }
+        }
+
+        [Benchmark]
+        public void Bind_Int_Property_Multiple_Priorities()
+        {
+            var obj = new StyledClass();
+            var sources = new List<Subject<BindingValue<int>>>();
+            var value = 0;
+
+            for (var p = BindingPriority.Animation; p <= BindingPriority.Style; ++p)
+            {
+                var source = new Subject<BindingValue<int>>();
+                sources.Add(source);
+                obj.Bind(StyledClass.IntValueProperty, source, p);
+            }
+
+            for (var i = 0; i < 100; ++i)
+            {
+                foreach (var source in sources)
+                {
+                    source.OnNext(value++);
+                }
+            }
+        }
+
+        [Benchmark]
+        public void Set_Validated_Int_Property_LocalValue()
+        {
+            var obj = new StyledClass();
+
+            for (var i = 0; i < 100; ++i)
+            {
+                obj.ValidatedIntValue += 1;
+            }
+        }
+
+        [Benchmark]
+        public void Set_Coerced_Int_Property_LocalValue()
+        {
+            var obj = new StyledClass();
+
+            for (var i = 0; i < 100; ++i)
+            {
+                obj.CoercedIntValue += 1;
+            }
+        }
+
+        class StyledClass : AvaloniaObject
+        {
+            public static readonly StyledProperty<int> IntValueProperty =
+                AvaloniaProperty.Register<StyledClass, int>(nameof(IntValue));
+            public static readonly StyledProperty<int> ValidatedIntValueProperty =
+                AvaloniaProperty.Register<StyledClass, int>(nameof(ValidatedIntValue), validate: ValidateIntValue);
+            public static readonly StyledProperty<int> CoercedIntValueProperty =
+                AvaloniaProperty.Register<StyledClass, int>(nameof(CoercedIntValue), coerce: CoerceIntValue);
+
+            public int IntValue
+            {
+                get => GetValue(IntValueProperty);
+                set => SetValue(IntValueProperty, value);
+            }
+
+            public int ValidatedIntValue
+            {
+                get => GetValue(ValidatedIntValueProperty);
+                set => SetValue(ValidatedIntValueProperty, value);
+            }
+
+            public int CoercedIntValue
+            {
+                get => GetValue(CoercedIntValueProperty);
+                set => SetValue(CoercedIntValueProperty, value);
+            }
+
+            private static bool ValidateIntValue(int arg)
+            {
+                return arg < 1000;
+            }
+
+            private static int CoerceIntValue(IAvaloniaObject arg1, int arg2)
+            {
+                return Math.Min(1000, arg2);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/ControlHierarchyCreator.cs b/tests/Avalonia.Benchmarks/ControlHierarchyCreator.cs
new file mode 100644
index 0000000000..1c9ba4e6ae
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/ControlHierarchyCreator.cs
@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+using Avalonia.Controls;
+
+namespace Avalonia.Benchmarks
+{
+    internal class ControlHierarchyCreator
+    {
+        public static List<Control> CreateChildren(List<Control> controls, IPanel parent, int childCount, int innerCount, int iterations)
+        {
+            for (var i = 0; i < childCount; ++i)
+            {
+                var control = new StackPanel();
+                parent.Children.Add(control);
+
+                for (int j = 0; j < innerCount; ++j)
+                {
+                    var child = new Button();
+
+                    parent.Children.Add(child);
+
+                    controls.Add(child);
+                }
+
+                if (iterations > 0)
+                {
+                    CreateChildren(controls, control, childCount, innerCount, iterations - 1);
+                }
+
+                controls.Add(control);
+            }
+
+            return controls;
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Data/AccessorTestObject.cs b/tests/Avalonia.Benchmarks/Data/AccessorTestObject.cs
new file mode 100644
index 0000000000..0039f5670c
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Data/AccessorTestObject.cs
@@ -0,0 +1,47 @@
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using JetBrains.Annotations;
+
+namespace Avalonia.Benchmarks.Data
+{
+    internal class AccessorTestObject : INotifyPropertyChanged
+    {
+        private string _test;
+
+        public string Test
+        {
+            get => _test;
+            set
+            {
+                if (_test == value)
+                {
+                    return;
+                }
+
+                _test = value;
+
+                OnPropertyChanged();
+            }
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        public void Execute()
+        {
+        }
+
+        public void Execute(object p0)
+        {
+        }
+
+        public void Execute(object p0, object p1)
+        {
+        }
+
+        [NotifyPropertyChangedInvocator]
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Data/BindingsBenchmark.cs b/tests/Avalonia.Benchmarks/Data/BindingsBenchmark.cs
new file mode 100644
index 0000000000..a320f07063
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Data/BindingsBenchmark.cs
@@ -0,0 +1,59 @@
+using Avalonia.Data;
+using BenchmarkDotNet.Attributes;
+
+namespace Avalonia.Benchmarks.Data
+{
+    [MemoryDiagnoser, InProcess]
+    public class BindingsBenchmark
+    {
+        [Benchmark]
+        public void TwoWayBinding_Via_Binding()
+        {
+            var instance = new TestClass();
+
+            var binding = new Binding(nameof(TestClass.BoundValue), BindingMode.TwoWay)
+            {
+                Source = instance
+            };
+
+            instance.Bind(TestClass.IntValueProperty, binding);
+        }
+
+        [Benchmark]
+        public void UpdateTwoWayBinding_Via_Binding()
+        {
+            var instance = new TestClass();
+
+            var binding = new Binding(nameof(TestClass.BoundValue), BindingMode.TwoWay)
+            {
+                Source = instance
+            };
+
+            instance.Bind(TestClass.IntValueProperty, binding);
+            for (int i = 0; i < 60; i++)
+            {
+                instance.IntValue = i;
+            }
+        }
+        private class TestClass : AvaloniaObject
+        {
+            public static readonly StyledProperty<int> IntValueProperty =
+                AvaloniaProperty.Register<TestClass, int>(nameof(IntValue));
+
+            public static readonly StyledProperty<int> BoundValueProperty =
+                AvaloniaProperty.Register<TestClass, int>(nameof(BoundValue));
+
+            public int IntValue
+            {
+                get => GetValue(IntValueProperty);
+                set => SetValue(IntValueProperty, value);
+            }
+
+            public int BoundValue
+            {
+                get => GetValue(BoundValueProperty);
+                set => SetValue(BoundValueProperty, value);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Data/PropertyAccessorBenchmarks.cs b/tests/Avalonia.Benchmarks/Data/PropertyAccessorBenchmarks.cs
new file mode 100644
index 0000000000..6c5e0d3b53
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Data/PropertyAccessorBenchmarks.cs
@@ -0,0 +1,44 @@
+using System;
+using Avalonia.Data.Core.Plugins;
+using BenchmarkDotNet.Attributes;
+
+namespace Avalonia.Benchmarks.Data
+{
+    [MemoryDiagnoser, InProcess]
+    public class PropertyAccessorBenchmarks
+    {
+        private readonly InpcPropertyAccessorPlugin _inpcPlugin = new InpcPropertyAccessorPlugin();
+        private readonly MethodAccessorPlugin _methodPlugin = new MethodAccessorPlugin();
+        private readonly AccessorTestObject _targetStrongRef = new AccessorTestObject();
+        private readonly WeakReference<object> _targetWeakRef;
+
+        public PropertyAccessorBenchmarks()
+        {
+            _targetWeakRef = new WeakReference<object>(_targetStrongRef);
+        }
+
+        [Benchmark]
+        public void InpcAccessorMatch()
+        {
+            _inpcPlugin.Match(_targetWeakRef, nameof(AccessorTestObject.Test));
+        }
+
+        [Benchmark]
+        public void InpcAccessorStart()
+        {
+            _inpcPlugin.Start(_targetWeakRef, nameof(AccessorTestObject.Test));
+        }
+
+        [Benchmark]
+        public void MethodAccessorMatch()
+        {
+            _methodPlugin.Match(_targetWeakRef, nameof(AccessorTestObject.Execute));
+        }
+
+        [Benchmark]
+        public void MethodAccessorStart()
+        {
+            _methodPlugin.Start(_targetWeakRef, nameof(AccessorTestObject.Execute));
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Data/PropertyAccessorPluginBenchmarks.cs b/tests/Avalonia.Benchmarks/Data/PropertyAccessorPluginBenchmarks.cs
new file mode 100644
index 0000000000..75e3269e3d
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Data/PropertyAccessorPluginBenchmarks.cs
@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+using Avalonia.Data.Core.Plugins;
+using BenchmarkDotNet.Attributes;
+
+namespace Avalonia.Benchmarks.Data
+{
+    [MemoryDiagnoser, InProcess]
+    public class PropertyAccessorPluginBenchmarks
+    {
+        private readonly AccessorTestObject _targetStrongRef = new AccessorTestObject();
+
+        private readonly List<IPropertyAccessorPlugin> _oldPlugins;
+        private readonly List<IPropertyAccessorPlugin> _newPlugins;
+
+        public PropertyAccessorPluginBenchmarks()
+        {
+            _oldPlugins = new List<IPropertyAccessorPlugin>
+            {
+                new AvaloniaPropertyAccessorPlugin(),
+                new MethodAccessorPlugin(),
+                new InpcPropertyAccessorPlugin()
+            };
+
+            _newPlugins = new List<IPropertyAccessorPlugin>
+            {
+                new AvaloniaPropertyAccessorPlugin(),
+                new InpcPropertyAccessorPlugin(),
+                new MethodAccessorPlugin()
+            };
+        }
+
+        [Benchmark]
+        public void MatchAccessorOld()
+        {
+            var propertyName = nameof(AccessorTestObject.Test);
+
+            foreach (IPropertyAccessorPlugin x in _oldPlugins)
+            {
+                if (x.Match(_targetStrongRef, propertyName))
+                {
+                    break;
+                }
+            }
+        }
+
+        [Benchmark]
+        public void MatchAccessorNew()
+        {
+            var propertyName = nameof(AccessorTestObject.Test);
+
+            foreach (IPropertyAccessorPlugin x in _newPlugins)
+            {
+                if (x.Match(_targetStrongRef, propertyName))
+                {
+                    break;
+                }
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Layout/ControlsBenchmark.cs b/tests/Avalonia.Benchmarks/Layout/ControlsBenchmark.cs
new file mode 100644
index 0000000000..3493dd0f53
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Layout/ControlsBenchmark.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Runtime.CompilerServices;
+using Avalonia.Controls;
+using Avalonia.UnitTests;
+using BenchmarkDotNet.Attributes;
+
+namespace Avalonia.Benchmarks.Layout
+{
+    [MemoryDiagnoser]
+    public class ControlsBenchmark : IDisposable
+    {
+        private readonly IDisposable _app;
+        private readonly TestRoot _root;
+
+        public ControlsBenchmark()
+        {
+            _app = UnitTestApplication.Start(
+                TestServices.StyledWindow.With(
+                    renderInterface: new NullRenderingPlatform(),
+                    threadingInterface: new NullThreadingPlatform(),
+                    standardCursorFactory: new NullCursorFactory()));
+
+            _root = new TestRoot(true, null)
+            {
+                Renderer = new NullRenderer()
+            };
+
+            _root.LayoutManager.ExecuteInitialLayoutPass();
+        }
+
+        [Benchmark]
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public void CreateCalendar()
+        {
+            var calendar = new Calendar();
+
+            _root.Child = calendar;
+
+            _root.LayoutManager.ExecuteLayoutPass();
+        }
+
+        [Benchmark]
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public void CreateButton()
+        {
+            var button = new Button();
+
+            _root.Child = button;
+
+            _root.LayoutManager.ExecuteLayoutPass();
+        }
+
+        [Benchmark]
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public void CreateTextBox()
+        {
+            var textBox = new TextBox();
+
+            _root.Child = textBox;
+
+            _root.LayoutManager.ExecuteLayoutPass();
+        }
+
+        public void Dispose()
+        {
+            _app.Dispose();
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Layout/Measure.cs b/tests/Avalonia.Benchmarks/Layout/Measure.cs
index b0490d8a0f..fce2cddec9 100644
--- a/tests/Avalonia.Benchmarks/Layout/Measure.cs
+++ b/tests/Avalonia.Benchmarks/Layout/Measure.cs
@@ -1,7 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 using Avalonia.Controls;
-using Avalonia.Layout;
 using Avalonia.UnitTests;
 using BenchmarkDotNet.Attributes;
 
@@ -10,48 +9,34 @@ namespace Avalonia.Benchmarks.Layout
     [MemoryDiagnoser]
     public class Measure
     {
-        private TestRoot root;
-        private List<Control> controls = new List<Control>();
+        private readonly TestRoot _root;
+        private readonly List<Control> _controls = new List<Control>();
 
         public Measure()
         {
             var panel = new StackPanel();
-            root = new TestRoot { Child = panel };
-            controls.Add(panel);
-            CreateChildren(panel, 3, 5);
-            root.LayoutManager.ExecuteInitialLayoutPass(root);
-        }
-
-        [Benchmark]
-        public void Remeasure_Half()
-        {
-            var random = new Random(1);
 
-            foreach (var control in controls)
+            _root = new TestRoot
             {
-                if (random.Next(2) == 0)
-                {
-                    control.InvalidateMeasure();
-                }
-            }
+                Child = panel,
+                Renderer = new NullRenderer()
+            };
 
-            root.LayoutManager.ExecuteLayoutPass();
+            _controls.Add(panel);
+            _controls = ControlHierarchyCreator.CreateChildren(_controls, panel, 3, 5, 5);
+
+            _root.LayoutManager.ExecuteInitialLayoutPass();
         }
 
-        private void CreateChildren(IPanel parent, int childCount, int iterations)
+        [Benchmark, MethodImpl(MethodImplOptions.NoInlining)]
+        public void Remeasure()
         {
-            for (var i = 0; i < childCount; ++i)
+            foreach (var control in _controls)
             {
-                var control = new StackPanel();
-                parent.Children.Add(control);
-
-                if (iterations > 0)
-                {
-                    CreateChildren(control, childCount, iterations - 1);
-                }
-
-                controls.Add(control);
+                control.InvalidateMeasure();
             }
+
+            _root.LayoutManager.ExecuteLayoutPass();
         }
     }
 }
diff --git a/tests/Avalonia.Benchmarks/NullCursorFactory.cs b/tests/Avalonia.Benchmarks/NullCursorFactory.cs
new file mode 100644
index 0000000000..012adce0f2
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/NullCursorFactory.cs
@@ -0,0 +1,14 @@
+using System;
+using Avalonia.Input;
+using Avalonia.Platform;
+
+namespace Avalonia.Benchmarks
+{
+    internal class NullCursorFactory : IStandardCursorFactory
+    {
+        public IPlatformHandle GetCursor(StandardCursorType cursorType)
+        {
+            return new PlatformHandle(IntPtr.Zero, "null");
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/NullFormattedTextImpl.cs b/tests/Avalonia.Benchmarks/NullFormattedTextImpl.cs
new file mode 100644
index 0000000000..f886d077cc
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/NullFormattedTextImpl.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Media;
+using Avalonia.Platform;
+
+namespace Avalonia.Benchmarks
+{
+    internal class NullFormattedTextImpl : IFormattedTextImpl
+    {
+        public Size Constraint { get; }
+
+        public Rect Bounds { get; }
+
+        public string Text { get; }
+
+        public IEnumerable<FormattedTextLine> GetLines()
+        {
+            throw new NotImplementedException();
+        }
+
+        public TextHitTestResult HitTestPoint(Point point)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Rect HitTestTextPosition(int index)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IEnumerable<Rect> HitTestTextRange(int index, int length)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/NullGlyphRun.cs b/tests/Avalonia.Benchmarks/NullGlyphRun.cs
new file mode 100644
index 0000000000..5ba0822649
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/NullGlyphRun.cs
@@ -0,0 +1,11 @@
+using Avalonia.Platform;
+
+namespace Avalonia.Benchmarks
+{
+    internal class NullGlyphRun : IGlyphRunImpl
+    {
+        public void Dispose()
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/NullRenderer.cs b/tests/Avalonia.Benchmarks/NullRenderer.cs
new file mode 100644
index 0000000000..c1701b5d57
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/NullRenderer.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Rendering;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Benchmarks
+{
+    internal class NullRenderer : IRenderer
+    {
+        public bool DrawFps { get; set; }
+        public bool DrawDirtyRects { get; set; }
+#pragma warning disable CS0067
+        public event EventHandler<SceneInvalidatedEventArgs> SceneInvalidated;
+#pragma warning restore CS0067
+        public void AddDirty(IVisual visual)
+        {
+        }
+
+        public void Dispose()
+        {
+        }
+
+        public IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool> filter) => null;
+
+        public IVisual HitTestFirst(Point p, IVisual root, Func<IVisual, bool> filter) => null;
+
+        public void Paint(Rect rect)
+        {
+        }
+
+        public void RecalculateChildren(IVisual visual)
+        {
+        }
+
+        public void Resized(Size size)
+        {
+        }
+
+        public void Start()
+        {
+        }
+
+        public void Stop()
+        {
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/NullRenderingPlatform.cs b/tests/Avalonia.Benchmarks/NullRenderingPlatform.cs
new file mode 100644
index 0000000000..1570205456
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/NullRenderingPlatform.cs
@@ -0,0 +1,102 @@
+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.Benchmarks
+{
+    internal class NullRenderingPlatform : IPlatformRenderInterface
+    {
+        public IFormattedTextImpl CreateFormattedText(string text, Typeface typeface, double fontSize, TextAlignment textAlignment,
+            TextWrapping wrapping, Size constraint, IReadOnlyList<FormattedTextStyleSpan> spans)
+        {
+            return new NullFormattedTextImpl();
+        }
+
+        public IGeometryImpl CreateEllipseGeometry(Rect rect)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IGeometryImpl CreateLineGeometry(Point p1, Point p2)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IGeometryImpl CreateRectangleGeometry(Rect rect)
+        {
+            return new MockStreamGeometryImpl();
+        }
+
+        public IStreamGeometryImpl CreateStreamGeometry()
+        {
+            return new MockStreamGeometryImpl();
+        }
+
+        public IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IRenderTargetBitmapImpl CreateRenderTargetBitmap(PixelSize size, Vector dpi)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IWriteableBitmapImpl CreateWriteableBitmap(PixelSize size, Vector dpi, PixelFormat format, AlphaFormat alphaFormat)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IBitmapImpl LoadBitmap(string fileName)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IBitmapImpl LoadBitmap(Stream stream)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IBitmapImpl LoadBitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride)
+        {
+            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 IFontManagerImpl CreateFontManager()
+        {
+            return new MockFontManagerImpl();
+        }
+
+        public IGlyphRunImpl CreateGlyphRun(GlyphRun glyphRun, out double width)
+        {
+            width = default;
+
+            return new NullGlyphRun();
+        }
+
+        public bool SupportsIndividualRoundRects => true;
+
+        public AlphaFormat DefaultAlphaFormat => AlphaFormat.Premul;
+
+        public PixelFormat DefaultPixelFormat => PixelFormat.Rgba8888;
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/NullThreadingPlatform.cs b/tests/Avalonia.Benchmarks/NullThreadingPlatform.cs
new file mode 100644
index 0000000000..bb469a6b33
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/NullThreadingPlatform.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Reactive.Disposables;
+using System.Threading;
+using Avalonia.Platform;
+using Avalonia.Threading;
+
+namespace Avalonia.Benchmarks
+{
+    internal class NullThreadingPlatform : IPlatformThreadingInterface
+    {
+        public void RunLoop(CancellationToken cancellationToken)
+        {
+        }
+
+        public IDisposable StartTimer(DispatcherPriority priority, TimeSpan interval, Action tick)
+        {
+            return Disposable.Empty;
+        }
+
+        public void Signal(DispatcherPriority priority)
+        {
+        }
+
+        public bool CurrentThreadIsLoopThread => true;
+
+#pragma warning disable CS0067
+        public event Action<DispatcherPriority?> Signaled;
+#pragma warning restore CS0067
+
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Program.cs b/tests/Avalonia.Benchmarks/Program.cs
index 3e80ee3d95..903778ff00 100644
--- a/tests/Avalonia.Benchmarks/Program.cs
+++ b/tests/Avalonia.Benchmarks/Program.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Linq;
 using System.Reflection;
 using BenchmarkDotNet.Attributes;
diff --git a/tests/Avalonia.Benchmarks/Styling/ApplyStyling.cs b/tests/Avalonia.Benchmarks/Styling/ApplyStyling.cs
index d24a646f74..22971d8de6 100644
--- a/tests/Avalonia.Benchmarks/Styling/ApplyStyling.cs
+++ b/tests/Avalonia.Benchmarks/Styling/ApplyStyling.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Linq;
 using BenchmarkDotNet.Attributes;
@@ -45,7 +42,7 @@ namespace Avalonia.Benchmarks.Styling
             {
                 _window.Styles.Add(new Style(x => x.OfType<TextBox>().Class("foo").Class("bar").Class("baz"))
                 {
-                    Setters = new[]
+                    Setters =
                     {
                         new Setter(TextBox.TextProperty, "foo"),
                     }
diff --git a/tests/Avalonia.Benchmarks/Styling/SelectorBenchmark.cs b/tests/Avalonia.Benchmarks/Styling/SelectorBenchmark.cs
new file mode 100644
index 0000000000..0ac96c1103
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Styling/SelectorBenchmark.cs
@@ -0,0 +1,52 @@
+using Avalonia.Controls;
+using Avalonia.Styling;
+using BenchmarkDotNet.Attributes;
+
+namespace Avalonia.Benchmarks.Styling
+{
+    [MemoryDiagnoser]
+    public class SelectorBenchmark
+    {
+        private readonly Control _notMatchingControl;
+        private readonly Calendar _matchingControl;
+        private readonly Selector _isCalendarSelector;
+        private readonly Selector _classSelector;
+
+        public SelectorBenchmark()
+        {
+            _notMatchingControl = new Control();
+            _matchingControl = new Calendar();
+
+            const string className = "selector-class";
+
+            _matchingControl.Classes.Add(className);
+
+            _isCalendarSelector = Selectors.Is<Calendar>(null);
+            _classSelector = Selectors.Class(null, className);
+        }
+
+        [Benchmark]
+        public SelectorMatch IsSelector_NoMatch()
+        {
+            return _isCalendarSelector.Match(_notMatchingControl);
+        }
+
+        [Benchmark]
+        public SelectorMatch IsSelector_Match()
+        {
+            return _isCalendarSelector.Match(_matchingControl);
+        }
+
+        [Benchmark]
+        public SelectorMatch ClassSelector_NoMatch()
+        {
+            return _classSelector.Match(_notMatchingControl);
+        }
+
+        [Benchmark]
+        public SelectorMatch ClassSelector_Match()
+        {
+            return _classSelector.Match(_matchingControl);
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Styling/StyleAttachBenchmark.cs b/tests/Avalonia.Benchmarks/Styling/StyleAttachBenchmark.cs
new file mode 100644
index 0000000000..7dad517e51
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Styling/StyleAttachBenchmark.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Runtime.CompilerServices;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Avalonia.UnitTests;
+using BenchmarkDotNet.Attributes;
+
+namespace Avalonia.Benchmarks.Styling
+{
+    [MemoryDiagnoser]
+    public class StyleAttachBenchmark : IDisposable
+    {
+        private readonly IDisposable _app;
+        private readonly TestRoot _root;
+        private readonly TextBox _control;
+
+        public StyleAttachBenchmark()
+        {
+            _app = UnitTestApplication.Start(
+                TestServices.StyledWindow.With(
+                    renderInterface: new NullRenderingPlatform(),
+                    threadingInterface: new NullThreadingPlatform()));
+
+            _root = new TestRoot(true, null)
+            {
+                Renderer = new NullRenderer(),
+            };
+
+            _control = new TextBox();
+        }
+
+        [Benchmark]
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public void AttachTextBoxStyles()
+        {
+            var styles = UnitTestApplication.Current.Styles;
+
+            styles.TryAttach(_control, UnitTestApplication.Current);
+            ((IStyleable)_control).DetachStyles();
+        }
+
+        public void Dispose()
+        {
+            _app.Dispose();
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Traversal/VisualTreeTraversal.cs b/tests/Avalonia.Benchmarks/Traversal/VisualTreeTraversal.cs
new file mode 100644
index 0000000000..c6da3a941f
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Traversal/VisualTreeTraversal.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using BenchmarkDotNet.Attributes;
+
+namespace Avalonia.Benchmarks.Traversal
+{
+    [MemoryDiagnoser]
+    public class VisualTreeTraversal
+    {
+        private readonly TestRoot _root;
+        private readonly List<Control> _controls = new List<Control>();
+        private readonly List<Control> _shuffledControls;
+
+        public VisualTreeTraversal()
+        {
+            var panel = new StackPanel();
+            _root = new TestRoot { Child = panel, Renderer = new NullRenderer()};
+            _controls.Add(panel);
+            _controls = ControlHierarchyCreator.CreateChildren(_controls, panel, 3, 5, 4);
+
+            var random = new Random(1);
+
+            _shuffledControls = _controls.OrderBy(r => random.Next()).ToList();
+
+            _root.LayoutManager.ExecuteInitialLayoutPass();
+        }
+
+        [Benchmark]
+        public void FindAncestorOfType_Linq()
+        {
+            foreach (Control control in _controls)
+            {
+                control.GetSelfAndVisualAncestors()
+                    .OfType<TestRoot>()
+                    .FirstOrDefault();
+            }
+        }
+
+        [Benchmark]
+        public void FindAncestorOfType_Optimized()
+        {
+            foreach (Control control in _controls)
+            {
+                control.FindAncestorOfType<TestRoot>();
+            }
+        }
+
+        [Benchmark]
+        public void FindCommonVisualAncestor()
+        {
+            foreach (IVisual first in _controls)
+            {
+                foreach (Control second in _shuffledControls)
+                {
+                    first.FindCommonVisualAncestor(second);
+                }
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Visuals/MatrixBenchmarks.cs b/tests/Avalonia.Benchmarks/Visuals/MatrixBenchmarks.cs
new file mode 100644
index 0000000000..17e2237eb0
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Visuals/MatrixBenchmarks.cs
@@ -0,0 +1,16 @@
+using BenchmarkDotNet.Attributes;
+
+namespace Avalonia.Benchmarks.Visuals
+{
+    [MemoryDiagnoser, InProcess]
+    public class MatrixBenchmarks
+    {
+        private static readonly Matrix s_data = Matrix.Identity;
+
+        [Benchmark(Baseline = true)]
+        public bool Decompose()
+        {
+            return Matrix.TryDecomposeTransform(s_data, out Matrix.Decomposed decomposed);
+        }
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Visuals/Media/PathMarkupParserTests.cs b/tests/Avalonia.Benchmarks/Visuals/Media/PathMarkupParserTests.cs
index c4106340b2..18aa4fc045 100644
--- a/tests/Avalonia.Benchmarks/Visuals/Media/PathMarkupParserTests.cs
+++ b/tests/Avalonia.Benchmarks/Visuals/Media/PathMarkupParserTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Media;
 using Avalonia.UnitTests;
diff --git a/tests/Avalonia.Controls.DataGrid.UnitTests/Avalonia.Controls.DataGrid.UnitTests.csproj b/tests/Avalonia.Controls.DataGrid.UnitTests/Avalonia.Controls.DataGrid.UnitTests.csproj
new file mode 100644
index 0000000000..c0c9303767
--- /dev/null
+++ b/tests/Avalonia.Controls.DataGrid.UnitTests/Avalonia.Controls.DataGrid.UnitTests.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp3.1;net47</TargetFrameworks>
+    <LangVersion>latest</LangVersion>
+    <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\Base.props" />
+  <Import Project="..\..\build\SharedVersion.props" />
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
+    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+</Project>
diff --git a/tests/Avalonia.Controls.DataGrid.UnitTests/Collections/DataGridSortDescriptionTests.cs b/tests/Avalonia.Controls.DataGrid.UnitTests/Collections/DataGridSortDescriptionTests.cs
new file mode 100644
index 0000000000..04d7ce3fc7
--- /dev/null
+++ b/tests/Avalonia.Controls.DataGrid.UnitTests/Collections/DataGridSortDescriptionTests.cs
@@ -0,0 +1,133 @@
+using System;
+using System.ComponentModel;
+using System.Linq;
+using Avalonia.Collections;
+using Xunit;
+
+namespace Avalonia.Controls.DataGrid.UnitTests.Collections
+{
+
+    public class DataGridSortDescriptionTests
+    {
+        [Fact]
+        public void OrderBy_Orders_Correctly_When_Ascending()
+        {
+            var items = new[]
+            {
+                new Item("b", "b"),
+                new Item("a", "a"),
+                new Item("c", "c"),
+            };
+            var expectedResult = items.OrderBy(i => i.Prop1).ToList();
+            var sortDescription = DataGridSortDescription.FromPath(nameof(Item.Prop1), ListSortDirection.Ascending);
+            
+            sortDescription.Initialize(typeof(Item));
+            var result = sortDescription.OrderBy(items).ToList();
+            
+            Assert.Equal(expectedResult, result);
+        }
+        
+        [Fact]
+        public void OrderBy_Orders_Correctly_When_Descending()
+        {
+            var items = new[]
+            {
+                new Item("b", "b"),
+                new Item("a", "a"),
+                new Item("c", "c"),
+            };
+            var expectedResult = items.OrderByDescending(i => i.Prop1).ToList();
+            var sortDescription = DataGridSortDescription.FromPath(nameof(Item.Prop1), ListSortDirection.Descending);
+            
+            sortDescription.Initialize(typeof(Item));
+            var result = sortDescription.OrderBy(items).ToList();
+            
+            Assert.Equal(expectedResult, result);
+        }
+
+        [Fact]
+        public void ThenBy_Orders_Correctly_When_Ascending()
+        {
+            // Casting nonsense below because IOrderedEnumerable<T> isn't covariant in full framework and we need an
+            // object of type IOrderedEnumerable<object> for DataGridSortDescription.ThenBy
+            var items = new[]
+            {
+                (object)new Item("a", "b"),
+                        new Item("a", "a"),
+                        new Item("a", "c"), 
+            }.OrderBy(i => ((Item)i).Prop1);
+            var expectedResult = new[]
+            {
+                new Item("a", "a"),
+                new Item("a", "b"),
+                new Item("a", "c"),
+            };
+            var sortDescription = DataGridSortDescription.FromPath(nameof(Item.Prop2), ListSortDirection.Ascending);
+            
+            sortDescription.Initialize(typeof(Item));
+            var result = sortDescription.ThenBy(items).ToList();
+            
+            Assert.Equal(expectedResult, result);
+        }
+        
+        [Fact]
+        public void ThenBy_Orders_Correctly_When_Descending()
+        {
+            // Casting nonsense below because IOrderedEnumerable<T> isn't covariant in full framework and we need an
+            // object of type IOrderedEnumerable<object> for DataGridSortDescription.ThenBy
+            var items = new[]
+            {
+                (object)new Item("a", "b"),
+                        new Item("a", "a"),
+                        new Item("a", "c"), 
+            }.OrderBy(i => ((Item)i).Prop1);
+            var expectedResult = new[]
+            {
+                new Item("a", "c"),
+                new Item("a", "b"),
+                new Item("a", "a"),
+            };
+            var sortDescription = DataGridSortDescription.FromPath(nameof(Item.Prop2), ListSortDirection.Descending);
+            
+            sortDescription.Initialize(typeof(Item));
+            var result = sortDescription.ThenBy(items).ToList();
+            
+            Assert.Equal(expectedResult, result);
+        }
+
+        private class Item : IEquatable<Item>
+        {
+            public Item(string prop1, string prop2)
+            {
+                Prop1 = prop1;
+                Prop2 = prop2;
+            }
+
+            public string Prop1 { get; }
+            public string Prop2 { get; }
+
+            public bool Equals(Item other)
+            {
+                if (ReferenceEquals(null, other)) return false;
+                if (ReferenceEquals(this, other)) return true;
+                return Prop1 == other.Prop1 && Prop2 == other.Prop2;
+            }
+
+            public override bool Equals(object obj)
+            {
+                if (ReferenceEquals(null, obj)) return false;
+                if (ReferenceEquals(this, obj)) return true;
+                if (obj.GetType() != this.GetType()) return false;
+                return Equals((Item) obj);
+            }
+
+            public override int GetHashCode()
+            {
+                unchecked
+                {
+                    return ((Prop1 != null ? Prop1.GetHashCode() : 0) * 397) ^ (Prop2 != null ? Prop2.GetHashCode() : 0);
+                }
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/AppBuilderTests.cs b/tests/Avalonia.Controls.UnitTests/AppBuilderTests.cs
index fae08d37b7..0c3cb72ef2 100644
--- a/tests/Avalonia.Controls.UnitTests/AppBuilderTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/AppBuilderTests.cs
@@ -1,12 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Xunit;
 using Avalonia.Controls.UnitTests;
 using Avalonia.Platform;
-using Avalonia.UnitTests;
+using Xunit;
 
 [assembly: ExportAvaloniaModule("DefaultModule", typeof(AppBuilderTests.DefaultModule))]
 [assembly: ExportAvaloniaModule("RenderingModule", typeof(AppBuilderTests.Direct2DModule), ForRenderingSubsystem = "Direct2D1")]
@@ -16,6 +11,7 @@ using Avalonia.UnitTests;
 
 namespace Avalonia.Controls.UnitTests
 {
+    using AppBuilder = Avalonia.UnitTests.AppBuilder;
 
     public class AppBuilderTests
     {
@@ -23,6 +19,19 @@ namespace Avalonia.Controls.UnitTests
         {
         }
 
+        public class AppWithDependencies : Application
+        {
+            public AppWithDependencies(object dependencyA, object dependencyB)
+            {
+                DependencyA = dependencyA;
+                DependencyB = dependencyB;
+            }
+
+            public object DependencyA { get; }
+
+            public object DependencyB { get; }
+        }
+
         public class DefaultModule
         {
             public static bool IsLoaded = false;
@@ -58,7 +67,30 @@ namespace Avalonia.Controls.UnitTests
                 IsLoaded = true;
             }
         }
-        
+
+        [Fact]
+        public void UseAppFactory()
+        {
+            using (AvaloniaLocator.EnterScope())
+            {
+                ResetModuleLoadStates();
+
+                Func<AppWithDependencies> appFactory = () => new AppWithDependencies(dependencyA: new object(), dependencyB: new object());
+
+                var builder = AppBuilder.Configure<AppWithDependencies>(appFactory)
+                    .UseWindowingSubsystem(() => { })
+                    .UseRenderingSubsystem(() => { })
+                    .UseAvaloniaModules()
+                    .SetupWithoutStarting();
+
+                AppWithDependencies app = (AppWithDependencies)builder.Instance;
+                Assert.NotNull(app.DependencyA);
+                Assert.NotNull(app.DependencyB);
+
+                Assert.True(DefaultModule.IsLoaded);
+            }
+        }
+
         [Fact]
         public void LoadsDefaultModule()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/ApplicationTests.cs b/tests/Avalonia.Controls.UnitTests/ApplicationTests.cs
index 9e31cab421..58ddc8ca60 100644
--- a/tests/Avalonia.Controls.UnitTests/ApplicationTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ApplicationTests.cs
@@ -1,9 +1,5 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Collections.Generic;
-using Avalonia.Threading;
+using System;
+using Avalonia.Data;
 using Avalonia.UnitTests;
 using Xunit;
 
@@ -35,5 +31,20 @@ namespace Avalonia.Controls.UnitTests
                 Assert.True(raised);
             }
         }
+
+        [Fact]
+        public void Can_Bind_To_DataContext()
+        {
+            using (UnitTestApplication.Start())
+            {
+                var application = Application.Current;
+
+                application.DataContext = "Test";
+
+                application.Bind(Application.NameProperty, new Binding("."));
+
+                Assert.Equal("Test", Application.Current.Name);
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
index 03d061e04f..3e78e951e2 100644
--- a/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -366,6 +363,40 @@ namespace Avalonia.Controls.UnitTests
             });
         }
         
+        [Fact]
+        public void Custom_TextSelector()
+        {
+            RunTest((control, textbox) =>
+            {
+                object selectedItem = control.Items.Cast<object>().First();
+                string input = "42";
+
+                control.TextSelector = (text, item) => text + item;
+                Assert.Equal(control.TextSelector("4", "2"), "42");
+
+                control.Text = input;
+                control.SelectedItem = selectedItem;
+                Assert.Equal(control.Text, control.TextSelector(input, selectedItem.ToString()));
+            });
+        }
+        
+        [Fact]
+        public void Custom_ItemSelector()
+        {
+            RunTest((control, textbox) =>
+            {
+                object selectedItem = control.Items.Cast<object>().First();
+                string input = "42";
+
+                control.ItemSelector = (text, item) => text + item;
+                Assert.Equal(control.ItemSelector("4", 2), "42");
+
+                control.Text = input;
+                control.SelectedItem = selectedItem;
+                Assert.Equal(control.Text, control.ItemSelector(input, selectedItem));
+            });
+        }
+
         /// <summary>
         /// Retrieves a defined predicate filter through a new AutoCompleteBox 
         /// control instance.
diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
index aa470bce9d..6b17427eda 100644
--- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
+++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net47</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net47</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <OutputType>Library</OutputType>
     <IsTestProject>true</IsTestProject>
@@ -12,7 +12,9 @@
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
   <Import Project="..\..\build\Base.props" />
+  <Import Project="..\..\build\SharedVersion.props" />
   <ItemGroup>
+    <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" />
diff --git a/tests/Avalonia.Controls.UnitTests/BorderTests.cs b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
index 0ac9392bc6..ab33eaaff9 100644
--- a/tests/Avalonia.Controls.UnitTests/BorderTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Media;
 using Avalonia.Rendering;
 using Avalonia.UnitTests;
@@ -57,7 +54,7 @@ namespace Avalonia.Controls.UnitTests
 
             var root = new TestRoot(target);
             var renderer = Mock.Get(root.Renderer);
-            renderer.ResetCalls();
+            renderer.Invocations.Clear();
 
             ((SolidColorBrush)target.Background).Color = Colors.Green;
 
diff --git a/tests/Avalonia.Controls.UnitTests/ButtonTests.cs b/tests/Avalonia.Controls.UnitTests/ButtonTests.cs
index 994804e9e1..7ad0e480c6 100644
--- a/tests/Avalonia.Controls.UnitTests/ButtonTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ButtonTests.cs
@@ -9,6 +9,7 @@ using Avalonia.UnitTests;
 using Avalonia.VisualTree;
 using Moq;
 using Xunit;
+using MouseButton = Avalonia.Input.MouseButton;
 
 namespace Avalonia.Controls.UnitTests
 {
diff --git a/tests/Avalonia.Controls.UnitTests/CalendarDatePickerTests.cs b/tests/Avalonia.Controls.UnitTests/CalendarDatePickerTests.cs
new file mode 100644
index 0000000000..f41a3e7581
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/CalendarDatePickerTests.cs
@@ -0,0 +1,127 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
+using Avalonia.Markup.Data;
+using Avalonia.Platform;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests
+{
+    public class CalendarDatePickerTests
+    {
+        private static bool CompareDates(DateTime first, DateTime second)
+        {
+            return first.Year == second.Year &&
+                first.Month == second.Month &&
+                first.Day == second.Day;
+        }
+
+        [Fact(Skip = "FIX ME ASAP")]
+        public void SelectedDateChanged_Should_Fire_When_SelectedDate_Set()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                bool handled = false;
+                CalendarDatePicker datePicker = CreateControl();
+                datePicker.SelectedDateChanged += (s,e) =>
+                {
+                    handled = true;
+                };
+                DateTime value = new DateTime(2000, 10, 10);
+                datePicker.SelectedDate = value;
+                Threading.Dispatcher.UIThread.RunJobs();
+                Assert.True(handled);
+            }
+        }
+
+        [Fact]
+        public void Setting_Selected_Date_To_Blackout_Date_Should_Throw()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                CalendarDatePicker datePicker = CreateControl();
+                datePicker.BlackoutDates.AddDatesInPast();
+
+                DateTime goodValue = DateTime.Today.AddDays(1);
+                datePicker.SelectedDate = goodValue;
+                Assert.True(CompareDates(datePicker.SelectedDate.Value, goodValue));
+
+                DateTime badValue = DateTime.Today.AddDays(-1);
+                Assert.ThrowsAny<ArgumentOutOfRangeException>(
+                    () => datePicker.SelectedDate = badValue);
+            }
+        }
+
+        [Fact]
+        public void Adding_Blackout_Dates_Containing_Selected_Date_Should_Throw()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                CalendarDatePicker datePicker = CreateControl();
+                datePicker.SelectedDate = DateTime.Today.AddDays(5);
+
+                Assert.ThrowsAny<ArgumentOutOfRangeException>(
+                    () => datePicker.BlackoutDates.Add(new CalendarDateRange(DateTime.Today, DateTime.Today.AddDays(10))));
+            }
+        }
+
+        private static TestServices Services => TestServices.MockThreadingInterface.With(
+            standardCursorFactory: Mock.Of<IStandardCursorFactory>());
+
+        private CalendarDatePicker CreateControl()
+        {
+            var datePicker =
+                new CalendarDatePicker
+                {
+                    Template = CreateTemplate()
+                };
+
+            datePicker.ApplyTemplate();
+            return datePicker;
+        }
+
+        private IControlTemplate CreateTemplate()
+        {
+            return new FuncControlTemplate<CalendarDatePicker>((control, scope) =>
+            {
+                var textBox = 
+                    new TextBox
+                    {
+                        Name = "PART_TextBox"
+                    }.RegisterInNameScope(scope);
+                var button =
+                    new Button
+                    {
+                        Name = "PART_Button"
+                    }.RegisterInNameScope(scope);
+                var calendar =
+                    new Calendar
+                    {
+                        Name = "PART_Calendar"
+                    }.RegisterInNameScope(scope);
+                var popup =
+                    new Popup
+                    {
+                        Name = "PART_Popup"
+                    }.RegisterInNameScope(scope);
+
+                var panel = new Panel();
+                panel.Children.Add(textBox);
+                panel.Children.Add(button);
+                panel.Children.Add(popup);
+                panel.Children.Add(calendar);
+
+                return panel;
+            });
+
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/CalendarTests.cs b/tests/Avalonia.Controls.UnitTests/CalendarTests.cs
index 4c45b1b230..95ddd211da 100644
--- a/tests/Avalonia.Controls.UnitTests/CalendarTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/CalendarTests.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Xunit;
+using Xunit;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -18,7 +15,7 @@ namespace Avalonia.Controls.UnitTests
                 first.Day == second.Day;
         }
 
-        [Fact]
+        [Fact(Skip ="FIX ME ASAP")]
         public void SelectedDatesChanged_Should_Fire_When_SelectedDate_Set()
         {
             bool handled = false;
diff --git a/tests/Avalonia.Controls.UnitTests/CanvasTests.cs b/tests/Avalonia.Controls.UnitTests/CanvasTests.cs
index 6759792764..11a349f53e 100644
--- a/tests/Avalonia.Controls.UnitTests/CanvasTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/CanvasTests.cs
@@ -1,8 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Controls.Shapes;
+using Avalonia.UnitTests;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
@@ -12,6 +10,8 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Left_Property_Should_Work()
         {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
             Rectangle rect;
             var target = new Canvas
             {
@@ -37,6 +37,8 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Top_Property_Should_Work()
         {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
             Rectangle rect;
             var target = new Canvas
             {
@@ -62,6 +64,8 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Right_Property_Should_Work()
         {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
             Rectangle rect;
             var target = new Canvas
             {
@@ -87,6 +91,8 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Bottom_Property_Should_Work()
         {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
             Rectangle rect;
             var target = new Canvas
             {
diff --git a/tests/Avalonia.Controls.UnitTests/CarouselTests.cs b/tests/Avalonia.Controls.UnitTests/CarouselTests.cs
index b16ac6bb8e..051f6c3fd3 100644
--- a/tests/Avalonia.Controls.UnitTests/CarouselTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/CarouselTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.ObjectModel;
 using System.Linq;
 using Avalonia.Controls.Presenters;
@@ -51,10 +48,9 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Single(target.GetLogicalChildren());
 
-            var child = target.GetLogicalChildren().Single();
+            var child = GetContainerTextBlock(target.GetLogicalChildren().Single());
 
-            Assert.IsType<TextBlock>(child);
-            Assert.Equal("Foo", ((TextBlock)child).Text);
+            Assert.Equal("Foo", child.Text);
         }
 
         [Fact]
@@ -98,20 +94,18 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Equal(3, target.GetLogicalChildren().Count());
 
-            var child = target.GetLogicalChildren().First();
+            var child = GetContainerTextBlock(target.GetLogicalChildren().First());
 
-            Assert.IsType<TextBlock>(child);
-            Assert.Equal("Foo", ((TextBlock)child).Text);
+            Assert.Equal("Foo", child.Text);
 
             var newItems = items.ToList();
             newItems.RemoveAt(0);
 
             target.Items = newItems;
 
-            child = target.GetLogicalChildren().First();
+            child = GetContainerTextBlock(target.GetLogicalChildren().First());
 
-            Assert.IsType<TextBlock>(child);
-            Assert.Equal("Bar", ((TextBlock)child).Text);
+            Assert.Equal("Bar", child.Text);
         }
 
         [Fact]
@@ -136,20 +130,18 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Single(target.GetLogicalChildren());
 
-            var child = target.GetLogicalChildren().Single();
+            var child = GetContainerTextBlock(target.GetLogicalChildren().Single());
 
-            Assert.IsType<TextBlock>(child);
-            Assert.Equal("Foo", ((TextBlock)child).Text);
+            Assert.Equal("Foo", child.Text);
 
             var newItems = items.ToList();
             newItems.RemoveAt(0);
 
             target.Items = newItems;
 
-            child = target.GetLogicalChildren().Single();
+            child = GetContainerTextBlock(target.GetLogicalChildren().Single());
 
-            Assert.IsType<TextBlock>(child);
-            Assert.Equal("Bar", ((TextBlock)child).Text);
+            Assert.Equal("Bar", child.Text);
         }
 
         [Fact]
@@ -176,7 +168,7 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void Selected_Index_Changes_To_When_Items_Assigned_Null()
+        public void Selected_Index_Changes_To_None_When_Items_Assigned_Null()
         {
             var items = new ObservableCollection<string>
             {
@@ -197,10 +189,9 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Equal(3, target.GetLogicalChildren().Count());
 
-            var child = target.GetLogicalChildren().First();
+            var child = GetContainerTextBlock(target.GetLogicalChildren().First());
 
-            Assert.IsType<TextBlock>(child);
-            Assert.Equal("Foo", ((TextBlock)child).Text);
+            Assert.Equal("Foo", child.Text);
 
             target.Items = null;
 
@@ -233,7 +224,7 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Equal("FooBar", target.SelectedItem);
 
-            var child = target.GetVisualDescendants().LastOrDefault();
+            var child = GetContainerTextBlock(target.GetVisualDescendants().LastOrDefault());
 
             Assert.IsType<TextBlock>(child);
             Assert.Equal("FooBar", ((TextBlock)child).Text);
@@ -261,21 +252,20 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Equal(3, target.GetLogicalChildren().Count());
 
-            var child = target.GetLogicalChildren().First();
+            var child = GetContainerTextBlock(target.GetLogicalChildren().First());
 
-            Assert.IsType<TextBlock>(child);
-            Assert.Equal("Foo", ((TextBlock)child).Text);
+            Assert.Equal("Foo", child.Text);
 
             items.RemoveAt(0);
 
-            child = target.GetLogicalChildren().First();
+            child = GetContainerTextBlock(target.GetLogicalChildren().First());
 
             Assert.IsType<TextBlock>(child);
             Assert.Equal("Bar", ((TextBlock)child).Text);
         }
 
         [Fact]
-        public void Selected_Item_Changes_To_NextAvailable_Item_If_SelectedItem_Is_Removed_From_Middle()
+        public void Selected_Item_Changes_To_First_Item_If_SelectedItem_Is_Removed_From_Middle()
         {
             var items = new ObservableCollection<string>
             {
@@ -298,8 +288,8 @@ namespace Avalonia.Controls.UnitTests
 
             items.RemoveAt(1);
 
-            Assert.Equal(1, target.SelectedIndex);
-            Assert.Equal("FooBar", target.SelectedItem);
+            Assert.Equal(0, target.SelectedIndex);
+            Assert.Equal("Foo", target.SelectedItem);
         }
 
         private Control CreateTemplate(Carousel control, INameScope scope)
@@ -314,5 +304,12 @@ namespace Avalonia.Controls.UnitTests
                 [~CarouselPresenter.PageTransitionProperty] = control[~Carousel.PageTransitionProperty],
             }.RegisterInNameScope(scope);
         }
+
+        private static TextBlock GetContainerTextBlock(object control)
+        {
+            var contentPresenter = Assert.IsType<ContentPresenter>(control);
+            contentPresenter.UpdateChild();
+            return Assert.IsType<TextBlock>(contentPresenter.Child);
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/ClassesTests.cs b/tests/Avalonia.Controls.UnitTests/ClassesTests.cs
index 8d2e23d027..c10e7b467c 100644
--- a/tests/Avalonia.Controls.UnitTests/ClassesTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ClassesTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Xunit;
 
diff --git a/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs
index 599e214b31..c8a30a42e9 100644
--- a/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs
@@ -1,11 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Shapes;
 using Avalonia.Controls.Templates;
-using Avalonia.Input;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.UnitTests;
@@ -30,6 +26,7 @@ namespace Avalonia.Controls.UnitTests
             Assert.True(target.IsDropDownOpen);
 
             _helper.Down(target);
+            _helper.Up(target);
 
             Assert.False(target.IsDropDownOpen);
         }
@@ -43,6 +40,7 @@ namespace Avalonia.Controls.UnitTests
                 Items = items,
                 SelectedIndex = 0,
             };
+            var root = new TestRoot(target);
 
             var rectangle = target.GetValue(ComboBox.SelectionBoxItemProperty) as Rectangle;
             Assert.NotNull(rectangle);
@@ -108,5 +106,36 @@ namespace Avalonia.Controls.UnitTests
                 };
             });
         }
+
+        [Fact]
+        public void Detaching_Closed_ComboBox_Keeps_Current_Focus()
+        {
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var target = new ComboBox
+                {
+                    Items = new[] { new Canvas() },
+                    SelectedIndex = 0,
+                    Template = GetTemplate(),
+                };
+
+                var other = new Control { Focusable = true };
+
+                StackPanel panel;
+
+                var root = new TestRoot { Child = panel = new StackPanel { Children = { target, other } } };
+
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+
+                other.Focus();
+
+                Assert.True(other.IsFocused);
+
+                panel.Children.Remove(target);
+
+                Assert.True(other.IsFocused);
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs b/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs
index f7332415ac..7cc0bae97f 100644
--- a/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Specialized;
 using System.Linq;
diff --git a/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs b/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
index f44f89e91f..39a3250686 100644
--- a/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
@@ -1,11 +1,11 @@
 using System;
-using System.Windows.Input;
-using Avalonia.Controls.Primitives;
-using Avalonia.Data;
 using Avalonia.Input;
-using Avalonia.Markup.Data;
+using Avalonia.LogicalTree;
+using Avalonia.Markup.Xaml;
+using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Platform;
 using Avalonia.UnitTests;
+using Castle.DynamicProxy.Generators;
 using Moq;
 using Xunit;
 
@@ -79,7 +79,7 @@ namespace Avalonia.Controls.UnitTests
         {
             using (Application())
             {
-                popupImpl.Setup(x => x.Show()).Verifiable();
+                popupImpl.Setup(x => x.Show(true)).Verifiable();
                 popupImpl.Setup(x => x.Hide()).Verifiable();
 
                 var sut = new ContextMenu();
@@ -99,7 +99,7 @@ namespace Avalonia.Controls.UnitTests
                 _mouse.Click(target);
 
                 Assert.False(sut.IsOpen);
-                popupImpl.Verify(x => x.Show(), Times.Once);
+                popupImpl.Verify(x => x.Show(true), Times.Once);
                 popupImpl.Verify(x => x.Hide(), Times.Once);
             }
         }
@@ -109,7 +109,7 @@ namespace Avalonia.Controls.UnitTests
         {
             using (Application())
             {
-                popupImpl.Setup(x => x.Show()).Verifiable();
+                popupImpl.Setup(x => x.Show(true)).Verifiable();
                 popupImpl.Setup(x => x.Hide()).Verifiable();
 
                 var sut = new ContextMenu();
@@ -130,7 +130,45 @@ namespace Avalonia.Controls.UnitTests
 
                 Assert.True(sut.IsOpen);
                 popupImpl.Verify(x => x.Hide(), Times.Once);
-                popupImpl.Verify(x => x.Show(), Times.Exactly(2));
+                popupImpl.Verify(x => x.Show(true), Times.Exactly(2));
+            }
+        }
+        
+        [Fact]
+        public void Context_Menu_Can_Be_Shared_Between_Controls_Even_After_A_Control_Is_Removed_From_Visual_Tree()
+        {
+            using (Application())
+            {
+                var sut = new ContextMenu();
+                var target1 = new Panel
+                {
+                    ContextMenu = sut
+                };
+
+                var target2 = new Panel
+                {
+                    ContextMenu = sut
+                };
+
+                var sp = new StackPanel { Children = { target1, target2 } };
+                var window = new Window { Content = sp };
+                
+                window.ApplyTemplate();
+                window.Presenter.ApplyTemplate();
+
+                _mouse.Click(target1, MouseButton.Right);
+
+                Assert.True(sut.IsOpen);
+
+                _mouse.Click(target2, MouseButton.Left);
+                
+                Assert.False(sut.IsOpen);
+                
+                sp.Children.Remove(target1);
+                
+                _mouse.Click(target2, MouseButton.Right);
+                
+                Assert.True(sut.IsOpen);
             }
         }
 
@@ -139,7 +177,7 @@ namespace Avalonia.Controls.UnitTests
         {
             using (Application())
             {
-                popupImpl.Setup(x => x.Show()).Verifiable();
+                popupImpl.Setup(x => x.Show(true)).Verifiable();
 
                 bool eventCalled = false;
                 var sut = new ContextMenu();
@@ -155,7 +193,102 @@ namespace Avalonia.Controls.UnitTests
 
                 Assert.True(eventCalled);
                 Assert.False(sut.IsOpen);
-                popupImpl.Verify(x => x.Show(), Times.Never);
+                popupImpl.Verify(x => x.Show(true), Times.Never);
+            }
+        }
+
+        [Fact]
+        public void Can_Set_Clear_ContextMenu_Property()
+        {
+            using (Application())
+            {
+                var target = new ContextMenu();
+                var control = new Panel();
+
+                control.ContextMenu = target;
+                control.ContextMenu = null;
+            }
+        }
+
+        [Fact]
+        public void Context_Menu_In_Resources_Can_Be_Shared()
+        {
+            using (Application())
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Resources>
+        <ContextMenu x:Key='contextMenu'>
+            <MenuItem>Foo</MenuItem>
+        </ContextMenu>
+	</Window.Resources>
+
+    <StackPanel>
+        <TextBlock Name='target1' ContextMenu='{StaticResource contextMenu}'/>
+        <TextBlock Name='target2' ContextMenu='{StaticResource contextMenu}'/>
+    </StackPanel>
+</Window>";
+
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var target1 = window.Find<TextBlock>("target1");
+                var target2 = window.Find<TextBlock>("target2");
+                var mouse = new MouseTestHelper();
+
+                Assert.NotNull(target1.ContextMenu);
+                Assert.NotNull(target2.ContextMenu);
+                Assert.Same(target1.ContextMenu, target2.ContextMenu);
+
+                window.Show();
+
+                var menu = target1.ContextMenu;
+                mouse.Click(target1, MouseButton.Right);
+                Assert.True(menu.IsOpen);
+                mouse.Click(target2, MouseButton.Right);
+                Assert.True(menu.IsOpen);
+            }
+        }
+
+        [Fact]
+        public void Context_Menu_Can_Be_Set_In_Style()
+        {
+            using (Application())
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Styles>
+        <Style Selector='TextBlock'>
+            <Setter Property='ContextMenu'>
+                <ContextMenu>
+                    <MenuItem>Foo</MenuItem>
+                </ContextMenu>
+            </Setter>
+        </Style>
+	</Window.Styles>
+
+    <StackPanel>
+        <TextBlock Name='target1'/>
+        <TextBlock Name='target2'/>
+    </StackPanel>
+</Window>";
+
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var target1 = window.Find<TextBlock>("target1");
+                var target2 = window.Find<TextBlock>("target2");
+                var mouse = new MouseTestHelper();
+
+                Assert.NotNull(target1.ContextMenu);
+                Assert.NotNull(target2.ContextMenu);
+                Assert.Same(target1.ContextMenu, target2.ContextMenu);
+
+                window.Show();
+
+                var menu = target1.ContextMenu;
+                mouse.Click(target1, MouseButton.Right);
+                Assert.True(menu.IsOpen);
+                mouse.Click(target2, MouseButton.Right);
+                Assert.True(menu.IsOpen);
             }
         }
 
@@ -164,7 +297,7 @@ namespace Avalonia.Controls.UnitTests
         {
             using (Application())
             {
-                popupImpl.Setup(x => x.Show()).Verifiable();
+                popupImpl.Setup(x => x.Show(true)).Verifiable();
                 popupImpl.Setup(x => x.Hide()).Verifiable();
 
                 bool eventCalled = false;
@@ -188,7 +321,7 @@ namespace Avalonia.Controls.UnitTests
                 Assert.True(eventCalled);
                 Assert.True(sut.IsOpen);
 
-                popupImpl.Verify(x => x.Show(), Times.Once());
+                popupImpl.Verify(x => x.Show(true), Times.Once());
                 popupImpl.Verify(x => x.Hide(), Times.Never);
             }
         }
@@ -200,16 +333,17 @@ namespace Avalonia.Controls.UnitTests
             screenImpl.Setup(x => x.ScreenCount).Returns(1);
             screenImpl.Setup(X => X.AllScreens).Returns( new[] { new Screen(1, screen, screen, true) });
 
-            popupImpl = MockWindowingPlatform.CreatePopupMock();
-            popupImpl.SetupGet(x => x.Scaling).Returns(1);
+            var windowImpl = MockWindowingPlatform.CreateWindowMock();
+            popupImpl = MockWindowingPlatform.CreatePopupMock(windowImpl.Object);
+            popupImpl.SetupGet(x => x.RenderScaling).Returns(1);
+            windowImpl.Setup(x => x.CreatePopup()).Returns(popupImpl.Object);
 
-            var windowImpl = MockWindowingPlatform.CreateWindowMock(() => popupImpl.Object);
             windowImpl.Setup(x => x.Screen).Returns(screenImpl.Object);
 
             var services = TestServices.StyledWindow.With(
                                         inputManager: new InputManager(),
                                         windowImpl: windowImpl.Object,
-                                        windowingPlatform: new MockWindowingPlatform(() => windowImpl.Object, () => popupImpl.Object));
+                                        windowingPlatform: new MockWindowingPlatform(() => windowImpl.Object, x => popupImpl.Object));
 
             return UnitTestApplication.Start(services);
         }
diff --git a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
index 7de80f72cc..7bcb120850 100644
--- a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
@@ -1,18 +1,10 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
+using System;
 using System.Linq;
-using Avalonia.Controls.Primitives;
-using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Shapes;
 using Avalonia.Controls.Templates;
-using Avalonia.Data;
-using Avalonia.Markup.Data;
 using Avalonia.Platform;
 using Avalonia.UnitTests;
+using Avalonia.VisualTree;
 using Moq;
 using Xunit;
 
@@ -20,25 +12,18 @@ namespace Avalonia.Controls.UnitTests
 {
     public class DatePickerTests
     {
-        private static bool CompareDates(DateTime first, DateTime second)
-        {
-            return first.Year == second.Year &&
-                first.Month == second.Month &&
-                first.Day == second.Day;
-        }
-
         [Fact]
         public void SelectedDateChanged_Should_Fire_When_SelectedDate_Set()
         {
             using (UnitTestApplication.Start(Services))
             {
                 bool handled = false;
-                DatePicker datePicker = CreateControl();
-                datePicker.SelectedDateChanged += (s,e) =>
+                DatePicker datePicker = new DatePicker();
+                datePicker.SelectedDateChanged += (s, e) =>
                 {
                     handled = true;
                 };
-                DateTime value = new DateTime(2000, 10, 10);
+                DateTimeOffset value = new DateTimeOffset(2000, 10, 10, 0, 0, 0, TimeSpan.Zero);
                 datePicker.SelectedDate = value;
                 Threading.Dispatcher.UIThread.RunJobs();
                 Assert.True(handled);
@@ -46,85 +31,225 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void Setting_Selected_Date_To_Blackout_Date_Should_Throw()
+        public void DayVisible_False_Should_Hide_Day()
         {
             using (UnitTestApplication.Start(Services))
             {
-                DatePicker datePicker = CreateControl();
-                datePicker.BlackoutDates.AddDatesInPast();
+                DatePicker datePicker = new DatePicker
+                {
+                    Template = CreateTemplate(),
+                    DayVisible = false
+                };
+                datePicker.ApplyTemplate();
+                Threading.Dispatcher.UIThread.RunJobs();
+
+                var desc = datePicker.GetVisualDescendants();
+                Assert.True(desc.Count() > 1);//Should be layoutroot grid & button
+                TextBlock dayText = null;
+                Grid container = null;
+
+                Assert.True(desc.ElementAt(1) is Button);
 
-                DateTime goodValue = DateTime.Today.AddDays(1);
-                datePicker.SelectedDate = goodValue;
-                Assert.True(CompareDates(datePicker.SelectedDate.Value, goodValue));
+                container = (desc.ElementAt(1) as Button).Content as Grid;
+                Assert.True(container != null);
 
-                DateTime badValue = DateTime.Today.AddDays(-1);
-                Assert.ThrowsAny<ArgumentOutOfRangeException>(
-                    () => datePicker.SelectedDate = badValue);
+                for(int i = 0; i < container.Children.Count; i++)
+                {
+                    if(container.Children[i] is TextBlock tb && tb.Name == "DayText")
+                    {
+                        dayText = tb;
+                        break;
+                    }
+                }
+
+                Assert.True(dayText != null);
+                Assert.True(!dayText.IsVisible);
+                Assert.True(container.ColumnDefinitions.Count == 3);
             }
         }
 
         [Fact]
-        public void Adding_Blackout_Dates_Containing_Selected_Date_Should_Throw()
+        public void MonthVisible_False_Should_Hide_Month()
         {
             using (UnitTestApplication.Start(Services))
             {
-                DatePicker datePicker = CreateControl();
-                datePicker.SelectedDate = DateTime.Today.AddDays(5);
+                DatePicker datePicker = new DatePicker
+                {
+                    Template = CreateTemplate(),
+                    MonthVisible = false
+                };
+                datePicker.ApplyTemplate();
+                Threading.Dispatcher.UIThread.RunJobs();
+
+                var desc = datePicker.GetVisualDescendants();
+                Assert.True(desc.Count() > 1);//Should be layoutroot grid & button
+                TextBlock monthText = null;
+                Grid container = null;
+
+                Assert.True(desc.ElementAt(1) is Button);
 
-                Assert.ThrowsAny<ArgumentOutOfRangeException>(
-                    () => datePicker.BlackoutDates.Add(new CalendarDateRange(DateTime.Today, DateTime.Today.AddDays(10))));
+                container = (desc.ElementAt(1) as Button).Content as Grid;
+                Assert.True(container != null);
+
+                for (int i = 0; i < container.Children.Count; i++)
+                {
+                    if (container.Children[i] is TextBlock tb && tb.Name == "MonthText")
+                    {
+                        monthText = tb;
+                        break;
+                    }
+                }
+
+                Assert.True(monthText != null);
+                Assert.True(!monthText.IsVisible);
+                Assert.True(container.ColumnDefinitions.Count == 3);
             }
         }
 
-        private static TestServices Services => TestServices.MockThreadingInterface.With(
-            standardCursorFactory: Mock.Of<IStandardCursorFactory>());
-
-        private DatePicker CreateControl()
+        [Fact]
+        public void YearVisible_False_Should_Hide_Year()
         {
-            var datePicker =
-                new DatePicker
+            using (UnitTestApplication.Start(Services))
+            {
+                DatePicker datePicker = new DatePicker
                 {
-                    Template = CreateTemplate()
+                    Template = CreateTemplate(),
+                    YearVisible = false
                 };
+                datePicker.ApplyTemplate();
+                Threading.Dispatcher.UIThread.RunJobs();
+
+                var desc = datePicker.GetVisualDescendants();
+                Assert.True(desc.Count() > 1);//Should be layoutroot grid & button
+                TextBlock yearText = null;
+                Grid container = null;
+
+                Assert.True(desc.ElementAt(1) is Button);
+
+                container = (desc.ElementAt(1) as Button).Content as Grid;
+                Assert.True(container != null);
+
+                for (int i = 0; i < container.Children.Count; i++)
+                {
+                    if (container.Children[i] is TextBlock tb && tb.Name == "YearText")
+                    {
+                        yearText = tb;
+                        break;
+                    }
+                }
 
-            datePicker.ApplyTemplate();
-            return datePicker;
+                Assert.True(yearText != null);
+                Assert.True(!yearText.IsVisible);
+                Assert.True(container.ColumnDefinitions.Count == 3);
+            }
         }
 
-        private IControlTemplate CreateTemplate()
+        [Fact]
+        public void SelectedDate_null_Should_Use_Placeholders()
         {
-            return new FuncControlTemplate<DatePicker>((control, scope) =>
+            using (UnitTestApplication.Start(Services))
             {
-                var textBox = 
-                    new TextBox
-                    {
-                        Name = "PART_TextBox"
-                    }.RegisterInNameScope(scope);
-                var button =
-                    new Button
+                DatePicker datePicker = new DatePicker
+                {
+                    Template = CreateTemplate(),
+                    YearVisible = false
+                };
+                datePicker.ApplyTemplate();
+                Threading.Dispatcher.UIThread.RunJobs();
+
+                var desc = datePicker.GetVisualDescendants();
+                Assert.True(desc.Count() > 1);//Should be layoutroot grid & button
+                TextBlock yearText = null;
+                TextBlock monthText = null;
+                TextBlock dayText = null;
+                Grid container = null;
+
+                Assert.True(desc.ElementAt(1) is Button);
+
+                container = (desc.ElementAt(1) as Button).Content as Grid;
+                Assert.True(container != null);
+
+                for (int i = 0; i < container.Children.Count; i++)
+                {
+                    if (container.Children[i] is TextBlock tb && tb.Name == "YearText")
                     {
-                        Name = "PART_Button"
-                    }.RegisterInNameScope(scope);
-                var calendar =
-                    new Calendar
+                        yearText = tb;
+                    }
+                    else if (container.Children[i] is TextBlock tb1 && tb1.Name == "MonthText")
                     {
-                        Name = "PART_Calendar"
-                    }.RegisterInNameScope(scope);
-                var popup =
-                    new Popup
+                        monthText = tb1;
+                    }
+                    else if (container.Children[i] is TextBlock tb2 && tb2.Name == "DayText")
                     {
-                        Name = "PART_Popup"
-                    }.RegisterInNameScope(scope);
+                        dayText = tb2;
+                    }
+                }
 
-                var panel = new Panel();
-                panel.Children.Add(textBox);
-                panel.Children.Add(button);
-                panel.Children.Add(popup);
-                panel.Children.Add(calendar);
+                DateTimeOffset value = new DateTimeOffset(2000, 10, 10, 0, 0, 0, TimeSpan.Zero);
+                datePicker.SelectedDate = value;
 
-                return panel;
-            });
+                Assert.False(dayText.Text == "day");
+                Assert.False(monthText.Text == "month");
+                Assert.False(yearText.Text == "year");
+                Assert.False(datePicker.Classes.Contains(":hasnodate"));
 
+                datePicker.SelectedDate = null;
+
+                Assert.True(dayText.Text == "day");
+                Assert.True(monthText.Text == "month");
+                Assert.True(yearText.Text == "year");
+                Assert.True(datePicker.Classes.Contains(":hasnodate"));
+            }
+        }
+
+        private static TestServices Services => TestServices.MockThreadingInterface.With(
+            fontManagerImpl: new MockFontManagerImpl(),
+            standardCursorFactory: Mock.Of<IStandardCursorFactory>(),
+            textShaperImpl: new MockTextShaperImpl());
+
+        private IControlTemplate CreateTemplate()
+        {
+            return new FuncControlTemplate((control, scope) =>
+            {
+                var layoutRoot = new Grid
+                {
+                    Name = "LayoutRoot"
+                }.RegisterInNameScope(scope);
+                //Skip contentpresenter
+                var flyoutButton = new Button
+                {
+                    Name = "FlyoutButton"
+                }.RegisterInNameScope(scope);
+                var contentGrid = new Grid
+                {
+                    Name = "ButtonContentGrid"
+                }.RegisterInNameScope(scope);
+                var dayText = new TextBlock
+                {
+                    Name = "DayText"
+                }.RegisterInNameScope(scope);
+                var monthText = new TextBlock
+                {
+                    Name = "MonthText"
+                }.RegisterInNameScope(scope);
+                var yearText = new TextBlock
+                {
+                    Name = "YearText"
+                }.RegisterInNameScope(scope);
+                var firstSpacer = new Rectangle
+                {
+                    Name = "FirstSpacer"
+                }.RegisterInNameScope(scope);
+                var secondSpacer = new Rectangle
+                {
+                    Name = "SecondSpacer"
+                }.RegisterInNameScope(scope);
+               
+                contentGrid.Children.AddRange(new IControl[] { dayText, monthText, yearText, firstSpacer, secondSpacer });
+                flyoutButton.Content = contentGrid;
+                layoutRoot.Children.Add(flyoutButton);
+                return layoutRoot;
+            });
         }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/DecoratorTests.cs b/tests/Avalonia.Controls.UnitTests/DecoratorTests.cs
index 873b7f5478..65749efbf9 100644
--- a/tests/Avalonia.Controls.UnitTests/DecoratorTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/DecoratorTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Specialized;
 using System.Linq;
 using Avalonia.LogicalTree;
diff --git a/tests/Avalonia.Controls.UnitTests/DesktopStyleApplicationLifetimeTests.cs b/tests/Avalonia.Controls.UnitTests/DesktopStyleApplicationLifetimeTests.cs
index dee7a84812..84f02aeda5 100644
--- a/tests/Avalonia.Controls.UnitTests/DesktopStyleApplicationLifetimeTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/DesktopStyleApplicationLifetimeTests.cs
@@ -191,7 +191,8 @@ namespace Avalonia.Controls.UnitTests
         {
             var windowImpl = new Mock<IWindowImpl>();
             windowImpl.SetupProperty(x => x.Closed);
-            windowImpl.Setup(x => x.Scaling).Returns(1);
+            windowImpl.Setup(x => x.DesktopScaling).Returns(1);
+            windowImpl.Setup(x => x.RenderScaling).Returns(1);
 
             var services = TestServices.StyledWindow.With(
                 windowingPlatform: new MockWindowingPlatform(() => windowImpl.Object));
diff --git a/tests/Avalonia.Controls.UnitTests/DockPanelTests.cs b/tests/Avalonia.Controls.UnitTests/DockPanelTests.cs
index 59f047abae..4da1ef5a10 100644
--- a/tests/Avalonia.Controls.UnitTests/DockPanelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/DockPanelTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
diff --git a/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs b/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs
index 70410dff0d..c5c7737f0d 100644
--- a/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
@@ -147,6 +144,16 @@ namespace Avalonia.Controls.UnitTests.Generators
             Assert.Equal("bar", container.Content);
         }
 
+        [Fact]
+        public void Materialize_Should_Create_Containers_When_Item_Is_Null()
+        {
+            var owner = new Decorator();
+            var target = new ItemContainerGenerator<ListBoxItem>(owner, ListBoxItem.ContentProperty, null);
+            var container = (ListBoxItem)target.Materialize(0, null).ContainerControl;
+
+            Assert.True(container != null, "The containers is not materialized.");
+        }
+
         private IList<ItemContainerInfo> Materialize(
             IItemContainerGenerator generator,
             int index,
diff --git a/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTypedTests.cs b/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTypedTests.cs
index 05954cbcd2..aab7c52f34 100644
--- a/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTypedTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTypedTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Controls.Generators;
diff --git a/tests/Avalonia.Controls.UnitTests/GridLengthTests.cs b/tests/Avalonia.Controls.UnitTests/GridLengthTests.cs
index ab4da0ca7e..8c00726e05 100644
--- a/tests/Avalonia.Controls.UnitTests/GridLengthTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/GridLengthTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
 using System.Linq;
diff --git a/tests/Avalonia.Controls.UnitTests/GridTests.cs b/tests/Avalonia.Controls.UnitTests/GridTests.cs
index 353bb9c98d..4ffa526b85 100644
--- a/tests/Avalonia.Controls.UnitTests/GridTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/GridTests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Avalonia.UnitTests;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -1182,13 +1183,18 @@ namespace Avalonia.Controls.UnitTests
             foreach (var xgrids in grids)
                 scope.Children.Add(xgrids);
 
-            var root = new Grid();
-            root.UseLayoutRounding = false;
-            root.SetValue(Grid.IsSharedSizeScopeProperty, true);
-            root.Children.Add(scope);
+            var rootGrid = new Grid();
+            rootGrid.UseLayoutRounding = false;
+            rootGrid.SetValue(Grid.IsSharedSizeScopeProperty, true);
+            rootGrid.Children.Add(scope);
 
-            root.Measure(new Size(50, 50));
-            root.Arrange(new Rect(new Point(), new Point(50, 50)));
+            var root = new TestRoot(rootGrid)
+            {
+                Width = 50,
+                Height = 50,
+            };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
 
             PrintColumnDefinitions(grids[0]);
             Assert.Equal(5, grids[0].ColumnDefinitions[0].ActualWidth);
diff --git a/tests/Avalonia.Controls.UnitTests/HeaderedItemsControlTests .cs b/tests/Avalonia.Controls.UnitTests/HeaderedItemsControlTests .cs
index fcf7bf3c8c..5c86e3e5a9 100644
--- a/tests/Avalonia.Controls.UnitTests/HeaderedItemsControlTests .cs	
+++ b/tests/Avalonia.Controls.UnitTests/HeaderedItemsControlTests .cs	
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
diff --git a/tests/Avalonia.Controls.UnitTests/ImageTests.cs b/tests/Avalonia.Controls.UnitTests/ImageTests.cs
index 71d0d1e328..ad735cd088 100644
--- a/tests/Avalonia.Controls.UnitTests/ImageTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ImageTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Moq;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
@@ -13,7 +10,7 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Measure_Should_Return_Correct_Size_For_No_Stretch()
         {
-            var bitmap = Mock.Of<IBitmap>(x => x.PixelSize == new PixelSize(50, 100));
+            var bitmap = CreateBitmap(50, 100);
             var target = new Image();
             target.Stretch = Stretch.None;
             target.Source = bitmap;
@@ -26,7 +23,7 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Measure_Should_Return_Correct_Size_For_Fill_Stretch()
         {
-            var bitmap = Mock.Of<IBitmap>(x => x.PixelSize == new PixelSize(50, 100));
+            var bitmap = CreateBitmap(50, 100);
             var target = new Image();
             target.Stretch = Stretch.Fill;
             target.Source = bitmap;
@@ -39,7 +36,7 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Measure_Should_Return_Correct_Size_For_Uniform_Stretch()
         {
-            var bitmap = Mock.Of<IBitmap>(x => x.PixelSize == new PixelSize(50, 100));
+            var bitmap = CreateBitmap(50, 100);
             var target = new Image();
             target.Stretch = Stretch.Uniform;
             target.Source = bitmap;
@@ -52,7 +49,7 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Measure_Should_Return_Correct_Size_For_UniformToFill_Stretch()
         {
-            var bitmap = Mock.Of<IBitmap>(x => x.PixelSize == new PixelSize(50, 100));
+            var bitmap = CreateBitmap(50, 100);
             var target = new Image();
             target.Stretch = Stretch.UniformToFill;
             target.Source = bitmap;
@@ -62,10 +59,59 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(new Size(50, 50), target.DesiredSize);
         }
 
+        [Fact]
+        public void Measure_Should_Return_Correct_Size_With_StretchDirection_DownOnly()
+        {
+            var bitmap = CreateBitmap(50, 100);
+            var target = new Image();
+            target.StretchDirection = StretchDirection.DownOnly;
+            target.Source = bitmap;
+
+            target.Measure(new Size(150, 150));
+
+            Assert.Equal(new Size(50, 100), target.DesiredSize);
+        }
+
+        [Fact]
+        public void Measure_Should_Return_Correct_Size_For_Infinite_Height()
+        {
+            var bitmap = CreateBitmap(50, 100);
+            var image = new Image();
+            image.Source = bitmap;
+
+            image.Measure(new Size(200, double.PositiveInfinity));
+
+            Assert.Equal(new Size(200, 400), image.DesiredSize);
+        }
+
+        [Fact]
+        public void Measure_Should_Return_Correct_Size_For_Infinite_Width()
+        {
+            var bitmap = CreateBitmap(50, 100);
+            var image = new Image();
+            image.Source = bitmap;
+
+            image.Measure(new Size(double.PositiveInfinity, 400));
+
+            Assert.Equal(new Size(200, 400), image.DesiredSize);
+        }
+
+        [Fact]
+        public void Measure_Should_Return_Correct_Size_For_Infinite_Width_Height()
+        {
+            var bitmap = CreateBitmap(50, 100);
+            var image = new Image();
+            image.Source = bitmap;
+
+            image.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+
+            Assert.Equal(new Size(50, 100), image.DesiredSize);
+        }
+
         [Fact]
         public void Arrange_Should_Return_Correct_Size_For_No_Stretch()
         {
-            var bitmap = Mock.Of<IBitmap>(x => x.PixelSize == new PixelSize(50, 100));
+            var bitmap = CreateBitmap(50, 100);
             var target = new Image();
             target.Stretch = Stretch.None;
             target.Source = bitmap;
@@ -79,7 +125,7 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Arrange_Should_Return_Correct_Size_For_Fill_Stretch()
         {
-            var bitmap = Mock.Of<IBitmap>(x => x.PixelSize == new PixelSize(50, 100));
+            var bitmap = CreateBitmap(50, 100);
             var target = new Image();
             target.Stretch = Stretch.Fill;
             target.Source = bitmap;
@@ -93,7 +139,7 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Arrange_Should_Return_Correct_Size_For_Uniform_Stretch()
         {
-            var bitmap = Mock.Of<IBitmap>(x => x.PixelSize == new PixelSize(50, 100));
+            var bitmap = CreateBitmap(50, 100);
             var target = new Image();
             target.Stretch = Stretch.Uniform;
             target.Source = bitmap;
@@ -107,7 +153,7 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Arrange_Should_Return_Correct_Size_For_UniformToFill_Stretch()
         {
-            var bitmap = Mock.Of<IBitmap>(x => x.PixelSize == new PixelSize(50, 100));
+            var bitmap = CreateBitmap(50, 100);
             var target = new Image();
             target.Stretch = Stretch.UniformToFill;
             target.Source = bitmap;
@@ -117,5 +163,10 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Equal(new Size(25, 100), target.Bounds.Size);
         }
+
+        private IBitmap CreateBitmap(int width, int height)
+        {
+            return Mock.Of<IBitmap>(x => x.Size == new Size(width, height));
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
index 227d783874..684486cbae 100644
--- a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Specialized;
 using System.Linq;
 using Avalonia.Collections;
@@ -66,7 +63,7 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void Container_Child_Should_Have_LogicalParent_Set_To_Container()
+        public void Container_Should_Have_LogicalParent_Set_To_ItemsControl()
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
@@ -87,7 +84,7 @@ namespace Avalonia.Controls.UnitTests
 
                 var container = (ContentPresenter)target.Presenter.Panel.Children[0];
 
-                Assert.Equal(container, container.Child.Parent);
+                Assert.Equal(target, container.Parent);
             }
         }
 
@@ -190,7 +187,7 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void Adding_String_Item_Should_Make_TextBlock_Appear_In_LogicalChildren()
+        public void Adding_String_Item_Should_Make_ContentPresenter_Appear_In_LogicalChildren()
         {
             var target = new ItemsControl();
             var child = new Control();
@@ -202,7 +199,7 @@ namespace Avalonia.Controls.UnitTests
 
             var logical = (ILogical)target;
             Assert.Equal(1, logical.LogicalChildren.Count);
-            Assert.IsType<TextBlock>(logical.LogicalChildren[0]);
+            Assert.IsType<ContentPresenter>(logical.LogicalChildren[0]);
         }
 
         [Fact]
@@ -575,6 +572,30 @@ namespace Avalonia.Controls.UnitTests
             };
         }
 
+        [Fact]
+        public void Detaching_Then_Reattaching_To_Logical_Tree_Twice_Does_Not_Throw()
+        {
+            // # Issue 3487
+            var target = new ItemsControl
+            {
+                Template = GetTemplate(),
+                Items = new[] { "foo", "bar" },
+                ItemTemplate = new FuncDataTemplate<string>((_, __) => new Canvas()),
+            };
+
+            var root = new TestRoot(target);
+            root.Measure(Size.Infinity);
+            root.Arrange(new Rect(root.DesiredSize));
+
+            root.Child = null;
+            root.Child = target;
+
+            target.Measure(Size.Infinity);
+
+            root.Child = null;
+            root.Child = target;
+        }
+
         private class Item
         {
             public Item(string value)
diff --git a/tests/Avalonia.Controls.UnitTests/LayoutTransformControlTests.cs b/tests/Avalonia.Controls.UnitTests/LayoutTransformControlTests.cs
index 13c946b549..60139c2881 100644
--- a/tests/Avalonia.Controls.UnitTests/LayoutTransformControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/LayoutTransformControlTests.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls.Shapes;
 using Avalonia.Media;
+using Avalonia.UnitTests;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
@@ -171,6 +172,8 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Should_Generate_RotateTransform_90_degrees()
         {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
             LayoutTransformControl lt = CreateWithChildAndMeasureAndTransform(
                                         100,
                                         25,
@@ -193,6 +196,8 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Should_Generate_RotateTransform_minus_90_degrees()
         {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
             LayoutTransformControl lt = CreateWithChildAndMeasureAndTransform(
                                         100,
                                         25,
@@ -215,6 +220,8 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Should_Generate_ScaleTransform_x2()
         {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
             LayoutTransformControl lt = CreateWithChildAndMeasureAndTransform(
                                         100,
                                         50,
@@ -236,6 +243,8 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Should_Generate_SkewTransform_45_degrees()
         {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
             LayoutTransformControl lt = CreateWithChildAndMeasureAndTransform(
                                         100,
                                         100,
@@ -258,6 +267,8 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Should_Generate_SkewTransform_minus_45_degrees()
         {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
             LayoutTransformControl lt = CreateWithChildAndMeasureAndTransform(
                                         100,
                                         100,
@@ -279,6 +290,8 @@ namespace Avalonia.Controls.UnitTests
 
         private static void TransformMeasureSizeTest(Size size, Transform transform, Size expectedSize)
         {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
             LayoutTransformControl lt = CreateWithChildAndMeasureAndTransform(
                 size.Width,
                 size.Height,
@@ -292,6 +305,8 @@ namespace Avalonia.Controls.UnitTests
 
         private static void TransformRootBoundsTest(Size size, Transform transform, Rect expectedBounds)
         {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
             LayoutTransformControl lt = CreateWithChildAndMeasureAndTransform(size.Width, size.Height, transform);
 
             Rect outBounds = lt.TransformRoot.Bounds;
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
index df2508a3ed..145fce4fed 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
@@ -1,9 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Linq;
 using Avalonia.Collections;
 using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.LogicalTree;
@@ -245,6 +243,23 @@ namespace Avalonia.Controls.UnitTests
             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
+            {
+                Template = ListBoxTemplate(),
+                Items = items,
+                ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Height = 10 })
+            };
+
+            Prepare(target);
+            target.Scroll.Offset = new Vector(0, 1);
+
+            items.RemoveRange(0, 11);
+        }
+
         private void RaisePressedEvent(ListBox listBox, ListBoxItem item, MouseButton mouseButton)
         {
             _mouse.Click(listBox, item, mouseButton);
@@ -314,7 +329,7 @@ namespace Avalonia.Controls.UnitTests
                     return tb;
                 }, true);
 
-                lm.ExecuteInitialLayoutPass(wnd);
+                lm.ExecuteInitialLayoutPass();
 
                 target.Items = items;
 
@@ -352,6 +367,93 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void Clicking_Item_Should_Raise_BringIntoView_For_Correct_Control()
+        {
+            // 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);
+
+            Assert.Equal(1, raised);
+        }
+
+        [Fact]
+        public void Adding_And_Selecting_Item_With_AutoScrollToSelectedItem_Should_NotHide_FirstItem()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var items = new AvaloniaList<string>();
+
+                var wnd = new Window() { Width = 100, Height = 100, IsVisible = true };
+
+                var target = new ListBox()
+                {
+                    VerticalAlignment = Layout.VerticalAlignment.Top,
+                    AutoScrollToSelectedItem = true,
+                    Width = 50,
+                    VirtualizationMode = ItemVirtualizationMode.Simple,
+                    ItemTemplate = new FuncDataTemplate<object>((c, _) => new Border() { Height = 10 }),
+                    Items = items,
+                };
+                wnd.Content = target;
+
+                var lm = wnd.LayoutManager;
+
+                lm.ExecuteInitialLayoutPass();
+
+                var panel = target.Presenter.Panel;
+
+                items.Add("Item 1");
+                target.Selection.Select(0);
+                lm.ExecuteLayoutPass();
+
+                Assert.Equal(1, panel.Children.Count);
+
+                items.Add("Item 2");
+                target.Selection.Select(1);
+                lm.ExecuteLayoutPass();
+
+                Assert.Equal(2, panel.Children.Count);
+
+                //make sure we have enough space to show all items
+                Assert.True(panel.Bounds.Height >= panel.Children.Sum(c => c.Bounds.Height));
+
+                //make sure we show items and they completelly visible, not only partially
+                Assert.True(panel.Children[0].Bounds.Top >= 0 && panel.Children[0].Bounds.Bottom <= panel.Bounds.Height, "first item is not completelly visible!");
+                Assert.True(panel.Children[1].Bounds.Top >= 0 && panel.Children[1].Bounds.Bottom <= panel.Bounds.Height, "second item is not completelly visible!");
+            }
+        }
+
         private FuncControlTemplate ListBoxTemplate()
         {
             return new FuncControlTemplate<ListBox>((parent, scope) =>
@@ -383,14 +485,26 @@ namespace Avalonia.Controls.UnitTests
         private FuncControlTemplate ScrollViewerTemplate()
         {
             return new FuncControlTemplate<ScrollViewer>((parent, scope) =>
-                new ScrollContentPresenter
+                new Panel
                 {
-                    Name = "PART_ContentPresenter",
-                    [~ScrollContentPresenter.ContentProperty] = parent.GetObservable(ScrollViewer.ContentProperty).ToBinding(),
-                    [~~ScrollContentPresenter.ExtentProperty] = parent[~~ScrollViewer.ExtentProperty],
-                    [~~ScrollContentPresenter.OffsetProperty] = parent[~~ScrollViewer.OffsetProperty],
-                    [~~ScrollContentPresenter.ViewportProperty] = parent[~~ScrollViewer.ViewportProperty],
-                }.RegisterInNameScope(scope));
+                    Children =
+                    {
+                        new ScrollContentPresenter
+                        {
+                            Name = "PART_ContentPresenter",
+                            [~ScrollContentPresenter.ContentProperty] = parent.GetObservable(ScrollViewer.ContentProperty).ToBinding(),
+                            [~~ScrollContentPresenter.ExtentProperty] = parent[~~ScrollViewer.ExtentProperty],
+                            [~~ScrollContentPresenter.OffsetProperty] = parent[~~ScrollViewer.OffsetProperty],
+                            [~~ScrollContentPresenter.ViewportProperty] = parent[~~ScrollViewer.ViewportProperty],
+                        }.RegisterInNameScope(scope),
+                        new ScrollBar
+                        {
+                            Name = "verticalScrollBar",
+                            [~ScrollBar.MaximumProperty] = parent[~ScrollViewer.VerticalScrollBarMaximumProperty],
+                            [~~ScrollBar.ValueProperty] = parent[~~ScrollViewer.VerticalScrollBarValueProperty],
+                        }
+                    }
+                });
         }
 
         private void Prepare(ListBox target)
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs
new file mode 100644
index 0000000000..7c7cdd08db
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs
@@ -0,0 +1,126 @@
+using System.Linq;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.Styling;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests
+{
+    public class ListBoxTests_Multiple
+    {
+        [Fact]
+        public void Focusing_Item_With_Shift_And_Arrow_Key_Should_Add_To_Selection()
+        {
+            var target = new ListBox
+            {
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
+                Items = new[] { "Foo", "Bar", "Baz " },
+                SelectionMode = SelectionMode.Multiple
+            };
+
+            ApplyTemplate(target);
+
+            target.SelectedItem = "Foo";
+
+            target.Presenter.Panel.Children[1].RaiseEvent(new GotFocusEventArgs
+            {
+                RoutedEvent = InputElement.GotFocusEvent,
+                NavigationMethod = NavigationMethod.Directional,
+                KeyModifiers = KeyModifiers.Shift
+            });
+
+            Assert.Equal(new[] { "Foo", "Bar" }, target.SelectedItems);
+        }
+
+        [Fact]
+        public void Focusing_Item_With_Ctrl_And_Arrow_Key_Should_Add_To_Selection()
+        {
+            var target = new ListBox
+            {
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
+                Items = new[] { "Foo", "Bar", "Baz " },
+                SelectionMode = SelectionMode.Multiple
+            };
+
+            ApplyTemplate(target);
+
+            target.SelectedItem = "Foo";
+
+            target.Presenter.Panel.Children[1].RaiseEvent(new GotFocusEventArgs
+            {
+                RoutedEvent = InputElement.GotFocusEvent,
+                NavigationMethod = NavigationMethod.Directional,
+                KeyModifiers = KeyModifiers.Control
+            });
+
+            Assert.Equal(new[] { "Foo", "Bar" }, target.SelectedItems);
+        }
+
+        [Fact]
+        public void Focusing_Selected_Item_With_Ctrl_And_Arrow_Key_Should_Remove_From_Selection()
+        {
+            var target = new ListBox
+            {
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
+                Items = new[] { "Foo", "Bar", "Baz " },
+                SelectionMode = SelectionMode.Multiple
+            };
+
+            ApplyTemplate(target);
+
+            target.SelectedItems.Add("Foo");
+            target.SelectedItems.Add("Bar");
+
+            target.Presenter.Panel.Children[0].RaiseEvent(new GotFocusEventArgs
+            {
+                RoutedEvent = InputElement.GotFocusEvent,
+                NavigationMethod = NavigationMethod.Directional,
+                KeyModifiers = KeyModifiers.Control
+            });
+
+            Assert.Equal(new[] { "Bar" }, target.SelectedItems);
+        }
+
+        private Control CreateListBoxTemplate(ITemplatedControl parent, INameScope scope)
+        {
+            return new ScrollViewer
+            {
+                Template = new FuncControlTemplate(CreateScrollViewerTemplate),
+                Content = new ItemsPresenter
+                {
+                    Name = "PART_ItemsPresenter",
+                    [~ItemsPresenter.ItemsProperty] = parent.GetObservable(ItemsControl.ItemsProperty).ToBinding(),
+                }.RegisterInNameScope(scope)
+            };
+        }
+
+        private Control CreateScrollViewerTemplate(ITemplatedControl parent, INameScope scope)
+        {
+            return new ScrollContentPresenter
+            {
+                Name = "PART_ContentPresenter",
+                [~ContentPresenter.ContentProperty] =
+                    parent.GetObservable(ContentControl.ContentProperty).ToBinding(),
+            }.RegisterInNameScope(scope);
+        }
+
+        private void ApplyTemplate(ListBox target)
+        {
+            // Apply the template to the ListBox itself.
+            target.ApplyTemplate();
+
+            // Then to its inner ScrollViewer.
+            var scrollViewer = (ScrollViewer)target.GetVisualChildren().Single();
+            scrollViewer.ApplyTemplate();
+
+            // Then make the ScrollViewer create its child.
+            ((ContentPresenter)scrollViewer.Presenter).UpdateChild();
+
+            // Now the ItemsPresenter should be reigstered, so apply its template.
+            target.Presenter.ApplyTemplate();
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
index 27ddd95d20..8f795104bf 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
diff --git a/tests/Avalonia.Controls.UnitTests/Mixins/PressedMixinTests.cs b/tests/Avalonia.Controls.UnitTests/Mixins/PressedMixinTests.cs
new file mode 100644
index 0000000000..0ff1f40121
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/Mixins/PressedMixinTests.cs
@@ -0,0 +1,37 @@
+using Avalonia.Controls.Mixins;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests.Mixins
+{
+    public class PressedMixinTests
+    {
+        private MouseTestHelper _mouse = new MouseTestHelper();
+
+        [Fact]
+        public void Selected_Class_Should_Not_Initially_Be_Added()
+        {
+            var target = new TestControl();
+
+            Assert.Empty(target.Classes);
+        }
+
+        [Fact]
+        public void Setting_IsSelected_Should_Add_Selected_Class()
+        {
+            var target = new TestControl();
+
+            _mouse.Down(target);
+
+            Assert.Equal(new[] { ":pressed" }, target.Classes);
+        }
+
+        private class TestControl : Control
+        {
+            static TestControl()
+            {
+                PressedMixin.Attach<TestControl>();
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/Mixins/SelectableMixinTests.cs b/tests/Avalonia.Controls.UnitTests/Mixins/SelectableMixinTests.cs
index 7d6f8805c4..c0610146b7 100644
--- a/tests/Avalonia.Controls.UnitTests/Mixins/SelectableMixinTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Mixins/SelectableMixinTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Primitives;
 using Xunit;
diff --git a/tests/Avalonia.Controls.UnitTests/NameScopeTests.cs b/tests/Avalonia.Controls.UnitTests/NameScopeTests.cs
index 0fdcd3fd34..888b3b3d24 100644
--- a/tests/Avalonia.Controls.UnitTests/NameScopeTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/NameScopeTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Xunit;
 
diff --git a/tests/Avalonia.Controls.UnitTests/PanelTests.cs b/tests/Avalonia.Controls.UnitTests/PanelTests.cs
index 4a404ea97e..f189638c7d 100644
--- a/tests/Avalonia.Controls.UnitTests/PanelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/PanelTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Linq;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
@@ -130,7 +127,7 @@ namespace Avalonia.Controls.UnitTests
 
             var root = new TestRoot(target);
             var renderer = Mock.Get(root.Renderer);
-            renderer.ResetCalls();
+            renderer.Invocations.Clear();
 
             ((SolidColorBrush)target.Background).Color = Colors.Green;
 
diff --git a/tests/Avalonia.Controls.UnitTests/Platform/DefaultMenuInteractionHandlerTests.cs b/tests/Avalonia.Controls.UnitTests/Platform/DefaultMenuInteractionHandlerTests.cs
index 989bd744a6..1a11091b81 100644
--- a/tests/Avalonia.Controls.UnitTests/Platform/DefaultMenuInteractionHandlerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Platform/DefaultMenuInteractionHandlerTests.cs
@@ -124,6 +124,24 @@ namespace Avalonia.Controls.UnitTests.Platform
                 Assert.True(e.Handled);
             }
 
+            [Fact]
+            public void Click_On_TopLevel_Calls_MainMenu_Open()
+            {
+                var target = new DefaultMenuInteractionHandler(false);
+                var menu = new Mock<IMainMenu>();
+                menu.As<IMenuElement>();
+
+                var item = Mock.Of<IMenuItem>(x =>
+                    x.IsTopLevel == true &&
+                    x.HasSubMenu == true &&
+                    x.Parent == menu.Object);
+
+                var e = CreatePressed(item);
+
+                target.PointerPressed(item, e);
+                menu.Verify(x => x.Open());
+            }
+
             [Fact]
             public void Click_On_Open_TopLevel_Menu_Closes_Menu()
             {
@@ -199,6 +217,18 @@ namespace Avalonia.Controls.UnitTests.Platform
                 menu.VerifySet(x => x.SelectedItem = null, Times.Never);
                 Assert.False(e.Handled);
             }
+
+            [Fact]
+            public void Doesnt_Throw_On_Menu_Keypress()
+            {
+                // Issue #3459
+                var target = new DefaultMenuInteractionHandler(false);
+                var menu = Mock.Of<IMenu>();
+                var item = Mock.Of<IMenuItem>(x => x.IsTopLevel == true && x.Parent == menu);
+                var e = new KeyEventArgs { Key = Key.Tab, Source = menu };
+
+                target.KeyDown(menu, e);
+            }
         }
 
         public class NonTopLevel
@@ -473,26 +503,26 @@ namespace Avalonia.Controls.UnitTests.Platform
                 target.PointerEnter(item, enter);
                 Assert.True(timer.ActionIsQueued);
                 Mock.Get(parentItem).VerifySet(x => x.SelectedItem = item);
-                Mock.Get(parentItem).ResetCalls();
+                Mock.Get(parentItem).Invocations.Clear();
 
                 // SubMenu shown after a delay.
                 timer.Pulse();
                 Mock.Get(item).Verify(x => x.Open());
                 Mock.Get(item).SetupGet(x => x.IsSubMenuOpen).Returns(true);
-                Mock.Get(item).ResetCalls();
+                Mock.Get(item).Invocations.Clear();
 
                 // Pointer briefly exits item, but submenu remains open.
                 target.PointerLeave(item, leave);
                 Mock.Get(item).Verify(x => x.Close(), Times.Never);
-                Mock.Get(item).ResetCalls();
+                Mock.Get(item).Invocations.Clear();
 
                 // Pointer enters child item; is selected.
                 enter.Source = childItem;
                 target.PointerEnter(childItem, enter);
                 Mock.Get(item).VerifySet(x => x.SelectedItem = childItem);
                 Mock.Get(parentItem).VerifySet(x => x.SelectedItem = item);
-                Mock.Get(item).ResetCalls();
-                Mock.Get(parentItem).ResetCalls();
+                Mock.Get(item).Invocations.Clear();
+                Mock.Get(parentItem).Invocations.Clear();
             }
 
             [Fact]
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/CarouselPresenterTests.cs b/tests/Avalonia.Controls.UnitTests/Presenters/CarouselPresenterTests.cs
index 2cc9965740..11c9787114 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/CarouselPresenterTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/CarouselPresenterTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Linq;
 using Moq;
 using Avalonia.Controls.Generators;
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
index 6d6dfc9230..a579e869b0 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
index 98e57601a4..ed44fbfc32 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Layout.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Presenters;
 using Avalonia.Layout;
 using Xunit;
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
index 59f3ae44c2..c7aa583b6f 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
@@ -60,7 +57,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
             var parentMock = new Mock<Control>();
             parentMock.As<IContentPresenterHost>();
             parentMock.As<IRenderRoot>();
-            parentMock.As<IStyleRoot>();
+            parentMock.As<ILogicalRoot>();
 
             (target as ISetLogicalParent).SetParent(parentMock.Object);
 
@@ -105,7 +102,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
             var parentMock = new Mock<Control>();
             parentMock.As<IRenderRoot>();
-            parentMock.As<IStyleRoot>();
+            parentMock.As<ILogicalRoot>();
             parentMock.As<ILogical>().SetupGet(l => l.IsAttachedToLogicalTree).Returns(true);
 
             (contentControl as ISetLogicalParent).SetParent(parentMock.Object);
@@ -150,7 +147,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
             var parentMock = new Mock<Control>();
             parentMock.As<IContentPresenterHost>();
             parentMock.As<IRenderRoot>();
-            parentMock.As<IStyleRoot>();
+            parentMock.As<ILogicalRoot>();
 
             (target as ISetLogicalParent).SetParent(parentMock.Object);
 
@@ -215,7 +212,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
             var root = new TestRoot(target);
             var renderer = Mock.Get(root.Renderer);
-            renderer.ResetCalls();
+            renderer.Invocations.Clear();
 
             ((SolidColorBrush)target.Background).Color = Colors.Green;
 
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Unrooted.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Unrooted.cs
index c30e81a1cb..aae6b83207 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Unrooted.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Unrooted.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
 using Avalonia.UnitTests;
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests.cs
index 274ca335d9..fab57cec49 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.ObjectModel;
 using System.Linq;
 using Moq;
@@ -63,6 +60,25 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Assert.IsType<ListBoxItem>(target.Panel.Children[1]);
         }
 
+        [Fact]
+        public void Should_Create_Containers_Only_Once()
+        {
+            var parent = new TestItemsControl();
+            var target = new ItemsPresenter
+            {
+                Items = new[] { "foo", "bar" },
+                [StyledElement.TemplatedParentProperty] = parent,
+            };
+            var raised = 0;
+
+            parent.ItemContainerGenerator.Materialized += (s, e) => ++raised;
+
+            target.ApplyTemplate();
+
+            Assert.Equal(2, target.Panel.Children.Count);
+            Assert.Equal(2, raised);
+        }
+
         [Fact]
         public void ItemContainerGenerator_Should_Be_Picked_Up_From_TemplatedControl()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs
index 269da884ba..d529cc4f75 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -235,7 +232,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
                 var scroll = (TestScroller)target.Parent;
 
                 scroll.Width = scroll.Height = 100;
-                scroll.LayoutManager.ExecuteInitialLayoutPass(scroll);
+                scroll.LayoutManager.ExecuteInitialLayoutPass();
 
                 // Ensure than an intermediate measure pass doesn't add more controls than it
                 // should. This can happen if target gets measured with Size.Infinity which
@@ -327,6 +324,11 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
         private class TestScroller : ScrollContentPresenter, IRenderRoot, ILayoutRoot
         {
+            public TestScroller()
+            {
+                LayoutManager = new LayoutManager(this);
+            }
+
             public IRenderer Renderer { get; }
             public Size ClientSize { get; }
             public double RenderScaling => 1;
@@ -335,7 +337,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
             public double LayoutScaling => 1;
 
-            public ILayoutManager LayoutManager { get; } = new LayoutManager();
+            public ILayoutManager LayoutManager { get; }
 
             public IRenderTarget CreateRenderTarget() => throw new NotImplementedException();
             public void Invalidate(Rect rect) => throw new NotImplementedException();
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
index 7a6cf0fba7..a467c6dd03 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -13,6 +10,7 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Layout;
+using Avalonia.LogicalTree;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Styling;
@@ -575,7 +573,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
                 target.Arrange(Rect.Empty);
 
                 // Check for issue #591: this should not throw.
-                target.ScrollIntoView(items[0]);
+                target.ScrollIntoView(0);
             }
         }
 
@@ -725,11 +723,11 @@ namespace Avalonia.Controls.UnitTests.Presenters
             var scroller = (TestScroller)target.Parent;
 
             scroller.Width = scroller.Height = 100;
-            scroller.LayoutManager.ExecuteInitialLayoutPass(scroller);
+            scroller.LayoutManager.ExecuteInitialLayoutPass();
 
             var last = (target.Items as IList)[10];
 
-            target.ScrollIntoView(last);
+            target.ScrollIntoView(10);
 
             Assert.Equal(new Vector(0, 1), ((ILogicalScrollable)target).Offset);
             Assert.Same(target.Panel.Children[9].DataContext, last);
@@ -742,16 +740,16 @@ namespace Avalonia.Controls.UnitTests.Presenters
             var scroller = (TestScroller)target.Parent;
 
             scroller.Width = scroller.Height = 100;
-            scroller.LayoutManager.ExecuteInitialLayoutPass(scroller);
+            scroller.LayoutManager.ExecuteInitialLayoutPass();
 
             var last = (target.Items as IList)[10];
 
-            target.ScrollIntoView(last);
+            target.ScrollIntoView(10);
 
             Assert.Equal(new Vector(0, 1), ((ILogicalScrollable)target).Offset);
             Assert.Same(target.Panel.Children[9].DataContext, last);
 
-            target.ScrollIntoView(last);
+            target.ScrollIntoView(10);
 
             Assert.Equal(new Vector(0, 1), ((ILogicalScrollable)target).Offset);
             Assert.Same(target.Panel.Children[9].DataContext, last);
@@ -840,7 +838,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
                 var scroller = (TestScroller)target.Parent;
 
                 scroller.Width = scroller.Height = 100;
-                scroller.LayoutManager.ExecuteInitialLayoutPass(scroller);
+                scroller.LayoutManager.ExecuteInitialLayoutPass();
 
                 var from = target.Panel.Children[5];
                 var result = ((ILogicalScrollable)target).GetControlInDirection(
@@ -857,7 +855,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
                 var scroller = (TestScroller)target.Parent;
 
                 scroller.Width = scroller.Height = 100;
-                scroller.LayoutManager.ExecuteInitialLayoutPass(scroller);
+                scroller.LayoutManager.ExecuteInitialLayoutPass();
 
                 var from = target.Panel.Children[9];
                 var result = ((ILogicalScrollable)target).GetControlInDirection(
@@ -876,7 +874,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
                 scroller.Width = 100;
                 scroller.Height = 95;
-                scroller.LayoutManager.ExecuteInitialLayoutPass(scroller);
+                scroller.LayoutManager.ExecuteInitialLayoutPass();
 
                 var from = target.Panel.Children[8];
                 var result = ((ILogicalScrollable)target).GetControlInDirection(
@@ -895,7 +893,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
                 scroller.Width = 100;
                 scroller.Height = 95;
-                scroller.LayoutManager.ExecuteInitialLayoutPass(scroller);
+                scroller.LayoutManager.ExecuteInitialLayoutPass();
                 ((ILogicalScrollable)target).Offset = new Vector(0, 11);
 
                 var from = target.Panel.Children[1];
@@ -948,7 +946,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
                 var scroller = (TestScroller)target.Parent;
 
                 scroller.Width = scroller.Height = 100;
-                scroller.LayoutManager.ExecuteInitialLayoutPass(scroller);
+                scroller.LayoutManager.ExecuteInitialLayoutPass();
 
                 var from = target.Panel.Children[5];
                 var result = ((ILogicalScrollable)target).GetControlInDirection(
@@ -965,7 +963,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
                 var scroller = (TestScroller)target.Parent;
 
                 scroller.Width = scroller.Height = 100;
-                scroller.LayoutManager.ExecuteInitialLayoutPass(scroller);
+                scroller.LayoutManager.ExecuteInitialLayoutPass();
 
                 var from = target.Panel.Children[9];
                 var result = ((ILogicalScrollable)target).GetControlInDirection(
@@ -984,7 +982,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
                 scroller.Width = 95;
                 scroller.Height = 100;
-                scroller.LayoutManager.ExecuteInitialLayoutPass(scroller);
+                scroller.LayoutManager.ExecuteInitialLayoutPass();
 
                 var from = target.Panel.Children[8];
                 var result = ((ILogicalScrollable)target).GetControlInDirection(
@@ -1003,7 +1001,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
                 scroller.Width = 95;
                 scroller.Height = 100;
-                scroller.LayoutManager.ExecuteInitialLayoutPass(scroller);
+                scroller.LayoutManager.ExecuteInitialLayoutPass();
                 ((ILogicalScrollable)target).Offset = new Vector(11, 0);
 
                 var from = target.Panel.Children[1];
@@ -1062,8 +1060,13 @@ namespace Avalonia.Controls.UnitTests.Presenters
             });
         }
 
-        private class TestScroller : ScrollContentPresenter, IRenderRoot, ILayoutRoot, IStyleRoot
+        private class TestScroller : ScrollContentPresenter, IRenderRoot, ILayoutRoot, ILogicalRoot
         {
+            public TestScroller()
+            {
+                LayoutManager = new LayoutManager(this);
+            }
+
             public IRenderer Renderer { get; }
             public Size ClientSize { get; }
             public double RenderScaling => 1;
@@ -1072,7 +1075,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
 
             public double LayoutScaling => 1;
 
-            public ILayoutManager LayoutManager { get; } = new LayoutManager();
+            public ILayoutManager LayoutManager { get; }
 
             public IRenderTarget CreateRenderTarget() => throw new NotImplementedException();
             public void Invalidate(Rect rect) => throw new NotImplementedException();
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs
index 4501315c94..f6130d49d6 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Reactive.Linq;
@@ -120,13 +117,17 @@ namespace Avalonia.Controls.UnitTests.Presenters
                     Width = 150,
                     Height = 150,
                 },
-                Offset = new Vector(25, 25),
             };
 
             target.UpdateChild();
             target.Measure(new Size(100, 100));
             target.Arrange(new Rect(0, 0, 100, 100));
 
+            target.Offset = new Vector(25, 25);
+
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
             Assert.Equal(new Rect(-25, -25, 150, 150), content.Bounds);
         }
 
@@ -348,4 +349,4 @@ namespace Avalonia.Controls.UnitTests.Presenters
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests_ILogicalScrollable.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests_ILogicalScrollable.cs
index 11d5bd408b..a3292644b3 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests_ILogicalScrollable.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests_ILogicalScrollable.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
 using Avalonia.Controls.Presenters;
@@ -62,13 +59,17 @@ namespace Avalonia.Controls.UnitTests
                 CanHorizontallyScroll = true,
                 CanVerticallyScroll = true,
                 Content = scrollable,
-                Offset = new Vector(25, 25),
             };
 
             target.UpdateChild();
             target.Measure(new Size(100, 100));
             target.Arrange(new Rect(0, 0, 100, 100));
 
+            target.Offset = new Vector(25, 25);
+            
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
             Assert.Equal(new Rect(-25, -25, 150, 150), scrollable.Bounds);
         }
 
@@ -104,7 +105,7 @@ namespace Avalonia.Controls.UnitTests
 
             target.UpdateChild();
 
-            Assert.NotNull(scrollable.InvalidateScroll);
+            Assert.True(scrollable.HasScrollInvalidatedSubscriber);
         }
 
         [Fact]
@@ -120,7 +121,7 @@ namespace Avalonia.Controls.UnitTests
             target.Content = null;
             target.UpdateChild();
 
-            Assert.Null(scrollable.InvalidateScroll);
+            Assert.False(scrollable.HasScrollInvalidatedSubscriber);
         }
 
         [Fact]
@@ -220,7 +221,7 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(new Rect(0, 0, 100, 100), scrollable.Bounds);
 
             scrollable.IsLogicalScrollEnabled = false;
-            scrollable.InvalidateScroll();
+            scrollable.RaiseScrollInvalidated(EventArgs.Empty);
             target.Measure(new Size(100, 100));
             target.Arrange(new Rect(0, 0, 100, 100));
 
@@ -230,7 +231,7 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(new Rect(0, 0, 150, 150), scrollable.Bounds);
 
             scrollable.IsLogicalScrollEnabled = true;
-            scrollable.InvalidateScroll();
+            scrollable.RaiseScrollInvalidated(EventArgs.Empty);
             target.Measure(new Size(100, 100));
             target.Arrange(new Rect(0, 0, 100, 100));
 
@@ -321,12 +322,20 @@ namespace Avalonia.Controls.UnitTests
             private Size _extent;
             private Vector _offset;
             private Size _viewport;
+            private EventHandler _scrollInvalidated;
 
             public bool CanHorizontallyScroll { get; set; }
             public bool CanVerticallyScroll { get; set; }
             public bool IsLogicalScrollEnabled { get; set; } = true;
             public Size AvailableSize { get; private set; }
-            public Action InvalidateScroll { get; set; }
+
+            public bool HasScrollInvalidatedSubscriber => _scrollInvalidated != null;
+            
+            public event EventHandler ScrollInvalidated
+            {
+                add => _scrollInvalidated += value;
+                remove => _scrollInvalidated -= value;
+            }
 
             public Size Extent
             {
@@ -334,7 +343,7 @@ namespace Avalonia.Controls.UnitTests
                 set
                 {
                     _extent = value;
-                    InvalidateScroll?.Invoke();
+                    _scrollInvalidated?.Invoke(this, EventArgs.Empty);
                 }
             }
 
@@ -344,7 +353,7 @@ namespace Avalonia.Controls.UnitTests
                 set
                 {
                     _offset = value;
-                    InvalidateScroll?.Invoke();
+                    _scrollInvalidated?.Invoke(this, EventArgs.Empty);
                 }
             }
 
@@ -354,7 +363,7 @@ namespace Avalonia.Controls.UnitTests
                 set
                 {
                     _viewport = value;
-                    InvalidateScroll?.Invoke();
+                    _scrollInvalidated?.Invoke(this, EventArgs.Empty);
                 }
             }
 
@@ -379,6 +388,11 @@ namespace Avalonia.Controls.UnitTests
                 throw new NotImplementedException();
             }
 
+            public void RaiseScrollInvalidated(EventArgs e)
+            {
+                _scrollInvalidated?.Invoke(this, e);
+            }
+
             protected override Size MeasureOverride(Size availableSize)
             {
                 AvailableSize = availableSize;
@@ -391,4 +405,4 @@ namespace Avalonia.Controls.UnitTests
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/TextPresenter_Tests.cs b/tests/Avalonia.Controls.UnitTests/Presenters/TextPresenter_Tests.cs
index 23dae8f341..d49ee35901 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/TextPresenter_Tests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/TextPresenter_Tests.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls.Presenters;
+using Avalonia.UnitTests;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests.Presenters
@@ -8,33 +9,40 @@ namespace Avalonia.Controls.UnitTests.Presenters
         [Fact]
         public void TextPresenter_Can_Contain_Null_With_Password_Char_Set()
         {
-            var target = new TextPresenter
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                PasswordChar = '*'
-            };
+                var target = new TextPresenter
+                {
+                    PasswordChar = '*'
+                };
 
-            Assert.NotNull(target.FormattedText);
+                Assert.NotNull(target.FormattedText);
+            }
         }
 
         [Fact]
         public void TextPresenter_Can_Contain_Null_WithOut_Password_Char_Set()
         {
-            var target = new TextPresenter();
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+
+                var target = new TextPresenter();
 
-            Assert.NotNull(target.FormattedText);
+                Assert.NotNull(target.FormattedText);
+            }
         }
 
         [Fact]
         public void Text_Presenter_Replaces_Formatted_Text_With_Password_Char()
         {
-            var target = new TextPresenter
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                PasswordChar = '*',
-                Text = "Test"
-            };
 
-            Assert.NotNull(target.FormattedText);
-            Assert.Equal("****", target.FormattedText.Text);
+                var target = new TextPresenter { PasswordChar = '*', Text = "Test" };
+
+                Assert.NotNull(target.FormattedText);
+                Assert.Equal("****", target.FormattedText.Text);
+            }
         }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
index f75f6fcf91..f27ff3928c 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
@@ -1,15 +1,16 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Primitives.PopupPositioning;
 using Avalonia.Controls.Templates;
 using Avalonia.LogicalTree;
+using Avalonia.Platform;
 using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
+using Moq;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests.Primitives
@@ -77,8 +78,13 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
                 var templatedChild = ((Visual)target.Host).GetVisualChildren().Single();
                 
-                Assert.IsType<VisualLayerManager>(templatedChild);
-                var contentPresenter = templatedChild.VisualChildren.Single();
+                Assert.IsType<Panel>(templatedChild);
+
+                var visualLayerManager = templatedChild.GetVisualChildren().Skip(1).Single();
+
+                Assert.IsType<VisualLayerManager>(visualLayerManager);
+
+                var contentPresenter = visualLayerManager.VisualChildren.Single();
                 Assert.IsType<ContentPresenter>(contentPresenter);
                 
                 
@@ -175,9 +181,151 @@ namespace Avalonia.Controls.UnitTests.Primitives
             }
         }
 
-        private PopupRoot CreateTarget(TopLevel popupParent)
+        [Fact]
+        public void Child_Should_Be_Measured_With_MaxAutoSizeHint()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var child = new ChildControl();
+                var window = new Window();
+                var popupImpl = MockWindowingPlatform.CreatePopupMock(window.PlatformImpl);
+                popupImpl.Setup(x => x.MaxAutoSizeHint).Returns(new Size(1200, 1000));
+                var target = CreateTarget(window, popupImpl.Object);
+                
+                target.Content = child;
+                target.Show();
+
+                Assert.Equal(1, child.MeasureSizes.Count);
+                Assert.Equal(new Size(1200, 1000), child.MeasureSizes[0]);
+            }
+        }
+
+        [Fact]
+        public void Child_Should_Be_Measured_With_Width_Height_When_Set()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var child = new ChildControl();
+                var window = new Window();
+                var target = CreateTarget(window);
+
+                target.Width = 500;
+                target.Height = 600;
+                target.Content = child;
+                target.Show();
+
+                Assert.Equal(1, child.MeasureSizes.Count);
+                Assert.Equal(new Size(500, 600), child.MeasureSizes[0]);
+            }
+        }
+
+        [Fact]
+        public void Child_Should_Be_Measured_With_MaxWidth_MaxHeight_When_Set()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var child = new ChildControl();
+                var window = new Window();
+                var target = CreateTarget(window);
+
+                target.MaxWidth = 500;
+                target.MaxHeight = 600;
+                target.Content = child;
+                target.Show();
+
+                Assert.Equal(1, child.MeasureSizes.Count);
+                Assert.Equal(new Size(500, 600), child.MeasureSizes[0]);
+            }
+        }
+
+        [Fact]
+        public void Should_Not_Have_Offset_On_Bounds_When_Content_Larger_Than_Max_Window_Size()
+        {
+            // Issue #3784.
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var window = new Window();
+                var popupImpl = MockWindowingPlatform.CreatePopupMock(window.PlatformImpl);
+
+                var child = new Canvas
+                {
+                    Width = 400,
+                    Height = 1344,
+                };
+
+                var target = CreateTarget(window, popupImpl.Object);
+                target.Content = child;
+
+                target.Show();
+
+                Assert.Equal(new Size(400, 1024), target.Bounds.Size);
+
+                // Issue #3784 causes this to be (0, 160) which makes no sense as Window has no
+                // parent control to be offset against.
+                Assert.Equal(new Point(0, 0), target.Bounds.Position);
+            }
+        }
+
+        [Fact]
+        public void MinWidth_MinHeight_Should_Be_Respected()
+        {
+            // Issue #3796
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var window = new Window();
+                var popupImpl = MockWindowingPlatform.CreatePopupMock(window.PlatformImpl);
+
+                var target = CreateTarget(window, popupImpl.Object);
+                target.MinWidth = 400;
+                target.MinHeight = 800;
+                target.Content = new Border
+                {
+                    Width = 100,
+                    Height = 100,
+                };
+
+                target.Show();
+
+                Assert.Equal(new Rect(0, 0, 400, 800), target.Bounds);
+                Assert.Equal(new Size(400, 800), target.ClientSize);
+                Assert.Equal(new Size(400, 800), target.PlatformImpl.ClientSize);
+            }
+        }
+
+        [Fact]
+        public void Setting_Width_Should_Resize_WindowImpl()
+        {
+            // Issue #3796
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var window = new Window();
+                var popupImpl = MockWindowingPlatform.CreatePopupMock(window.PlatformImpl);
+                var positioner = new Mock<IPopupPositioner>();
+                popupImpl.Setup(x => x.PopupPositioner).Returns(positioner.Object);
+
+                var target = CreateTarget(window, popupImpl.Object);
+                target.Width = 400;
+                target.Height = 800;
+
+                target.Show();
+
+                Assert.Equal(400, target.Width);
+                Assert.Equal(800, target.Height);
+
+                target.Width = 410;
+                target.LayoutManager.ExecuteLayoutPass();
+
+                positioner.Verify(x => 
+                    x.Update(It.Is<PopupPositionerParameters>(x => x.Size.Width == 410)));
+                Assert.Equal(410, target.Width);
+            }
+        }
+
+        private PopupRoot CreateTarget(TopLevel popupParent, IPopupImpl impl = null)
         {
-            var result = new PopupRoot(popupParent, popupParent.PlatformImpl.CreatePopup())
+            impl ??= popupParent.PlatformImpl.CreatePopup();
+
+            var result = new PopupRoot(popupParent, impl)
             {
                 Template = new FuncControlTemplate<PopupRoot>((parent, scope) =>
                     new ContentPresenter
@@ -194,7 +342,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
         private class TemplatedControlWithPopup : TemplatedControl
         {
-            public static readonly AvaloniaProperty<Control> PopupContentProperty =
+            public static readonly StyledProperty<Control> PopupContentProperty =
                 AvaloniaProperty.Register<TemplatedControlWithPopup, Control>(nameof(PopupContent));
 
             public TemplatedControlWithPopup()
@@ -215,10 +363,21 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 set => SetValue(PopupContentProperty, value);
             }
 
-            protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+            protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
             {
                 Popup = (Popup)this.GetVisualChildren().Single();
             }
         }
+
+        private class ChildControl : Control
+        {
+            public List<Size> MeasureSizes { get; } = new List<Size>();
+
+            protected override Size MeasureOverride(Size availableSize)
+            {
+                MeasureSizes.Add(availableSize);
+                return base.MeasureOverride(availableSize);
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
index 7cb9fccee8..9223b08c81 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Specialized;
 using System.Diagnostics;
@@ -17,13 +14,57 @@ using Avalonia.UnitTests;
 using Avalonia.VisualTree;
 using Xunit;
 using Avalonia.Input;
+using Avalonia.Rendering;
 
 namespace Avalonia.Controls.UnitTests.Primitives
 {
     public class PopupTests
     {
         protected bool UsePopupHost;
-        
+
+        [Fact]
+        public void Popup_Open_Without_Target_Should_Attach_Itself_Later()
+        {
+            using (CreateServices())
+            {
+                int openedEvent = 0;
+                var target = new Popup();
+                target.Opened += (s, a) => openedEvent++;
+                target.IsOpen = true;
+
+                var window = PreparedWindow(target);
+                window.Show();
+                Assert.Equal(1, openedEvent);
+            }
+        }
+
+        [Fact]
+        public void Popup_Without_TopLevel_Shouldnt_Call_Open()
+        {
+            int openedEvent = 0;
+            var target = new Popup();
+            target.Opened += (s, a) => openedEvent++;
+            target.IsOpen = true;
+
+            Assert.Equal(0, openedEvent);
+        }
+
+        [Fact]
+        public void Opening_Popup_Shouldnt_Throw_When_Not_In_Visual_Tree()
+        {
+            var target = new Popup();
+            target.IsOpen = true;
+        }
+
+        [Fact]
+        public void Opening_Popup_Shouldnt_Throw_When_In_Tree_Without_TopLevel()
+        {
+            Control c = new Control();
+            var target = new Popup();
+            ((ISetLogicalParent)target).SetParent(c);
+            target.IsOpen = true;
+        }
+
         [Fact]
         public void Setting_Child_Should_Set_Child_Controls_LogicalParent()
         {
@@ -223,7 +264,33 @@ namespace Avalonia.Controls.UnitTests.Primitives
             }
         }
 
-        
+        [Fact]
+        public void Popup_Close_On_Closed_Popup_Should_Not_Raise_Closed_Event()
+        {
+            using (CreateServices())
+            {
+                var window = PreparedWindow();
+                var target = new Popup() { PlacementMode = PlacementMode.Pointer };
+
+                window.Content = target;
+                window.ApplyTemplate();
+                
+                int closedCount = 0;
+
+                target.Closed += (sender, args) =>
+                {
+                    closedCount++;
+                };
+
+                target.Close();
+                target.Close();
+                target.Close();
+                target.Close();
+
+                Assert.Equal(0, closedCount);
+            }
+        }
+
         [Fact]
         public void Templated_Control_With_Popup_In_Template_Should_Set_TemplatedParent()
         {
@@ -252,6 +319,8 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 Assert.Equal(
                     new[]
                     {
+                        "Panel",
+                        "Border",
                         "VisualLayerManager",
                         "ContentPresenter",
                         "ContentPresenter",
@@ -266,6 +335,8 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 Assert.Equal(
                     new object[]
                     {
+                        popupRoot,
+                        popupRoot,
                         popupRoot,
                         popupRoot,
                         target,
@@ -275,13 +346,6 @@ namespace Avalonia.Controls.UnitTests.Primitives
             }
         }
 
-        Window PreparedWindow(object content = null)
-        {
-            var w = new Window {Content = content};
-            w.ApplyTemplate();
-            return w;
-        }
-
         [Fact]
         public void DataContextBeginUpdate_Should_Not_Be_Called_For_Controls_That_Dont_Inherit()
         {
@@ -328,18 +392,225 @@ namespace Avalonia.Controls.UnitTests.Primitives
             }
         }
 
+        [Fact]
+        public void OverlayDismissEventPassThrough_Should_Pass_Event_To_Window_Contents()
+        {
+            using (CreateServices())
+            {
+                var renderer = new Mock<IRenderer>();
+                var platform = AvaloniaLocator.Current.GetService<IWindowingPlatform>();
+                var windowImpl = Mock.Get(platform.CreateWindow());
+                windowImpl.Setup(x => x.CreateRenderer(It.IsAny<IRenderRoot>())).Returns(renderer.Object);
+
+                var window = new Window(windowImpl.Object);
+                window.ApplyTemplate();
+
+                var target = new Popup() 
+                { 
+                    PlacementTarget = window ,
+                    IsLightDismissEnabled = true,
+                    OverlayDismissEventPassThrough = true,
+                };
+
+                var raised = 0;
+                var border = new Border();
+                window.Content = border;
+
+                renderer.Setup(x =>
+                    x.HitTestFirst(new Point(10, 15), window, It.IsAny<Func<IVisual, bool>>()))
+                    .Returns(border);
+
+                border.PointerPressed += (s, e) =>
+                {
+                    Assert.Same(border, e.Source);
+                    ++raised;
+                };
+
+                target.Open();
+                Assert.True(target.IsOpen);
+
+                var e = CreatePointerPressedEventArgs(window, new Point(10, 15));
+                var overlay = LightDismissOverlayLayer.GetLightDismissOverlayLayer(window);
+                overlay.RaiseEvent(e);
+
+                Assert.Equal(1, raised);
+                Assert.False(target.IsOpen);
+            }
+        }
+
+        [Fact]
+        public void Focusable_Controls_In_Popup_Should_Get_Focus()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var window = PreparedWindow();
+
+                var tb = new TextBox();
+                var b = new Button();
+                var p = new Popup
+                {
+                    PlacementTarget = window,
+                    Child = new StackPanel
+                    {
+                        Children =
+                        {
+                            tb,
+                            b
+                        }
+                    }
+                };
+                ((ISetLogicalParent)p).SetParent(p.PlacementTarget);
+                window.Show();
+
+                p.Open();
+
+                if(p.Host is OverlayPopupHost host)
+                {
+                    //Need to measure/arrange for visual children to show up
+                    //in OverlayPopupHost
+                    host.Measure(Size.Infinity);
+                    host.Arrange(new Rect(host.DesiredSize));
+                }
+
+                tb.Focus();
+
+                Assert.True(FocusManager.Instance?.Current == tb);
+
+                //Ensure focus remains in the popup
+                var nextFocus = KeyboardNavigationHandler.GetNext(FocusManager.Instance.Current, NavigationDirection.Next);
+
+                Assert.True(nextFocus == b);
+
+                p.Close();
+            }
+        }
+
+        [Fact]
+        public void Closing_Popup_Sets_Focus_On_PlacementTarget()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var window = PreparedWindow();
+
+                var tb = new TextBox();
+                var p = new Popup
+                {
+                    PlacementTarget = window,
+                    Child = tb
+                };
+                ((ISetLogicalParent)p).SetParent(p.PlacementTarget);
+                window.Show();
+
+                p.Open();
+
+                if (p.Host is OverlayPopupHost host)
+                {
+                    //Need to measure/arrange for visual children to show up
+                    //in OverlayPopupHost
+                    host.Measure(Size.Infinity);
+                    host.Arrange(new Rect(host.DesiredSize));
+                }
+
+                tb.Focus();
+
+                p.Close();
+
+                var focus = FocusManager.Instance?.Current;
+                Assert.True(focus == window);
+            }
+        }
+
+        [Fact]
+        public void Prog_Close_Popup_NoLightDismiss_Doesnt_Move_Focus_To_PlacementTarget()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var window = PreparedWindow();
+
+                var windowTB = new TextBox();
+                window.Content = windowTB;
+
+                var popupTB = new TextBox();
+                var p = new Popup
+                {
+                    PlacementTarget = window,
+                    IsLightDismissEnabled = false,
+                    Child = popupTB
+                };
+                ((ISetLogicalParent)p).SetParent(p.PlacementTarget);
+                window.Show();
+
+                p.Open();
+
+                if (p.Host is OverlayPopupHost host)
+                {
+                    //Need to measure/arrange for visual children to show up
+                    //in OverlayPopupHost
+                    host.Measure(Size.Infinity);
+                    host.Arrange(new Rect(host.DesiredSize));
+                }
+
+                popupTB.Focus();
+
+                windowTB.Focus();
+
+                var focus = FocusManager.Instance?.Current;
+
+                Assert.True(focus == windowTB);
+
+                p.Close();
+
+                Assert.True(focus == windowTB);
+            }
+        }
+
         private IDisposable CreateServices()
         {
             return UnitTestApplication.Start(TestServices.StyledWindow.With(windowingPlatform:
                 new MockWindowingPlatform(null,
-                    () =>
+                    x =>
                     {
                         if(UsePopupHost)
                             return null;
-                        return MockWindowingPlatform.CreatePopupMock().Object;
+                        return MockWindowingPlatform.CreatePopupMock(x).Object;
                     })));
         }
 
+        private IDisposable CreateServicesWithFocus()
+        {
+            return UnitTestApplication.Start(TestServices.StyledWindow.With(windowingPlatform:
+                new MockWindowingPlatform(null,
+                    x =>
+                    {
+                        if (UsePopupHost)
+                            return null;
+                        return MockWindowingPlatform.CreatePopupMock(x).Object;
+                    }), 
+                    focusManager: new FocusManager(),
+                    keyboardDevice: () => new KeyboardDevice()));
+        }
+
+       
+        private PointerPressedEventArgs CreatePointerPressedEventArgs(Window source, Point p)
+        {
+            var pointer = new Pointer(Pointer.GetNextFreeId(), PointerType.Mouse, true);
+            return new PointerPressedEventArgs(
+                source,
+                pointer,
+                source,
+                p,
+                0,
+                new PointerPointProperties(RawInputModifiers.None, PointerUpdateKind.LeftButtonPressed),
+                KeyModifiers.None);
+        }
+
+        private Window PreparedWindow(object content = null)
+        {
+            var w = new Window { Content = content };
+            w.ApplyTemplate();
+            return w;
+        }
+
         private static IControl PopupContentControlTemplate(PopupContentControl control, INameScope scope)
         {
             return new Popup
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
index e2eb628512..67d22ea30e 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.ComponentModel;
 using Avalonia.Controls.Primitives;
@@ -82,22 +79,6 @@ namespace Avalonia.Controls.UnitTests.Primitives
             Assert.Equal(50, target.Value);
         }
 
-        [Fact]
-        public void Properties_Should_Not_Accept_Nan_And_Inifinity()
-        {
-            var target = new TestRange();
-
-            Assert.Throws<ArgumentException>(() => target.Minimum = double.NaN);
-            Assert.Throws<ArgumentException>(() => target.Minimum = double.PositiveInfinity);
-            Assert.Throws<ArgumentException>(() => target.Minimum = double.NegativeInfinity);
-            Assert.Throws<ArgumentException>(() => target.Maximum = double.NaN);
-            Assert.Throws<ArgumentException>(() => target.Maximum = double.PositiveInfinity);
-            Assert.Throws<ArgumentException>(() => target.Maximum = double.NegativeInfinity);
-            Assert.Throws<ArgumentException>(() => target.Value = double.NaN);
-            Assert.Throws<ArgumentException>(() => target.Value = double.PositiveInfinity);
-            Assert.Throws<ArgumentException>(() => target.Value = double.NegativeInfinity);
-        }
-
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/ScrollBarTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/ScrollBarTests.cs
index 2372987c4c..49fda57092 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/ScrollBarTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/ScrollBarTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Linq;
 using Avalonia.Controls.Primitives;
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
index d819581000..514d3b5475 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -10,6 +7,7 @@ using System.Linq;
 using Avalonia.Collections;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Selection;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Input;
@@ -22,7 +20,7 @@ using Xunit;
 
 namespace Avalonia.Controls.UnitTests.Primitives
 {
-    public class SelectingItemsControlTests
+    public partial class SelectingItemsControlTests
     {
         private MouseTestHelper _helper = new MouseTestHelper();
 
@@ -59,7 +57,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 Template = Template(),
             };
 
-            target.ApplyTemplate();
+            Prepare(target);
 
             Assert.False(items[0].IsSelected);
             Assert.False(items[1].IsSelected);
@@ -80,8 +78,8 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 Template = Template(),
             };
 
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
+            Prepare(target);
+
             target.SelectedItem = items[1];
 
             Assert.False(items[0].IsSelected);
@@ -104,8 +102,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             };
 
             target.SelectedItem = items[1];
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
+            Prepare(target);
 
             Assert.False(items[0].IsSelected);
             Assert.True(items[1].IsSelected);
@@ -129,6 +126,23 @@ namespace Avalonia.Controls.UnitTests.Primitives
             Assert.Equal(-1, target.SelectedIndex);
         }
 
+        [Fact]
+        public void SelectedIndex_Should_Be_Minus_1_Without_Initialize()
+        {
+            var items = new[]
+            {
+                new Item(),
+                new Item(),
+            };
+
+            var target = new ListBox();
+            target.Items = items;
+            target.Template = Template();
+            target.DataContext = new object();
+
+            Assert.Equal(-1, target.SelectedIndex);
+        }
+
         [Fact]
         public void SelectedIndex_Should_Be_0_After_Initialize_With_AlwaysSelected()
         {
@@ -145,6 +159,8 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.Template = Template();
             target.EndInit();
 
+            Prepare(target);
+
             Assert.Equal(0, target.SelectedIndex);
         }
 
@@ -167,11 +183,13 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
             listBox.EndInit();
 
+            Prepare(listBox);
+
             Assert.Equal("B", listBox.SelectedItem);
         }
 
         [Fact]
-        public void Setting_SelectedIndex_Before_Initialize_Should_Retain()
+        public void Setting_SelectedIndex_Before_Initialize_Should_Retain_Selection()
         {
             var listBox = new ListBox
             {
@@ -209,7 +227,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
         }
 
         [Fact]
-        public void Setting_SelectedItem_Before_Initialize_Should_Retain()
+        public void Setting_SelectedItem_Before_Initialize_Should_Retain_Selection()
         {
             var listBox = new ListBox
             {
@@ -228,7 +246,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
 
         [Fact]
-        public void Setting_SelectedItems_Before_Initialize_Should_Retain()
+        public void Setting_SelectedItems_Before_Initialize_Should_Retain_Selection()
         {
             var listBox = new ListBox
             {
@@ -276,7 +294,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
         }
 
         [Fact]
-        public void Setting_SelectedIndex_Before_Initialize_With_AlwaysSelected_Should_Retain()
+        public void Setting_SelectedIndex_Before_Initialize_With_AlwaysSelected_Should_Retain_Selection()
         {
             var listBox = new ListBox
             {
@@ -310,8 +328,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             };
 
             target.SelectedIndex = 1;
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
+            Prepare(target);
 
             Assert.False(items[0].IsSelected);
             Assert.True(items[1].IsSelected);
@@ -466,8 +483,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 Template = Template(),
             };
 
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
+            Prepare(target);
             items.Add(new Item { IsSelected = true });
 
             Assert.Equal(2, target.SelectedIndex);
@@ -516,43 +532,101 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 Template = Template(),
             };
 
-            target.ApplyTemplate();
+            Prepare(target);
             target.SelectedIndex = 1;
 
             Assert.Equal(items[1], target.SelectedItem);
             Assert.Equal(1, target.SelectedIndex);
 
+            SelectionChangedEventArgs receivedArgs = null;
+
+            target.SelectionChanged += (_, args) => receivedArgs = args;
+
+            var removed = items[1];
+
             items.RemoveAt(1);
 
             Assert.Null(target.SelectedItem);
             Assert.Equal(-1, target.SelectedIndex);
+            Assert.NotNull(receivedArgs);
+            Assert.Empty(receivedArgs.AddedItems);
+            Assert.Equal(new[] { removed }, receivedArgs.RemovedItems);
+            Assert.False(items.Single().IsSelected);
         }
 
         [Fact]
-        public void Moving_Selected_Item_Should_Update_Selection()
+        public void Removing_Selected_Item_Should_Update_Selection_With_AlwaysSelected()
         {
+            var item0 = new Item();
+            var item1 = new Item();
             var items = new AvaloniaList<Item>
             {
-                new Item(),
-                new Item(),
+                item0,
+                item1,
             };
 
-            var target = new SelectingItemsControl
+            var target = new TestSelector
             {
                 Items = items,
                 Template = Template(),
+                SelectionMode = SelectionMode.AlwaysSelected,
             };
 
-            target.ApplyTemplate();
+            Prepare(target);
+            target.SelectedIndex = 1;
+
+            Assert.Equal(items[1], target.SelectedItem);
+            Assert.Equal(1, target.SelectedIndex);
+
+            SelectionChangedEventArgs receivedArgs = null;
+
+            target.SelectionChanged += (_, args) => receivedArgs = args;
+
+            items.RemoveAt(1);
+
+            Assert.Same(item0, target.SelectedItem);
+            Assert.Equal(0, target.SelectedIndex);
+            Assert.NotNull(receivedArgs);
+            Assert.Equal(new[] { item0 }, receivedArgs.AddedItems);
+            Assert.Equal(new[] { item1 }, receivedArgs.RemovedItems);
+            Assert.True(items.Single().IsSelected);
+        }
+
+        [Fact]
+        public void Removing_Selected_Item_Should_Clear_Selection_With_BeginInit()
+        {
+            var items = new AvaloniaList<Item>
+            {
+                new Item(),
+                new Item(),
+            };
+
+            var target = new SelectingItemsControl();
+            target.BeginInit();
+            target.Items = items;
+            target.Template = Template();
+            target.EndInit();
+
+            Prepare(target);
             target.SelectedIndex = 0;
 
             Assert.Equal(items[0], target.SelectedItem);
             Assert.Equal(0, target.SelectedIndex);
 
-            items.Move(0, 1);
+            SelectionChangedEventArgs receivedArgs = null;
 
-            Assert.Equal(items[1], target.SelectedItem);
-            Assert.Equal(1, target.SelectedIndex);
+            target.SelectionChanged += (_, args) => receivedArgs = args;
+
+            var removed = items[0];
+
+            items.RemoveAt(0);
+
+            Assert.Null(target.SelectedItem);
+            Assert.Equal(-1, target.SelectedIndex);
+            Assert.NotNull(receivedArgs);
+            Assert.Empty(receivedArgs.AddedItems);
+            Assert.Equal(new[] { removed }, receivedArgs.RemovedItems);
+            Assert.False(items.Single().IsSelected);
         }
 
         [Fact]
@@ -599,8 +673,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 Template = Template(),
             };
 
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
+            Prepare(target);
             target.SelectedItem = items[1];
 
             Assert.False(items[0].IsSelected);
@@ -630,8 +703,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 Template = Template(),
             };
 
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
+            Prepare(target);
             target.SelectedItem = items[1];
 
             Assert.False(items[0].IsSelected);
@@ -721,8 +793,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 SelectedIndex = 1,
             };
 
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
+            Prepare(target);
 
             var called = false;
 
@@ -738,6 +809,186 @@ namespace Avalonia.Controls.UnitTests.Primitives
             Assert.True(called);
         }
 
+        [Fact]
+        public void Setting_SelectedIndex_Should_Raise_PropertyChanged_Events()
+        {
+            var items = new ObservableCollection<string> { "foo", "bar", "baz" };
+
+            var target = new TestSelector
+            {
+                Items = items,
+                Template = Template(),
+            };
+
+            var selectedIndexRaised = 0;
+            var selectedItemRaised = 0;
+
+            target.PropertyChanged += (s, e) =>
+            {
+                if (e.Property == SelectingItemsControl.SelectedIndexProperty)
+                {
+                    Assert.Equal(-1, e.OldValue);
+                    Assert.Equal(1, e.NewValue);
+                    ++selectedIndexRaised;
+                }
+                else if (e.Property == SelectingItemsControl.SelectedItemProperty)
+                {
+                    Assert.Null(e.OldValue);
+                    Assert.Equal("bar", e.NewValue);
+                    ++selectedItemRaised;
+                }
+            };
+
+            target.SelectedIndex = 1;
+
+            Assert.Equal(1, selectedIndexRaised);
+            Assert.Equal(1, selectedItemRaised);
+        }
+
+        [Fact]
+        public void Removing_Selected_Item_Should_Raise_PropertyChanged_Events()
+        {
+            var items = new ObservableCollection<string> { "foo", "bar", "baz" };
+
+            var target = new TestSelector
+            {
+                Items = items,
+                Template = Template(),
+            };
+
+            var selectedIndexRaised = 0;
+            var selectedItemRaised = 0;
+            target.SelectedIndex = 1;
+
+            target.PropertyChanged += (s, e) =>
+            {
+                if (e.Property == SelectingItemsControl.SelectedIndexProperty)
+                {
+                    Assert.Equal(1, e.OldValue);
+                    Assert.Equal(-1, e.NewValue);
+                    ++selectedIndexRaised;
+                }
+                else if (e.Property == SelectingItemsControl.SelectedItemProperty)
+                {
+                    Assert.Equal("bar", e.OldValue);
+                    Assert.Null(e.NewValue);
+                }
+            };
+
+            items.RemoveAt(1);
+
+            Assert.Equal(1, selectedIndexRaised);
+            Assert.Equal(0, selectedItemRaised);
+        }
+
+        [Fact]
+        public void Removing_Selected_Item0_Should_Raise_PropertyChanged_Events_With_AlwaysSelected()
+        {
+            var items = new ObservableCollection<string> { "foo", "bar", "baz" };
+
+            var target = new TestSelector
+            {
+                Items = items,
+                Template = Template(),
+                SelectionMode = SelectionMode.AlwaysSelected,
+            };
+
+            var selectedIndexRaised = 0;
+            var selectedItemRaised = 0;
+            target.SelectedIndex = 0;
+
+            target.PropertyChanged += (s, e) =>
+            {
+                if (e.Property == SelectingItemsControl.SelectedIndexProperty)
+                {
+                    ++selectedIndexRaised;
+                }
+                else if (e.Property == SelectingItemsControl.SelectedItemProperty)
+                {
+                    Assert.Equal("foo", e.OldValue);
+                    Assert.Equal("bar", e.NewValue);
+                    ++selectedItemRaised;
+                }
+            };
+
+            items.RemoveAt(0);
+
+            Assert.Equal(0, selectedIndexRaised);
+            Assert.Equal(1, selectedItemRaised);
+        }
+
+        [Fact]
+        public void Removing_Selected_Item1_Should_Raise_PropertyChanged_Events_With_AlwaysSelected()
+        {
+            var items = new ObservableCollection<string> { "foo", "bar", "baz" };
+
+            var target = new TestSelector
+            {
+                Items = items,
+                Template = Template(),
+                SelectionMode = SelectionMode.AlwaysSelected,
+            };
+
+            var selectedIndexRaised = 0;
+            var selectedItemRaised = 0;
+            target.SelectedIndex = 1;
+
+            target.PropertyChanged += (s, e) =>
+            {
+                if (e.Property == SelectingItemsControl.SelectedIndexProperty)
+                {
+                    Assert.Equal(1, e.OldValue);
+                    Assert.Equal(0, e.NewValue);
+                    ++selectedIndexRaised;
+                }
+                else if (e.Property == SelectingItemsControl.SelectedItemProperty)
+                {
+                    Assert.Equal("bar", e.OldValue);
+                    Assert.Equal("foo", e.NewValue);
+                }
+            };
+
+            items.RemoveAt(1);
+
+            Assert.Equal(1, selectedIndexRaised);
+            Assert.Equal(0, selectedItemRaised);
+        }
+
+        [Fact]
+        public void Removing_Item_Before_Selection_Should_Raise_PropertyChanged_Events()
+        {
+            var items = new ObservableCollection<string> { "foo", "bar", "baz" };
+
+            var target = new SelectingItemsControl
+            {
+                Items = items,
+                Template = Template(),
+            };
+
+            var selectedIndexRaised = 0;
+            var selectedItemRaised = 0;
+            target.SelectedIndex = 1;
+
+            target.PropertyChanged += (s, e) =>
+            {
+                if (e.Property == SelectingItemsControl.SelectedIndexProperty)
+                {
+                    Assert.Equal(1, e.OldValue);
+                    Assert.Equal(0, e.NewValue);
+                    ++selectedIndexRaised;
+                }
+                else if (e.Property == SelectingItemsControl.SelectedItemProperty)
+                {
+                    ++selectedItemRaised;
+                }
+            };
+
+            items.RemoveAt(0);
+
+            Assert.Equal(1, selectedIndexRaised);
+            Assert.Equal(0, selectedItemRaised);
+        }
+
         [Fact]
         public void Order_Of_Setting_Items_And_SelectedIndex_During_Initialization_Should_Not_Matter()
         {
@@ -749,6 +1000,8 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.Items = items;
             ((ISupportInitialize)target).EndInit();
 
+            Prepare(target);
+
             Assert.Equal(1, target.SelectedIndex);
             Assert.Equal("Bar", target.SelectedItem);
         }
@@ -764,6 +1017,8 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.Items = items;
             ((ISupportInitialize)target).EndInit();
 
+            Prepare(target);
+
             Assert.Equal(1, target.SelectedIndex);
             Assert.Equal("Bar", target.SelectedItem);
         }
@@ -861,8 +1116,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 Items = new[] { "Foo", "Bar", "Baz " },
             };
 
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
+            Prepare(target);
             _helper.Down((Interactive)target.Presenter.Panel.Children[1]);
 
             var panel = target.Presenter.Panel;
@@ -883,8 +1137,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 Items = items,
             };
 
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
+            Prepare(target);
 
             _helper.Down(target.Presenter.Panel.Children[1]);
 
@@ -978,8 +1231,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
             };
 
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
+            Prepare(target);
             _helper.Down((Interactive)target.Presenter.Panel.Children[3]);
 
             Assert.Equal(3, target.SelectedIndex);
@@ -994,11 +1246,10 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
             };
 
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
+            Prepare(target);
             _helper.Down((Interactive)target.Presenter.Panel.Children[3]);
 
-            Assert.Equal(new[] { ":selected" }, target.Presenter.Panel.Children[3].Classes);
+            Assert.Equal(new[] { ":pressed", ":selected" }, target.Presenter.Panel.Children[3].Classes);
         }
 
         [Fact]
@@ -1018,8 +1269,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 SelectedIndex = 1,
             };
 
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
+            Prepare(target);
 
             items.Insert(0, "Qux");
 
@@ -1044,8 +1294,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 SelectedIndex = 1,
             };
 
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
+            Prepare(target);
 
             items.RemoveAt(0);
 
@@ -1053,6 +1302,65 @@ namespace Avalonia.Controls.UnitTests.Primitives
             Assert.Equal("Bar", target.SelectedItem);
         }
 
+        [Fact]
+        public void Binding_SelectedIndex_Selects_Correct_Item()
+        {
+            // Issue #4496 (part 2)
+            var items = new ObservableCollection<string>();
+
+            var other = new ListBox
+            {
+                Template = Template(),
+                Items = items,
+                SelectionMode = SelectionMode.AlwaysSelected,
+            };
+
+            var target = new ListBox
+            {
+                Template = Template(),
+                Items = items,
+                [!ListBox.SelectedIndexProperty] = other[!ListBox.SelectedIndexProperty],
+            };
+
+            Prepare(other);
+            Prepare(target);
+
+            items.Add("Foo");
+
+            Assert.Equal(0, other.SelectedIndex);
+            Assert.Equal(0, target.SelectedIndex);
+        }
+
+        [Fact]
+        public void Binding_SelectedItem_Selects_Correct_Item()
+        {
+            // Issue #4496 (part 2)
+            var items = new ObservableCollection<string>();
+
+            var other = new ListBox
+            {
+                Template = Template(),
+                Items = items,
+                SelectionMode = SelectionMode.AlwaysSelected,
+            };
+
+            var target = new ListBox
+            {
+                Template = Template(),
+                Items = items,
+                [!ListBox.SelectedItemProperty] = other[!ListBox.SelectedItemProperty],
+            };
+
+            Prepare(target);
+            other.ApplyTemplate();
+            other.Presenter.ApplyTemplate();
+
+            items.Add("Foo");
+
+            Assert.Equal(0, other.SelectedIndex);
+            Assert.Equal(0, target.SelectedIndex);
+        }
+
         [Fact]
         public void Replacing_Selected_Item_Should_Update_SelectedItem()
         {
@@ -1070,13 +1378,12 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 SelectedIndex = 1,
             };
 
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
+            Prepare(target);
 
             items[1] = "Qux";
 
-            Assert.Equal(1, target.SelectedIndex);
-            Assert.Equal("Qux", target.SelectedItem);
+            Assert.Equal(-1, target.SelectedIndex);
+            Assert.Null(target.SelectedItem);
         }
 
         [Fact]
@@ -1095,13 +1402,36 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 Items = items,
             };
 
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-
             var raised = false;
+
+            Prepare(target);
             target.AddHandler(Control.RequestBringIntoViewEvent, (s, e) => raised = true);
+            target.SelectedIndex = 2;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void AutoScrollToSelectedItem_Causes_Scroll_To_Initial_SelectedItem()
+        {
+            var items = new ObservableCollection<string>
+            {
+               "Foo",
+               "Bar",
+               "Baz"
+            };
+
+            var target = new ListBox
+            {
+                Template = Template(),
+                Items = items,
+            };
+
+            var raised = false;
 
+            target.AddHandler(Control.RequestBringIntoViewEvent, (s, e) => raised = true);
             target.SelectedIndex = 2;
+            Prepare(target);
 
             Assert.True(raised);
         }
@@ -1146,9 +1476,102 @@ namespace Avalonia.Controls.UnitTests.Primitives
         }
 
         [Fact]
-        public void Can_Set_Both_SelectedItem_And_SelectedItems_During_Initialization()
+        public void AutoScrollToSelectedItem_Scrolls_When_Reattached_To_Visual_Tree_If_Selection_Changed_While_Detached_From_Visual_Tree()
         {
-            // Issue #2969.
+            var items = new ObservableCollection<string>
+            {
+               "Foo",
+               "Bar",
+               "Baz"
+            };
+
+            var target = new ListBox
+            {
+                Template = Template(),
+                Items = items,
+                SelectedIndex = 2,
+            };
+
+            var raised = false;
+
+            Prepare(target);
+
+            var root = (TestRoot)target.Parent;
+
+            target.AddHandler(Control.RequestBringIntoViewEvent, (s, e) => raised = true);
+
+            root.Child = null;
+            target.SelectedIndex = 1;
+            root.Child = target;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void AutoScrollToSelectedItem_Doesnt_Scroll_If_Reattached_To_Visual_Tree_With_No_Selection_Change()
+        {
+            var items = new ObservableCollection<string>
+            {
+               "Foo",
+               "Bar",
+               "Baz"
+            };
+
+            var target = new ListBox
+            {
+                Template = Template(),
+                Items = items,
+                SelectedIndex = 2,
+            };
+
+            var raised = false;
+
+            Prepare(target);
+
+            var root = (TestRoot)target.Parent;
+
+            target.AddHandler(Control.RequestBringIntoViewEvent, (s, e) => raised = true);
+
+            root.Child = null;
+            root.Child = target;
+
+            Assert.False(raised);
+        }
+
+        [Fact]
+        public void AutoScrollToSelectedItem_Causes_Scroll_When_Turned_On()
+        {
+            var items = new ObservableCollection<string>
+            {
+               "Foo",
+               "Bar",
+               "Baz"
+            };
+
+            var target = new ListBox
+            {
+                Template = Template(),
+                Items = items,
+                AutoScrollToSelectedItem = false,
+            };
+
+            Prepare(target);
+
+            var raised = false;
+            target.AddHandler(Control.RequestBringIntoViewEvent, (s, e) => raised = true);
+            target.SelectedIndex = 2;
+
+            Assert.False(raised);
+
+            target.AutoScrollToSelectedItem = true;
+
+            Assert.True(raised);
+        }
+
+        [Fact]
+        public void Can_Set_Both_SelectedItem_And_SelectedItems_During_Initialization()
+        {
+            // Issue #2969.
             var target = new ListBox();
             var selectedItems = new List<object>();
 
@@ -1159,6 +1582,8 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.SelectedItem = "Bar";
             target.EndInit();
 
+            Prepare(target);
+
             Assert.Equal("Bar", target.SelectedItem);
             Assert.Equal(1, target.SelectedIndex);
             Assert.Same(selectedItems, target.SelectedItems);
@@ -1185,6 +1610,28 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.MoveSelection(NavigationDirection.Next, true);
         }
 
+        [Fact]
+        public void MoveSelection_Does_Select_Disabled_Controls()
+        {
+            // Issue #3426.
+            var target = new TestSelector
+            {
+                Template = Template(),
+                Items = new[]
+                {
+                    new ListBoxItem(),
+                    new ListBoxItem { IsEnabled = false },
+                },
+                SelectedIndex = 0,
+            };
+
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+            target.MoveSelection(NavigationDirection.Next, true);
+
+            Assert.Equal(0, target.SelectedIndex);
+        }
+
         [Fact]
         public void Pre_Selecting_Item_Should_Set_Selection_After_It_Was_Added_When_AlwaysSelected()
         {
@@ -1203,16 +1650,274 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
             target.Items = items;
 
-            target.ApplyTemplate();
-
-            target.Presenter.ApplyTemplate();
+            Prepare(target);
 
             Assert.Equal(second, target.SelectedItem);
 
             Assert.Equal(1, target.SelectedIndex);
         }
 
-        private FuncControlTemplate Template()
+        [Fact]
+        public void Setting_SelectionMode_Should_Update_SelectionModel()
+        {
+            var target = new TestSelector();
+            var model = target.Selection;
+
+            Assert.True(model.SingleSelect);
+
+            target.SelectionMode = SelectionMode.Multiple;
+
+            Assert.False(model.SingleSelect);
+        }
+
+        [Fact]
+        public void Does_The_Best_It_Can_With_AutoSelecting_ViewModel()
+        {
+            // Tests the following scenario:
+            //
+            // - Items changes from empty to having 1 item
+            // - ViewModel auto-selects item 0 in CollectionChanged
+            // - SelectionModel receives CollectionChanged
+            // - And so adjusts the selected item from 0 to 1, which is past the end of the items.
+            //
+            // There's not much we can do about this situation because the order in which
+            // CollectionChanged handlers are called can't be known (the problem also exists with
+            // WPF). The best we can do is not select an invalid index.
+            var vm = new SelectionViewModel();
+
+            vm.Items.CollectionChanged += (s, e) =>
+            {
+                if (vm.SelectedIndex == -1 && vm.Items.Count > 0)
+                {
+                    vm.SelectedIndex = 0;
+                }
+            };
+
+            var target = new ListBox
+            {
+                [!ListBox.ItemsProperty] = new Binding("Items"),
+                [!ListBox.SelectedIndexProperty] = new Binding("SelectedIndex"),
+                DataContext = vm,
+            };
+
+            Prepare(target);
+
+            vm.Items.Add("foo");
+            vm.Items.Add("bar");
+
+            Assert.Equal(0, target.SelectedIndex);
+            Assert.Equal(new[] { 0 }, target.Selection.SelectedIndexes);
+            Assert.Equal("foo", target.SelectedItem);
+            Assert.Equal(new[] { "foo" }, target.SelectedItems);
+        }
+
+        [Fact]
+        public void Preserves_Initial_SelectedItems_When_Bound()
+        {
+            // Issue #4272 (there are two issues there, this addresses the second one).
+            var vm = new SelectionViewModel
+            {
+                Items = { "foo", "bar", "baz" },
+                SelectedItems = { "bar" },
+            };
+
+            var target = new ListBox
+            {
+                [!ListBox.ItemsProperty] = new Binding("Items"),
+                [!ListBox.SelectedItemsProperty] = new Binding("SelectedItems"),
+                DataContext = vm,
+            };
+
+            Prepare(target);
+
+            Assert.Equal(1, target.SelectedIndex);
+            Assert.Equal(new[] { 1 }, target.Selection.SelectedIndexes);
+            Assert.Equal("bar", target.SelectedItem);
+            Assert.Equal(new[] { "bar" }, target.SelectedItems);
+        }
+
+        [Fact]
+        public void Preserves_SelectedItem_When_Items_Changed()
+        {
+            // Issue #4048
+            var target = new SelectingItemsControl
+            {
+                Items = new[] { "foo", "bar", "baz"},
+                SelectedItem = "bar",
+            };
+
+            Prepare(target);
+
+            Assert.Equal(1, target.SelectedIndex);
+            Assert.Equal("bar", target.SelectedItem);
+
+            target.Items = new[] { "qux", "foo", "bar" };
+
+            Assert.Equal(2, target.SelectedIndex);
+            Assert.Equal("bar", target.SelectedItem);
+        }
+
+        [Fact]
+        public void Setting_SelectedItems_Raises_PropertyChanged()
+        {
+            var target = new TestSelector
+            {
+                Items = new[] { "foo", "bar", "baz" },
+            };
+
+            var raised = 0;
+            var newValue = new AvaloniaList<object>();
+
+            Prepare(target);
+
+            target.PropertyChanged += (s, e) =>
+            {
+                if (e.Property == ListBox.SelectedItemsProperty)
+                {
+                    Assert.Null(e.OldValue);
+                    Assert.Same(newValue, e.NewValue);
+                    ++raised;
+                }
+            };
+
+            target.SelectedItems = newValue;
+
+            Assert.Equal(1, raised);
+        }
+
+        [Fact]
+        public void Setting_Selection_Raises_SelectedItems_PropertyChanged()
+        {
+            var target = new TestSelector
+            {
+                Items = new[] { "foo", "bar", "baz" },
+            };
+
+            var raised = 0;
+            var oldValue = target.SelectedItems;
+
+            Prepare(target);
+
+            target.PropertyChanged += (s, e) =>
+            {
+                if (e.Property == ListBox.SelectedItemsProperty)
+                {
+                    Assert.Same(oldValue, e.OldValue);
+                    Assert.Null(e.NewValue);
+                    ++raised;
+                }
+            };
+
+            target.Selection = new SelectionModel<int>();
+
+            Assert.Equal(1, raised);
+        }
+
+        [Fact]
+        public void Handles_Removing_Last_Item_In_Two_Controls_With_Bound_SelectedIndex()
+        {
+            var items = new ObservableCollection<string> { "foo" };
+
+            // Simulates problem with TabStrip and Carousel with bound SelectedIndex.
+            var tabStrip = new TestSelector 
+            { 
+                Items = items, 
+                SelectionMode = SelectionMode.AlwaysSelected,
+            };
+
+            var carousel = new TestSelector
+            {
+                Items = items,
+                [!Carousel.SelectedIndexProperty] = tabStrip[!TabStrip.SelectedIndexProperty],
+            };
+
+            var tabStripRaised = 0;
+            var carouselRaised = 0;
+
+            tabStrip.SelectionChanged += (s, e) =>
+            {
+                Assert.Equal(new[] { "foo" }, e.RemovedItems);
+                Assert.Empty(e.AddedItems);
+                ++tabStripRaised;
+            };
+
+            carousel.SelectionChanged += (s, e) =>
+            {
+                Assert.Equal(new[] { "foo" }, e.RemovedItems);
+                Assert.Empty(e.AddedItems);
+                ++carouselRaised;
+            };
+
+            items.RemoveAt(0);
+
+            Assert.Equal(1, tabStripRaised);
+            Assert.Equal(1, carouselRaised);
+        }
+
+        [Fact]
+        public void Handles_Removing_Last_Item_In_Controls_With_Bound_SelectedItem()
+        {
+            var items = new ObservableCollection<string> { "foo" };
+
+            // Simulates problem with TabStrip and Carousel with bound SelectedItem.
+            var tabStrip = new TestSelector
+            {
+                Items = items,
+                SelectionMode = SelectionMode.AlwaysSelected,
+            };
+
+            var carousel = new TestSelector
+            {
+                Items = items,
+                [!Carousel.SelectedItemProperty] = tabStrip[!TabStrip.SelectedItemProperty],
+            };
+
+            var tabStripRaised = 0;
+            var carouselRaised = 0;
+
+            tabStrip.SelectionChanged += (s, e) =>
+            {
+                Assert.Equal(new[] { "foo" }, e.RemovedItems);
+                Assert.Empty(e.AddedItems);
+                ++tabStripRaised;
+            };
+
+            carousel.SelectionChanged += (s, e) =>
+            {
+                Assert.Equal(new[] { "foo" }, e.RemovedItems);
+                Assert.Empty(e.AddedItems);
+                ++carouselRaised;
+            };
+
+            items.RemoveAt(0);
+
+            Assert.Equal(1, tabStripRaised);
+            Assert.Equal(1, carouselRaised);
+        }
+
+        private static void Prepare(SelectingItemsControl target)
+        {
+            var root = new TestRoot
+            {
+                Child = target,
+                Width = 100,
+                Height = 100,
+                Styles =
+                {
+                    new Style(x => x.Is<SelectingItemsControl>())
+                    {
+                        Setters =
+                        {
+                            new Setter(ListBox.TemplateProperty, Template()),
+                        },
+                    },
+                },
+            };
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+        }
+
+        private static FuncControlTemplate Template()
         {
             return new FuncControlTemplate<SelectingItemsControl>((control, scope) =>
                 new ItemsPresenter
@@ -1252,6 +1957,30 @@ namespace Avalonia.Controls.UnitTests.Primitives
             public int SelectedIndex { get; set; }
         }
 
+        private class SelectionViewModel : NotifyingBase
+        {
+            private int _selectedIndex = -1;
+
+            public SelectionViewModel()
+            {
+                Items = new ObservableCollection<string>();
+                SelectedItems = new ObservableCollection<string>();
+            }
+
+            public int SelectedIndex
+            {
+                get => _selectedIndex;
+                set
+                {
+                    _selectedIndex = value;
+                    RaisePropertyChanged();
+                }
+            }
+
+            public ObservableCollection<string> Items { get; }
+            public ObservableCollection<string> SelectedItems { get; }
+        }
+
         private class RootWithItems : TestRoot
         {
             public List<string> Items { get; set; } = new List<string>() { "a", "b", "c", "d", "e" };
@@ -1270,6 +1999,24 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 SelectionMode = selectionMode;
             }
 
+            public new ISelectionModel Selection
+            {
+                get => base.Selection;
+                set => base.Selection = value;
+            }
+
+            public new IList SelectedItems
+            {
+                get => base.SelectedItems;
+                set => base.SelectedItems = value;
+            }
+
+            public new SelectionMode SelectionMode
+            {
+                get => base.SelectionMode;
+                set => base.SelectionMode = value;
+            }
+
             public new bool MoveSelection(NavigationDirection direction, bool wrap)
             {
                 return base.MoveSelection(direction, wrap);
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs
index a7010c521b..7b7e651cc9 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using Avalonia.Collections;
@@ -78,8 +75,8 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.SelectedIndex = 2;
             items.RemoveAt(2);
 
-            Assert.Equal(2, target.SelectedIndex);
-            Assert.Equal("qux", target.SelectedItem);
+            Assert.Equal(0, target.SelectedIndex);
+            Assert.Equal("foo", target.SelectedItem);
         }
 
         [Fact]
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
index 952a00a14e..6b26d76371 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -9,6 +6,7 @@ using System.Linq;
 using Avalonia.Collections;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Selection;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Input;
@@ -73,8 +71,6 @@ namespace Avalonia.Controls.UnitTests.Primitives
         [Fact]
         public void Assigning_Multiple_SelectedItems_Should_Set_SelectedIndex()
         {
-            // Note that we don't need SelectionMode = Multiple here. Multiple selections can always
-            // be made in code.
             var target = new TestSelector
             {
                 Items = new[] { "foo", "bar", "baz" },
@@ -340,7 +336,6 @@ namespace Avalonia.Controls.UnitTests.Primitives
                     "qiz",
                     "lol",
                 },
-                SelectionMode = SelectionMode.Multiple,
                 Template = Template(),
             };
 
@@ -373,7 +368,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.SelectedIndex = 3;
             target.SelectRange(1);
 
-            Assert.Equal(new[] { "qux", "baz", "bar" }, target.SelectedItems.Cast<object>().ToList());
+            Assert.Equal(new[] { "qux", "bar", "baz" }, target.SelectedItems.Cast<object>().ToList());
         }
 
         [Fact]
@@ -522,7 +517,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
         /// DataContext is in the process of changing.
         /// </remarks>
         [Fact]
-        public void Should_Not_Write_To_Old_DataContext()
+        public void Should_Not_Write_SelectedItems_To_Old_DataContext()
         {
             var vm = new OldDataContextViewModel();
             var target = new TestSelector();
@@ -558,6 +553,46 @@ namespace Avalonia.Controls.UnitTests.Primitives
             Assert.Empty(target.SelectedItems);
         }
 
+        /// <summary>
+        /// See <see cref="Should_Not_Write_SelectedItems_To_Old_DataContext"/>.
+        /// </summary>
+        [Fact]
+        public void Should_Not_Write_SelectionModel_To_Old_DataContext()
+        {
+            var vm = new OldDataContextViewModel();
+            var target = new TestSelector();
+
+            var itemsBinding = new Binding
+            {
+                Path = "Items",
+                Mode = BindingMode.OneWay,
+            };
+
+            var selectionBinding = new Binding
+            {
+                Path = "Selection",
+                Mode = BindingMode.OneWay,
+            };
+
+            // Bind Items and Selection to the VM.
+            target.Bind(TestSelector.ItemsProperty, itemsBinding);
+            target.Bind(TestSelector.SelectionProperty, selectionBinding);
+
+            // Set DataContext and SelectedIndex
+            target.DataContext = vm;
+            target.SelectedIndex = 1;
+
+            // Make sure selection is written to selection model
+            Assert.Equal(1, vm.Selection.SelectedIndex);
+
+            // Clear DataContext and ensure that selection is still set in model.
+            target.DataContext = null;
+            Assert.Equal(1, vm.Selection.SelectedIndex);
+
+            // Ensure target's SelectedItems is now clear.
+            Assert.Empty(target.SelectedItems);
+        }
+
         [Fact]
         public void Unbound_SelectedItems_Should_Be_Cleared_When_DataContext_Cleared()
         {
@@ -675,7 +710,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
             target.ApplyTemplate();
             target.Presenter.ApplyTemplate();
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: InputModifiers.Shift);
+            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Shift);
 
             var panel = target.Presenter.Panel;
 
@@ -683,6 +718,57 @@ namespace Avalonia.Controls.UnitTests.Primitives
             Assert.Equal(new[] { 0, 1, 2 }, SelectedContainers(target));
         }
 
+        [Fact]
+        public void Ctrl_Selecting_Raises_SelectionChanged_Events()
+        {
+            var target = new ListBox
+            {
+                Template = Template(),
+                Items = new[] { "Foo", "Bar", "Baz", "Qux" },
+                SelectionMode = SelectionMode.Multiple,
+            };
+
+            target.ApplyTemplate();
+            target.Presenter.ApplyTemplate();
+
+            SelectionChangedEventArgs receivedArgs = null;
+
+            target.SelectionChanged += (_, args) => receivedArgs = args;
+
+            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);
+            }
+
+            _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
+
+            VerifyAdded("Bar");
+
+            receivedArgs = null;
+            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Control);
+
+            VerifyAdded("Baz");
+
+            receivedArgs = null;
+            _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: KeyModifiers.Control);
+
+            VerifyAdded("Qux");
+
+            receivedArgs = null;
+            _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: KeyModifiers.Control);
+
+            VerifyRemoved("Bar");
+        }
+
         [Fact]
         public void Ctrl_Selecting_SelectedItem_With_Multiple_Selection_Active_Sets_SelectedItem_To_Next_Selection()
         {
@@ -696,14 +782,14 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.ApplyTemplate();
             target.Presenter.ApplyTemplate();
             _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: InputModifiers.Control);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: InputModifiers.Control);
+            _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: InputModifiers.Control);
+            _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: KeyModifiers.Control);
 
             Assert.Equal(2, target.SelectedIndex);
             Assert.Equal("Baz", target.SelectedItem);
@@ -723,12 +809,12 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.ApplyTemplate();
             target.Presenter.ApplyTemplate();
             _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: InputModifiers.Control);
+            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Control);
 
             Assert.Equal(1, target.SelectedIndex);
             Assert.Equal("Bar", target.SelectedItem);
 
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: InputModifiers.Control);
+            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Control);
 
             Assert.Equal(1, target.SelectedIndex);
             Assert.Equal("Bar", target.SelectedItem);
@@ -747,7 +833,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.ApplyTemplate();
             target.Presenter.ApplyTemplate();
             _helper.Click((Interactive)target.Presenter.Panel.Children[3]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[4], modifiers: InputModifiers.Control);
+            _helper.Click((Interactive)target.Presenter.Panel.Children[4], modifiers: KeyModifiers.Control);
 
             var panel = target.Presenter.Panel;
 
@@ -768,7 +854,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.ApplyTemplate();
             target.Presenter.ApplyTemplate();
             _helper.Click((Interactive)target.Presenter.Panel.Children[3]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[5], modifiers: InputModifiers.Shift);
+            _helper.Click((Interactive)target.Presenter.Panel.Children[5], modifiers: KeyModifiers.Shift);
 
             var panel = target.Presenter.Panel;
 
@@ -789,7 +875,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.ApplyTemplate();
             target.Presenter.ApplyTemplate();
             _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[5], modifiers: InputModifiers.Shift);
+            _helper.Click((Interactive)target.Presenter.Panel.Children[5], modifiers: KeyModifiers.Shift);
 
             var panel = target.Presenter.Panel;
 
@@ -797,6 +883,52 @@ namespace Avalonia.Controls.UnitTests.Primitives
             Assert.Equal(new[] { 0, 1, 2, 3, 4, 5 }, SelectedContainers(target));
         }
 
+        [Fact]
+        public void Shift_Selecting_Raises_SelectionChanged_Events()
+        {
+            var target = new ListBox
+            {
+                Template = Template(),
+                Items = new[] { "Foo", "Bar", "Baz", "Qux" },
+                SelectionMode = SelectionMode.Multiple,
+            };
+
+            target.ApplyTemplate();
+            target.Presenter.ApplyTemplate();
+
+            SelectionChangedEventArgs receivedArgs = null;
+
+            target.SelectionChanged += (_, args) => receivedArgs = args;
+
+            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);
+            }
+
+            _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
+
+            VerifyAdded("Bar");
+
+            receivedArgs = null;
+            _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: KeyModifiers.Shift);
+
+            VerifyAdded("Baz" ,"Qux");
+
+            receivedArgs = null;
+            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Shift);
+
+            VerifyRemoved("Qux");
+        }
+
         [Fact]
         public void Duplicate_Items_Are_Added_To_SelectedItems_In_Order()
         {
@@ -813,15 +945,15 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
             Assert.Equal(new[] { "Foo" }, target.SelectedItems);
 
-            _helper.Click((Interactive)target.Presenter.Panel.Children[4], modifiers: InputModifiers.Control);
+            _helper.Click((Interactive)target.Presenter.Panel.Children[4], modifiers: KeyModifiers.Control);
 
             Assert.Equal(new[] { "Foo", "Bar" }, target.SelectedItems);
 
-            _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: InputModifiers.Control);
+            _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: KeyModifiers.Control);
 
             Assert.Equal(new[] { "Foo", "Bar", "Foo" }, target.SelectedItems);
 
-            _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: InputModifiers.Control);
+            _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: KeyModifiers.Control);
 
             Assert.Equal(new[] { "Foo", "Bar", "Foo", "Bar" }, target.SelectedItems);
         }
@@ -845,6 +977,30 @@ namespace Avalonia.Controls.UnitTests.Primitives
             Assert.Equal("Foo", target.SelectedItem);
         }
 
+        [Fact]
+        public void SelectAll_Raises_SelectionChanged_Event()
+        {
+            var target = new TestSelector
+            {
+                Template = Template(),
+                Items = new[] { "Foo", "Bar", "Baz" },
+                SelectionMode = SelectionMode.Multiple,
+            };
+
+            target.ApplyTemplate();
+            target.Presenter.ApplyTemplate();
+
+            SelectionChangedEventArgs receivedArgs = null;
+
+            target.SelectionChanged += (_, args) => receivedArgs = args;
+
+            target.SelectAll();
+
+            Assert.NotNull(receivedArgs);
+            Assert.Equal(target.Items, receivedArgs.AddedItems);
+            Assert.Empty(receivedArgs.RemovedItems);
+        }
+
         [Fact]
         public void UnselectAll_Clears_SelectedIndex_And_SelectedItem()
         {
@@ -996,7 +1152,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.SelectAll();
             items[1] = "Qux";
 
-            Assert.Equal(new[] { "Foo", "Qux", "Baz" }, target.SelectedItems);
+            Assert.Equal(new[] { "Foo", "Baz" }, target.SelectedItems);
         }
 
         [Fact]
@@ -1059,7 +1215,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.ApplyTemplate();
             target.Presenter.ApplyTemplate();
             _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: InputModifiers.Shift);
+            _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: KeyModifiers.Shift);
 
             Assert.Equal(2, target.SelectedItems.Count);
 
@@ -1109,7 +1265,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.Presenter.ApplyTemplate();
 
             _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], MouseButton.Right, modifiers: InputModifiers.Shift);
+            _helper.Click((Interactive)target.Presenter.Panel.Children[2], MouseButton.Right, modifiers: KeyModifiers.Shift);
 
             Assert.Equal(1, target.SelectedItems.Count);
         }
@@ -1129,11 +1285,198 @@ namespace Avalonia.Controls.UnitTests.Primitives
             target.Presenter.ApplyTemplate();
 
             _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], MouseButton.Right, modifiers: InputModifiers.Control);
+            _helper.Click((Interactive)target.Presenter.Panel.Children[2], MouseButton.Right, modifiers: KeyModifiers.Control);
 
             Assert.Equal(1, target.SelectedItems.Count);
         }
 
+        [Fact]
+        public void Adding_To_Selection_Should_Set_SelectedIndex()
+        {
+            var target = new TestSelector
+            {
+                Items = new[] { "foo", "bar" },
+                Template = Template(),
+            };
+
+            target.ApplyTemplate();
+            target.SelectedItems.Add("bar");
+
+            Assert.Equal(1, target.SelectedIndex);
+        }
+
+        [Fact]
+        public void Assigning_Null_To_Selection_Should_Create_New_SelectionModel()
+        {
+            var target = new TestSelector
+            {
+                Items = new[] { "foo", "bar" },
+                Template = Template(),
+            };
+
+            var oldSelection = target.Selection;
+
+            target.Selection = null;
+
+            Assert.NotNull(target.Selection);
+            Assert.NotSame(oldSelection, target.Selection);
+        }
+
+        [Fact]
+        public void Assigning_SelectionModel_With_Different_Source_To_Selection_Should_Fail()
+        {
+            var target = new TestSelector
+            {
+                Items = new[] { "foo", "bar" },
+                Template = Template(),
+            };
+
+            var selection = new SelectionModel<string> { Source = new[] { "baz" } };
+            Assert.Throws<ArgumentException>(() => target.Selection = selection);
+        }
+
+        [Fact]
+        public void Assigning_SelectionModel_With_Null_Source_To_Selection_Should_Set_Source()
+        {
+            var target = new TestSelector
+            {
+                Items = new[] { "foo", "bar" },
+                Template = Template(),
+            };
+
+            var selection = new SelectionModel<string>();
+            target.Selection = selection;
+
+            Assert.Same(target.Items, selection.Source);
+        }
+
+        [Fact]
+        public void Assigning_Single_Selected_Item_To_Selection_Should_Set_SelectedIndex()
+        {
+            var target = new TestSelector
+            {
+                Items = new[] { "foo", "bar" },
+                Template = Template(),
+            };
+
+            target.ApplyTemplate();
+            target.Presenter.ApplyTemplate();
+
+            var selection = new SelectionModel<string> { SingleSelect = false };
+            selection.Select(1);
+            target.Selection = selection;
+
+            Assert.Equal(1, target.SelectedIndex);
+            Assert.Equal(new[] { "bar" }, target.Selection.SelectedItems);
+            Assert.Equal(new[] { 1 }, SelectedContainers(target));
+        }
+
+        [Fact]
+        public void Assigning_Multiple_Selected_Items_To_Selection_Should_Set_SelectedIndex()
+        {
+            var target = new TestSelector
+            {
+                Items = new[] { "foo", "bar", "baz" },
+                Template = Template(),
+            };
+
+            target.ApplyTemplate();
+            target.Presenter.ApplyTemplate();
+
+            var selection = new SelectionModel<string> { SingleSelect = false };
+            selection.SelectRange(0, 2);
+            target.Selection = selection;
+
+            Assert.Equal(0, target.SelectedIndex);
+            Assert.Equal(new[] { "foo", "bar", "baz" }, target.Selection.SelectedItems);
+            Assert.Equal(new[] { 0, 1, 2 }, SelectedContainers(target));
+        }
+
+        [Fact]
+        public void Reassigning_Selection_Should_Clear_Selection()
+        {
+            var target = new TestSelector
+            {
+                Items = new[] { "foo", "bar" },
+                Template = Template(),
+            };
+
+            target.ApplyTemplate();
+            target.Selection.Select(1);
+            target.Selection = new SelectionModel<string>();
+
+            Assert.Equal(-1, target.SelectedIndex);
+            Assert.Null(target.SelectedItem);
+        }
+
+        [Fact]
+        public void Assigning_Selection_Should_Set_Item_IsSelected()
+        {
+            var items = new[]
+            {
+                new ListBoxItem(),
+                new ListBoxItem(),
+                new ListBoxItem(),
+            };
+
+            var target = new TestSelector
+            {
+                Items = items,
+                Template = Template(),
+            };
+
+            target.ApplyTemplate();
+            target.Presenter.ApplyTemplate();
+
+            var selection = new SelectionModel<object> { SingleSelect = false };
+            selection.SelectRange(0, 1);
+            target.Selection = selection;
+
+            Assert.True(items[0].IsSelected);
+            Assert.True(items[1].IsSelected);
+            Assert.False(items[2].IsSelected);
+        }
+
+        [Fact]
+        public void Assigning_Selection_Should_Raise_SelectionChanged()
+        {
+            var items = new[] { "foo", "bar", "baz" };
+
+            var target = new TestSelector
+            {
+                Items = items,
+                Template = Template(),
+                SelectedItem = "bar",
+            };
+
+            var raised = 0;
+
+            target.SelectionChanged += (s, e) =>
+            {
+                if (raised == 0)
+                {
+                    Assert.Empty(e.AddedItems.Cast<object>());
+                    Assert.Equal(new[] { "bar" }, e.RemovedItems.Cast<object>());
+                }
+                else
+                {
+                    Assert.Equal(new[] { "foo", "baz" }, e.AddedItems.Cast<object>());
+                    Assert.Empty(e.RemovedItems.Cast<object>());
+                }
+
+                ++raised;
+            };
+
+            target.ApplyTemplate();
+            target.Presenter.ApplyTemplate();
+
+            var selection = new SelectionModel<string> { Source = items, SingleSelect = false };
+            selection.Select(0);
+            selection.Select(2);
+            target.Selection = selection;
+
+            Assert.Equal(2, raised);
+        }
         private IEnumerable<int> SelectedContainers(SelectingItemsControl target)
         {
             return target.Presenter.Panel.Children
@@ -1156,6 +1499,13 @@ namespace Avalonia.Controls.UnitTests.Primitives
         {
             public static readonly new AvaloniaProperty<IList> SelectedItemsProperty = 
                 SelectingItemsControl.SelectedItemsProperty;
+            public static readonly new DirectProperty<SelectingItemsControl, ISelectionModel> SelectionProperty =
+                SelectingItemsControl.SelectionProperty;
+
+            public TestSelector()
+            {
+                SelectionMode = SelectionMode.Multiple;
+            }
 
             public new IList SelectedItems
             {
@@ -1163,14 +1513,20 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 set { base.SelectedItems = value; }
             }
 
+            public new ISelectionModel Selection
+            {
+                get => base.Selection;
+                set => base.Selection = value;
+            }
+
             public new SelectionMode SelectionMode
             {
                 get { return base.SelectionMode; }
                 set { base.SelectionMode = value; }
             }
 
-            public new void SelectAll() => base.SelectAll();
-            public new void UnselectAll() => base.UnselectAll();
+            public void SelectAll() => Selection.SelectAll();
+            public void UnselectAll() => Selection.Clear();
             public void SelectRange(int index) => UpdateSelection(index, true, true);
             public void Toggle(int index) => UpdateSelection(index, true, false, true);
         }
@@ -1181,10 +1537,12 @@ namespace Avalonia.Controls.UnitTests.Primitives
             {
                 Items = new List<string> { "foo", "bar" };
                 SelectedItems = new List<string>();
+                Selection = new SelectionModel<string>();
             }
 
             public List<string> Items { get; } 
             public List<string> SelectedItems { get; }
+            public SelectionModel<string> Selection { get; }
         }
 
         private class ItemContainer : Control, ISelectable
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/TabStripTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/TabStripTests.cs
index b4570ec229..b1e18dc587 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/TabStripTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/TabStripTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.ObjectModel;
 using System.Linq;
 using Moq;
@@ -70,7 +67,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
         }
 
         [Fact]
-        public void Removing_Selected_Should_Select_Next()
+        public void Removing_Selected_Should_Select_First()
         {
             var items = new ObservableCollection<TabItem>()
             {
@@ -99,10 +96,9 @@ namespace Avalonia.Controls.UnitTests.Primitives
             Assert.Same(items[1], target.SelectedItem);
             items.RemoveAt(1);
 
-            // Assert for former element [2] now [1] == "3rd"
-            Assert.Equal(1, target.SelectedIndex);
-            Assert.Same(items[1], target.SelectedItem);
-            Assert.Same("3rd", ((TabItem)target.SelectedItem).Name);
+            Assert.Equal(0, target.SelectedIndex);
+            Assert.Same(items[0], target.SelectedItem);
+            Assert.Same("first", ((TabItem)target.SelectedItem).Name);
         }
 
         private Control CreateTabStripTemplate(TabStrip parent, INameScope scope)
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests.cs
index d36d0b609b..58d2eedb1f 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,6 +10,7 @@ using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
 using Xunit;
+using Avalonia.Media;
 
 namespace Avalonia.Controls.UnitTests.Primitives
 {
@@ -363,7 +361,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                     {
                         new Style(x => x.OfType<TestTemplatedControl>())
                         {
-                            Setters = new[]
+                            Setters =
                             {
                                 new Setter(
                                     TemplatedControl.TemplateProperty,
@@ -399,7 +397,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                     {
                         new Style(x => x.OfType<TestTemplatedControl>())
                         {
-                            Setters = new[]
+                            Setters =
                             {
                                 new Setter(
                                     TemplatedControl.TemplateProperty,
@@ -438,7 +436,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                     {
                         new Style(x => x.OfType<TestTemplatedControl>())
                         {
-                            Setters = new[]
+                            Setters =
                             {
                                 new Setter(
                                     TemplatedControl.TemplateProperty,
@@ -458,7 +456,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                     {
                         new Style(x => x.OfType<TestTemplatedControl>())
                         {
-                            Setters = new[]
+                            Setters =
                             {
                                 new Setter(
                                     TemplatedControl.TemplateProperty,
@@ -515,6 +513,70 @@ namespace Avalonia.Controls.UnitTests.Primitives
             }
         }
 
+        [Fact]
+        public void Templated_Child_Should_Find_Resource_In_TemplatedParent()
+        {
+            var target = new ContentControl
+            {
+                Resources =
+                {
+                    { "red", Brushes.Red },
+                },
+                Template = new FuncControlTemplate<ContentControl>((x, scope) =>
+                {
+                    var result = new ContentPresenter
+                    {
+                        Name = "PART_ContentPresenter",
+                        [!ContentPresenter.ContentProperty] = x[!ContentControl.ContentProperty],
+                    }.RegisterInNameScope(scope);
+
+                    result.Bind(ContentPresenter.BackgroundProperty, result.GetResourceObservable("red"));
+
+                    return result;
+                }),
+            };
+
+            var root = new TestRoot(target);
+            target.ApplyTemplate();
+
+            var contentPresenter = Assert.IsType<ContentPresenter>(target.GetVisualChildren().Single());
+            Assert.Same(Brushes.Red, contentPresenter.Background);
+        }
+
+        [Fact]
+        public void Changing_Resource_In_Templated_Parent_Should_Affect_Templated_Child()
+        {
+            var target = new ContentControl
+            {
+                Resources =
+                {
+                    { "red", Brushes.Red },
+                },
+                Template = new FuncControlTemplate<ContentControl>((x, scope) =>
+                {
+                    var result = new ContentPresenter
+                    {
+                        Name = "PART_ContentPresenter",
+                        [!ContentPresenter.ContentProperty] = x[!ContentControl.ContentProperty],
+                    }.RegisterInNameScope(scope);
+
+                    result.Bind(ContentPresenter.BackgroundProperty, result.GetResourceObservable("red"));
+
+                    return result;
+                }),
+            };
+
+            var root = new TestRoot(target);
+            target.ApplyTemplate();
+
+            var contentPresenter = Assert.IsType<ContentPresenter>(target.GetVisualChildren().Single());
+            Assert.Same(Brushes.Red, contentPresenter.Background);
+
+            target.Resources["red"] = Brushes.Green;
+
+            Assert.Same(Brushes.Green, contentPresenter.Background);
+        }
+
         private static IControl ScrollingContentControlTemplate(ContentControl control, INameScope scope)
         {
             return new Border
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/ToggleButtonTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/ToggleButtonTests.cs
index 4f4ab47b0a..9acd42aba6 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/ToggleButtonTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/ToggleButtonTests.cs
@@ -1,5 +1,4 @@
 using Avalonia.Data;
-using Avalonia.Markup.Data;
 using Avalonia.UnitTests;
 
 using Xunit;
@@ -63,6 +62,54 @@ namespace Avalonia.Controls.Primitives.UnitTests
             Assert.Null(threeStateButton.IsChecked);
         }
 
+        [Fact]
+        public void ToggleButton_Events_Are_Raised_On_Is_Checked_Changes()
+        {
+            var threeStateButton = new ToggleButton();
+
+            bool checkedRaised = false;
+            threeStateButton.Checked += (_, __) => checkedRaised = true;
+
+            threeStateButton.IsChecked = true;
+            Assert.True(checkedRaised);
+
+            bool uncheckedRaised = false;
+            threeStateButton.Unchecked += (_, __) => uncheckedRaised = true;
+
+            threeStateButton.IsChecked = false;
+            Assert.True(uncheckedRaised);
+
+            bool indeterminateRaised = false;
+            threeStateButton.Indeterminate += (_, __) => indeterminateRaised = true;
+
+            threeStateButton.IsChecked = null;
+            Assert.True(indeterminateRaised);
+        }
+
+        [Fact]
+        public void ToggleButton_Events_Are_Raised_When_Toggling()
+        {
+            var threeStateButton = new TestToggleButton { IsThreeState = true };
+
+            bool checkedRaised = false;
+            threeStateButton.Checked += (_, __) => checkedRaised = true;
+
+            threeStateButton.Toggle();
+            Assert.True(checkedRaised);
+
+            bool indeterminateRaised = false;
+            threeStateButton.Indeterminate += (_, __) => indeterminateRaised = true;
+
+            threeStateButton.Toggle();
+            Assert.True(indeterminateRaised);
+
+            bool uncheckedRaised = false;
+            threeStateButton.Unchecked += (_, __) => uncheckedRaised = true;
+
+            threeStateButton.Toggle();
+            Assert.True(uncheckedRaised);
+        }
+
         private class Class1 : NotifyingBase
         {
             private bool _foo;
@@ -80,5 +127,10 @@ namespace Avalonia.Controls.Primitives.UnitTests
                 set { nullableFoo = value; RaisePropertyChanged(); }
             }
         }
+
+        private class TestToggleButton : ToggleButton
+        {
+            public new void Toggle() => base.Toggle();
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/TrackTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/TrackTests.cs
index dde0e0000d..59276a94d0 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/TrackTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/TrackTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Primitives;
 using Avalonia.Layout;
 using Avalonia.LogicalTree;
@@ -70,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, 34, 12), thumb.Bounds);
+            Assert.Equal(new Rect(33, 0, 33, 12), thumb.Bounds);
         }
 
         [Fact]
@@ -95,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, 34), thumb.Bounds);
+            Assert.Equal(new Rect(0, 33, 12, 33), thumb.Bounds);
         }
 
         [Fact]
diff --git a/tests/Avalonia.Controls.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Controls.UnitTests/Properties/AssemblyInfo.cs
index 2ef7b85bc0..4a32235f92 100644
--- a/tests/Avalonia.Controls.UnitTests/Properties/AssemblyInfo.cs
+++ b/tests/Avalonia.Controls.UnitTests/Properties/AssemblyInfo.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reflection;
 using Xunit;
 
diff --git a/tests/Avalonia.Controls.UnitTests/RelativePanelTests.cs b/tests/Avalonia.Controls.UnitTests/RelativePanelTests.cs
new file mode 100644
index 0000000000..6b2f05c923
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/RelativePanelTests.cs
@@ -0,0 +1,142 @@
+using Avalonia.Controls.Shapes;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests
+{
+    public class RelativePanelTests
+    {
+        [Fact]
+        public void Lays_Out_1_Child_Next_the_other()
+        {
+            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.Top,
+                HorizontalAlignment = Layout.HorizontalAlignment.Left,
+                Children =
+                {
+                    rect1, rect2
+                }
+            };
+
+            RelativePanel.SetAlignLeftWithPanel(rect1 , true);
+            RelativePanel.SetRightOf(rect2, rect1);
+            target.Measure(new Size(400, 400));
+            target.Arrange(new Rect(target.DesiredSize));
+
+            Assert.Equal(new Size(40, 20), target.Bounds.Size);
+            Assert.Equal(new Rect(0, 0, 20, 20), target.Children[0].Bounds);
+            Assert.Equal(new Rect(20, 0, 20, 20), target.Children[1].Bounds);
+        }
+
+        [Fact]
+        public void Lays_Out_1_Child_Below_the_other()
+        {
+            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.Top,
+                HorizontalAlignment = Layout.HorizontalAlignment.Left,
+                Children =
+                {
+                    rect1, rect2
+                }
+            };
+
+            RelativePanel.SetAlignLeftWithPanel(rect1, true);
+            RelativePanel.SetBelow(rect2, rect1);
+            target.Measure(new Size(400, 400));
+            target.Arrange(new Rect(target.DesiredSize));
+
+            Assert.Equal(new Size(20, 40), target.Bounds.Size);
+            Assert.Equal(new Rect(0, 0, 20, 20), target.Children[0].Bounds);
+            Assert.Equal(new Rect(0, 20, 20, 20), target.Children[1].Bounds);
+        }
+
+        [Fact]
+        public void RelativePanel_Can_Center()
+        {
+            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.Center,
+                HorizontalAlignment = Layout.HorizontalAlignment.Center,
+                Children =
+                {
+                    rect1, rect2
+                }
+            };
+
+            RelativePanel.SetAlignLeftWithPanel(rect1, true);
+            RelativePanel.SetBelow(rect2, rect1);
+            target.Measure(new Size(400, 400));
+            target.Arrange(new Rect(target.DesiredSize));
+
+            Assert.Equal(new Size(20, 40), target.Bounds.Size);
+            Assert.Equal(new Rect(0, 0, 20, 20), target.Children[0].Bounds);
+            Assert.Equal(new Rect(0, 20, 20, 20), target.Children[1].Bounds);
+        }
+
+        [Fact]
+        public void LeftOf_Measures_Correctly()
+        {
+            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.Center,
+                HorizontalAlignment = Layout.HorizontalAlignment.Center,
+                Children =
+                {
+                    rect1, rect2
+                }
+            };
+
+            RelativePanel.SetLeftOf(rect2, rect1);
+            target.Measure(new Size(400, 400));
+            target.Arrange(new Rect(target.DesiredSize));
+
+            Assert.Equal(new Size(20, 20), target.Bounds.Size);
+            Assert.Equal(new Rect(0, 0, 20, 20), target.Children[0].Bounds);
+            Assert.Equal(new Rect(-20, 0, 20, 20), target.Children[1].Bounds);
+        }
+
+        [Fact]
+        public void Above_Measures_Correctly()
+        {
+            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.Center,
+                HorizontalAlignment = Layout.HorizontalAlignment.Center,
+                Children =
+                {
+                    rect1, rect2
+                }
+            };
+
+            RelativePanel.SetAbove(rect2, rect1);
+            target.Measure(new Size(400, 400));
+            target.Arrange(new Rect(target.DesiredSize));
+
+            Assert.Equal(new Size(20, 20), target.Bounds.Size);
+            Assert.Equal(new Rect(0, 0, 20, 20), target.Children[0].Bounds);
+            Assert.Equal(new Rect(0, -20, 20, 20), target.Children[1].Bounds);
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs b/tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs
index 2238175a4a..ab21c5d330 100644
--- a/tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs
@@ -1,12 +1,11 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Layout;
+using Avalonia.UnitTests;
+using Moq;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
@@ -65,6 +64,179 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(new Vector(10, 10), target.Offset);
         }
 
+        [Fact]
+        public void Test_ScrollToHome()
+        {
+            var target = new ScrollViewer();
+            target.SetValue(ScrollViewer.ExtentProperty, new Size(50, 50));
+            target.SetValue(ScrollViewer.ViewportProperty, new Size(10, 10));
+            target.Offset = new Vector(25, 25);
+            target.ScrollToHome();
+
+            Assert.Equal(new Vector(0, 0), target.Offset);
+        }
+
+        [Fact]
+        public void Test_ScrollToEnd()
+        {
+            var target = new ScrollViewer();
+            target.SetValue(ScrollViewer.ExtentProperty, new Size(50, 50));
+            target.SetValue(ScrollViewer.ViewportProperty, new Size(10, 10));
+            target.Offset = new Vector(25, 25);
+            target.ScrollToEnd();
+
+            Assert.Equal(new Vector(0, 40), target.Offset);
+        }
+
+        [Fact]
+        public void SmallChange_Should_Be_16()
+        {
+            var target = new ScrollViewer();
+
+            Assert.Equal(new Size(16, 16), target.SmallChange);
+        }
+
+        [Fact]
+        public void LargeChange_Should_Be_Viewport()
+        {
+            var target = new ScrollViewer();
+
+            target.SetValue(ScrollViewer.ViewportProperty, new Size(104, 143));
+            Assert.Equal(new Size(104, 143), target.LargeChange);
+        }
+
+        [Fact]
+        public void SmallChange_Should_Come_From_ILogicalScrollable_If_Present()
+        {
+            var child = new Mock<Control>();
+            var logicalScroll = child.As<ILogicalScrollable>();
+
+            logicalScroll.Setup(x => x.IsLogicalScrollEnabled).Returns(true);
+            logicalScroll.Setup(x => x.ScrollSize).Returns(new Size(12, 43));
+
+            var target = new ScrollViewer
+            {
+                Template = new FuncControlTemplate<ScrollViewer>(CreateTemplate),
+                Content = child.Object,
+            };
+
+            target.ApplyTemplate();
+            ((ContentPresenter)target.Presenter).UpdateChild();
+
+            Assert.Equal(new Size(12, 43), target.SmallChange);
+        }
+
+        [Fact]
+        public void LargeChange_Should_Come_From_ILogicalScrollable_If_Present()
+        {
+            var child = new Mock<Control>();
+            var logicalScroll = child.As<ILogicalScrollable>();
+
+            logicalScroll.Setup(x => x.IsLogicalScrollEnabled).Returns(true);
+            logicalScroll.Setup(x => x.PageScrollSize).Returns(new Size(45, 67));
+
+            var target = new ScrollViewer
+            {
+                Template = new FuncControlTemplate<ScrollViewer>(CreateTemplate),
+                Content = child.Object,
+            };
+
+            target.ApplyTemplate();
+            ((ContentPresenter)target.Presenter).UpdateChild();
+
+            Assert.Equal(new Size(45, 67), target.LargeChange);
+        }
+
+        [Fact]
+        public void Changing_Extent_Should_Raise_ScrollChanged()
+        {
+            var target = new ScrollViewer();
+            var root = new TestRoot(target);
+            var raised = 0;
+
+            target.SetValue(ScrollViewer.ExtentProperty, new Size(100, 100));
+            target.SetValue(ScrollViewer.ViewportProperty, new Size(50, 50));
+            target.Offset = new Vector(10, 10);
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            target.ScrollChanged += (s, e) =>
+            {
+                Assert.Equal(new Vector(11, 12), e.ExtentDelta);
+                Assert.Equal(default, e.OffsetDelta);
+                Assert.Equal(default, e.ViewportDelta);
+                ++raised;
+            };
+
+            target.SetValue(ScrollViewer.ExtentProperty, new Size(111, 112));
+
+            Assert.Equal(0, raised);
+
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.Equal(1, raised);
+        }
+
+        [Fact]
+        public void Changing_Offset_Should_Raise_ScrollChanged()
+        {
+            var target = new ScrollViewer();
+            var root = new TestRoot(target);
+            var raised = 0;
+
+            target.SetValue(ScrollViewer.ExtentProperty, new Size(100, 100));
+            target.SetValue(ScrollViewer.ViewportProperty, new Size(50, 50));
+            target.Offset = new Vector(10, 10);
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            target.ScrollChanged += (s, e) =>
+            {
+                Assert.Equal(default, e.ExtentDelta);
+                Assert.Equal(new Vector(12, 14), e.OffsetDelta);
+                Assert.Equal(default, e.ViewportDelta);
+                ++raised;
+            };
+
+            target.Offset = new Vector(22, 24);
+
+            Assert.Equal(0, raised);
+
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.Equal(1, raised);
+        }
+
+        [Fact]
+        public void Changing_Viewport_Should_Raise_ScrollChanged()
+        {
+            var target = new ScrollViewer();
+            var root = new TestRoot(target);
+            var raised = 0;
+
+            target.SetValue(ScrollViewer.ExtentProperty, new Size(100, 100));
+            target.SetValue(ScrollViewer.ViewportProperty, new Size(50, 50));
+            target.Offset = new Vector(10, 10);
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            target.ScrollChanged += (s, e) =>
+            {
+                Assert.Equal(default, e.ExtentDelta);
+                Assert.Equal(default, e.OffsetDelta);
+                Assert.Equal(new Vector(6, 8), e.ViewportDelta);
+                ++raised;
+            };
+
+            target.SetValue(ScrollViewer.ViewportProperty, new Size(56, 58));
+
+            Assert.Equal(0, raised);
+
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.Equal(1, raised);
+        }
+
         private Control CreateTemplate(ScrollViewer control, INameScope scope)
         {
             return new Grid
diff --git a/tests/Avalonia.Controls.UnitTests/Selection/InternalSelectionModelTests.cs b/tests/Avalonia.Controls.UnitTests/Selection/InternalSelectionModelTests.cs
new file mode 100644
index 0000000000..ce3e698cf3
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/Selection/InternalSelectionModelTests.cs
@@ -0,0 +1,297 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using Avalonia.Collections;
+using Avalonia.Controls.Selection;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests.Selection
+{
+    public class InternalSelectionModelTests
+    {
+        [Fact]
+        public void Selecting_Item_Adds_To_WritableSelectedItems()
+        {
+            var target = CreateTarget();
+
+            target.Select(0);
+
+            Assert.Equal(new[] { "foo" }, target.WritableSelectedItems);
+        }
+
+        [Fact]
+        public void Selecting_Duplicate_On_Model_Adds_To_WritableSelectedItems()
+        {
+            var target = CreateTarget(source: new[] { "foo", "bar", "baz", "foo", "bar", "baz" });
+
+            target.SelectRange(1, 4);
+
+            Assert.Equal(new[] { "bar", "baz", "foo", "bar" }, target.WritableSelectedItems);
+        }
+
+        [Fact]
+        public void Deselecting_On_Model_Removes_SelectedItem()
+        {
+            var target = CreateTarget();
+
+            target.SelectRange(1, 2);
+            target.Deselect(1);
+
+            Assert.Equal(new[] { "baz" }, target.WritableSelectedItems);
+        }
+
+        [Fact]
+        public void Deselecting_Duplicate_On_Model_Removes_SelectedItem()
+        {
+            var target = CreateTarget(source: new[] { "foo", "bar", "baz", "foo", "bar", "baz" });
+
+            target.SelectRange(1, 2);
+            target.Select(4);
+            target.Deselect(4);
+
+            Assert.Equal(new[] { "baz", "bar" }, target.WritableSelectedItems);
+        }
+
+        [Fact]
+        public void Adding_To_WritableSelectedItems_Selects_On_Model()
+        {
+            var target = CreateTarget();
+
+            target.SelectRange(1, 2);
+            target.WritableSelectedItems.Add("foo");
+
+            Assert.Equal(new[] { 0, 1, 2 }, target.SelectedIndexes);
+            Assert.Equal(new[] { "bar", "baz", "foo" }, target.WritableSelectedItems);
+        }
+
+        [Fact]
+        public void Removing_From_WritableSelectedItems_Deselects_On_Model()
+        {
+            var target = CreateTarget();
+
+            target.SelectRange(1, 2);
+            target.WritableSelectedItems.Remove("baz");
+
+            Assert.Equal(new[] { 1 }, target.SelectedIndexes);
+            Assert.Equal(new[] { "bar" }, target.WritableSelectedItems);
+        }
+
+        [Fact]
+        public void Replacing_SelectedItem_Updates_Model()
+        {
+            var target = CreateTarget();
+
+            target.SelectRange(1, 2);
+            target.WritableSelectedItems[0] = "foo";
+
+            Assert.Equal(new[] { 0, 2 }, target.SelectedIndexes);
+            Assert.Equal(new[] { "foo", "baz" }, target.WritableSelectedItems);
+        }
+
+        [Fact]
+        public void Clearing_WritableSelectedItems_Updates_Model()
+        {
+            var target = CreateTarget();
+
+            target.WritableSelectedItems.Clear();
+
+            Assert.Empty(target.SelectedIndexes);
+        }
+
+        [Fact]
+        public void Setting_WritableSelectedItems_Updates_Model()
+        {
+            var target = CreateTarget();
+            var oldItems = target.WritableSelectedItems;
+
+            var newItems = new AvaloniaList<string> { "foo", "baz" };
+            target.WritableSelectedItems = newItems;
+
+            Assert.Equal(new[] { 0, 2 }, target.SelectedIndexes);
+            Assert.Same(newItems, target.WritableSelectedItems);
+            Assert.NotSame(oldItems, target.WritableSelectedItems);
+            Assert.Equal(new[] { "foo", "baz" }, newItems);
+        }
+
+        [Fact]
+        public void Setting_Items_To_Null_Clears_Selection()
+        {
+            var target = CreateTarget();
+
+            target.SelectRange(1, 2);
+            target.WritableSelectedItems = null;
+
+            Assert.Empty(target.SelectedIndexes);
+        }
+
+        [Fact]
+        public void Setting_Items_To_Null_Creates_Empty_Items()
+        {
+            var target = CreateTarget();
+            var oldItems = target.WritableSelectedItems;
+
+            target.WritableSelectedItems = null;
+
+            Assert.NotNull(target.WritableSelectedItems);
+            Assert.NotSame(oldItems, target.WritableSelectedItems);
+            Assert.IsType<AvaloniaList<object>>(target.WritableSelectedItems);
+        }
+
+        [Fact]
+        public void Adds_Null_WritableSelectedItems_When_Source_Is_Null()
+        {
+            var target = CreateTarget(nullSource: true);
+
+            target.SelectRange(1, 2);
+            Assert.Equal(new object[] { null, null }, target.WritableSelectedItems);
+        }
+
+        [Fact]
+        public void Updates_WritableSelectedItems_When_Source_Changes_From_Null()
+        {
+            var target = CreateTarget(nullSource: true);
+
+            target.SelectRange(1, 2);
+            Assert.Equal(new object[] { null, null }, target.WritableSelectedItems);
+
+            target.Source = new[] { "foo", "bar", "baz" };
+            Assert.Equal(new[] { "bar", "baz" }, target.WritableSelectedItems);
+        }
+
+        [Fact]
+        public void Updates_WritableSelectedItems_When_Source_Changes_To_Null()
+        {
+            var target = CreateTarget();
+
+            target.SelectRange(1, 2);
+            Assert.Equal(new[] { "bar", "baz" }, target.WritableSelectedItems);
+
+            target.Source = null;
+            Assert.Equal(new object[] { null, null }, target.WritableSelectedItems);
+        }
+
+        [Fact]
+        public void WritableSelectedItems_Can_Be_Set_Before_Source()
+        {
+            var target = CreateTarget(nullSource: true);
+            var items = new AvaloniaList<string> { "foo", "bar", "baz" };
+            var WritableSelectedItems = new AvaloniaList<string> { "bar" };
+
+            target.WritableSelectedItems = WritableSelectedItems;
+            target.Source = items;
+
+            Assert.Equal(1, target.SelectedIndex);
+        }
+
+        [Fact]
+        public void Does_Not_Accept_Fixed_Size_Items()
+        {
+            var target = CreateTarget();
+
+            Assert.Throws<NotSupportedException>(() =>
+                target.WritableSelectedItems = new[] { "foo", "bar", "baz" });
+        }
+
+        [Fact]
+        public void Restores_Selection_On_Items_Reset()
+        {
+            var items = new ResettingCollection(new[] { "foo", "bar", "baz" });
+            var target = CreateTarget(source: items);
+
+            target.SelectedIndex = 1;
+            items.Reset(new[] { "baz", "foo", "bar" });
+
+            Assert.Equal(2, target.SelectedIndex);
+        }
+
+        [Fact]
+        public void Raises_Selection_Changed_On_Items_Reset()
+        {
+            var items = new ResettingCollection(new[] { "foo", "bar", "baz" });
+            var target = CreateTarget(source: items);
+
+            target.SelectedIndex = 1;
+
+            var changed = new List<string>();
+
+            target.PropertyChanged += (s, e) => changed.Add(e.PropertyName);
+
+            var oldSelectedIndex = target.SelectedIndex;
+            var oldSelectedItem = target.SelectedItem;
+
+            items.Reset(new string[0]);
+
+            Assert.NotEqual(oldSelectedIndex, target.SelectedIndex);
+            Assert.NotEqual(oldSelectedItem, target.SelectedItem);
+
+            Assert.Equal(-1, target.SelectedIndex);
+            Assert.Equal(null, target.SelectedItem);
+
+            Assert.Contains(nameof(target.SelectedIndex), changed);
+            Assert.Contains(nameof(target.SelectedItem), changed);
+        }
+
+        [Fact]
+        public void Preserves_SelectedItem_On_Items_Reset()
+        {
+            var items = new ResettingCollection(new[] { "foo", "bar", "baz" });
+            var target = CreateTarget(source: items);
+
+            target.SelectedItem = "foo";
+
+            Assert.Equal(0, target.SelectedIndex);
+
+            items.Reset(new string[] { "baz", "foo", "bar" });
+
+            Assert.Equal("foo", target.SelectedItem);
+            Assert.Equal(1, target.SelectedIndex);
+        }
+
+        [Fact]
+        public void Preserves_Selection_On_Source_Changed()
+        {
+            var target = CreateTarget();
+
+            target.SelectedIndex = 1;
+            target.Source = new[] { "baz", "foo", "bar" };
+
+            Assert.Equal(2, target.SelectedIndex);
+        }
+
+        private static InternalSelectionModel CreateTarget(
+            bool singleSelect = false,
+            IList source = null,
+            bool nullSource = false)
+        {
+            source ??= !nullSource ? new[] { "foo", "bar", "baz" } : null;
+
+            var result = new InternalSelectionModel
+            {
+                SingleSelect = singleSelect,
+            };
+
+            ((ISelectionModel)result).Source = source;
+            return result;
+        }
+
+        private class ResettingCollection : List<string>, INotifyCollectionChanged
+        {
+            public ResettingCollection(IEnumerable<string> items)
+            {
+                AddRange(items);
+            }
+
+            public void Reset(IEnumerable<string> items)
+            {
+                Clear();
+                AddRange(items);
+                CollectionChanged?.Invoke(
+                    this,
+                    new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+            }
+
+            public event NotifyCollectionChangedEventHandler CollectionChanged;
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Multiple.cs b/tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Multiple.cs
new file mode 100644
index 0000000000..68bdbe51e8
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Multiple.cs
@@ -0,0 +1,1679 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using Avalonia.Collections;
+using Avalonia.Controls.Selection;
+using Xunit;
+
+#nullable enable
+
+namespace Avalonia.Controls.UnitTests.Selection
+{
+    public class SelectionModelTests_Multiple
+    {
+        public class No_Source
+        {
+            [Fact]
+            public void Can_Select_Multiple_Items_Before_Source_Assigned()
+            {
+                var target = CreateTarget(false);
+                var raised = 0;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    var index = raised switch
+                    {
+                        0 => 5,
+                        1 => 10,
+                        2 => 100,
+                        _ => throw new NotSupportedException(),
+                    };
+
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Empty(e.DeselectedItems);
+                    Assert.Equal(new[] { index }, e.SelectedIndexes);
+                    Assert.Equal(new string?[] { null }, e.SelectedItems);
+                    ++raised;
+                };
+
+                target.SelectedIndex = 5;
+                target.Select(10);
+                target.Select(100);
+
+                Assert.Equal(5, target.SelectedIndex);
+                Assert.Equal(new[] { 5, 10, 100 }, target.SelectedIndexes);
+                Assert.Null(target.SelectedItem);
+                Assert.Equal(new string?[] { null, null, null }, target.SelectedItems);
+                Assert.Equal(3, raised);
+            }
+
+            [Fact]
+            public void Initializing_Source_Retains_Valid_Selection_And_Removes_Invalid()
+            {
+                var target = CreateTarget(false);
+                var raised = 0;
+
+                target.SelectedIndex = 1;
+                target.Select(2);
+                target.Select(10);
+                target.Select(100);
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 10, 100 }, e.DeselectedIndexes);
+                    Assert.Equal(new string?[] { null, null }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++raised;
+                };
+
+                target.Source = new[] { "foo", "bar", "baz" };
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal(new[] { 1, 2 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar", "baz" }, target.SelectedItems);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Initializing_Source_Coerces_SelectedIndex()
+            {
+                var target = CreateTarget(false);
+                var raised = 0;
+
+                target.SelectedIndex = 100;
+                target.Select(2);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedIndex))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.Source = new[] { "foo", "bar", "baz" };
+
+                Assert.Equal(2, target.SelectedIndex);
+                Assert.Equal(new[] { 2 }, target.SelectedIndexes);
+                Assert.Equal("baz", target.SelectedItem);
+                Assert.Equal(new[] { "baz" }, target.SelectedItems);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Initializing_Source_Doesnt_Raise_SelectionChanged_If_Selection_Valid()
+            {
+                var target = CreateTarget(false);
+                var raised = 0;
+
+                target.Select(1);
+                target.Select(2);
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    ++raised;
+                };
+
+                target.Source = new[] { "foo", "bar", "baz" };
+
+                Assert.Equal(0, raised);
+            }
+
+            [Fact]
+            public void Initializing_Source_Raises_SelectedItems_PropertyChanged()
+            {
+                var target = CreateTarget(false);
+                var selectedItemRaised = 0;
+                var selectedItemsRaised = 0;
+
+                target.Select(1);
+                target.Select(2);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedItem))
+                    {
+                        ++selectedItemRaised;
+                    }
+                    else if (e.PropertyName == nameof(target.SelectedItems))
+                    {
+                        ++selectedItemsRaised;
+                    }
+                };
+
+                target.Source = new[] { "foo", "bar", "baz" };
+
+                Assert.Equal(1, selectedItemRaised);
+                Assert.Equal(1, selectedItemsRaised);
+            }
+
+            [Fact]
+            public void Initializing_Source_Respects_Range_SourceItem_Order()
+            {
+                var target = CreateTarget(false);
+
+                target.SelectRange(2, 2);
+                target.SelectedItem = "bar";
+
+                target.Source = new[] { "foo", "bar", "baz" };
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal(new[] { 1 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+            }
+
+            [Fact]
+            public void Initializing_Source_Respects_SourceItem_Range_Order()
+            {
+                var target = CreateTarget(false);
+
+                target.SelectedItem = "baz";
+                target.SelectRange(1, 1);
+
+                target.Source = new[] { "foo", "bar", "baz" };
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal(new[] { 1 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+            }
+
+            [Fact]
+            public void Changing_Source_To_Null_Raises_SelectedItems_PropertyChanged()
+            {
+                var target = CreateTarget();
+                var selectedItemRaised = 0;
+                var selectedItemsRaised = 0;
+
+                target.Select(1);
+                target.Select(2);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedItem))
+                    {
+                        ++selectedItemRaised;
+                    }
+                    else if (e.PropertyName == nameof(target.SelectedItems))
+                    {
+                        ++selectedItemsRaised;
+                    }
+                };
+
+                target.Source = null;
+
+                Assert.Equal(1, selectedItemRaised);
+                Assert.Equal(1, selectedItemsRaised);
+            }
+        }
+
+        public class SelectedIndex
+        {
+            [Fact]
+            public void SelectedIndex_Larger_Than_Source_Clears_Selection()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 1;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 1 }, e.DeselectedIndexes);
+                    Assert.Equal(new[] { "bar" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++raised;
+                };
+
+                target.SelectedIndex = 15;
+
+                Assert.Equal(-1, target.SelectedIndex);
+                Assert.Empty(target.SelectedIndexes);
+                Assert.Null(target.SelectedItem);
+                Assert.Empty(target.SelectedItems);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Negative_SelectedIndex_Is_Coerced_To_Minus_1()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectionChanged += (s, e) => ++raised;
+
+                target.SelectedIndex = -5;
+
+                Assert.Equal(-1, target.SelectedIndex);
+                Assert.Empty(target.SelectedIndexes);
+                Assert.Null(target.SelectedItem);
+                Assert.Empty(target.SelectedItems);
+                Assert.Equal(0, raised);
+            }
+
+            [Fact]
+            public void Setting_SelectedIndex_Clears_Old_Selection()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 0;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 0 }, e.DeselectedIndexes);
+                    Assert.Equal(new[] { "foo" }, e.DeselectedItems);
+                    Assert.Equal(new[] { 1 }, e.SelectedIndexes);
+                    Assert.Equal(new[] { "bar" }, e.SelectedItems);
+                    ++raised;
+                };
+
+                target.SelectedIndex = 1;
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal(new[] { 1 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void PropertyChanged_Is_Raised()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+                
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedIndex))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.SelectedIndex = 1;
+
+                Assert.Equal(1, raised);
+            }
+        }
+
+        public class SelectedIndexes
+        {
+            [Fact]
+            public void PropertyChanged_Is_Raised_When_SelectedIndex_Changes()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedIndexes))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.SelectedIndex = 1;
+
+                Assert.Equal(1, raised);
+            }
+        }
+
+        public class SelectedItem
+        {
+            [Fact]
+            public void PropertyChanged_Is_Raised_When_SelectedIndex_Changes()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedItem))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.SelectedIndex = 1;
+
+                Assert.Equal(1, raised);
+            }
+        }
+
+        public class SelectedItems
+        {
+            [Fact]
+            public void PropertyChanged_Is_Raised_When_SelectedIndex_Changes()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedItems))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.SelectedIndex = 1;
+
+                Assert.Equal(1, raised);
+            }
+        }
+
+        public class Select
+        {
+            [Fact]
+            public void Select_Sets_SelectedIndex_If_Previously_Unset()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedIndex))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.Select(1);
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Select_Adds_To_Selection()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 0;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Empty(e.DeselectedItems);
+                    Assert.Equal(new[] { 1 }, e.SelectedIndexes);
+                    Assert.Equal(new[] { "bar" }, e.SelectedItems);
+                    ++raised;
+                };
+
+                target.Select(1);
+
+                Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(new[] { 0, 1 }, target.SelectedIndexes);
+                Assert.Equal("foo", target.SelectedItem);
+                Assert.Equal(new[] { "foo", "bar" }, target.SelectedItems);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Select_With_Invalid_Index_Does_Nothing()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 0;
+
+                target.PropertyChanged += (s, e) => ++raised;
+                target.SelectionChanged += (s, e) => ++raised;
+
+                target.Select(15);
+
+                Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(new[] { 0 }, target.SelectedIndexes);
+                Assert.Equal("foo", target.SelectedItem);
+                Assert.Equal(new[] { "foo" }, target.SelectedItems);
+                Assert.Equal(0, raised);
+            }
+
+            [Fact]
+            public void Selecting_Already_Selected_Item_Doesnt_Raise_SelectionChanged()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.Select(2);
+                target.SelectionChanged += (s, e) => ++raised;
+                target.Select(2);
+
+                Assert.Equal(0, raised);
+            }
+        }
+
+        public class SelectRange
+        {
+            [Fact]
+            public void SelectRange_Selects_Items()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Empty(e.DeselectedItems);
+                    Assert.Equal(new[] { 1, 2 }, e.SelectedIndexes);
+                    Assert.Equal(new[] { "bar", "baz" }, e.SelectedItems);
+                    ++raised;
+                };
+
+                target.SelectRange(1, 2);
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal(new[] { 1, 2 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar", "baz" }, target.SelectedItems);
+                Assert.Equal(1, target.AnchorIndex);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void SelectRange_Ignores_Out_Of_Bounds_Items()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Empty(e.DeselectedItems);
+                    Assert.Equal(new[] { 11, 12 }, e.SelectedIndexes);
+                    Assert.Equal(new[] { "xyzzy", "thud" }, e.SelectedItems);
+                    ++raised;
+                };
+
+                target.SelectRange(11, 20);
+
+                Assert.Equal(11, target.SelectedIndex);
+                Assert.Equal(new[] { 11, 12 }, target.SelectedIndexes);
+                Assert.Equal("xyzzy", target.SelectedItem);
+                Assert.Equal(new[] { "xyzzy", "thud" }, target.SelectedItems);
+                Assert.Equal(11, target.AnchorIndex);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void SelectRange_Does_Nothing_For_Non_Intersecting_Range()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectionChanged += (s, e) => ++raised;
+
+                target.SelectRange(18, 30);
+
+                Assert.Equal(-1, target.SelectedIndex);
+                Assert.Equal(-1, target.AnchorIndex);
+                Assert.Equal(0, raised);
+            }
+        }
+
+        public class Deselect
+        {
+            [Fact]
+            public void Deselect_Clears_Selected_Item()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 0;
+                target.Select(1);
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 1 }, e.DeselectedIndexes);
+                    Assert.Equal(new[] { "bar" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++raised;
+                };
+
+                target.Deselect(1);
+
+                Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(new[] { 0 }, target.SelectedIndexes);
+                Assert.Equal("foo", target.SelectedItem);
+                Assert.Equal(new[] { "foo" }, target.SelectedItems);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Deselect_Updates_SelectedItem_To_First_Selected_Item()
+            {
+                var target = CreateTarget();
+
+                target.SelectRange(3, 5);
+                target.Deselect(3);
+
+                Assert.Equal(4, target.SelectedIndex);
+            }
+        }
+
+        public class DeselectRange
+        {
+            [Fact]
+            public void DeselectRange_Clears_Identical_Range()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectRange(1, 2);
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 1, 2 }, e.DeselectedIndexes);
+                    Assert.Equal(new[] { "bar", "baz" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++raised;
+                };
+
+                target.DeselectRange(1, 2);
+
+                Assert.Equal(-1, target.SelectedIndex);
+                Assert.Empty(target.SelectedIndexes);
+                Assert.Null(target.SelectedItem);
+                Assert.Empty(target.SelectedItems);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void DeselectRange_Clears_Intersecting_Range()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectRange(1, 2);
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 1 }, e.DeselectedIndexes);
+                    Assert.Equal(new[] { "bar" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++raised;
+                };
+
+                target.DeselectRange(0, 1);
+
+                Assert.Equal(2, target.SelectedIndex);
+                Assert.Equal(new[] { 2 }, target.SelectedIndexes);
+                Assert.Equal("baz", target.SelectedItem);
+                Assert.Equal(new[] { "baz" }, target.SelectedItems);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void DeselectRange_Does_Nothing_For_Nonintersecting_Range()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 0;
+                target.SelectionChanged += (s, e) => ++raised;
+                target.DeselectRange(1, 2);
+
+                Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(new[] { 0 }, target.SelectedIndexes);
+                Assert.Equal("foo", target.SelectedItem);
+                Assert.Equal(new[] { "foo" }, target.SelectedItems);
+                Assert.Equal(0, raised);
+            }
+        }
+
+        public class Clear
+        {
+            [Fact]
+            public void Clear_Raises_SelectionChanged()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.Select(1);
+                target.Select(2);
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 1, 2 }, e.DeselectedIndexes);
+                    Assert.Equal(new[] { "bar", "baz" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++raised;
+                };
+
+                target.Clear();
+
+                Assert.Equal(1, raised);
+            }
+        }
+
+        public class AnchorIndex
+        {
+            [Fact]
+            public void Setting_SelectedIndex_Sets_AnchorIndex()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.AnchorIndex))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.SelectedIndex = 1;
+
+                Assert.Equal(1, target.AnchorIndex);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Setting_SelectedIndex_To_Minus_1_Doesnt_Clear_AnchorIndex()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 1;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.AnchorIndex))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.SelectedIndex = -1;
+
+                Assert.Equal(1, target.AnchorIndex);
+                Assert.Equal(0, raised);
+            }
+
+            [Fact]
+            public void Select_Sets_AnchorIndex()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 0;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.AnchorIndex))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.Select(1);
+
+                Assert.Equal(1, target.AnchorIndex);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void SelectRange_Doesnt_Overwrite_AnchorIndex()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.AnchorIndex = 0;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.AnchorIndex))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.SelectRange(1, 2);
+
+                Assert.Equal(0, target.AnchorIndex);
+                Assert.Equal(0, raised);
+            }
+
+            [Fact]
+            public void Deselect_Doesnt_Clear_AnchorIndex()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.Select(0);
+                target.Select(1);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.AnchorIndex))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.Deselect(1);
+
+                Assert.Equal(1, target.AnchorIndex);
+                Assert.Equal(0, raised);
+            }
+        }
+
+        public class SingleSelect
+        {
+            [Fact]
+            public void Converting_To_Single_Selection_Removes_Multiple_Selection()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectRange(1, 3);
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 2, 3 }, e.DeselectedIndexes);
+                    Assert.Equal(new[] { "baz", "qux" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++raised;
+                };
+
+                target.SingleSelect = true;
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal(new[] { 1 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Raises_PropertyChanged()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SingleSelect))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.SingleSelect = true;
+
+                Assert.Equal(1, raised);
+            }
+        }
+
+        public class CollectionChanges
+        {
+            [Fact]
+            public void Adding_Item_Before_Selected_Item_Updates_Indexes()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var selectionChangedRaised = 0;
+                var indexesChangedraised = 0;
+
+                target.SelectedIndex = 1;
+
+                target.SelectionChanged += (s, e) => ++selectionChangedRaised;
+
+                target.IndexesChanged += (s, e) =>
+                {
+                    Assert.Equal(0, e.StartIndex);
+                    Assert.Equal(1, e.Delta);
+                    ++indexesChangedraised;
+                };
+
+                data.Insert(0, "new");
+
+                Assert.Equal(2, target.SelectedIndex);
+                Assert.Equal(new[] { 2 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+                Assert.Equal(2, target.AnchorIndex);
+                Assert.Equal(1, indexesChangedraised);
+                Assert.Equal(0, selectionChangedRaised);
+            }
+
+            [Fact]
+            public void Adding_Item_After_Selected_Doesnt_Raise_Events()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var raised = 0;
+
+                target.SelectedIndex = 1;
+
+                target.PropertyChanged += (s, e) => ++raised;
+                target.SelectionChanged += (s, e) => ++raised;
+                target.IndexesChanged += (s, e) => ++raised;
+
+                data.Insert(2, "new");
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal(new[] { 1 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+                Assert.Equal(1, target.AnchorIndex);
+                Assert.Equal(0, raised);
+            }
+
+            [Fact]
+            public void Adding_Item_At_Beginning_Of_SelectedRange_Updates_Indexes()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var selectionChangedRaised = 0;
+                var indexesChangedraised = 0;
+
+                target.SelectRange(4, 8);
+
+                target.SelectionChanged += (s, e) => ++selectionChangedRaised;
+
+                target.IndexesChanged += (s, e) =>
+                {
+                    Assert.Equal(4, e.StartIndex);
+                    Assert.Equal(2, e.Delta);
+                    ++indexesChangedraised;
+                };
+
+                data.InsertRange(4, new[] { "frank", "tank" });
+
+                Assert.Equal(6, target.SelectedIndex);
+                Assert.Equal(new[] { 6, 7, 8, 9, 10 }, target.SelectedIndexes);
+                Assert.Equal("quux", target.SelectedItem);
+                Assert.Equal(new[] { "quux", "corge", "grault", "garply", "waldo" }, target.SelectedItems);
+                Assert.Equal(6, target.AnchorIndex);
+                Assert.Equal(1, indexesChangedraised);
+                Assert.Equal(0, selectionChangedRaised);
+            }
+
+            [Fact]
+            public void Adding_Item_At_End_Of_SelectedRange_Updates_Indexes()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var selectionChangedRaised = 0;
+                var indexesChangedraised = 0;
+
+                target.SelectRange(4, 8);
+
+                target.SelectionChanged += (s, e) => ++selectionChangedRaised;
+
+                target.IndexesChanged += (s, e) =>
+                {
+                    Assert.Equal(8, e.StartIndex);
+                    Assert.Equal(2, e.Delta);
+                    ++indexesChangedraised;
+                };
+
+                data.InsertRange(8, new[] { "frank", "tank" });
+
+                Assert.Equal(4, target.SelectedIndex);
+                Assert.Equal(new[] { 4, 5, 6, 7, 10 }, target.SelectedIndexes);
+                Assert.Equal("quux", target.SelectedItem);
+                Assert.Equal(new[] { "quux", "corge", "grault", "garply", "waldo" }, target.SelectedItems);
+                Assert.Equal(4, target.AnchorIndex);
+                Assert.Equal(1, indexesChangedraised);
+                Assert.Equal(0, selectionChangedRaised);
+            }
+
+            [Fact]
+            public void Adding_Item_In_Middle_Of_SelectedRange_Updates_Indexes()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var selectionChangedRaised = 0;
+                var indexesChangedraised = 0;
+
+                target.SelectRange(4, 8);
+
+                target.SelectionChanged += (s, e) => ++selectionChangedRaised;
+
+                target.IndexesChanged += (s, e) =>
+                {
+                    Assert.Equal(6, e.StartIndex);
+                    Assert.Equal(2, e.Delta);
+                    ++indexesChangedraised;
+                };
+
+                data.InsertRange(6, new[] { "frank", "tank" });
+
+                Assert.Equal(4, target.SelectedIndex);
+                Assert.Equal(new[] { 4, 5, 8, 9, 10 }, target.SelectedIndexes);
+                Assert.Equal("quux", target.SelectedItem);
+                Assert.Equal(new[] { "quux", "corge", "grault", "garply", "waldo" }, target.SelectedItems);
+                Assert.Equal(4, target.AnchorIndex);
+                Assert.Equal(1, indexesChangedraised);
+                Assert.Equal(0, selectionChangedRaised);
+            }
+
+            [Fact]
+            public void Removing_Selected_Item_Updates_State()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var selectionChangedRaised = 0;
+                var selectedIndexRaised = 0;
+
+                target.Source = data;
+                target.Select(1);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedIndex))
+                    {
+                        ++selectedIndexRaised;
+                    }
+                };
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Equal(new[] { "bar" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++selectionChangedRaised;
+                };
+
+                data.RemoveAt(1);
+
+                Assert.Equal(-1, target.SelectedIndex);
+                Assert.Empty(target.SelectedIndexes);
+                Assert.Null(target.SelectedItem);
+                Assert.Empty(target.SelectedItems);
+                Assert.Equal(-1, target.AnchorIndex);
+                Assert.Equal(1, selectionChangedRaised);
+                Assert.Equal(1, selectedIndexRaised);
+            }
+
+            [Fact]
+            public void Removing_Item_Before_Selected_Item_Updates_Indexes()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var selectionChangedRaised = 0;
+                var indexesChangedraised = 0;
+
+                target.SelectedIndex = 1;
+
+                target.SelectionChanged += (s, e) => ++selectionChangedRaised;
+
+                target.IndexesChanged += (s, e) =>
+                {
+                    Assert.Equal(0, e.StartIndex);
+                    Assert.Equal(-1, e.Delta);
+                    ++indexesChangedraised;
+                };
+
+                data.RemoveAt(0);
+
+                Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(new[] { 0 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+                Assert.Equal(0, target.AnchorIndex);
+                Assert.Equal(1, indexesChangedraised);
+                Assert.Equal(0, selectionChangedRaised);
+            }
+
+            [Fact]
+            public void Removing_Item_After_Selected_Doesnt_Raise_Events()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var raised = 0;
+
+                target.SelectedIndex = 1;
+
+                target.PropertyChanged += (s, e) => ++raised;
+                target.SelectionChanged += (s, e) => ++raised;
+                target.IndexesChanged += (s, e) => ++raised;
+
+                data.RemoveAt(2);
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal(new[] { 1 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+                Assert.Equal(1, target.AnchorIndex);
+                Assert.Equal(0, raised);
+            }
+
+            [Fact]
+            public void Removing_Selected_Range_Raises_Events()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var selectionChangedRaised = 0;
+                var selectedIndexRaised = 0;
+
+                target.Source = data;
+                target.SelectRange(4, 8);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedIndex))
+                    {
+                        ++selectedIndexRaised;
+                    }
+                };
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Equal(new[] { "quux", "corge", "grault", "garply", "waldo" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++selectionChangedRaised;
+                };
+
+                data.RemoveRange(4, 5);
+
+                Assert.Equal(-1, target.SelectedIndex);
+                Assert.Empty(target.SelectedIndexes);
+                Assert.Null(target.SelectedItem);
+                Assert.Empty(target.SelectedItems);
+                Assert.Equal(-1, target.AnchorIndex);
+                Assert.Equal(1, selectionChangedRaised);
+                Assert.Equal(1, selectedIndexRaised);
+            }
+
+            [Fact]
+            public void Removing_Partial_Selected_Range_Raises_Events_1()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var selectionChangedRaised = 0;
+                var selectedIndexRaised = 0;
+
+                target.Source = data;
+                target.SelectRange(4, 8);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedIndex))
+                    {
+                        ++selectedIndexRaised;
+                    }
+                };
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Equal(new[] { "quux", "corge", "grault" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++selectionChangedRaised;
+                };
+
+                data.RemoveRange(0, 7);
+
+                Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(new[] { 0, 1 }, target.SelectedIndexes);
+                Assert.Equal("garply", target.SelectedItem);
+                Assert.Equal(new[] { "garply", "waldo" }, target.SelectedItems);
+                Assert.Equal(0, target.AnchorIndex);
+                Assert.Equal(1, selectionChangedRaised);
+                Assert.Equal(1, selectedIndexRaised);
+            }
+
+            [Fact]
+            public void Removing_Partial_Selected_Range_Raises_Events_2()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var selectionChangedRaised = 0;
+                var selectedIndexRaised = 0;
+
+                target.Source = data;
+                target.SelectRange(4, 8);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedIndex))
+                    {
+                        ++selectedIndexRaised;
+                    }
+                };
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Equal(new[] { "garply", "waldo" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++selectionChangedRaised;
+                };
+
+                data.RemoveRange(7, 3);
+
+                Assert.Equal(4, target.SelectedIndex);
+                Assert.Equal(new[] { 4, 5, 6 }, target.SelectedIndexes);
+                Assert.Equal("quux", target.SelectedItem);
+                Assert.Equal(new[] { "quux", "corge", "grault" }, target.SelectedItems);
+                Assert.Equal(4, target.AnchorIndex);
+                Assert.Equal(1, selectionChangedRaised);
+                Assert.Equal(0, selectedIndexRaised);
+            }
+
+            [Fact]
+            public void Removing_Partial_Selected_Range_Raises_Events_3()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var selectionChangedRaised = 0;
+                var selectedIndexRaised = 0;
+
+                target.Source = data;
+                target.SelectRange(4, 8);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedIndex))
+                    {
+                        ++selectedIndexRaised;
+                    }
+                };
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Equal(new[] { "corge", "grault", "garply" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++selectionChangedRaised;
+                };
+
+                data.RemoveRange(5, 3);
+
+                Assert.Equal(4, target.SelectedIndex);
+                Assert.Equal(new[] { 4, 5 }, target.SelectedIndexes);
+                Assert.Equal("quux", target.SelectedItem);
+                Assert.Equal(new[] { "quux", "waldo" }, target.SelectedItems);
+                Assert.Equal(4, target.AnchorIndex);
+                Assert.Equal(1, selectionChangedRaised);
+                Assert.Equal(0, selectedIndexRaised);
+            }
+
+            [Fact]
+            public void Replacing_Selected_Item_Updates_State()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var selectionChangedRaised = 0;
+                var selectedIndexRaised = 0;
+                var selectedItemRaised = 0;
+                var indexesChangedRaised = 0;
+
+                target.Source = data;
+                target.SelectRange(1, 4);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedIndex))
+                    {
+                        ++selectedIndexRaised;
+                    }
+
+                    if (e.PropertyName == nameof(target.SelectedItem))
+                    {
+                        ++selectedItemRaised;
+                    }
+                };
+
+                target.IndexesChanged += (s, e) => ++indexesChangedRaised;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Equal(new[] { "bar" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++selectionChangedRaised;
+                };
+
+                data[1] = "new";
+
+                Assert.Equal(2, target.SelectedIndex);
+                Assert.Equal(new[] { 2, 3, 4 }, target.SelectedIndexes);
+                Assert.Equal("baz", target.SelectedItem);
+                Assert.Equal(new[] { "baz", "qux", "quux" }, target.SelectedItems);
+                Assert.Equal(2, target.AnchorIndex);
+                Assert.Equal(1, selectionChangedRaised);
+                Assert.Equal(1, selectedIndexRaised);
+                Assert.Equal(1, selectedItemRaised);
+                Assert.Equal(0, indexesChangedRaised);
+            }
+
+            [Fact]
+            public void Resetting_Source_Updates_State()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var selectionChangedRaised = 0;
+                var selectedIndexRaised = 0;
+                var resetRaised = 0;
+
+                target.Source = data;
+                target.Select(1);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedIndex))
+                    {
+                        ++selectedIndexRaised;
+                    }
+                };
+
+                target.SelectionChanged += (s, e) => ++selectionChangedRaised;
+                target.SourceReset += (s, e) => ++resetRaised;
+
+                data.Clear();
+
+                Assert.Equal(-1, target.SelectedIndex);
+                Assert.Empty(target.SelectedIndexes);
+                Assert.Null(target.SelectedItem);
+                Assert.Empty(target.SelectedItems);
+                Assert.Equal(-1, target.AnchorIndex);
+                Assert.Equal(0, selectionChangedRaised);
+                Assert.Equal(1, resetRaised);
+                Assert.Equal(1, selectedIndexRaised);
+            }
+
+            [Fact]
+            public void Handles_Selection_Made_In_CollectionChanged()
+            {
+                // Tests the following scenario:
+                //
+                // - Items changes from empty to having 2 items
+                // - ViewModel auto-selects range 0..1 in CollectionChanged
+                // - SelectionModel receives CollectionChanged
+                // - And so adjusts the selected item from 0..1 to 2..4, which is past the end of
+                //   the items.
+                //
+                // There's not much we can do about this situation because the order in which
+                // CollectionChanged handlers are called can't be known (the problem also exists with
+                // WPF). The best we can do is not select an invalid index.
+                var target = CreateTarget(createData: false);
+                var data = new AvaloniaList<string>();
+
+                data.CollectionChanged += (s, e) =>
+                {
+                    target.SelectRange(0, 1);
+                };
+
+                target.Source = data;
+                data.AddRange(new[] { "foo", "bar" });
+
+                Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(new[] { 0, 1 }, target.SelectedIndexes);
+                Assert.Equal("foo", target.SelectedItem);
+                Assert.Equal(new[] { "foo", "bar" }, target.SelectedItems);
+                Assert.Equal(0, target.AnchorIndex);
+            }
+        }
+
+        public class BatchUpdate
+        {
+            [Fact]
+            public void Correctly_Batches_Selects()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Empty(e.DeselectedItems);
+                    Assert.Equal(new[] { 2, 3 }, e.SelectedIndexes);
+                    Assert.Equal(new[] { "baz", "qux" }, e.SelectedItems);
+                    ++raised;
+                };
+
+                using (target.BatchUpdate())
+                {
+                    target.Select(2);
+                    target.Select(3);
+                }
+
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Correctly_Batches_SelectRanges()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Empty(e.DeselectedItems);
+                    Assert.Equal(new[] { 2, 3, 5, 6 }, e.SelectedIndexes);
+                    Assert.Equal(new[] { "baz", "qux", "corge", "grault" }, e.SelectedItems);
+                    ++raised;
+                };
+
+                using (target.BatchUpdate())
+                {
+                    target.SelectRange(2, 3);
+                    target.SelectRange(5, 6);
+                }
+
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Correctly_Batches_Select_Deselect()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Empty(e.DeselectedItems);
+                    Assert.Equal(new[] { 2, 3 }, e.SelectedIndexes);
+                    Assert.Equal(new[] { "baz", "qux" }, e.SelectedItems);
+                    ++raised;
+                };
+
+                using (target.BatchUpdate())
+                {
+                    target.Select(2);
+                    target.Select(3);
+                    target.Select(4);
+                    target.Deselect(4);
+                }
+
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Correctly_Batches_Deselect_Select()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectRange(2, 8);
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 2, 3 }, e.DeselectedIndexes);
+                    Assert.Equal(new[] { "baz", "qux" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++raised;
+                };
+
+                using (target.BatchUpdate())
+                {
+                    target.Deselect(2);
+                    target.Deselect(3);
+                    target.Deselect(4);
+                    target.Select(4);
+                }
+
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Correctly_Batches_Select_Deselect_Range()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Empty(e.DeselectedItems);
+                    Assert.Equal(new[] { 2, 3 }, e.SelectedIndexes);
+                    Assert.Equal(new[] { "baz", "qux" }, e.SelectedItems);
+                    ++raised;
+                };
+
+                using (target.BatchUpdate())
+                {
+                    target.SelectRange(2, 6);
+                    target.DeselectRange(4, 8);
+                }
+
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Correctly_Batches_Deselect_Select_Range()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectRange(2, 8);
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 2, 3 }, e.DeselectedIndexes);
+                    Assert.Equal(new[] { "baz", "qux" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++raised;
+                };
+
+                using (target.BatchUpdate())
+                {
+                    target.DeselectRange(2, 6);
+                    target.SelectRange(4, 8);
+                }
+
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Correctly_Batches_Clear_Select()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectRange(2, 3);
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 3 }, e.DeselectedIndexes);
+                    Assert.Equal(new[] { "qux" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++raised;
+                };
+
+                using (target.BatchUpdate())
+                {
+                    target.Clear();
+                    target.Select(2);
+                }
+
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Correctly_Batches_Clear_SelectedIndex()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectRange(2, 3);
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 3 }, e.DeselectedIndexes);
+                    Assert.Equal(new[] { "qux" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++raised;
+                };
+
+                using (target.BatchUpdate())
+                {
+                    target.Clear();
+                    target.SelectedIndex = 2;
+                }
+
+                Assert.Equal(1, raised);
+            }
+        }
+
+        public class LostSelection
+        {
+            [Fact]
+            public void LostSelection_Called_On_Clear()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 1;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 1 }, e.DeselectedIndexes);
+                    Assert.Equal(new[] { "bar" }, e.DeselectedItems);
+                    Assert.Equal(new[] { 0 }, e.SelectedIndexes);
+                    Assert.Equal(new[] { "foo" }, e.SelectedItems);
+                    ++raised;
+                };
+
+                target.LostSelection += (s, e) =>
+                {
+                    target.Select(0);
+                };
+
+                target.Clear();
+
+                Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void LostSelection_Called_When_Selection_Removed()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var raised = 0;
+
+                target.SelectRange(1, 3);
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Equal(new[] { "bar", "baz", "qux" }, e.DeselectedItems);
+                    Assert.Equal(new[] { 0 }, e.SelectedIndexes);
+                    Assert.Equal(new[] { "quux" }, e.SelectedItems);
+                    ++raised;
+                };
+
+                target.LostSelection += (s, e) =>
+                {
+                    target.Select(0);
+                };
+
+                data.RemoveRange(0, 4);
+
+                Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(1, raised);
+            }
+        }
+
+        public class SourceReset
+        {
+            [Fact]
+            public void Can_Restore_Selection_In_SourceReset_Event()
+            {
+                var data = new ResettingList<string> { "foo", "bar", "baz" };
+                var target = CreateTarget(createData: false);
+                var sourceResetRaised = 0;
+                var selectionChangedRaised = 0;
+
+                target.Source = data;
+                target.SelectedIndex = 1;
+
+                target.SourceReset += (s, e) =>
+                {
+                    target.SelectedIndex = data.IndexOf("bar");
+                    ++sourceResetRaised;
+                };
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Empty(e.DeselectedItems);
+                    Assert.Equal(new[] { 3 }, e.SelectedIndexes);
+                    Assert.Equal(new[] { "bar" }, e.SelectedItems);
+                    ++selectionChangedRaised;
+                };
+
+                data.Reset(new[] { "qux", "foo", "quux", "bar", "baz" });
+
+                Assert.Equal(3, target.SelectedIndex);
+                Assert.Equal(1, selectionChangedRaised);
+                Assert.Equal(1, sourceResetRaised);
+            }
+        }
+
+        private static SelectionModel<string?> CreateTarget(bool createData = true)
+        {
+            var result = new SelectionModel<string?> { SingleSelect = false };
+
+            if (createData)
+            {
+                result.Source = new AvaloniaList<string>
+                {
+                    "foo",
+                    "bar",
+                    "baz",
+                    "qux",
+                    "quux",
+                    "corge",
+                    "grault",
+                    "garply",
+                    "waldo",
+                    "fred",
+                    "plugh",
+                    "xyzzy",
+                    "thud"
+                };
+            }
+
+            return result;
+        }
+
+        private class ResettingList<T> : List<T>, INotifyCollectionChanged
+        {
+            public event NotifyCollectionChangedEventHandler? CollectionChanged;
+
+            public void Reset(IEnumerable<T>? items = null)
+            {
+                if (items != null)
+                {
+                    Clear();
+                    AddRange(items);
+                }
+
+                CollectionChanged?.Invoke(
+                    this,
+                    new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+            }
+        }
+
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Single.cs b/tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Single.cs
new file mode 100644
index 0000000000..668af3b5d7
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Single.cs
@@ -0,0 +1,1302 @@
+using System;
+using System.Collections.Specialized;
+using Avalonia.Collections;
+using Avalonia.Controls.Selection;
+using Avalonia.Controls.Utils;
+using Xunit;
+using CollectionChangedEventManager = Avalonia.Controls.Utils.CollectionChangedEventManager;
+
+#nullable enable
+
+namespace Avalonia.Controls.UnitTests.Selection
+{
+    public class SelectionModelTests_Single
+    {
+        public class Source
+        {
+            [Fact]
+            public void Can_Select_Index_Before_Source_Assigned()
+            {
+                var target = CreateTarget(false);
+                var raised = 0;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Empty(e.DeselectedItems);
+                    Assert.Equal(new[] { 5 }, e.SelectedIndexes);
+                    Assert.Equal(new string?[] { null }, e.SelectedItems);
+                    ++raised;
+                };
+
+                target.SelectedIndex = 5;
+
+                Assert.Equal(5, target.SelectedIndex);
+                Assert.Equal(new[] { 5 }, target.SelectedIndexes);
+                Assert.Null(target.SelectedItem);
+                Assert.Equal(new string?[] { null }, target.SelectedItems);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Can_Select_Item_Before_Source_Assigned()
+            {
+                var target = CreateTarget(false);
+                var raised = 0;
+
+                target.SelectionChanged += (s, e) => ++raised;
+                target.SelectedItem = "bar";
+
+                Assert.Equal(-1, target.SelectedIndex);
+                Assert.Empty(target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new string?[] { "bar" }, target.SelectedItems);
+                Assert.Equal(0, raised);
+            }
+
+            [Fact]
+            public void Initializing_Source_Retains_Valid_Index_Selection()
+            {
+                var target = CreateTarget(false);
+                var raised = 0;
+
+                target.SelectedIndex = 1;
+
+                target.SelectionChanged += (s, e) => ++raised;
+
+                target.Source = new[] { "foo", "bar", "baz" };
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal(new[] { 1 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+                Assert.Equal(0, raised);
+            }
+
+            [Fact]
+            public void Initializing_Source_Removes_Invalid_Index_Selection()
+            {
+                var target = CreateTarget(false);
+                var raised = 0;
+
+                target.SelectedIndex = 5;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 5 }, e.DeselectedIndexes);
+                    Assert.Equal(new string?[] { null }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++raised;
+                };
+
+                target.Source = new[] { "foo", "bar", "baz" };
+
+                Assert.Equal(-1, target.SelectedIndex);
+                Assert.Empty(target.SelectedIndexes);
+                Assert.Null(target.SelectedItem);
+                Assert.Empty(target.SelectedItems);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Initializing_Source_Retains_Valid_Item_Selection()
+            {
+                var target = CreateTarget(false);
+                var raised = 0;
+
+                target.SelectedItem = "bar";
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Empty(e.DeselectedItems);
+                    Assert.Equal(new[] { 1 }, e.SelectedIndexes);
+                    Assert.Equal(new string[] { "bar" }, e.SelectedItems);
+                    ++raised;
+                };
+
+                target.Source = new[] { "foo", "bar", "baz" };
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal(new[] { 1 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Initializing_Source_Removes_Invalid_Item_Selection()
+            {
+                var target = CreateTarget(false);
+                var raised = 0;
+
+                target.SelectedItem = "qux";
+                target.SelectionChanged += (s, e) => ++raised;
+                target.Source = new[] { "foo", "bar", "baz" };
+
+                Assert.Equal(-1, target.SelectedIndex);
+                Assert.Empty(target.SelectedIndexes);
+                Assert.Null(target.SelectedItem);
+                Assert.Empty(target.SelectedItems);
+                Assert.Equal(0, raised);
+            }
+
+            [Fact]
+            public void Initializing_Source_Respects_SourceIndex_SourceItem_Order()
+            {
+                var target = CreateTarget(false);
+
+                target.SelectedIndex = 0;
+                target.SelectedItem = "bar";
+
+                target.Source = new[] { "foo", "bar", "baz" };
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal(new[] { 1 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+            }
+
+            [Fact]
+            public void Initializing_Source_Respects_SourceItem_SourceIndex_Order()
+            {
+                var target = CreateTarget(false);
+
+                target.SelectedItem = "foo";
+                target.SelectedIndex = 1;
+
+                target.Source = new[] { "foo", "bar", "baz" };
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal(new[] { 1 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+            }
+
+            [Fact]
+            public void Initializing_Source_Raises_SelectedItems_PropertyChanged()
+            {
+                var target = CreateTarget(false);
+                var selectedItemRaised = 0;
+                var selectedItemsRaised = 0;
+
+                target.Select(1);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedItem))
+                    {
+                        ++selectedItemRaised;
+                    }
+                    else if (e.PropertyName == nameof(target.SelectedItems))
+                    {
+                        ++selectedItemsRaised;
+                    }
+                };
+
+                target.Source = new[] { "foo", "bar", "baz" };
+
+                Assert.Equal(1, selectedItemRaised);
+                Assert.Equal(1, selectedItemsRaised);
+            }
+
+            [Fact]
+            public void Changing_Source_To_Null_Doesnt_Clear_Selection()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 2;
+
+                target.SelectionChanged += (s, e) => ++raised;
+
+                target.Source = null;
+
+                Assert.Equal(2, target.SelectedIndex);
+                Assert.Equal(new[] { 2 }, target.SelectedIndexes);
+                Assert.Null(target.SelectedItem);
+                Assert.Equal(new string?[] { null }, target.SelectedItems);
+                Assert.Equal(0, raised);
+            }
+
+            [Fact]
+            public void Changing_Source_To_NonNull_First_Clears_Old_Selection()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 2;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 2 }, e.DeselectedIndexes);
+                    Assert.Equal(new string?[] { "baz" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++raised;
+                };
+
+                target.Source = new[] { "qux", "quux", "corge" };
+
+                Assert.Equal(-1, target.SelectedIndex);
+                Assert.Empty(target.SelectedIndexes);
+                Assert.Null(target.SelectedItem);
+                Assert.Empty(target.SelectedItems);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Changing_Source_To_Null_Raises_SelectedItems_PropertyChanged()
+            {
+                var target = CreateTarget();
+                var selectedItemRaised = 0;
+                var selectedItemsRaised = 0;
+
+                target.Select(1);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedItem))
+                    {
+                        ++selectedItemRaised;
+                    }
+                    else if (e.PropertyName == nameof(target.SelectedItems))
+                    {
+                        ++selectedItemsRaised;
+                    }
+                };
+
+                target.Source = null;
+
+                Assert.Equal(1, selectedItemRaised);
+                Assert.Equal(1, selectedItemsRaised);
+            }
+
+            [Fact]
+            public void Raises_PropertyChanged()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.Source))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.Source = new[] { "qux", "quux", "corge" };
+
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Can_Assign_ValueType_Collection_To_SelectionModel_Of_Object()
+            {
+                var target = (ISelectionModel)new SelectionModel<object>();
+
+                target.Source = new[] { 1, 2, 3 };
+            }
+        }
+
+        public class SelectedIndex
+        {
+            [Fact]
+            public void SelectedIndex_Larger_Than_Source_Clears_Selection()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 1;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 1 }, e.DeselectedIndexes);
+                    Assert.Equal(new[] { "bar" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++raised;
+                };
+
+                target.SelectedIndex = 5;
+
+                Assert.Equal(-1, target.SelectedIndex);
+                Assert.Empty(target.SelectedIndexes);
+                Assert.Null(target.SelectedItem);
+                Assert.Empty(target.SelectedItems);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Negative_SelectedIndex_Is_Coerced_To_Minus_1()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectionChanged += (s, e) => ++raised;
+
+                target.SelectedIndex = -5;
+
+                Assert.Equal(-1, target.SelectedIndex);
+                Assert.Empty(target.SelectedIndexes);
+                Assert.Null(target.SelectedItem);
+                Assert.Empty(target.SelectedItems);
+                Assert.Equal(0, raised);
+            }
+
+            [Fact]
+            public void Setting_SelectedIndex_Clears_Old_Selection()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 0;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 0 }, e.DeselectedIndexes);
+                    Assert.Equal(new[] { "foo" }, e.DeselectedItems);
+                    Assert.Equal(new[] { 1 }, e.SelectedIndexes);
+                    Assert.Equal(new[] { "bar" }, e.SelectedItems);
+                    ++raised;
+                };
+
+                target.SelectedIndex = 1;
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal(new[] { 1 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Setting_SelectedIndex_During_CollectionChanged_Results_In_Correct_Selection()
+            {
+                // Issue #4496
+                var data = new AvaloniaList<string>();
+                var target = CreateTarget();
+                var binding = new MockBinding(target, data);
+
+                target.Source = data;
+
+                data.Add("foo");
+
+                Assert.Equal(0, target.SelectedIndex);
+            }
+
+            [Fact]
+            public void PropertyChanged_Is_Raised()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedIndex))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.SelectedIndex = 1;
+
+                Assert.Equal(1, raised);
+            }
+
+            private class MockBinding : ICollectionChangedListener
+            {
+                private readonly SelectionModel<string?> _target;
+
+                public MockBinding(SelectionModel<string?> target, AvaloniaList<string> data)
+                {
+                    _target = target;
+                    CollectionChangedEventManager.Instance.AddListener(data, this);
+                }
+
+                public void Changed(INotifyCollectionChanged sender, NotifyCollectionChangedEventArgs e)
+                {
+                    _target.Select(0);
+                }
+
+                public void PostChanged(INotifyCollectionChanged sender, NotifyCollectionChangedEventArgs e)
+                {
+                }
+
+                public void PreChanged(INotifyCollectionChanged sender, NotifyCollectionChangedEventArgs e)
+                {
+                }
+            }
+        }
+
+        public class SelectedItem
+        {
+            [Fact]
+            public void Setting_SelectedItem_To_Valid_Item_Updates_Selection()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Empty(e.DeselectedItems);
+                    Assert.Equal(new[] { 1 }, e.SelectedIndexes);
+                    Assert.Equal(new[] { "bar" }, e.SelectedItems);
+                    ++raised;
+                };
+
+                target.SelectedItem = "bar";
+
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void PropertyChanged_Is_Raised_When_SelectedIndex_Changes()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedItem))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.SelectedIndex = 1;
+
+                Assert.Equal(1, raised);
+            }
+        }
+
+        public class SelectedIndexes
+        {
+            [Fact]
+            public void PropertyChanged_Is_Raised_When_SelectedIndex_Changes()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedIndexes))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.SelectedIndex = 1;
+
+                Assert.Equal(1, raised);
+            }
+        }
+
+        public class SelectedItems
+        {
+            [Fact]
+            public void PropertyChanged_Is_Raised_When_SelectedIndex_Changes()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedItems))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.SelectedIndex = 1;
+
+                Assert.Equal(1, raised);
+            }
+        }
+
+        public class Select
+        {
+            [Fact]
+            public void Select_Sets_SelectedIndex()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 0;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedIndex))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.Select(1);
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Select_Clears_Old_Selection()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 0;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 0 }, e.DeselectedIndexes);
+                    Assert.Equal(new[] { "foo" }, e.DeselectedItems);
+                    Assert.Equal(new[] { 1 }, e.SelectedIndexes);
+                    Assert.Equal(new[] { "bar" }, e.SelectedItems);
+                    ++raised;
+                };
+
+                target.Select(1);
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal(new[] { 1 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Select_With_Invalid_Index_Does_Nothing()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 0;
+
+                target.PropertyChanged += (s, e) => ++raised;
+                target.SelectionChanged += (s, e) => ++raised;
+
+                target.Select(5);
+
+                Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(new[] { 0 }, target.SelectedIndexes);
+                Assert.Equal("foo", target.SelectedItem);
+                Assert.Equal(new[] { "foo" }, target.SelectedItems);
+                Assert.Equal(0, raised);
+            }
+
+            [Fact]
+            public void Selecting_Already_Selected_Item_Doesnt_Raise_SelectionChanged()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.Select(2);
+                target.SelectionChanged += (s, e) => ++raised;
+                target.Select(2);
+
+                Assert.Equal(0, raised);
+            }
+        }
+
+        public class SelectRange
+        {
+            [Fact]
+            public void SelectRange_Throws()
+            {
+                var target = CreateTarget();
+
+                Assert.Throws<InvalidOperationException>(() => target.SelectRange(0, 10));
+            }
+        }
+
+        public class Deselect
+        {
+            [Fact]
+            public void Deselect_Clears_Current_Selection()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 0;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 0 }, e.DeselectedIndexes);
+                    Assert.Equal(new[] { "foo" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++raised;
+                };
+
+                target.Deselect(0);
+
+                Assert.Equal(-1, target.SelectedIndex);
+                Assert.Empty(target.SelectedIndexes);
+                Assert.Null(target.SelectedItem);
+                Assert.Empty(target.SelectedItems);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Deselect_Does_Nothing_For_Nonselected_Item()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 1;
+                target.SelectionChanged += (s, e) => ++raised;
+                target.Deselect(0);
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal(new[] { 1 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+                Assert.Equal(0, raised);
+            }
+        }
+
+        public class DeselectRange
+        {
+            [Fact]
+            public void DeselectRange_Clears_Current_Selection_For_Intersecting_Range()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 0;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 0 }, e.DeselectedIndexes);
+                    Assert.Equal(new[] { "foo" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++raised;
+                };
+
+                target.DeselectRange(0, 2);
+
+                Assert.Equal(-1, target.SelectedIndex);
+                Assert.Empty(target.SelectedIndexes);
+                Assert.Null(target.SelectedItem);
+                Assert.Empty(target.SelectedItems);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void DeselectRange_Does_Nothing_For_Nonintersecting_Range()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 0;
+                target.SelectionChanged += (s, e) => ++raised;
+                target.DeselectRange(1, 2);
+
+                Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(new[] { 0 }, target.SelectedIndexes);
+                Assert.Equal("foo", target.SelectedItem);
+                Assert.Equal(new[] { "foo" }, target.SelectedItems);
+                Assert.Equal(0, raised);
+            }
+        }
+
+        public class Clear
+        {
+            [Fact]
+            public void Clear_Raises_SelectionChanged()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.Select(1);
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 1 }, e.DeselectedIndexes);
+                    Assert.Equal(new[] { "bar" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++raised;
+                };
+
+                target.Clear();
+
+                Assert.Equal(1, raised);
+            }
+        }
+
+        public class AnchorIndex
+        {
+            [Fact]
+            public void Setting_SelectedIndex_Sets_AnchorIndex()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.AnchorIndex))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.SelectedIndex = 1;
+
+                Assert.Equal(1, target.AnchorIndex);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Setting_SelectedIndex_To_Minus_1_Doesnt_Clear_AnchorIndex()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 1;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.AnchorIndex))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.SelectedIndex = -1;
+
+                Assert.Equal(1, target.AnchorIndex);
+                Assert.Equal(0, raised);
+            }
+
+            [Fact]
+            public void Select_Sets_AnchorIndex()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.AnchorIndex))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.Select(1);
+
+                Assert.Equal(1, target.AnchorIndex);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void Deselect_Doesnt_Clear_AnchorIndex()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.Select(1);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.AnchorIndex))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.Deselect(1);
+
+                Assert.Equal(1, target.AnchorIndex);
+                Assert.Equal(0, raised);
+            }
+
+            [Fact]
+            public void Raises_PropertyChanged()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.AnchorIndex))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.SelectedIndex = 1;
+
+                Assert.Equal(1, raised);
+            }
+        }
+
+        public class SingleSelect
+        {
+            [Fact]
+            public void Converting_To_Multiple_Selection_Preserves_Selection()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 1;
+
+                target.SelectionChanged += (s, e) => ++raised;
+
+                target.SingleSelect = false;
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal(new[] { 1 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+                Assert.Equal(0, raised);
+            }
+
+            [Fact]
+            public void Raises_PropertyChanged()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SingleSelect))
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.SingleSelect = false;
+
+                Assert.Equal(1, raised);
+            }
+        }
+
+        public class CollectionChanges
+        {
+            [Fact]
+            public void Adding_Item_Before_Selected_Item_Updates_Indexes()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var selectionChangedRaised = 0;
+                var indexesChangedRaised = 0;
+                var selectedIndexRaised = 0;
+
+                target.SelectedIndex = 1;
+
+                target.SelectionChanged += (s, e) => ++selectionChangedRaised;
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedIndex))
+                    {
+                        ++selectedIndexRaised;
+                    }
+                };
+
+                target.IndexesChanged += (s, e) =>
+                {
+                    Assert.Equal(0, e.StartIndex);
+                    Assert.Equal(1, e.Delta);
+                    ++indexesChangedRaised;
+                };
+
+                data.Insert(0, "new");
+
+                Assert.Equal(2, target.SelectedIndex);
+                Assert.Equal(new[] { 2 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+                Assert.Equal(2, target.AnchorIndex);
+                Assert.Equal(1, indexesChangedRaised);
+                Assert.Equal(1, selectedIndexRaised);
+                Assert.Equal(0, selectionChangedRaised);
+            }
+
+            [Fact]
+            public void Adding_Item_After_Selected_Doesnt_Raise_Events()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var raised = 0;
+
+                target.SelectedIndex = 1;
+
+                target.PropertyChanged += (s, e) => ++raised;
+                target.SelectionChanged += (s, e) => ++raised;
+                target.IndexesChanged += (s, e) => ++raised;
+
+                data.Insert(2, "new");
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal(new[] { 1 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+                Assert.Equal(1, target.AnchorIndex);
+                Assert.Equal(0, raised);
+            }
+
+            [Fact]
+            public void Removing_Selected_Item_Updates_State()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var selectionChangedRaised = 0;
+                var selectedIndexRaised = 0;
+
+                target.Source = data;
+                target.Select(1);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedIndex))
+                    {
+                        ++selectedIndexRaised;
+                    }
+                };
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Equal(new[] { "bar" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++selectionChangedRaised;
+                };
+
+                data.RemoveAt(1);
+
+                Assert.Equal(-1, target.SelectedIndex);
+                Assert.Empty(target.SelectedIndexes);
+                Assert.Null(target.SelectedItem);
+                Assert.Empty(target.SelectedItems);
+                Assert.Equal(-1, target.AnchorIndex);
+                Assert.Equal(1, selectionChangedRaised);
+                Assert.Equal(1, selectedIndexRaised);
+            }
+
+            [Fact]
+            public void Removing_Item_Before_Selected_Item_Updates_Indexes()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var selectionChangedRaised = 0;
+                var indexesChangedraised = 0;
+
+                target.SelectedIndex = 1;
+
+                target.SelectionChanged += (s, e) => ++selectionChangedRaised;
+
+                target.IndexesChanged += (s, e) =>
+                {
+                    Assert.Equal(0, e.StartIndex);
+                    Assert.Equal(-1, e.Delta);
+                    ++indexesChangedraised;
+                };
+
+                data.RemoveAt(0);
+
+                Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(new[] { 0 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+                Assert.Equal(0, target.AnchorIndex);
+                Assert.Equal(1, indexesChangedraised);
+                Assert.Equal(0, selectionChangedRaised);
+            }
+
+            [Fact]
+            public void Removing_Item_After_Selected_Doesnt_Raise_Events()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var raised = 0;
+
+                target.SelectedIndex = 1;
+
+                target.PropertyChanged += (s, e) => ++raised;
+                target.SelectionChanged += (s, e) => ++raised;
+                target.IndexesChanged += (s, e) => ++raised;
+
+                data.RemoveAt(2);
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal(new[] { 1 }, target.SelectedIndexes);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+                Assert.Equal(1, target.AnchorIndex);
+                Assert.Equal(0, raised);
+            }
+
+            [Fact]
+            public void Replacing_Selected_Item_Updates_State()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var selectionChangedRaised = 0;
+                var selectedIndexRaised = 0;
+                var selectedItemRaised = 0;
+
+                target.Source = data;
+                target.Select(1);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedIndex))
+                    {
+                        ++selectedIndexRaised;
+                    }
+
+                    if (e.PropertyName == nameof(target.SelectedItem))
+                    {
+                        ++selectedItemRaised;
+                    }
+                };
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Equal(new[] { "bar" }, e.DeselectedItems);
+                    Assert.Empty(e.SelectedIndexes);
+                    Assert.Empty(e.SelectedItems);
+                    ++selectionChangedRaised;
+                };
+
+                data[1] = "new";
+
+                Assert.Equal(-1, target.SelectedIndex);
+                Assert.Empty(target.SelectedIndexes);
+                Assert.Null(target.SelectedItem);
+                Assert.Empty(target.SelectedItems);
+                Assert.Equal(-1, target.AnchorIndex);
+                Assert.Equal(1, selectionChangedRaised);
+                Assert.Equal(1, selectedIndexRaised);
+                Assert.Equal(1, selectedItemRaised);
+            }
+
+            [Fact]
+            public void Resetting_Source_Updates_State()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var selectionChangedRaised = 0;
+                var selectedIndexRaised = 0;
+                var resetRaised = 0;
+
+                target.Source = data;
+                target.Select(1);
+
+                target.PropertyChanged += (s, e) =>
+                {
+                    if (e.PropertyName == nameof(target.SelectedIndex))
+                    {
+                        ++selectedIndexRaised;
+                    }
+                };
+
+                target.SelectionChanged += (s, e) => ++selectionChangedRaised;
+                target.SourceReset += (s, e) => ++resetRaised;
+
+                data.Clear();
+
+                Assert.Equal(-1, target.SelectedIndex);
+                Assert.Empty(target.SelectedIndexes);
+                Assert.Null(target.SelectedItem);
+                Assert.Empty(target.SelectedItems);
+                Assert.Equal(-1, target.AnchorIndex);
+                Assert.Equal(0, selectionChangedRaised);
+                Assert.Equal(1, resetRaised);
+                Assert.Equal(1, selectedIndexRaised);
+            }
+
+            [Fact]
+            public void Handles_Selection_Made_In_CollectionChanged()
+            {
+                // Tests the following scenario:
+                //
+                // - Items changes from empty to having 1 item
+                // - ViewModel auto-selects item 0 in CollectionChanged
+                // - SelectionModel receives CollectionChanged
+                // - And so adjusts the selected item from 0 to 1, which is past the end of the items.
+                //
+                // There's not much we can do about this situation because the order in which
+                // CollectionChanged handlers are called can't be known (the problem also exists with
+                // WPF). The best we can do is not select an invalid index.
+                var target = CreateTarget(createData: false);
+                var data = new AvaloniaList<string>();
+
+                data.CollectionChanged += (s, e) =>
+                {
+                    target.Select(0);
+                };
+
+                target.Source = data;
+                data.Add("foo");
+
+                Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(new[] { 0 }, target.SelectedIndexes);
+                Assert.Equal("foo", target.SelectedItem);
+                Assert.Equal(new[] { "foo" }, target.SelectedItems);
+                Assert.Equal(0, target.AnchorIndex);
+            }
+        }
+
+        public class BatchUpdate
+        {
+            [Fact]
+            public void Changes_Do_Not_Take_Effect_Until_EndUpdate_Called()
+            {
+                var target = CreateTarget();
+
+                target.BeginBatchUpdate();
+                target.Select(0);
+
+                Assert.Equal(-1, target.SelectedIndex);
+
+                target.EndBatchUpdate();
+
+                Assert.Equal(0, target.SelectedIndex);
+            }
+
+            [Fact]
+            public void Correctly_Batches_Clear_SelectedIndex()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 2;
+                target.SelectionChanged += (s, e) => ++raised;
+
+                using (target.BatchUpdate())
+                {
+                    target.Clear();
+                    target.SelectedIndex = 2;
+                }
+
+                Assert.Equal(0, raised);
+            }
+        }
+
+        public class LostSelection
+        {
+            [Fact]
+            public void LostSelection_Called_On_Clear()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 1;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 1 }, e.DeselectedIndexes);
+                    Assert.Equal(new[] { "bar" }, e.DeselectedItems);
+                    Assert.Equal(new[] { 0 }, e.SelectedIndexes);
+                    Assert.Equal(new[] { "foo" }, e.SelectedItems);
+                    ++raised;
+                };
+
+                target.LostSelection += (s, e) =>
+                {
+                    target.Select(0);
+                };
+
+                target.Clear();
+
+                Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void LostSelection_Called_When_SelectedItem_Removed()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var raised = 0;
+
+                target.SelectedIndex = 1;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.DeselectedIndexes);
+                    Assert.Equal(new[] { "bar" }, e.DeselectedItems);
+                    Assert.Equal(new[] { 0 }, e.SelectedIndexes);
+                    Assert.Equal(new[] { "foo" }, e.SelectedItems);
+                    ++raised;
+                };
+
+                target.LostSelection += (s, e) =>
+                {
+                    target.Select(0);
+                };
+
+                data.RemoveAt(1);
+
+                Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(1, raised);
+            }
+
+            [Fact]
+            public void LostSelection_Not_Called_With_Old_Source_When_Changing_Source()
+            {
+                var target = CreateTarget();
+                var data = (AvaloniaList<string>)target.Source!;
+                var raised = 0;
+
+                target.LostSelection += (s, e) =>
+                {
+                    if (target.Source == data)
+                    {
+                        ++raised;
+                    }
+                };
+
+                target.Source = null;
+
+                Assert.Equal(0, raised);
+            }
+        }
+
+        public class UntypedInterface
+        {
+            [Fact]
+            public void Raises_Untyped_SelectionChanged_Event()
+            {
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectedIndex = 1;
+
+                ((ISelectionModel)target).SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal(new[] { 1 }, e.DeselectedIndexes);
+                    Assert.Equal(new[] { "bar" }, e.DeselectedItems);
+                    Assert.Equal(new[] { 2 }, e.SelectedIndexes);
+                    Assert.Equal(new[] { "baz" }, e.SelectedItems);
+                    ++raised;
+                };
+
+                target.SelectedIndex = 2;
+
+                Assert.Equal(1, raised);
+            }
+        }
+
+        private static SelectionModel<string?> CreateTarget(bool createData = true)
+        {
+            var result = new SelectionModel<string?> { SingleSelect = true };
+
+            if (createData)
+            {
+                result.Source = new AvaloniaList<string> { "foo", "bar", "baz" };
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/Shapes/EllipseTests.cs b/tests/Avalonia.Controls.UnitTests/Shapes/EllipseTests.cs
new file mode 100644
index 0000000000..626945894f
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/Shapes/EllipseTests.cs
@@ -0,0 +1,57 @@
+using Avalonia.Controls.Shapes;
+using Avalonia.Media;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests.Shapes
+{
+    public class EllipseTests
+    {
+        [Fact]
+        public void Measure_Does_Not_Set_RenderedGeometry_Rect()
+        {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+            
+            var target = new Ellipse();
+
+            target.Measure(new Size(100, 100));
+
+            var geometry = Assert.IsType<EllipseGeometry>(target.RenderedGeometry);
+            Assert.Equal(default, geometry.Rect);
+        }
+
+        [Fact]
+        public void Arrange_Sets_RenderedGeometry_Properties()
+        {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
+            var target = new Ellipse();
+
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            var geometry = Assert.IsType<EllipseGeometry>(target.RenderedGeometry);
+            Assert.Equal(new Rect(0, 0, 100, 100), geometry.Rect);            
+        }
+
+        [Fact]
+        public void Rearranging_Updates_RenderedGeometry_Rect()
+        {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
+            var target = new Ellipse();
+
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            var geometry = Assert.IsType<EllipseGeometry>(target.RenderedGeometry);
+            Assert.Equal(new Rect(0, 0, 100, 100), geometry.Rect);
+
+            target.Measure(new Size(200, 200));
+            target.Arrange(new Rect(0, 0, 200, 200));
+
+            geometry = Assert.IsType<EllipseGeometry>(target.RenderedGeometry);
+            Assert.Equal(new Rect(0, 0, 200, 200), geometry.Rect);
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/Shapes/PathTests.cs b/tests/Avalonia.Controls.UnitTests/Shapes/PathTests.cs
index 05224c2495..8b8656a76b 100644
--- a/tests/Avalonia.Controls.UnitTests/Shapes/PathTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Shapes/PathTests.cs
@@ -1,4 +1,6 @@
 using Avalonia.Controls.Shapes;
+using Avalonia.Media;
+using Avalonia.UnitTests;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests.Shapes
@@ -12,5 +14,169 @@ namespace Avalonia.Controls.UnitTests.Shapes
 
             target.Measure(Size.Infinity);
         }
+
+        [Fact]
+        public void Subscribes_To_Geometry_Changes()
+        {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
+            var geometry = new EllipseGeometry { Rect = new Rect(0, 0, 10, 10) };
+            var target = new Path { Data = geometry };
+
+            var root = new TestRoot(target);
+
+            target.Measure(Size.Infinity);
+            Assert.True(target.IsMeasureValid);
+
+            geometry.Rect = new Rect(0, 0, 20, 20);
+
+            Assert.False(target.IsMeasureValid);
+
+            root.Child = null;
+        }
+
+        [Theory]
+        [InlineData(Stretch.None, 100, 200)]
+        [InlineData(Stretch.Fill, 500, 500)]
+        [InlineData(Stretch.Uniform, 250, 500)]
+        [InlineData(Stretch.UniformToFill, 500, 500)]
+        public void Calculates_Correct_DesiredSize_For_Finite_Bounds(Stretch stretch, double expectedWidth, double expectedHeight)
+        {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
+            var target = new Path()
+            {
+                Data = new RectangleGeometry { Rect = new Rect(0, 0, 100, 200) },
+                Stretch = stretch,
+            };
+
+            target.Measure(new Size(500, 500));
+
+            Assert.Equal(new Size(expectedWidth, expectedHeight), target.DesiredSize);
+        }
+
+        [Theory]
+        [InlineData(Stretch.None)]
+        [InlineData(Stretch.Fill)]
+        [InlineData(Stretch.Uniform)]
+        [InlineData(Stretch.UniformToFill)]
+        public void Calculates_Correct_DesiredSize_For_Infinite_Bounds(Stretch stretch)
+        {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
+            var target = new Path()
+            {
+                Data = new RectangleGeometry { Rect = new Rect(0, 0, 100, 200) },
+                Stretch = stretch,
+            };
+
+            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+
+            Assert.Equal(new Size(100, 200), target.DesiredSize);
+        }
+
+        [Fact]
+        public void Measure_Does_Not_Update_RenderedGeometry_Transform()
+        {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
+            var target = new Path
+            {
+                Data = new RectangleGeometry { Rect = new Rect(0, 0, 100, 200) },
+                Stretch = Stretch.Fill,
+            };
+
+            target.Measure(new Size(500, 500));
+
+            Assert.Null(target.RenderedGeometry.Transform);
+        }
+
+        [Theory]
+        [InlineData(Stretch.None, 1, 1)]
+        [InlineData(Stretch.Fill, 5, 2.5)]
+        [InlineData(Stretch.Uniform, 2.5, 2.5)]
+        [InlineData(Stretch.UniformToFill, 5, 5)]
+        public void Arrange_Updates_RenderedGeometry_Transform(Stretch stretch, double expectedScaleX, double expectedScaleY)
+        {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
+            var target = new Path
+            {
+                Data = new RectangleGeometry { Rect = new Rect(0, 0, 100, 200) },
+                Stretch = stretch,
+            };
+
+            target.Measure(new Size(500, 500));
+            target.Arrange(new Rect(0, 0, 500, 500));
+
+            if (expectedScaleX == 1 && expectedScaleY == 1)
+            {
+                Assert.Null(target.RenderedGeometry.Transform);
+            }
+            else
+            {
+                Assert.Equal(Matrix.CreateScale(expectedScaleX, expectedScaleY), target.RenderedGeometry.Transform.Value);
+            }
+        }
+
+        [Fact]
+        public void Arrange_Reserves_All_Of_Arrange_Rect()
+        {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
+            RectangleGeometry geometry;
+            var target = new Path
+            {
+                Data = geometry = new RectangleGeometry { Rect = new Rect(0, 0, 100, 200) },
+                Stretch = Stretch.Uniform,
+            };
+
+            target.Measure(new Size(400, 400));
+            target.Arrange(new Rect(0, 0, 400, 400));
+
+            Assert.Equal(new Rect(0, 0, 100, 200), geometry.Rect);
+            Assert.Equal(Matrix.CreateScale(2, 2), target.RenderedGeometry.Transform.Value);
+            Assert.Equal(new Rect(0, 0, 400, 400), target.Bounds);
+        }
+
+        [Fact]
+        public void Measure_Without_Arrange_Does_Not_Clear_RenderedGeometry_Transform()
+        {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
+            var target = new Path
+            {
+                Data = new RectangleGeometry { Rect = new Rect(0, 0, 100, 100) },
+                Stretch = Stretch.Fill,
+            };
+
+            target.Measure(new Size(200, 200));
+            target.Arrange(new Rect(0, 0, 200, 200));
+
+            Assert.Equal(Matrix.CreateScale(2, 2), target.RenderedGeometry.Transform.Value);
+
+            target.Measure(new Size(300, 300));
+
+            Assert.Equal(Matrix.CreateScale(2, 2), target.RenderedGeometry.Transform.Value);
+        }
+
+        [Fact]
+        public void Arrange_Without_Measure_Updates_RenderedGeometry_Transform()
+        {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
+            var target = new Path 
+            { 
+                Data = new RectangleGeometry { Rect = new Rect(0, 0, 100, 100) },
+                Stretch = Stretch.Fill,
+            };
+
+            target.Measure(new Size(200, 200));
+            target.Arrange(new Rect(0, 0, 200, 200));
+            Assert.Equal(Matrix.CreateScale(2, 2), target.RenderedGeometry.Transform.Value);
+
+            target.Arrange(new Rect(0, 0, 300, 300));
+            Assert.Equal(Matrix.CreateScale(3, 3), target.RenderedGeometry.Transform.Value);
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/Shapes/RectangleTests.cs b/tests/Avalonia.Controls.UnitTests/Shapes/RectangleTests.cs
index 0ec73edec0..8d8ce10d4c 100644
--- a/tests/Avalonia.Controls.UnitTests/Shapes/RectangleTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Shapes/RectangleTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Avalonia.Controls.Shapes;
+using Avalonia.Controls.Shapes;
 using Avalonia.Media;
 using Avalonia.UnitTests;
 using Moq;
@@ -11,6 +8,53 @@ namespace Avalonia.Controls.UnitTests.Shapes
 {
     public class RectangleTests
     {
+        [Fact]
+        public void Measure_Does_Not_Set_RenderedGeometry_Rect()
+        {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
+            var target = new Rectangle();
+
+            target.Measure(new Size(100, 100));
+
+            var geometry = Assert.IsType<RectangleGeometry>(target.RenderedGeometry);
+            Assert.Equal(Rect.Empty, geometry.Rect);
+        }
+
+        [Fact]
+        public void Arrange_Sets_RenderedGeometry_Rect()
+        {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
+            var target = new Rectangle();
+
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            var geometry = Assert.IsType<RectangleGeometry>(target.RenderedGeometry);
+            Assert.Equal(new Rect(0, 0, 100, 100), geometry.Rect);
+        }
+
+        [Fact]
+        public void Rearranging_Updates_RenderedGeometry_Rect()
+        {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
+            var target = new Rectangle();
+
+            target.Measure(new Size(100, 100));
+            target.Arrange(new Rect(0, 0, 100, 100));
+
+            var geometry = Assert.IsType<RectangleGeometry>(target.RenderedGeometry);
+            Assert.Equal(new Rect(0, 0, 100, 100), geometry.Rect);
+
+            target.Measure(new Size(200, 200));
+            target.Arrange(new Rect(0, 0, 200, 200));
+
+            geometry = Assert.IsType<RectangleGeometry>(target.RenderedGeometry);
+            Assert.Equal(new Rect(0, 0, 200, 200), geometry.Rect);
+        }
+
         [Fact]
         public void Changing_Fill_Brush_Color_Should_Invalidate_Visual()
         {
@@ -21,7 +65,7 @@ namespace Avalonia.Controls.UnitTests.Shapes
 
             var root = new TestRoot(target);
             var renderer = Mock.Get(root.Renderer);
-            renderer.ResetCalls();
+            renderer.Invocations.Clear();
 
             ((SolidColorBrush)target.Fill).Color = Colors.Green;
 
@@ -38,7 +82,7 @@ namespace Avalonia.Controls.UnitTests.Shapes
 
             var root = new TestRoot(target);
             var renderer = Mock.Get(root.Renderer);
-            renderer.ResetCalls();
+            renderer.Invocations.Clear();
 
             ((SolidColorBrush)target.Stroke).Color = Colors.Green;
 
diff --git a/tests/Avalonia.Controls.UnitTests/SplitViewTests.cs b/tests/Avalonia.Controls.UnitTests/SplitViewTests.cs
new file mode 100644
index 0000000000..03653ec42c
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/SplitViewTests.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests
+{
+    
+    public class SplitViewTests
+    {
+        [Fact]
+        public void SplitView_PaneOpening_Should_Fire_Before_PaneOpened()
+        {
+            var splitView = new SplitView();
+
+            bool handledOpening = false;
+            splitView.PaneOpening += (x, e) =>
+            {
+                handledOpening = true;
+            };
+
+            splitView.PaneOpened += (x, e) =>
+            {
+                Assert.True(handledOpening);
+            };
+
+            splitView.IsPaneOpen = true;
+        }
+
+        [Fact]
+        public void SplitView_PaneClosing_Should_Fire_Before_PaneClosed()
+        {
+            var splitView = new SplitView();
+            splitView.IsPaneOpen = true;
+
+            bool handledClosing = false;
+            splitView.PaneClosing += (x, e) =>
+            {
+                handledClosing = true;
+            };
+
+            splitView.PaneClosed += (x, e) =>
+            {
+                Assert.True(handledClosing);
+            };
+
+            splitView.IsPaneOpen = false;
+        }
+
+        [Fact]
+        public void SplitView_Cancel_Close_Should_Prevent_Pane_From_Closing()
+        {
+            var splitView = new SplitView();
+            splitView.IsPaneOpen = true;
+
+            splitView.PaneClosing += (x, e) =>
+            {
+                e.Cancel = true;
+            };
+
+            splitView.IsPaneOpen = false;
+
+            Assert.True(splitView.IsPaneOpen);
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/StackPanelTests.cs b/tests/Avalonia.Controls.UnitTests/StackPanelTests.cs
index 984734d414..101bf044e8 100644
--- a/tests/Avalonia.Controls.UnitTests/StackPanelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/StackPanelTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Linq;
 using Avalonia.Layout;
 using Xunit;
diff --git a/tests/Avalonia.Controls.UnitTests/TabControlTests.cs b/tests/Avalonia.Controls.UnitTests/TabControlTests.cs
index a9e86d71ee..e6f7ac601f 100644
--- a/tests/Avalonia.Controls.UnitTests/TabControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TabControlTests.cs
@@ -1,14 +1,14 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using Avalonia.Collections;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
+using Avalonia.Controls.Utils;
 using Avalonia.LogicalTree;
+using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Xunit;
@@ -95,7 +95,7 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void Removal_Should_Set_Next_Tab()
+        public void Removal_Should_Set_First_Tab()
         {
             var collection = new ObservableCollection<TabItem>()
             {
@@ -122,14 +122,87 @@ namespace Avalonia.Controls.UnitTests
                 Items = collection,
             };
 
-            target.ApplyTemplate();
+            Prepare(target);
             target.SelectedItem = collection[1];
-            collection.RemoveAt(1);
 
-            // compare with former [2] now [1] == "3rd"
             Assert.Same(collection[1], target.SelectedItem);
+            Assert.Equal(collection[1].Content, target.SelectedContent);
+
+            collection.RemoveAt(1);
+
+            Assert.Same(collection[0], target.SelectedItem);
+            Assert.Equal(collection[0].Content, target.SelectedContent);
+        }
+
+        [Fact]
+        public void Removal_Should_Set_New_Item0_When_Item0_Selected()
+        {
+            var collection = new ObservableCollection<TabItem>()
+            {
+                new TabItem
+                {
+                    Name = "first",
+                    Content = "foo",
+                },
+                new TabItem
+                {
+                    Name = "second",
+                    Content = "bar",
+                },
+                new TabItem
+                {
+                    Name = "3rd",
+                    Content = "barf",
+                },
+            };
+
+            var target = new TabControl
+            {
+                Template = TabControlTemplate(),
+                Items = collection,
+            };
+
+            Prepare(target);
+            target.SelectedItem = collection[0];
+
+            Assert.Same(collection[0], target.SelectedItem);
+            Assert.Equal(collection[0].Content, target.SelectedContent);
+
+            collection.RemoveAt(0);
+
+            Assert.Same(collection[0], target.SelectedItem);
+            Assert.Equal(collection[0].Content, target.SelectedContent);
         }
 
+        [Fact]
+        public void Removal_Should_Set_New_Item0_When_Item0_Selected_With_DataTemplate()
+        {
+            using var app = UnitTestApplication.Start(TestServices.StyledWindow);
+
+            var collection = new ObservableCollection<Item>()
+            {
+                new Item("first"),
+                new Item("second"),
+                new Item("3rd"),
+            };
+
+            var target = new TabControl
+            {
+                Template = TabControlTemplate(),
+                Items = collection,
+            };
+
+            Prepare(target);
+            target.SelectedItem = collection[0];
+
+            Assert.Same(collection[0], target.SelectedItem);
+            Assert.Equal(collection[0], target.SelectedContent);
+
+            collection.RemoveAt(0);
+
+            Assert.Same(collection[0], target.SelectedItem);
+            Assert.Equal(collection[0], target.SelectedContent);
+        }
 
         [Fact]
         public void TabItem_Templates_Should_Be_Set_Before_TabItem_ApplyTemplate()
@@ -163,7 +236,7 @@ namespace Avalonia.Controls.UnitTests
                     {
                         new Style(x => x.OfType<TabItem>())
                         {
-                            Setters = new[]
+                            Setters =
                             {
                                 new Setter(TemplatedControl.TemplateProperty, template)
                             }
@@ -330,6 +403,27 @@ namespace Avalonia.Controls.UnitTests
             Assert.NotEqual(dataContext, tabItem.Content);
         }
 
+        [Fact]
+        public void Can_Have_Empty_Tab_Control()
+        {
+            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'>
+    <TabControl Name='tabs' Items='{Binding Tabs}'/>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var tabControl = window.FindControl<TabControl>("tabs");
+
+                tabControl.DataContext = new { Tabs = new List<string>() };
+                window.ApplyTemplate();
+
+                Assert.Equal(0, tabControl.Items.Count());
+            }
+        }
+
         private IControlTemplate TabControlTemplate()
         {
             return new FuncControlTemplate<TabControl>((parent, scope) =>
@@ -364,6 +458,13 @@ namespace Avalonia.Controls.UnitTests
                 }.RegisterInNameScope(scope));
         }
 
+        private void Prepare(TabControl target)
+        {
+            ApplyTemplate(target);
+            target.Measure(Size.Infinity);
+            target.Arrange(new Rect(target.DesiredSize));
+        }
+
         private void ApplyTemplate(TabControl target)
         {
             target.ApplyTemplate();
diff --git a/tests/Avalonia.Controls.UnitTests/Templates/TemplateExtensionsTests.cs b/tests/Avalonia.Controls.UnitTests/Templates/TemplateExtensionsTests.cs
index df8a0f723a..8789d79742 100644
--- a/tests/Avalonia.Controls.UnitTests/Templates/TemplateExtensionsTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Templates/TemplateExtensionsTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Linq;
 using Avalonia.Controls.UnitTests;
 using Xunit;
diff --git a/tests/Avalonia.Controls.UnitTests/TestTemplatedControl.cs b/tests/Avalonia.Controls.UnitTests/TestTemplatedControl.cs
index 532cb6cded..7636ad9db9 100644
--- a/tests/Avalonia.Controls.UnitTests/TestTemplatedControl.cs
+++ b/tests/Avalonia.Controls.UnitTests/TestTemplatedControl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Primitives;
 using Avalonia.VisualTree;
 
@@ -15,9 +12,8 @@ namespace Avalonia.Controls.UnitTests
             VisualChildren.Add(visual);
         }
 
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
-            base.OnTemplateApplied(e);
             OnTemplateAppliedCalled = true;
         }
     }
diff --git a/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs b/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
index 45e683455b..b180a536a5 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Data;
 using Avalonia.Media;
 using Avalonia.Rendering;
@@ -40,7 +37,7 @@ namespace Avalonia.Controls.UnitTests
 
             var root = new TestRoot(target);
             var renderer = Mock.Get(root.Renderer);
-            renderer.ResetCalls();
+            renderer.Invocations.Clear();
 
             ((SolidColorBrush)target.Background).Color = Colors.Green;
 
@@ -57,7 +54,7 @@ namespace Avalonia.Controls.UnitTests
 
             var root = new TestRoot(target);
             var renderer = Mock.Get(root.Renderer);
-            renderer.ResetCalls();
+            renderer.Invocations.Clear();
 
             ((SolidColorBrush)target.Foreground).Color = Colors.Green;
 
diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
index 225eca17b2..fe25fa7346 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
@@ -1,13 +1,12 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
+using System.Threading.Tasks;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.UnitTests;
@@ -18,6 +17,46 @@ namespace Avalonia.Controls.UnitTests
 {
     public class TextBoxTests
     {
+        [Fact]
+        public void Opening_Context_Menu_Does_not_Lose_Selection()
+        {
+            using (UnitTestApplication.Start(FocusServices))
+            {
+                var target1 = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "1234",
+                    ContextMenu = new TestContextMenu()
+                };
+
+                var target2 = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "5678"
+                };
+                
+                var sp = new StackPanel();
+                sp.Children.Add(target1);
+                sp.Children.Add(target2);
+
+                target1.ApplyTemplate();
+                target2.ApplyTemplate();
+                
+                var root = new TestRoot() { Child = sp };
+
+                target1.SelectionStart = 0;
+                target1.SelectionEnd = 3;
+                
+                target1.Focus();
+                Assert.False(target2.IsFocused);
+                Assert.True(target1.IsFocused);
+
+                target2.Focus();
+                
+                Assert.Equal("123", target1.SelectedText);
+            }
+        }
+        
         [Fact]
         public void DefaultBindingMode_Should_Be_TwoWay()
         {
@@ -385,6 +424,85 @@ namespace Avalonia.Controls.UnitTests
                 Assert.True(target.SelectionEnd <= "123".Length);
             }
         }
+
+        [Fact]
+        public void SelectedText_Changes_OnSelectionChange()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "0123456789"
+                };
+
+                Assert.True(target.SelectedText == "");
+
+                target.SelectionStart = 2;
+                target.SelectionEnd = 4;
+
+                Assert.True(target.SelectedText == "23");
+            }
+        }
+
+        [Fact]
+        public void SelectedText_EditsText()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "0123"
+                };
+
+                target.SelectedText = "AA";
+                Assert.True(target.Text == "AA0123");
+
+                target.SelectionStart = 1;
+                target.SelectionEnd = 3;
+                target.SelectedText = "BB";
+
+                Assert.True(target.Text == "ABB123");
+            }
+        }
+
+        [Fact]
+        public void SelectedText_CanClearText()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "0123"
+                };
+                target.SelectionStart = 1;
+                target.SelectionEnd = 3;
+                target.SelectedText = "";
+
+                Assert.True(target.Text == "03");
+            }
+        }
+
+        [Fact]
+        public void SelectedText_NullClearsText()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "0123"
+                };
+                target.SelectionStart = 1;
+                target.SelectionEnd = 3;
+                target.SelectedText = null;
+
+                Assert.True(target.Text == "03");
+            }
+        }
+
         [Fact]
         public void CoerceCaretIndex_Doesnt_Cause_Exception_with_malformed_line_ending()
         {
@@ -443,6 +561,75 @@ namespace Avalonia.Controls.UnitTests
                 Assert.Equal(1, lfcount);
             }
         }
+        
+        [Fact]
+        public void TextBox_CaretIndex_Persists_When_Focus_Lost()
+        {
+            using (UnitTestApplication.Start(FocusServices))
+            {
+                var target1 = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "1234"
+                };
+                var target2 = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "5678"
+                };
+                var sp = new StackPanel();
+                sp.Children.Add(target1);
+                sp.Children.Add(target2);
+
+                target1.ApplyTemplate();
+                target2.ApplyTemplate();
+                
+                var root = new TestRoot { Child = sp };
+
+                target2.Focus();
+                target2.CaretIndex = 2;
+                Assert.False(target1.IsFocused);
+                Assert.True(target2.IsFocused);
+
+                target1.Focus();
+                
+                Assert.Equal(2, target2.CaretIndex);
+            }
+        }
+        
+        [Fact]
+        public void TextBox_Reveal_Password_Reset_When_Lost_Focus()
+        {
+            using (UnitTestApplication.Start(FocusServices))
+            {
+                var target1 = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "1234",
+                    PasswordChar = '*'
+                };
+                var target2 = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "5678"
+                };
+                var sp = new StackPanel();
+                sp.Children.Add(target1);
+                sp.Children.Add(target2);
+
+                target1.ApplyTemplate();
+                target2.ApplyTemplate();
+                
+                var root = new TestRoot { Child = sp };
+
+                target1.Focus();
+                target1.RevealPassword = true;
+                
+                target2.Focus();
+                
+                Assert.False(target1.RevealPassword);
+            }
+        }
 
         [Fact]
         public void Setting_Bound_Text_To_Null_Works()
@@ -478,6 +665,34 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Theory]
+        [InlineData(Key.X, KeyModifiers.Control)]
+        [InlineData(Key.Back, KeyModifiers.None)]
+        [InlineData(Key.Delete, KeyModifiers.None)]
+        [InlineData(Key.Tab, KeyModifiers.None)]
+        [InlineData(Key.Enter, KeyModifiers.None)]
+        public void Keys_Allow_Undo(Key key, KeyModifiers modifiers)
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "0123",
+                    AcceptsReturn = true,
+                    AcceptsTab = true
+                };
+                target.SelectionStart = 1;
+                target.SelectionEnd = 3;
+                AvaloniaLocator.CurrentMutable
+                    .Bind<Input.Platform.IClipboard>().ToSingleton<ClipboardStub>();
+
+                RaiseKeyEvent(target, key, modifiers);
+                RaiseKeyEvent(target, Key.Z, KeyModifiers.Control); // undo
+                Assert.True(target.Text == "0123");
+            }
+        }
+
         private static TestServices FocusServices => TestServices.MockThreadingInterface.With(
             focusManager: new FocusManager(),
             keyboardDevice: () => new KeyboardDevice(),
@@ -540,5 +755,27 @@ namespace Avalonia.Controls.UnitTests
                 set { _bar = value; RaisePropertyChanged(); }
             }
         }
+
+        private class ClipboardStub : IClipboard // in order to get tests working that use the clipboard
+        {
+            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)null);
+        }
+        
+        private class TestContextMenu : ContextMenu
+        {
+            public TestContextMenu()
+            {
+                IsOpen = true;
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs
index 0f4a0759aa..78b6bf01ec 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
diff --git a/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs b/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs
new file mode 100644
index 0000000000..682f0eaadb
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs
@@ -0,0 +1,173 @@
+using System;
+using System.Linq;
+using Avalonia.Controls.Shapes;
+using Avalonia.Controls.Templates;
+using Avalonia.Platform;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests
+{
+    public class TimePickerTests
+    {
+        [Fact]
+        public void SelectedTimeChanged_Should_Fire_When_SelectedTime_Set()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                bool handled = false;
+                TimePicker timePicker = new TimePicker();
+                timePicker.SelectedTimeChanged += (s, e) =>
+                {
+                    handled = true;
+                };
+                TimeSpan value = TimeSpan.FromHours(10);
+                timePicker.SelectedTime = value;
+                Threading.Dispatcher.UIThread.RunJobs();
+                Assert.True(handled);
+            }
+        }
+
+        [Fact]
+        public void Using_24HourClock_Should_Hide_Period()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                TimePicker timePicker = new TimePicker()
+                {
+                    ClockIdentifier = "12HourClock",
+                    Template = CreateTemplate()
+                };
+                timePicker.ApplyTemplate();
+
+                var desc = timePicker.GetVisualDescendants();
+                Assert.True(desc.Count() > 1);//Should be layoutroot grid & button
+                Grid container = null;
+
+                Assert.True(desc.ElementAt(1) is Button);
+
+                container = (desc.ElementAt(1) as Button).Content as Grid;
+                Assert.True(container != null);
+
+                var periodTextHost = container.Children[4] as Border;
+                Assert.True(periodTextHost != null);
+                Assert.True(periodTextHost.IsVisible);
+
+                timePicker.ClockIdentifier = "24HourClock";
+                Assert.False(periodTextHost.IsVisible);
+            }
+        }
+
+        [Fact]
+        public void SelectedTime_null_Should_Use_Placeholders()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                TimePicker timePicker = new TimePicker()
+                {
+                    Template = CreateTemplate()
+                };
+                timePicker.ApplyTemplate();
+
+                var desc = timePicker.GetVisualDescendants();
+                Assert.True(desc.Count() > 1);//Should be layoutroot grid & button
+                Grid container = null;
+
+                Assert.True(desc.ElementAt(1) is Button);
+
+                container = (desc.ElementAt(1) as Button).Content as Grid;
+                Assert.True(container != null);
+
+                var hourTextHost = container.Children[0] as Border;
+                Assert.True(hourTextHost != null);
+                var hourText = hourTextHost.Child as TextBlock;
+                var minuteTextHost = container.Children[2] as Border;
+                Assert.True(minuteTextHost != null);
+                var minuteText = minuteTextHost.Child as TextBlock;
+
+                TimeSpan ts = TimeSpan.FromHours(10);
+                timePicker.SelectedTime = ts;
+                Assert.False(hourText.Text == "hour");
+                Assert.False(minuteText.Text == "minute");
+
+                timePicker.SelectedTime = null;
+                Assert.True(hourText.Text == "hour");
+                Assert.True(minuteText.Text == "minute");
+            }
+        }
+
+        private static TestServices Services => TestServices.MockThreadingInterface.With(
+            fontManagerImpl: new MockFontManagerImpl(),
+            standardCursorFactory: Mock.Of<IStandardCursorFactory>(),
+            textShaperImpl: new MockTextShaperImpl());
+
+        private IControlTemplate CreateTemplate()
+        {
+            return new FuncControlTemplate((control, scope) =>
+            {
+                var layoutRoot = new Grid
+                {
+                    Name = "LayoutRoot"
+                }.RegisterInNameScope(scope);
+                //Skip contentpresenter
+                var flyoutButton = new Button
+                {
+                    Name = "FlyoutButton"
+                }.RegisterInNameScope(scope);
+                var contentGrid = new Grid
+                {
+                    Name = "FlyoutButtonContentGrid"
+                }.RegisterInNameScope(scope);
+
+                var firstPickerHost = new Border
+                {
+                    Name = "FirstPickerHost",
+                    Child = new TextBlock
+                    {
+                        Name = "HourTextBlock"
+                    }.RegisterInNameScope(scope)
+                }.RegisterInNameScope(scope);
+                Grid.SetColumn(firstPickerHost, 0);
+
+                var secondPickerHost = new Border
+                {
+                    Name = "SecondPickerHost",
+                    Child = new TextBlock
+                    {
+                        Name = "MinuteTextBlock"
+                    }.RegisterInNameScope(scope)
+                }.RegisterInNameScope(scope);
+                Grid.SetColumn(secondPickerHost, 2);
+
+                var thirdPickerHost = new Border
+                {
+                    Name = "ThirdPickerHost",
+                    Child = new TextBlock
+                    {
+                        Name = "PeriodTextBlock"
+                    }.RegisterInNameScope(scope)
+                }.RegisterInNameScope(scope);
+                Grid.SetColumn(thirdPickerHost, 4);
+
+                var firstSpacer = new Rectangle
+                {
+                    Name = "FirstColumnDivider"
+                }.RegisterInNameScope(scope);
+                Grid.SetColumn(firstSpacer, 1);
+
+                var secondSpacer = new Rectangle
+                {
+                    Name = "SecondColumnDivider"
+                }.RegisterInNameScope(scope);
+                Grid.SetColumn(secondSpacer, 3);
+
+                contentGrid.Children.AddRange(new IControl[] { firstPickerHost, firstSpacer, secondPickerHost, secondSpacer, thirdPickerHost });
+                flyoutButton.Content = contentGrid;
+                layoutRoot.Children.Add(flyoutButton);
+                return layoutRoot;
+            });
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/ToolTipTests.cs b/tests/Avalonia.Controls.UnitTests/ToolTipTests.cs
index 362dd6d111..9279e78013 100644
--- a/tests/Avalonia.Controls.UnitTests/ToolTipTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ToolTipTests.cs
@@ -1,8 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Disposables;
+using Avalonia.Markup.Xaml;
 using Avalonia.Platform;
 using Avalonia.Threading;
 using Avalonia.UnitTests;
@@ -33,6 +31,73 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.False(ToolTip.GetIsOpen(control));
         }
+        
+        [Fact]
+        public void Should_Close_When_Control_Detaches()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var window = new Window();
+
+                var panel = new Panel();
+                
+                var target = new Decorator()
+                {
+                    [ToolTip.TipProperty] = "Tip",
+                    [ToolTip.ShowDelayProperty] = 0
+                };
+                
+                panel.Children.Add(target);
+
+                window.Content = panel;
+
+                window.ApplyTemplate();
+                window.Presenter.ApplyTemplate();
+
+                Assert.True((target as IVisual).IsAttachedToVisualTree);                               
+
+                _mouseHelper.Enter(target);
+
+                Assert.True(ToolTip.GetIsOpen(target));
+                
+                panel.Children.Remove(target);
+                
+                Assert.False(ToolTip.GetIsOpen(target));
+            }
+        }
+        
+        [Fact]
+        public void Should_Close_When_Tip_Is_Opened_And_Detached_From_Visual_Tree()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Panel x:Name='PART_panel'>
+        <Decorator x:Name='PART_target' ToolTip.Tip='{Binding Tip}' ToolTip.ShowDelay='0' />
+    </Panel>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                
+                window.DataContext = new ToolTipViewModel();
+                window.ApplyTemplate();
+                window.Presenter.ApplyTemplate();
+
+                var target = window.Find<Decorator>("PART_target");
+                var panel = window.Find<Panel>("PART_panel");
+                
+                Assert.True((target as IVisual).IsAttachedToVisualTree);                               
+
+                _mouseHelper.Enter(target);
+
+                Assert.True(ToolTip.GetIsOpen(target));
+
+                panel.Children.Remove(target);
+                
+                Assert.False(ToolTip.GetIsOpen(target));
+            }
+        }
 
         [Fact]
         public void Should_Open_On_Pointer_Enter()
@@ -59,6 +124,35 @@ namespace Avalonia.Controls.UnitTests
                 Assert.True(ToolTip.GetIsOpen(target));
             }
         }
+        
+        [Fact]
+        public void Content_Should_Update_When_Tip_Property_Changes_And_Already_Open()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var window = new Window();
+
+                var target = new Decorator()
+                {
+                    [ToolTip.TipProperty] = "Tip",
+                    [ToolTip.ShowDelayProperty] = 0
+                };
+
+                window.Content = target;
+
+                window.ApplyTemplate();
+                window.Presenter.ApplyTemplate();
+
+                _mouseHelper.Enter(target);
+
+                Assert.True(ToolTip.GetIsOpen(target));
+                Assert.Equal("Tip", target.GetValue(ToolTip.ToolTipProperty).Content);
+                
+                
+                ToolTip.SetTip(target, "Tip1");
+                Assert.Equal("Tip1", target.GetValue(ToolTip.ToolTipProperty).Content);
+            }
+        }
 
         [Fact]
         public void Should_Open_On_Pointer_Enter_With_Delay()
@@ -105,5 +199,81 @@ namespace Avalonia.Controls.UnitTests
                 Assert.True(ToolTip.GetIsOpen(target));
             }
         }
+
+        [Fact]
+        public void Open_Class_Should_Not_Initially_Be_Added()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var toolTip = new ToolTip();
+                var window = new Window();
+
+                var decorator = new Decorator()
+                {
+                    [ToolTip.TipProperty] = toolTip
+                };
+
+                window.Content = decorator;
+
+                window.ApplyTemplate();
+                window.Presenter.ApplyTemplate();
+
+                Assert.Empty(toolTip.Classes);
+            }
+        }
+
+        [Fact]
+        public void Setting_IsOpen_Should_Add_Open_Class()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var toolTip = new ToolTip();
+                var window = new Window();
+
+                var decorator = new Decorator()
+                {
+                    [ToolTip.TipProperty] = toolTip
+                };
+
+                window.Content = decorator;
+
+                window.ApplyTemplate();
+                window.Presenter.ApplyTemplate();
+
+                ToolTip.SetIsOpen(decorator, true);
+
+                Assert.Equal(new[] { ":open" }, toolTip.Classes);
+            }
+        }
+
+        [Fact]
+        public void Clearing_IsOpen_Should_Remove_Open_Class()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var toolTip = new ToolTip();
+                var window = new Window();
+
+                var decorator = new Decorator()
+                {
+                    [ToolTip.TipProperty] = toolTip
+                };
+
+                window.Content = decorator;
+
+                window.ApplyTemplate();
+                window.Presenter.ApplyTemplate();
+
+                ToolTip.SetIsOpen(decorator, true);
+                ToolTip.SetIsOpen(decorator, false);
+
+                Assert.Empty(toolTip.Classes);
+            }
+        }
+    }
+
+    internal class ToolTipViewModel
+    {
+        public string Tip => "Tip";
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs b/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
index 72c81659c3..6b30aed257 100644
--- a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
@@ -9,6 +6,7 @@ using Avalonia.Input.Raw;
 using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.Platform;
+using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Moq;
 using Xunit;
@@ -95,7 +93,7 @@ namespace Avalonia.Controls.UnitTests
             {
                 var impl = new Mock<ITopLevelImpl>();
                 impl.SetupProperty(x => x.Resized);
-                impl.SetupGet(x => x.Scaling).Returns(1);
+                impl.SetupGet(x => x.RenderScaling).Returns(1);
 
                 var target = new TestTopLevel(impl.Object)
                 {
@@ -108,7 +106,7 @@ namespace Avalonia.Controls.UnitTests
                     }
                 };
 
-                target.LayoutManager.ExecuteInitialLayoutPass(target);
+                target.LayoutManager.ExecuteInitialLayoutPass();
 
                 Assert.Equal(new Rect(0, 0, 321, 432), target.Bounds);
             }
@@ -166,6 +164,31 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void Impl_Close_Should_Raise_DetachedFromLogicalTree_Event()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var impl = new Mock<ITopLevelImpl>();
+                impl.SetupAllProperties();
+
+                var target = new TestTopLevel(impl.Object);
+                var raised = 0;
+
+                target.DetachedFromLogicalTree += (s, e) =>
+                {
+                    Assert.Same(target, e.Root);
+                    Assert.Same(target, e.Source);
+                    Assert.Null(e.Parent);
+                    ++raised;
+                };
+
+                impl.Object.Closed();
+
+                Assert.Equal(1, raised);
+            }
+        }
+
         [Fact]
         public void Impl_Input_Should_Pass_Input_To_InputManager()
         {
@@ -244,6 +267,61 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void Close_Should_Dispose_LayoutManager()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var impl = new Mock<ITopLevelImpl>();
+                impl.SetupAllProperties();
+
+                var layoutManager = new Mock<ILayoutManager>();
+                var target = new TestTopLevel(impl.Object, layoutManager.Object);
+
+                impl.Object.Closed();
+
+                layoutManager.Verify(x => x.Dispose());
+            }
+        }
+
+        [Fact]
+        public void Reacts_To_Changes_In_Global_Styles()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var impl = new Mock<ITopLevelImpl>();
+                impl.SetupGet(x => x.RenderScaling).Returns(1);
+
+                var child = new Border { Classes = { "foo" } };
+                var target = new TestTopLevel(impl.Object)
+                {
+                    Template = CreateTemplate(),
+                    Content = child,
+                };
+
+                target.LayoutManager.ExecuteInitialLayoutPass();
+
+                Assert.Equal(new Thickness(0), child.BorderThickness);
+
+                var style = new Style(x => x.OfType<Border>().Class("foo"))
+                {
+                    Setters =
+                    {
+                        new Setter(Border.BorderThicknessProperty, new Thickness(2))
+                    }
+                };
+
+                Application.Current.Styles.Add(style);
+                target.LayoutManager.ExecuteInitialLayoutPass();
+
+                Assert.Equal(new Thickness(2), child.BorderThickness);
+
+                Application.Current.Styles.Remove(style);
+
+                Assert.Equal(new Thickness(0), child.BorderThickness);
+            }
+        }
+
         private FuncControlTemplate<TestTopLevel> CreateTemplate()
         {
             return new FuncControlTemplate<TestTopLevel>((x, scope) =>
@@ -262,7 +340,7 @@ namespace Avalonia.Controls.UnitTests
             public TestTopLevel(ITopLevelImpl impl, ILayoutManager layoutManager = null)
                 : base(impl)
             {
-                _layoutManager = layoutManager ?? new LayoutManager();
+                _layoutManager = layoutManager ?? new LayoutManager(this);
             }
 
             protected override ILayoutManager CreateLayoutManager() => _layoutManager;
diff --git a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
index a91b7a0701..cea77bb7c9 100644
--- a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
@@ -1,10 +1,10 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using Avalonia.Collections;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
@@ -16,6 +16,7 @@ using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
 using Avalonia.Styling;
 using Avalonia.UnitTests;
+using JetBrains.Annotations;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
@@ -33,6 +34,8 @@ namespace Avalonia.Controls.UnitTests
                 Items = CreateTestTreeData(),
             };
 
+            var root = new TestRoot(target);
+
             CreateNodeDataTemplate(target);
             ApplyTemplates(target);
 
@@ -77,6 +80,8 @@ namespace Avalonia.Controls.UnitTests
                 Items = CreateTestTreeData(),
             };
 
+            var root = new TestRoot(target);
+
             CreateNodeDataTemplate(target);
             ApplyTemplates(target);
 
@@ -117,304 +122,379 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Clicking_Item_Should_Select_It()
         {
-            var tree = CreateTestTreeData();
-            var target = new TreeView
+            using (Application())
             {
-                Template = CreateTreeViewTemplate(),
-                Items = tree,
-            };
+                var tree = CreateTestTreeData();
+                var target = new TreeView
+                {
+                    Template = CreateTreeViewTemplate(),
+                    Items = tree,
+                };
 
-            var visualRoot = new TestRoot();
-            visualRoot.Child = target;
+                var visualRoot = new TestRoot();
+                visualRoot.Child = target;
 
-            CreateNodeDataTemplate(target);
-            ApplyTemplates(target);
+                CreateNodeDataTemplate(target);
+                ApplyTemplates(target);
+                ExpandAll(target);
 
-            var item = tree[0].Children[1].Children[0];
-            var container = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(item);
+                var item = tree[0].Children[1].Children[0];
+                var container = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(item);
 
-            Assert.NotNull(container);
+                Assert.NotNull(container);
 
-            _mouse.Click(container);
+                _mouse.Click(container);
 
-            Assert.Equal(item, target.SelectedItem);
-            Assert.True(container.IsSelected);
+                Assert.Equal(item, target.SelectedItem);
+                Assert.True(container.IsSelected);
+            }
         }
 
         [Fact]
         public void Clicking_WithControlModifier_Selected_Item_Should_Deselect_It()
         {
-            var tree = CreateTestTreeData();
-            var target = new TreeView
+            using (Application())
             {
-                Template = CreateTreeViewTemplate(),
-                Items = tree
-            };
+                var tree = CreateTestTreeData();
+                var target = new TreeView
+                {
+                    Template = CreateTreeViewTemplate(),
+                    Items = tree
+                };
 
-            var visualRoot = new TestRoot();
-            visualRoot.Child = target;
+                var visualRoot = new TestRoot();
+                visualRoot.Child = target;
 
-            CreateNodeDataTemplate(target);
-            ApplyTemplates(target);
+                CreateNodeDataTemplate(target);
+                ApplyTemplates(target);
+                ExpandAll(target);
 
-            var item = tree[0].Children[1].Children[0];
-            var container = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(item);
+                var item = tree[0].Children[1].Children[0];
+                var container = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(item);
 
-            Assert.NotNull(container);
+                Assert.NotNull(container);
 
-            target.SelectedItem = item;
+                target.SelectedItem = item;
 
-            Assert.True(container.IsSelected);
+                Assert.True(container.IsSelected);
 
-            _mouse.Click(container, modifiers: InputModifiers.Control);
+                _mouse.Click(container, modifiers: KeyModifiers.Control);
 
-            Assert.Null(target.SelectedItem);
-            Assert.False(container.IsSelected);
+                Assert.Null(target.SelectedItem);
+                Assert.False(container.IsSelected);
+            }
         }
 
         [Fact]
         public void Clicking_WithControlModifier_Not_Selected_Item_Should_Select_It()
         {
-            var tree = CreateTestTreeData();
-            var target = new TreeView
+            using (Application())
             {
-                Template = CreateTreeViewTemplate(),
-                Items = tree
-            };
+                var tree = CreateTestTreeData();
+                var target = new TreeView
+                {
+                    Template = CreateTreeViewTemplate(),
+                    Items = tree
+                };
 
-            var visualRoot = new TestRoot();
-            visualRoot.Child = target;
+                var visualRoot = new TestRoot();
+                visualRoot.Child = target;
 
-            CreateNodeDataTemplate(target);
-            ApplyTemplates(target);
+                CreateNodeDataTemplate(target);
+                ApplyTemplates(target);
+                ExpandAll(target);
 
-            var item1 = tree[0].Children[1].Children[0];
-            var container1 = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(item1);
+                var item1 = tree[0].Children[1].Children[0];
+                var container1 = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(item1);
 
-            var item2 = tree[0].Children[1];
-            var container2 = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(item2);
+                var item2 = tree[0].Children[1];
+                var container2 = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(item2);
 
-            Assert.NotNull(container1);
-            Assert.NotNull(container2);
+                Assert.NotNull(container1);
+                Assert.NotNull(container2);
 
-            target.SelectedItem = item1;
+                target.SelectedItem = item1;
 
-            Assert.True(container1.IsSelected);
+                Assert.True(container1.IsSelected);
 
-            _mouse.Click(container2, modifiers: InputModifiers.Control);
-            
-            Assert.Equal(item2, target.SelectedItem);
-            Assert.False(container1.IsSelected);
-            Assert.True(container2.IsSelected);
+                _mouse.Click(container2, modifiers: KeyModifiers.Control);
+
+                Assert.Equal(item2, target.SelectedItem);
+                Assert.False(container1.IsSelected);
+                Assert.True(container2.IsSelected);
+            }
         }
 
         [Fact]
         public void Clicking_WithControlModifier_Selected_Item_Should_Deselect_And_Remove_From_SelectedItems()
         {
-            var tree = CreateTestTreeData();
-            var target = new TreeView
+            using (Application())
             {
-                Template = CreateTreeViewTemplate(),
-                Items = tree,
-                SelectionMode = SelectionMode.Multiple
-            };
+                var tree = CreateTestTreeData();
+                var target = new TreeView
+                {
+                    Template = CreateTreeViewTemplate(),
+                    Items = tree,
+                    SelectionMode = SelectionMode.Multiple
+                };
 
-            var visualRoot = new TestRoot();
-            visualRoot.Child = target;
+                var visualRoot = new TestRoot();
+                visualRoot.Child = target;
 
-            CreateNodeDataTemplate(target);
-            ApplyTemplates(target);
+                CreateNodeDataTemplate(target);
+                ApplyTemplates(target);
+                ExpandAll(target);
 
-            var rootNode = tree[0];
+                var rootNode = tree[0];
 
-            var item1 = rootNode.Children[0];
-            var item2 = rootNode.Children.Last();
+                var item1 = rootNode.Children[0];
+                var item2 = rootNode.Children.Last();
 
-            var item1Container = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(item1);
-            var item2Container = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(item2);
+                var item1Container = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(item1);
+                var item2Container = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(item2);
 
-            ClickContainer(item1Container, InputModifiers.Control);
-            Assert.True(item1Container.IsSelected);
+                ClickContainer(item1Container, KeyModifiers.Control);
+                Assert.True(item1Container.IsSelected);
 
-            ClickContainer(item2Container, InputModifiers.Control);
-            Assert.True(item2Container.IsSelected);
+                ClickContainer(item2Container, KeyModifiers.Control);
+                Assert.True(item2Container.IsSelected);
 
-            Assert.Equal(new[] {item1, item2}, target.SelectedItems.OfType<Node>());
+                Assert.Equal(new[] { item1, item2 }, target.SelectedItems.OfType<Node>());
 
-            ClickContainer(item1Container, InputModifiers.Control);
-            Assert.False(item1Container.IsSelected);
+                ClickContainer(item1Container, KeyModifiers.Control);
+                Assert.False(item1Container.IsSelected);
 
-            Assert.DoesNotContain(item1, target.SelectedItems.OfType<Node>());
+                Assert.DoesNotContain(item1, target.SelectedItems.OfType<Node>());
+            }
         }
 
         [Fact]
         public void Clicking_WithShiftModifier_DownDirection_Should_Select_Range_Of_Items()
         {
-            var tree = CreateTestTreeData();
-            var target = new TreeView
+            using (Application())
             {
-                Template = CreateTreeViewTemplate(),
-                Items = tree,
-                SelectionMode = SelectionMode.Multiple
-            };
+                var tree = CreateTestTreeData();
+                var target = new TreeView
+                {
+                    Template = CreateTreeViewTemplate(),
+                    Items = tree,
+                    SelectionMode = SelectionMode.Multiple
+                };
 
-            var visualRoot = new TestRoot();
-            visualRoot.Child = target;
+                var visualRoot = new TestRoot();
+                visualRoot.Child = target;
 
-            CreateNodeDataTemplate(target);
-            ApplyTemplates(target);
+                CreateNodeDataTemplate(target);
+                ApplyTemplates(target);
+                ExpandAll(target);
 
-            var rootNode = tree[0];
+                var rootNode = tree[0];
 
-            var from = rootNode.Children[0];
-            var to = rootNode.Children.Last();
+                var from = rootNode.Children[0];
+                var to = rootNode.Children.Last();
 
-            var fromContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(from);
-            var toContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(to);
+                var fromContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(from);
+                var toContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(to);
 
-            ClickContainer(fromContainer, InputModifiers.None);
+                ClickContainer(fromContainer, KeyModifiers.None);
 
-            Assert.True(fromContainer.IsSelected);
+                Assert.True(fromContainer.IsSelected);
 
-            ClickContainer(toContainer, InputModifiers.Shift);
-            AssertChildrenSelected(target, rootNode);
+                ClickContainer(toContainer, KeyModifiers.Shift);
+                AssertChildrenSelected(target, rootNode);
+            }
         }
 
         [Fact]
         public void Clicking_WithShiftModifier_UpDirection_Should_Select_Range_Of_Items()
         {
-            var tree = CreateTestTreeData();
-            var target = new TreeView
+            using (Application())
             {
-                Template = CreateTreeViewTemplate(),
-                Items = tree,
-                SelectionMode = SelectionMode.Multiple
-            };
+                var tree = CreateTestTreeData();
+                var target = new TreeView
+                {
+                    Template = CreateTreeViewTemplate(),
+                    Items = tree,
+                    SelectionMode = SelectionMode.Multiple
+                };
 
-            var visualRoot = new TestRoot();
-            visualRoot.Child = target;
+                var visualRoot = new TestRoot();
+                visualRoot.Child = target;
 
-            CreateNodeDataTemplate(target);
-            ApplyTemplates(target);
+                CreateNodeDataTemplate(target);
+                ApplyTemplates(target);
+                ExpandAll(target);
 
-            var rootNode = tree[0];
+                var rootNode = tree[0];
 
-            var from = rootNode.Children.Last();
-            var to = rootNode.Children[0];
+                var from = rootNode.Children.Last();
+                var to = rootNode.Children[0];
 
-            var fromContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(from);
-            var toContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(to);
+                var fromContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(from);
+                var toContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(to);
 
-            ClickContainer(fromContainer, InputModifiers.None);
+                ClickContainer(fromContainer, KeyModifiers.None);
 
-            Assert.True(fromContainer.IsSelected);
+                Assert.True(fromContainer.IsSelected);
 
-            ClickContainer(toContainer, InputModifiers.Shift);
-            AssertChildrenSelected(target, rootNode);
+                ClickContainer(toContainer, KeyModifiers.Shift);
+                AssertChildrenSelected(target, rootNode);
+            }
         }
 
         [Fact]
         public void Clicking_First_Item_Of_SelectedItems_Should_Select_Only_It()
         {
-            var tree = CreateTestTreeData();
-            var target = new TreeView
+            using (Application())
             {
-                Template = CreateTreeViewTemplate(),
-                Items = tree,
-                SelectionMode = SelectionMode.Multiple
-            };
+                var tree = CreateTestTreeData();
+                var target = new TreeView
+                {
+                    Template = CreateTreeViewTemplate(),
+                    Items = tree,
+                    SelectionMode = SelectionMode.Multiple
+                };
 
-            var visualRoot = new TestRoot();
-            visualRoot.Child = target;
+                var visualRoot = new TestRoot();
+                visualRoot.Child = target;
 
-            CreateNodeDataTemplate(target);
-            ApplyTemplates(target);
+                CreateNodeDataTemplate(target);
+                ApplyTemplates(target);
+                ExpandAll(target);
 
-            var rootNode = tree[0];
+                var rootNode = tree[0];
 
-            var from = rootNode.Children.Last();
-            var to = rootNode.Children[0];
+                var from = rootNode.Children.Last();
+                var to = rootNode.Children[0];
 
-            var fromContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(from);
-            var toContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(to);
+                var fromContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(from);
+                var toContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(to);
 
-            ClickContainer(fromContainer, InputModifiers.None);
+                ClickContainer(fromContainer, KeyModifiers.None);
 
-            ClickContainer(toContainer, InputModifiers.Shift);
-            AssertChildrenSelected(target, rootNode);
+                ClickContainer(toContainer, KeyModifiers.Shift);
+                AssertChildrenSelected(target, rootNode);
 
-            ClickContainer(fromContainer, InputModifiers.None);
+                ClickContainer(fromContainer, KeyModifiers.None);
 
-            Assert.True(fromContainer.IsSelected);
+                Assert.True(fromContainer.IsSelected);
 
-            foreach (var child in rootNode.Children)
-            {
-                if (child == from)
+                foreach (var child in rootNode.Children)
                 {
-                    continue;
-                }
+                    if (child == from)
+                    {
+                        continue;
+                    }
 
-                var container = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(child);
+                    var container = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(child);
 
-                Assert.False(container.IsSelected);
+                    Assert.False(container.IsSelected);
+                }
             }
         }
 
         [Fact]
         public void Setting_SelectedItem_Should_Set_Container_Selected()
         {
-            var tree = CreateTestTreeData();
-            var target = new TreeView
+            using (Application())
             {
-                Template = CreateTreeViewTemplate(),
-                Items = tree,
-            };
+                var tree = CreateTestTreeData();
+                var target = new TreeView
+                {
+                    Template = CreateTreeViewTemplate(),
+                    Items = tree,
+                };
 
-            var visualRoot = new TestRoot();
-            visualRoot.Child = target;
+                var visualRoot = new TestRoot();
+                visualRoot.Child = target;
 
-            CreateNodeDataTemplate(target);
-            ApplyTemplates(target);
+                CreateNodeDataTemplate(target);
+                ApplyTemplates(target);
+                ExpandAll(target);
 
-            var item = tree[0].Children[1].Children[0];
-            var container = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(item);
+                var item = tree[0].Children[1].Children[0];
+                var container = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(item);
 
-            Assert.NotNull(container);
+                Assert.NotNull(container);
 
-            target.SelectedItem = item;
+                target.SelectedItem = item;
 
-            Assert.True(container.IsSelected);
+                Assert.True(container.IsSelected);
+            }
         }
 
         [Fact]
         public void Setting_SelectedItem_Should_Raise_SelectedItemChanged_Event()
         {
-            var tree = CreateTestTreeData();
-            var target = new TreeView
+            using (Application())
             {
-                Template = CreateTreeViewTemplate(),
-                Items = tree,
-            };
+                var tree = CreateTestTreeData();
+                var target = new TreeView
+                {
+                    Template = CreateTreeViewTemplate(),
+                    Items = tree,
+                };
 
-            var visualRoot = new TestRoot();
-            visualRoot.Child = target;
+                var visualRoot = new TestRoot();
+                visualRoot.Child = target;
 
-            CreateNodeDataTemplate(target);
-            ApplyTemplates(target);
+                CreateNodeDataTemplate(target);
+                ApplyTemplates(target);
+                ExpandAll(target);
+
+                var item = tree[0].Children[1].Children[0];
 
-            var item = tree[0].Children[1].Children[0];
+                var called = false;
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Empty(e.RemovedItems);
+                    Assert.Equal(1, e.AddedItems.Count);
+                    Assert.Same(item, e.AddedItems[0]);
+                    called = true;
+                };
 
-            var called = false;
-            target.SelectionChanged += (s, e) =>
+                target.SelectedItem = item;
+                Assert.True(called);
+            }
+        }
+
+        [Fact]
+        public void Bound_SelectedItem_Should_Not_Be_Cleared_when_Changing_Selection()
+        {
+            using (Application())
             {
-                Assert.Empty(e.RemovedItems);
-                Assert.Equal(1, e.AddedItems.Count);
-                Assert.Same(item, e.AddedItems[0]);
-                called = true;
-            };
+                var dataContext = new TestDataContext();
+
+                var target = new TreeView
+                {
+                    Template = CreateTreeViewTemplate(),
+                    DataContext = dataContext
+                };
+
+                target.Bind(TreeView.ItemsProperty, new Binding("Items"));
+                target.Bind(TreeView.SelectedItemProperty, new Binding("SelectedItem"));
+
+                var visualRoot = new TestRoot();
+                visualRoot.Child = target;
+
+                CreateNodeDataTemplate(target);
+                ApplyTemplates(target);
+
+                var selectedValues = new List<object>();
 
-            target.SelectedItem = item;
-            Assert.True(called);
+                dataContext.PropertyChanged += (_, e) =>
+                {
+                    if (e.PropertyName == nameof(TestDataContext.SelectedItem))
+                        selectedValues.Add(dataContext.SelectedItem);
+                };
+                selectedValues.Add(dataContext.SelectedItem);
+
+                _mouse.Click((Interactive)target.Presenter.Panel.Children[0], MouseButton.Left);
+                _mouse.Click((Interactive)target.Presenter.Panel.Children[2], MouseButton.Left);
+
+                Assert.Equal(3, selectedValues.Count);
+                Assert.Equal(new[] { null, "Item 0", "Item 2" }, selectedValues.ToArray());
+            }
         }
 
         [Fact]
@@ -527,6 +607,8 @@ namespace Avalonia.Controls.UnitTests
                 Items = data,
             };
 
+            var root = new TestRoot(target);
+
             CreateNodeDataTemplate(target);
             ApplyTemplates(target);
 
@@ -552,7 +634,7 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Keyboard_Navigation_Should_Move_To_Last_Selected_Node()
         {
-            using (UnitTestApplication.Start(TestServices.RealFocus))
+            using (Application())
             {
                 var focus = FocusManager.Instance;
                 var navigation = AvaloniaLocator.Current.GetService<IKeyboardNavigationHandler>();
@@ -576,6 +658,7 @@ namespace Avalonia.Controls.UnitTests
 
                 CreateNodeDataTemplate(target);
                 ApplyTemplates(target);
+                ExpandAll(target);
 
                 var item = data[0].Children[0];
                 var node = target.ItemContainerGenerator.Index.ContainerFromItem(item);
@@ -592,6 +675,50 @@ namespace Avalonia.Controls.UnitTests
                 Assert.Same(node, focus.Current);
             }
         }
+        
+        [Fact]
+        public void Keyboard_Navigation_Should_Not_Crash_If_Selected_Item_Is_not_In_Tree()
+        {
+            using (Application())
+            {
+                var focus = FocusManager.Instance;
+                var navigation = AvaloniaLocator.Current.GetService<IKeyboardNavigationHandler>();
+                var data = CreateTestTreeData();
+
+                var selectedNode = new Node { Value = "Out of Tree Selected Item" };
+
+                var target = new TreeView
+                {
+                    Template = CreateTreeViewTemplate(),
+                    Items = data,
+                    SelectedItem = selectedNode
+                };
+
+                var button = new Button();
+
+                var root = new TestRoot
+                {
+                    Child = new StackPanel
+                    {
+                        Children = { target, button },
+                    }
+                };
+
+                CreateNodeDataTemplate(target);
+                ApplyTemplates(target);
+                ExpandAll(target);
+
+                var item = data[0].Children[0];
+                var node = target.ItemContainerGenerator.Index.ContainerFromItem(item);
+                Assert.NotNull(node);
+
+                target.SelectedItem = selectedNode;
+                node.Focus();
+                Assert.Same(node, focus.Current);
+
+                var next = KeyboardNavigationHandler.GetNext(node, NavigationDirection.Previous);
+            }
+        }
 
         [Fact]
         public void Pressing_SelectAll_Gesture_Should_Select_All_Nodes()
@@ -611,6 +738,7 @@ namespace Avalonia.Controls.UnitTests
 
                 CreateNodeDataTemplate(target);
                 ApplyTemplates(target);
+                ExpandAll(target);
 
                 var rootNode = tree[0];
 
@@ -633,7 +761,7 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Pressing_SelectAll_Gesture_With_Downward_Range_Selected_Should_Select_All_Nodes()
         {
-            using (UnitTestApplication.Start())
+            using (Application())
             {
                 var tree = CreateTestTreeData();
                 var target = new TreeView
@@ -648,6 +776,7 @@ namespace Avalonia.Controls.UnitTests
 
                 CreateNodeDataTemplate(target);
                 ApplyTemplates(target);
+                ExpandAll(target);
 
                 var rootNode = tree[0];
 
@@ -657,8 +786,8 @@ namespace Avalonia.Controls.UnitTests
                 var fromContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(from);
                 var toContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(to);
 
-                ClickContainer(fromContainer, InputModifiers.None);
-                ClickContainer(toContainer, InputModifiers.Shift);
+                ClickContainer(fromContainer, KeyModifiers.None);
+                ClickContainer(toContainer, KeyModifiers.Shift);
 
                 var keymap = AvaloniaLocator.Current.GetService<PlatformHotkeyConfiguration>();
                 var selectAllGesture = keymap.SelectAll.First();
@@ -679,7 +808,7 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Pressing_SelectAll_Gesture_With_Upward_Range_Selected_Should_Select_All_Nodes()
         {
-            using (UnitTestApplication.Start())
+            using (Application())
             {
                 var tree = CreateTestTreeData();
                 var target = new TreeView
@@ -694,6 +823,7 @@ namespace Avalonia.Controls.UnitTests
 
                 CreateNodeDataTemplate(target);
                 ApplyTemplates(target);
+                ExpandAll(target);
 
                 var rootNode = tree[0];
 
@@ -703,8 +833,8 @@ namespace Avalonia.Controls.UnitTests
                 var fromContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(from);
                 var toContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(to);
 
-                ClickContainer(fromContainer, InputModifiers.None);
-                ClickContainer(toContainer, InputModifiers.Shift);
+                ClickContainer(fromContainer, KeyModifiers.None);
+                ClickContainer(toContainer, KeyModifiers.Shift);
 
                 var keymap = AvaloniaLocator.Current.GetService<PlatformHotkeyConfiguration>();
                 var selectAllGesture = keymap.SelectAll.First();
@@ -752,97 +882,106 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Right_Click_On_UnselectedItem_Should_Clear_Existing_Selection()
         {
-            var tree = CreateTestTreeData();
-            var target = new TreeView
+            using (Application())
             {
-                Template = CreateTreeViewTemplate(),
-                Items = tree,
-                SelectionMode = SelectionMode.Multiple,
-            };
+                var tree = CreateTestTreeData();
+                var target = new TreeView
+                {
+                    Template = CreateTreeViewTemplate(),
+                    Items = tree,
+                    SelectionMode = SelectionMode.Multiple,
+                };
 
-            var visualRoot = new TestRoot();
-            visualRoot.Child = target;
+                var visualRoot = new TestRoot();
+                visualRoot.Child = target;
 
-            CreateNodeDataTemplate(target);
-            ApplyTemplates(target);
-            target.ExpandSubTree((TreeViewItem)target.Presenter.Panel.Children[0]);
+                CreateNodeDataTemplate(target);
+                ApplyTemplates(target);
+                target.ExpandSubTree((TreeViewItem)target.Presenter.Panel.Children[0]);
 
-            var rootNode = tree[0];
-            var to = rootNode.Children[0];
-            var then = rootNode.Children[1];
+                var rootNode = tree[0];
+                var to = rootNode.Children[0];
+                var then = rootNode.Children[1];
 
-            var fromContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(rootNode);
-            var toContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(to);
-            var thenContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(then);
+                var fromContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(rootNode);
+                var toContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(to);
+                var thenContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(then);
 
-            ClickContainer(fromContainer, InputModifiers.None);
-            ClickContainer(toContainer, InputModifiers.Shift);
+                ClickContainer(fromContainer, KeyModifiers.None);
+                ClickContainer(toContainer, KeyModifiers.Shift);
 
-            Assert.Equal(2, target.SelectedItems.Count);
+                Assert.Equal(2, target.SelectedItems.Count);
 
-            _mouse.Click(thenContainer, MouseButton.Right);
+                _mouse.Click(thenContainer, MouseButton.Right);
 
-            Assert.Equal(1, target.SelectedItems.Count);
+                Assert.Equal(1, target.SelectedItems.Count);
+            }
         }
 
         [Fact]
         public void Shift_Right_Click_Should_Not_Select_Multiple()
         {
-            var tree = CreateTestTreeData();
-            var target = new TreeView
+            using (Application())
             {
-                Template = CreateTreeViewTemplate(),
-                Items = tree,
-                SelectionMode = SelectionMode.Multiple,
-            };
+                var tree = CreateTestTreeData();
+                var target = new TreeView
+                {
+                    Template = CreateTreeViewTemplate(),
+                    Items = tree,
+                    SelectionMode = SelectionMode.Multiple,
+                };
 
-            var visualRoot = new TestRoot();
-            visualRoot.Child = target;
+                var visualRoot = new TestRoot();
+                visualRoot.Child = target;
 
-            CreateNodeDataTemplate(target);
-            ApplyTemplates(target);
-            target.ExpandSubTree((TreeViewItem)target.Presenter.Panel.Children[0]);
+                CreateNodeDataTemplate(target);
+                ApplyTemplates(target);
+                target.ExpandSubTree((TreeViewItem)target.Presenter.Panel.Children[0]);
 
-            var rootNode = tree[0];
-            var from = rootNode.Children[0];
-            var to = rootNode.Children[1];
-            var fromContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(from);
-            var toContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(to);
+                var rootNode = tree[0];
+                var from = rootNode.Children[0];
+                var to = rootNode.Children[1];
+                var fromContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(from);
+                var toContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(to);
 
-            _mouse.Click(fromContainer);
-            _mouse.Click(toContainer, MouseButton.Right, modifiers: InputModifiers.Shift);
+                _mouse.Click(fromContainer);
+                _mouse.Click(toContainer, MouseButton.Right, modifiers: KeyModifiers.Shift);
 
-            Assert.Equal(1, target.SelectedItems.Count);
+                Assert.Equal(1, target.SelectedItems.Count);
+            }
         }
 
         [Fact]
         public void Ctrl_Right_Click_Should_Not_Select_Multiple()
         {
-            var tree = CreateTestTreeData();
-            var target = new TreeView
+            using (Application())
             {
-                Template = CreateTreeViewTemplate(),
-                Items = tree,
-                SelectionMode = SelectionMode.Multiple,
-            };
+                var tree = CreateTestTreeData();
+                var target = new TreeView
+                {
+                    Template = CreateTreeViewTemplate(),
+                    Items = tree,
+                    SelectionMode = SelectionMode.Multiple,
+                };
 
-            var visualRoot = new TestRoot();
-            visualRoot.Child = target;
+                var visualRoot = new TestRoot();
+                visualRoot.Child = target;
 
-            CreateNodeDataTemplate(target);
-            ApplyTemplates(target);
-            target.ExpandSubTree((TreeViewItem)target.Presenter.Panel.Children[0]);
+                CreateNodeDataTemplate(target);
+                ApplyTemplates(target);
+                target.ExpandSubTree((TreeViewItem)target.Presenter.Panel.Children[0]);
 
-            var rootNode = tree[0];
-            var from = rootNode.Children[0];
-            var to = rootNode.Children[1];
-            var fromContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(from);
-            var toContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(to);
+                var rootNode = tree[0];
+                var from = rootNode.Children[0];
+                var to = rootNode.Children[1];
+                var fromContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(from);
+                var toContainer = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(to);
 
-            _mouse.Click(fromContainer);
-            _mouse.Click(toContainer, MouseButton.Right, modifiers: InputModifiers.Control);
+                _mouse.Click(fromContainer);
+                _mouse.Click(toContainer, MouseButton.Right, modifiers: KeyModifiers.Control);
 
-            Assert.Equal(1, target.SelectedItems.Count);
+                Assert.Equal(1, target.SelectedItems.Count);
+            }
         }
 
         [Fact]
@@ -893,11 +1032,42 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(2, GetItem(target, 0, 1, 0).Level);
         }
 
+        [Fact]
+        public void Adding_Node_To_Removed_And_ReAdded_Parent_Should_Not_Crash()
+        {
+            // Issue #2985
+            var tree = CreateTestTreeData();
+            var target = new TreeView
+            {
+                Template = CreateTreeViewTemplate(),
+                Items = tree,
+            };
+
+            var visualRoot = new TestRoot();
+            visualRoot.Child = target;
+
+            CreateNodeDataTemplate(target);
+            ApplyTemplates(target);
+            ExpandAll(target);
+
+            var parent = tree[0];
+            var node = parent.Children[1];
+
+            parent.Children.Remove(node);
+            parent.Children.Add(node);
+
+            var item = target.ItemContainerGenerator.Index.ContainerFromItem(node);
+            ApplyTemplates(new[] { item });
+
+            // #2985 causes ArgumentException here.
+            node.Children.Add(new Node());
+        }
+
         [Fact]
         public void Auto_Expanding_In_Style_Should_Not_Break_Range_Selection()
         {
             /// Issue #2980.
-            using (UnitTestApplication.Start(TestServices.RealStyler))
+            using (Application())
             {
                 var target = new DerivedTreeView
                 {
@@ -929,10 +1099,73 @@ namespace Avalonia.Controls.UnitTests
                 ApplyTemplates(target);
 
                 _mouse.Click(GetItem(target, 0));
-                _mouse.Click(GetItem(target, 1), modifiers: InputModifiers.Shift);
+                _mouse.Click(GetItem(target, 1), modifiers: KeyModifiers.Shift);
             }
         }
 
+        [Fact]
+        public void Removing_TreeView_From_Root_Should_Preserve_TreeViewItems()
+        {
+            // Issue #3328
+            var tree = CreateTestTreeData();
+            var target = new TreeView
+            {
+                Template = CreateTreeViewTemplate(),
+                Items = tree,
+            };
+
+            var root = new TestRoot();
+            root.Child = target;
+
+            CreateNodeDataTemplate(target);
+            ApplyTemplates(target);
+            ExpandAll(target);
+
+            Assert.Equal(5, target.ItemContainerGenerator.Index.Containers.Count());
+
+            root.Child = null;
+
+            Assert.Equal(5, target.ItemContainerGenerator.Index.Containers.Count());
+            Assert.Equal(1, target.Presenter.Panel.Children.Count);
+
+            var rootNode = Assert.IsType<TreeViewItem>(target.Presenter.Panel.Children[0]);
+            Assert.Equal(3, rootNode.ItemContainerGenerator.Containers.Count());
+            Assert.Equal(3, rootNode.Presenter.Panel.Children.Count);
+
+            var child2Node = Assert.IsType<TreeViewItem>(rootNode.Presenter.Panel.Children[1]);
+            Assert.Equal(1, child2Node.ItemContainerGenerator.Containers.Count());
+            Assert.Equal(1, child2Node.Presenter.Panel.Children.Count);
+        }
+
+        [Fact]
+        public void Clearing_TreeView_Items_Clears_Index()
+        {
+            // Issue #3551
+            var tree = CreateTestTreeData();
+            var target = new TreeView
+            {
+                Template = CreateTreeViewTemplate(),
+                Items = tree,
+            };
+
+            var root = new TestRoot();
+            root.Child = target;
+
+            CreateNodeDataTemplate(target);
+            ApplyTemplates(target);
+
+            var rootNode = tree[0];
+            var container = (TreeViewItem)target.ItemContainerGenerator.Index.ContainerFromItem(rootNode);
+
+            Assert.NotNull(container);
+
+            root.Child = null;
+
+            tree.Clear();
+
+            Assert.Empty(target.ItemContainerGenerator.Index.Containers);
+        }
+
         private void ApplyTemplates(TreeView tree)
         {
             tree.ApplyTemplate();
@@ -1073,12 +1306,12 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        void ClickContainer(IControl container, InputModifiers modifiers)
+        private void ClickContainer(IControl container, KeyModifiers modifiers)
         {
             _mouse.Click(container, modifiers: modifiers);
         }
 
-        void AssertChildrenSelected(TreeView treeView, Node rootNode)
+        private void AssertChildrenSelected(TreeView treeView, Node rootNode)
         {
             foreach (var child in rootNode.Children)
             {
@@ -1088,6 +1321,16 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        private IDisposable Application()
+        {
+            return UnitTestApplication.Start(
+                TestServices.MockThreadingInterface.With(
+                    focusManager: new FocusManager(),
+                    keyboardDevice: () => new KeyboardDevice(),
+                    keyboardNavigation: new KeyboardNavigationHandler(),
+                    inputManager: new InputManager()));
+        }
+
         private class Node : NotifyingBase
         {
             private IAvaloniaList<Node> _children;
@@ -1117,8 +1360,6 @@ namespace Avalonia.Controls.UnitTests
                 return new TextBlock { Text = node.Value };
             }
 
-            public bool SupportsRecycling => false;
-
             public InstancedBinding ItemsSelector(object item)
             {
                 var obs = ExpressionObserver.Create(item, o => (o as Node).Children);
@@ -1134,5 +1375,30 @@ namespace Avalonia.Controls.UnitTests
         private class DerivedTreeView : TreeView
         {
         }
+
+        private class TestDataContext : INotifyPropertyChanged
+        {
+            private string _selectedItem;
+
+            public TestDataContext()
+            {
+                Items = new ObservableCollection<string>(Enumerable.Range(0, 5).Select(i => $"Item {i}"));
+            }
+
+            public ObservableCollection<string> Items { get; }
+
+            public string SelectedItem
+            {
+                get { return _selectedItem; }
+                set
+                {
+                    _selectedItem = value;
+                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(SelectedItem)));
+                }
+            }
+
+            public event PropertyChangedEventHandler PropertyChanged;
+            
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/UserControlTests.cs b/tests/Avalonia.Controls.UnitTests/UserControlTests.cs
index 9d3e568582..3d1980b0eb 100644
--- a/tests/Avalonia.Controls.UnitTests/UserControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/UserControlTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Linq;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
@@ -25,7 +22,7 @@ namespace Avalonia.Controls.UnitTests
                     {
                         new Style(x => x.OfType<UserControl>())
                         {
-                            Setters = new[]
+                            Setters =
                             {
                                 new Setter(TemplatedControl.TemplateProperty, GetTemplate())
                             }
diff --git a/tests/Avalonia.Controls.UnitTests/Utils/CollectionChangedEventManagerTests.cs b/tests/Avalonia.Controls.UnitTests/Utils/CollectionChangedEventManagerTests.cs
new file mode 100644
index 0000000000..8bbb5e456f
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/Utils/CollectionChangedEventManagerTests.cs
@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Text;
+using Avalonia.Collections;
+using Avalonia.Controls.Utils;
+using Xunit;
+using CollectionChangedEventManager = Avalonia.Controls.Utils.CollectionChangedEventManager;
+
+namespace Avalonia.Controls.UnitTests.Utils
+{
+    public class CollectionChangedEventManagerTests
+    {
+        [Fact]
+        public void AddListener_Listens_To_Events()
+        {
+            var source = new AvaloniaList<string>();
+            var listener = new Listener();
+
+            CollectionChangedEventManager.Instance.AddListener(source, listener);
+
+            Assert.Empty(listener.Received);
+
+            source.Add("foo");
+
+            Assert.Equal(1, listener.Received.Count);
+        }
+
+        [Fact]
+        public void RemoveListener_Stops_Listening_To_Events()
+        {
+            var source = new AvaloniaList<string>();
+            var listener = new Listener();
+
+            CollectionChangedEventManager.Instance.AddListener(source, listener);
+            CollectionChangedEventManager.Instance.RemoveListener(source, listener);
+
+            source.Add("foo");
+
+            Assert.Empty(listener.Received);
+        }
+
+        [Fact]
+        public void Receives_Events_From_Wrapped_Collection()
+        {
+            var source = new WrappingCollection();
+            var listener = new Listener();
+
+            CollectionChangedEventManager.Instance.AddListener(source, listener);
+
+            Assert.Empty(listener.Received);
+
+            source.Add("foo");
+
+            Assert.Equal(1, listener.Received.Count);
+        }
+
+        private class Listener : ICollectionChangedListener
+        {
+            public List<NotifyCollectionChangedEventArgs> Received { get; } = new List<NotifyCollectionChangedEventArgs>();
+
+            public void Changed(INotifyCollectionChanged sender, NotifyCollectionChangedEventArgs e)
+            {
+                Received.Add(e);
+            }
+
+            public void PostChanged(INotifyCollectionChanged sender, NotifyCollectionChangedEventArgs e)
+            {
+            }
+
+            public void PreChanged(INotifyCollectionChanged sender, NotifyCollectionChangedEventArgs e)
+            {
+            }
+        }
+
+        private class WrappingCollection : INotifyCollectionChanged
+        {
+            private AvaloniaList<string> _inner = new AvaloniaList<string>();
+
+            public void Add(string s) => _inner.Add(s);
+
+            public event NotifyCollectionChangedEventHandler CollectionChanged
+            {
+                add => _inner.CollectionChanged += value;
+                remove => _inner.CollectionChanged -= value;
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs b/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs
index dd3b113d5d..151c3070f4 100644
--- a/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Moq;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
@@ -8,6 +5,9 @@ using Avalonia.Input;
 using Avalonia.Platform;
 using Avalonia.Styling;
 using Xunit;
+using System;
+using Avalonia.Input.Raw;
+using Factory = System.Func<int, System.Action<object>, Avalonia.Controls.Window, Avalonia.AvaloniaObject>;
 
 namespace Avalonia.Controls.UnitTests.Utils
 {
@@ -24,8 +24,8 @@ namespace Avalonia.Controls.UnitTests.Utils
                     .Bind<IWindowingPlatform>().ToConstant(new WindowingPlatformMock())
                     .Bind<IStyler>().ToConstant(styler.Object);
 
-                var gesture1 = new KeyGesture(Key.A, InputModifiers.Control);
-                var gesture2 = new KeyGesture(Key.B, InputModifiers.Control);
+                var gesture1 = new KeyGesture(Key.A, KeyModifiers.Control);
+                var gesture2 = new KeyGesture(Key.B, KeyModifiers.Control);
 
                 var tl = new Window();
                 var button = new Button();
@@ -57,6 +57,127 @@ namespace Avalonia.Controls.UnitTests.Utils
             }
         }
 
+        [Theory]
+        [MemberData(nameof(ElementsFactory))]
+        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 gesture = new KeyGesture(Key.A, KeyModifiers.Control);
+
+                var action = new Action<object>(parameter =>
+                {
+                    if (parameter is int value)
+                    {
+                        commandResult = value;
+                    }
+                });
+
+                var root = new Window();
+                var element = factory(expectedParameter, action, root);
+
+                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.");
+            }
+        }
+
+
+        [Theory]
+        [MemberData(nameof(ElementsFactory))]
+        public void HotKeyManager_Should_Do_Not_Executed_When_IsEnabled_False(string factoryName, Factory factory)
+        {
+            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 gesture = new KeyGesture(Key.A, KeyModifiers.Control);
+
+                var action = new Action<object>(parameter =>
+                {
+                    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.");
+            }
+        }
+
+        public static TheoryData<string, Factory> ElementsFactory =>
+            new TheoryData<string, Factory>()
+            {
+                {nameof(Button), MakeButton},
+                {nameof(MenuItem),MakeMenu},
+            };
+
+        private static AvaloniaObject MakeMenu(int expectedParameter, Action<object> action, Window root)
+        {
+            var menuitem = new MenuItem()
+            {
+                Command = new Command(action),
+                CommandParameter = expectedParameter,
+            };
+            var rootMenu = new Menu();
+
+            rootMenu.Items = new[] { menuitem };
+
+            root.Content = rootMenu;
+            return menuitem;
+        }
+
+        private static AvaloniaObject MakeButton(int expectedParameter, Action<object> action, Window root)
+        {
+            var button = new Button()
+            {
+                Command = new Command(action),
+                CommandParameter = expectedParameter,
+            };
+
+            root.Content = button;
+            return button;
+        }
+
         private FuncControlTemplate CreateWindowTemplate()
         {
             return new FuncControlTemplate<Window>((parent, scope) =>
@@ -68,5 +189,22 @@ namespace Avalonia.Controls.UnitTests.Utils
                 }.RegisterInNameScope(scope);
             });
         }
+
+        class Command : System.Windows.Input.ICommand
+        {
+            private readonly Action<object> _execeute;
+
+#pragma warning disable 67 // Event not used
+            public event EventHandler CanExecuteChanged;
+#pragma warning restore 67 // Event not used
+
+            public Command(Action<object> execeute)
+            {
+                _execeute = execeute;
+            }
+            public bool CanExecute(object parameter) => true;
+
+            public void Execute(object parameter) => _execeute?.Invoke(parameter);
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/ViewboxTests.cs b/tests/Avalonia.Controls.UnitTests/ViewboxTests.cs
index ad0f318d2f..e005bafbf9 100644
--- a/tests/Avalonia.Controls.UnitTests/ViewboxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ViewboxTests.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls.Shapes;
 using Avalonia.Media;
+using Avalonia.UnitTests;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
@@ -9,6 +10,8 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Viewbox_Stretch_Uniform_Child()
         {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
             var target = new Viewbox() { Child = new Rectangle() { Width = 100, Height = 50 } };
 
             target.Measure(new Size(200, 200));
@@ -25,6 +28,8 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Viewbox_Stretch_None_Child()
         {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
             var target = new Viewbox() { Stretch = Stretch.None, Child = new Rectangle() { Width = 100, Height = 50 } };
 
             target.Measure(new Size(200, 200));
@@ -41,6 +46,8 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Viewbox_Stretch_Fill_Child()
         {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
             var target = new Viewbox() { Stretch = Stretch.Fill, Child = new Rectangle() { Width = 100, Height = 50 } };
 
             target.Measure(new Size(200, 200));
@@ -57,6 +64,8 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Viewbox_Stretch_UniformToFill_Child()
         {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
             var target = new Viewbox() { Stretch = Stretch.UniformToFill, Child = new Rectangle() { Width = 100, Height = 50 } };
 
             target.Measure(new Size(200, 200));
@@ -73,6 +82,8 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Viewbox_Stretch_Uniform_Child_With_Unrestricted_Width()
         {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
             var target = new Viewbox() { Child = new Rectangle() { Width = 100, Height = 50 } };
 
             target.Measure(new Size(double.PositiveInfinity, 200));
@@ -89,6 +100,8 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Viewbox_Stretch_Uniform_Child_With_Unrestricted_Height()
         {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
             var target = new Viewbox() { Child = new Rectangle() { Width = 100, Height = 50 } };
 
             target.Measure(new Size(200, double.PositiveInfinity));
diff --git a/tests/Avalonia.Controls.UnitTests/VirtualizingStackPanelTests.cs b/tests/Avalonia.Controls.UnitTests/VirtualizingStackPanelTests.cs
index 70a40faed3..a319a95e1f 100644
--- a/tests/Avalonia.Controls.UnitTests/VirtualizingStackPanelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/VirtualizingStackPanelTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.LogicalTree;
diff --git a/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs b/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs
index 55e8ae0115..8109b037c5 100644
--- a/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive;
 using System.Reactive.Subjects;
@@ -113,7 +110,8 @@ namespace Avalonia.Controls.UnitTests
         public void IsVisible_Should_Be_False_Atfer_Impl_Signals_Close()
         {
             var windowImpl = new Mock<IPopupImpl>();
-            windowImpl.Setup(x => x.Scaling).Returns(1);
+            windowImpl.Setup(x => x.DesktopScaling).Returns(1);
+            windowImpl.Setup(x => x.RenderScaling).Returns(1);
             windowImpl.SetupProperty(x => x.Closed);
 
             using (UnitTestApplication.Start(TestServices.StyledWindow))
@@ -131,14 +129,15 @@ namespace Avalonia.Controls.UnitTests
         public void Setting_IsVisible_True_Shows_Window()
         {
             var windowImpl = new Mock<IPopupImpl>();
-            windowImpl.Setup(x => x.Scaling).Returns(1);
+            windowImpl.Setup(x => x.DesktopScaling).Returns(1);
+            windowImpl.Setup(x => x.RenderScaling).Returns(1);
 
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
                 var target = new TestWindowBase(windowImpl.Object);
                 target.IsVisible = true;
 
-                windowImpl.Verify(x => x.Show());
+                windowImpl.Verify(x => x.Show(true));
             }
         }
 
@@ -146,7 +145,8 @@ namespace Avalonia.Controls.UnitTests
         public void Setting_IsVisible_False_Hides_Window()
         {
             var windowImpl = new Mock<IPopupImpl>();
-            windowImpl.Setup(x => x.Scaling).Returns(1);
+            windowImpl.Setup(x => x.DesktopScaling).Returns(1);
+            windowImpl.Setup(x => x.RenderScaling).Returns(1);
 
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
@@ -211,7 +211,8 @@ namespace Avalonia.Controls.UnitTests
             {
                 var renderer = new Mock<IRenderer>();
                 var windowImpl = new Mock<IPopupImpl>();
-                windowImpl.Setup(x => x.Scaling).Returns(1);
+                windowImpl.Setup(x => x.DesktopScaling).Returns(1);
+                windowImpl.Setup(x => x.RenderScaling).Returns(1);
                 windowImpl.SetupProperty(x => x.Closed);
                 windowImpl.Setup(x => x.CreateRenderer(It.IsAny<IRenderRoot>())).Returns(renderer.Object);
 
@@ -240,7 +241,7 @@ namespace Avalonia.Controls.UnitTests
 
             public TestWindowBase(IRenderer renderer = null)
                 : base(Mock.Of<IWindowBaseImpl>(x => 
-                    x.Scaling == 1 &&
+                    x.RenderScaling == 1 &&
                     x.CreateRenderer(It.IsAny<IRenderRoot>()) == renderer))
             {
             }
diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
index d87014f646..ba29001cf3 100644
--- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
@@ -1,12 +1,7 @@
-// -----------------------------------------------------------------------
-// <copyright file="WindowTests.cs" company="Steven Kirk">
-// Copyright 2015 MIT Licence. See licence.md for more information.
-// </copyright>
-// -----------------------------------------------------------------------
-
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Avalonia.Layout;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.UnitTests;
@@ -105,7 +100,8 @@ namespace Avalonia.Controls.UnitTests
         {
             var windowImpl = new Mock<IWindowImpl>();
             windowImpl.SetupProperty(x => x.Closed);
-            windowImpl.Setup(x => x.Scaling).Returns(1);
+            windowImpl.Setup(x => x.DesktopScaling).Returns(1);
+            windowImpl.Setup(x => x.RenderScaling).Returns(1);
 
             var services = TestServices.StyledWindow.With(
                 windowingPlatform: new MockWindowingPlatform(() => windowImpl.Object));
@@ -161,7 +157,7 @@ namespace Avalonia.Controls.UnitTests
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
-                var parent = Mock.Of<IWindowImpl>();
+                var parent = Mock.Of<Window>();
                 var renderer = new Mock<IRenderer>();
                 var target = new Window(CreateImpl(renderer));
 
@@ -176,7 +172,7 @@ namespace Avalonia.Controls.UnitTests
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
-                var parent = Mock.Of<IWindowImpl>();
+                var parent = Mock.Of<Window>();
                 var target = new Window();
                 var raised = false;
 
@@ -208,10 +204,11 @@ namespace Avalonia.Controls.UnitTests
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
-                var parent = new Mock<IWindowImpl>();
+                var parent = new Mock<Window>();
                 var windowImpl = new Mock<IWindowImpl>();
                 windowImpl.SetupProperty(x => x.Closed);
-                windowImpl.Setup(x => x.Scaling).Returns(1);
+                windowImpl.Setup(x => x.DesktopScaling).Returns(1);
+                windowImpl.Setup(x => x.RenderScaling).Returns(1);
 
                 var target = new Window(windowImpl.Object);
                 var task = target.ShowDialog<bool>(parent.Object);
@@ -228,8 +225,7 @@ namespace Avalonia.Controls.UnitTests
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
-                var windowImpl = Mock.Of<IWindowImpl>(x => x.Scaling == 1);
-                var target = new Window(windowImpl);
+                var target = new Window();
 
                 target.Show();
                 target.Close();
@@ -248,10 +244,11 @@ namespace Avalonia.Controls.UnitTests
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
-                var parent = new Mock<IWindowImpl>();
+                var parent = new Mock<Window>();
                 var windowImpl = new Mock<IWindowImpl>();
                 windowImpl.SetupProperty(x => x.Closed);
-                windowImpl.Setup(x => x.Scaling).Returns(1);
+                windowImpl.Setup(x => x.DesktopScaling).Returns(1);
+                windowImpl.Setup(x => x.RenderScaling).Returns(1);
 
                 var target = new Window(windowImpl.Object);
                 var task = target.ShowDialog<bool>(parent.Object);
@@ -279,7 +276,8 @@ namespace Avalonia.Controls.UnitTests
 
             var windowImpl = MockWindowingPlatform.CreateWindowMock();
             windowImpl.Setup(x => x.ClientSize).Returns(new Size(800, 480));
-            windowImpl.Setup(x => x.Scaling).Returns(1);
+            windowImpl.Setup(x => x.DesktopScaling).Returns(1);
+            windowImpl.Setup(x => x.RenderScaling).Returns(1);
             windowImpl.Setup(x => x.Screen).Returns(screens.Object);
 
             using (UnitTestApplication.Start(TestServices.StyledWindow))
@@ -303,13 +301,15 @@ namespace Avalonia.Controls.UnitTests
         {
             var parentWindowImpl = MockWindowingPlatform.CreateWindowMock();
             parentWindowImpl.Setup(x => x.ClientSize).Returns(new Size(800, 480));
-            parentWindowImpl.Setup(x => x.MaxClientSize).Returns(new Size(1920, 1080));
-            parentWindowImpl.Setup(x => x.Scaling).Returns(1);
+            parentWindowImpl.Setup(x => x.MaxAutoSizeHint).Returns(new Size(1920, 1080));
+            parentWindowImpl.Setup(x => x.DesktopScaling).Returns(1);
+            parentWindowImpl.Setup(x => x.RenderScaling).Returns(1);
 
             var windowImpl = MockWindowingPlatform.CreateWindowMock();
             windowImpl.Setup(x => x.ClientSize).Returns(new Size(320, 200));
-            windowImpl.Setup(x => x.MaxClientSize).Returns(new Size(1920, 1080));
-            windowImpl.Setup(x => x.Scaling).Returns(1);
+            windowImpl.Setup(x => x.MaxAutoSizeHint).Returns(new Size(1920, 1080));
+            windowImpl.Setup(x => x.DesktopScaling).Returns(1);
+            windowImpl.Setup(x => x.RenderScaling).Returns(1);
 
             var parentWindowServices = TestServices.StyledWindow.With(
                 windowingPlatform: new MockWindowingPlatform(() => parentWindowImpl.Object));
@@ -328,10 +328,9 @@ namespace Avalonia.Controls.UnitTests
                 {
                     var window = new Window();
                     window.WindowStartupLocation = WindowStartupLocation.CenterOwner;
-                    window.Position = new PixelPoint(60, 40);
-                    window.Owner = parentWindow;
+                    window.Position = new PixelPoint(60, 40);                    
 
-                    window.Show();
+                    window.ShowDialog(parentWindow);
 
                     var expectedPosition = new PixelPoint(
                         (int)(parentWindow.Position.X + parentWindow.ClientSize.Width / 2 - window.ClientSize.Width / 2),
@@ -342,11 +341,249 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        public class SizingTests
+        {
+            [Fact]
+            public void Child_Should_Be_Measured_With_Width_And_Height_If_SizeToContent_Is_Manual()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var child = new ChildControl();
+                    var target = new Window
+                    {
+                        Width = 100,
+                        Height = 50,
+                        SizeToContent = SizeToContent.Manual,
+                        Content = child
+                    };
+
+                    Show(target);
+
+                    Assert.Equal(1, child.MeasureSizes.Count);
+                    Assert.Equal(new Size(100, 50), child.MeasureSizes[0]);
+                }
+            }
+
+            [Fact]
+            public void Child_Should_Be_Measured_With_ClientSize_If_SizeToContent_Is_Manual_And_No_Width_Height_Specified()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var windowImpl = MockWindowingPlatform.CreateWindowMock();
+                    windowImpl.Setup(x => x.ClientSize).Returns(new Size(550, 450));
+
+                    var child = new ChildControl();
+                    var target = new Window(windowImpl.Object)
+                    {
+                        SizeToContent = SizeToContent.Manual,
+                        Content = child
+                    };
+
+                    Show(target);
+
+                    Assert.Equal(1, child.MeasureSizes.Count);
+                    Assert.Equal(new Size(550, 450), child.MeasureSizes[0]);
+                }
+            }
+
+            [Fact]
+            public void Child_Should_Be_Measured_With_MaxAutoSizeHint_If_SizeToContent_Is_WidthAndHeight()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var windowImpl = MockWindowingPlatform.CreateWindowMock();
+                    windowImpl.Setup(x => x.MaxAutoSizeHint).Returns(new Size(1200, 1000));
+
+                    var child = new ChildControl();
+                    var target = new Window(windowImpl.Object)
+                    {
+                        Width = 100,
+                        Height = 50,
+                        SizeToContent = SizeToContent.WidthAndHeight,
+                        Content = child
+                    };
+
+                    target.Show();
+
+                    Assert.Equal(1, child.MeasureSizes.Count);
+                    Assert.Equal(new Size(1200, 1000), child.MeasureSizes[0]);
+                }
+            }
+
+            [Fact]
+            public void Should_Not_Have_Offset_On_Bounds_When_Content_Larger_Than_Max_Window_Size()
+            {
+                // Issue #3784.
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var windowImpl = MockWindowingPlatform.CreateWindowMock();
+                    var clientSize = new Size(200, 200);
+                    var maxClientSize = new Size(480, 480);
+
+                    windowImpl.Setup(x => x.Resize(It.IsAny<Size>())).Callback<Size>(size =>
+                    {
+                        clientSize = size.Constrain(maxClientSize);
+                        windowImpl.Object.Resized?.Invoke(clientSize);
+                    });
+
+                    windowImpl.Setup(x => x.ClientSize).Returns(() => clientSize);
+
+                    var child = new Canvas
+                    {
+                        Width = 400,
+                        Height = 800,
+                    };
+                    var target = new Window(windowImpl.Object)
+                    {
+                        SizeToContent = SizeToContent.WidthAndHeight,
+                        Content = child
+                    };
+
+                    Show(target);
+
+                    Assert.Equal(new Size(400, 480), target.Bounds.Size);
+
+                    // Issue #3784 causes this to be (0, 160) which makes no sense as Window has no
+                    // parent control to be offset against.
+                    Assert.Equal(new Point(0, 0), target.Bounds.Position);
+                }
+            }
+
+            [Fact]
+            public void Width_Height_Should_Not_Be_NaN_After_Show_With_SizeToContent_WidthAndHeight()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var child = new Canvas
+                    {
+                        Width = 400,
+                        Height = 800,
+                    };
+
+                    var target = new Window()
+                    {
+                        SizeToContent = SizeToContent.WidthAndHeight,
+                        Content = child
+                    };
+
+                    Show(target);
+
+                    Assert.Equal(400, target.Width);
+                    Assert.Equal(800, target.Height);
+                }
+            }
+
+            [Fact]
+            public void SizeToContent_Should_Not_Be_Lost_On_Show()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var child = new Canvas
+                    {
+                        Width = 400,
+                        Height = 800,
+                    };
+
+                    var target = new Window()
+                    {
+                        SizeToContent = SizeToContent.WidthAndHeight,
+                        Content = child
+                    };
+
+                    Show(target);
+
+                    Assert.Equal(SizeToContent.WidthAndHeight, target.SizeToContent);
+                }
+            }
+
+            [Fact]
+            public void Width_Height_Should_Be_Updated_When_SizeToContent_Is_WidthAndHeight()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var child = new Canvas
+                    {
+                        Width = 400,
+                        Height = 800,
+                    };
+
+                    var target = new Window()
+                    {
+                        SizeToContent = SizeToContent.WidthAndHeight,
+                        Content = child
+                    };
+
+                    Show(target);
+
+                    Assert.Equal(400, target.Width);
+                    Assert.Equal(800, target.Height);
+
+                    child.Width = 410;
+                    target.LayoutManager.ExecuteLayoutPass();
+
+                    Assert.Equal(410, target.Width);
+                    Assert.Equal(800, target.Height);
+                    Assert.Equal(SizeToContent.WidthAndHeight, target.SizeToContent);
+                }
+            }
+
+            [Fact]
+            public void Setting_Width_Should_Resize_WindowImpl()
+            {
+                // Issue #3796
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var target = new Window()
+                    {
+                        Width = 400,
+                        Height = 800,
+                    };
+
+                    Show(target);
+
+                    Assert.Equal(400, target.Width);
+                    Assert.Equal(800, target.Height);
+
+                    target.Width = 410;
+                    target.LayoutManager.ExecuteLayoutPass();
+
+                    var windowImpl = Mock.Get(target.PlatformImpl);
+                    windowImpl.Verify(x => x.Resize(new Size(410, 800)));
+                    Assert.Equal(410, target.Width);
+                }
+            }
+
+            protected virtual void Show(Window window)
+            {
+                window.Show();
+            }
+        }
+
+        public class DialogSizingTests : SizingTests
+        {
+            protected override void Show(Window window)
+            {
+                var owner = new Window();
+                window.ShowDialog(owner);
+            }
+        }
+
         private IWindowImpl CreateImpl(Mock<IRenderer> renderer)
         {
             return Mock.Of<IWindowImpl>(x =>
-                x.Scaling == 1 &&
+                x.RenderScaling == 1 &&
                 x.CreateRenderer(It.IsAny<IRenderRoot>()) == renderer.Object);
         }
+
+        private class ChildControl : Control
+        {
+            public List<Size> MeasureSizes { get; } = new List<Size>();
+
+            protected override Size MeasureOverride(Size availableSize)
+            {
+                MeasureSizes.Add(availableSize);
+                return base.MeasureOverride(availableSize);
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/WindowingPlatformMock.cs b/tests/Avalonia.Controls.UnitTests/WindowingPlatformMock.cs
index a9c991b8b9..bf1322afbc 100644
--- a/tests/Avalonia.Controls.UnitTests/WindowingPlatformMock.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowingPlatformMock.cs
@@ -17,14 +17,14 @@ namespace Avalonia.Controls.UnitTests
 
         public IWindowImpl CreateWindow()
         {
-            return _windowImpl?.Invoke() ?? Mock.Of<IWindowImpl>(x => x.Scaling == 1);
+            return _windowImpl?.Invoke() ?? Mock.Of<IWindowImpl>(x => x.RenderScaling == 1);
         }
 
-        public IEmbeddableWindowImpl CreateEmbeddableWindow()
+        public IWindowImpl CreateEmbeddableWindow()
         {
             throw new NotImplementedException();
         }
 
-        public IPopupImpl CreatePopup() => _popupImpl?.Invoke() ?? Mock.Of<IPopupImpl>(x => x.Scaling == 1);
+        public IPopupImpl CreatePopup() => _popupImpl?.Invoke() ?? Mock.Of<IPopupImpl>(x => x.RenderScaling == 1);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Avalonia.Controls.UnitTests/WrapPanelTests.cs b/tests/Avalonia.Controls.UnitTests/WrapPanelTests.cs
index 82f94b4f3c..94f1b30fc9 100644
--- a/tests/Avalonia.Controls.UnitTests/WrapPanelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WrapPanelTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Layout;
 using Xunit;
 
diff --git a/tests/Avalonia.DesignerSupport.TestApp/App.xaml.cs b/tests/Avalonia.DesignerSupport.TestApp/App.xaml.cs
index 653a51232b..97b6b9021a 100644
--- a/tests/Avalonia.DesignerSupport.TestApp/App.xaml.cs
+++ b/tests/Avalonia.DesignerSupport.TestApp/App.xaml.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 
 namespace Avalonia.DesignerSupport.TestApp
@@ -13,5 +9,12 @@ namespace Avalonia.DesignerSupport.TestApp
         {
             AvaloniaXamlLoader.Load(this);
         }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                desktop.MainWindow = new MainWindow();
+            base.OnFrameworkInitializationCompleted();
+        }
     }
 }
diff --git a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj b/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
index 6bba5e7348..523c5e7ff4 100644
--- a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
+++ b/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
@@ -32,5 +32,4 @@
     <ProjectReference Include="..\..\src\Avalonia.Desktop\Avalonia.Desktop.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />
-  <Import Project="..\..\build\Serilog.props" />
 </Project>
diff --git a/tests/Avalonia.DesignerSupport.TestApp/Program.cs b/tests/Avalonia.DesignerSupport.TestApp/Program.cs
index c7c60a4eca..b8428511b3 100644
--- a/tests/Avalonia.DesignerSupport.TestApp/Program.cs
+++ b/tests/Avalonia.DesignerSupport.TestApp/Program.cs
@@ -1,24 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-
-namespace Avalonia.DesignerSupport.TestApp
+namespace Avalonia.DesignerSupport.TestApp
 {
     static class Program
     {
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
-        static void Main()
-        {
-            BuildAvaloniaApp().Start<MainWindow>();
-        }
+        public static int Main(string[] args)
+            => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
 
-        private static AppBuilder BuildAvaloniaApp()
-        {
-            return AppBuilder.Configure<App>().UsePlatformDetect();
-        }
+        public static AppBuilder BuildAvaloniaApp()
+          => AppBuilder.Configure<App>().UsePlatformDetect();
     }
 }
diff --git a/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj b/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj
index 94c2ed934d..dad500e3c6 100644
--- a/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj
+++ b/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
diff --git a/tests/Avalonia.DesignerSupport.Tests/DesignerSupportTests.cs b/tests/Avalonia.DesignerSupport.Tests/DesignerSupportTests.cs
index 01fa0e7783..d76ed9042f 100644
--- a/tests/Avalonia.DesignerSupport.Tests/DesignerSupportTests.cs
+++ b/tests/Avalonia.DesignerSupport.Tests/DesignerSupportTests.cs
@@ -11,6 +11,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Remote.Protocol;
 using Avalonia.Remote.Protocol.Designer;
+using Avalonia.Remote.Protocol.Viewport;
 using Xunit;
 using Xunit.Extensions;
 
@@ -28,22 +29,41 @@ namespace Avalonia.DesignerSupport.Tests
 
         [SkippableTheory,
          InlineData(
-            @"..\..\..\..\..\tests/Avalonia.DesignerSupport.TestApp/bin/$BUILD/netcoreapp2.0/",
+            @"..\..\..\..\..\tests/Avalonia.DesignerSupport.TestApp/bin/$BUILD/netcoreapp3.1/",
             "Avalonia.DesignerSupport.TestApp",
             "Avalonia.DesignerSupport.TestApp.dll",
-            @"..\..\..\..\..\tests\Avalonia.DesignerSupport.TestApp\MainWindow.xaml"),
+            @"..\..\..\..\..\tests\Avalonia.DesignerSupport.TestApp\MainWindow.xaml",
+            "win32"),
          InlineData(
-            @"..\..\..\..\..\samples\ControlCatalog.NetCore\bin\$BUILD\netcoreapp2.0\",
+            @"..\..\..\..\..\samples\ControlCatalog.NetCore\bin\$BUILD\netcoreapp3.1\",
             "ControlCatalog.NetCore",
             "ControlCatalog.dll",
-            @"..\..\..\..\..\samples\ControlCatalog\MainWindow.xaml")]
+            @"..\..\..\..\..\samples\ControlCatalog\MainWindow.xaml",
+            "win32"),
+        InlineData(
+            @"..\..\..\..\..\tests/Avalonia.DesignerSupport.TestApp/bin/$BUILD/netcoreapp3.1/",
+            "Avalonia.DesignerSupport.TestApp",
+            "Avalonia.DesignerSupport.TestApp.dll",
+            @"..\..\..\..\..\tests\Avalonia.DesignerSupport.TestApp\MainWindow.xaml",
+            "avalonia-remote"),
+        InlineData(
+            @"..\..\..\..\..\samples\ControlCatalog.NetCore\bin\$BUILD\netcoreapp3.1\",
+            "ControlCatalog.NetCore",
+            "ControlCatalog.dll",
+            @"..\..\..\..\..\samples\ControlCatalog\MainWindow.xaml",
+            "avalonia-remote")]
         public async Task Designer_In_Win32_Mode_Should_Provide_Valid_Hwnd(
             string outputDir,
             string executableName,
             string assemblyName,
-            string xamlFile)
+            string xamlFile,
+            string method)
         {
-            Skip.IfNot(RuntimeInformation.IsOSPlatform(OSPlatform.Windows));
+            outputDir = Path.GetFullPath(outputDir.Replace('\\', Path.DirectorySeparatorChar));
+            xamlFile = Path.GetFullPath(xamlFile.Replace('\\', Path.DirectorySeparatorChar));
+            
+            if (method == "win32")
+                Skip.IfNot(RuntimeInformation.IsOSPlatform(OSPlatform.Windows));
 
             var xaml = File.ReadAllText(xamlFile);
             string buildType;
@@ -56,6 +76,8 @@ namespace Avalonia.DesignerSupport.Tests
 
             var sessionId = Guid.NewGuid();
             long handle = 0;
+            bool success = false;
+            string error = null;
 
             var resultMessageReceivedToken = new CancellationTokenSource();
 
@@ -71,6 +93,18 @@ namespace Avalonia.DesignerSupport.Tests
                     if (msg is StartDesignerSessionMessage start)
                     {
                         Assert.Equal(sessionId, Guid.Parse(start.SessionId));
+                        if (method == "avalonia-remote")
+                        {
+                            await conn.Send(new ClientSupportedPixelFormatsMessage
+                            {
+                                Formats = new[] { PixelFormat.Rgba8888 }
+                            });
+                            await conn.Send(new ClientViewportAllocatedMessage
+                            {
+                                DpiX = 96, DpiY = 96, Width = 1024, Height = 768
+                            });
+                        }
+
                         await conn.Send(new UpdateXamlMessage
                         {
                             AssemblyPath = Path.Combine(outputDir, assemblyName),
@@ -80,8 +114,14 @@ namespace Avalonia.DesignerSupport.Tests
                     else if (msg is UpdateXamlResultMessage result)
                     {
                         if (result.Error != null)
+                        {
+                            error = result.Error;
                             outputHelper.WriteLine(result.Error);
-                        handle = result.Handle != null ? long.Parse(result.Handle) : 0;
+                        }
+                        else
+                            success = true;
+                        if (method == "win32")
+                            handle = result.Handle != null ? long.Parse(result.Handle) : 0;
                         resultMessageReceivedToken.Cancel();
                         conn.Dispose();
                     }
@@ -91,7 +131,7 @@ namespace Avalonia.DesignerSupport.Tests
             var cmdline =
                 $"exec --runtimeconfig \"{outputDir}{executableName}.runtimeconfig.json\" --depsfile \"{outputDir}{executableName}.deps.json\" "
                 + $" \"{DesignerAppPath.Replace("$BUILD", buildType)}\" "
-                + $"--transport tcp-bson://127.0.0.1:{port}/ --session-id {sessionId} --method win32 \"{outputDir}{executableName}.dll\"";
+                + $"--transport tcp-bson://127.0.0.1:{port}/ --session-id {sessionId} --method {method} \"{outputDir}{executableName}.dll\"";
 
             using (var proc = new Process
             {
@@ -128,10 +168,15 @@ namespace Avalonia.DesignerSupport.Tests
                 }
 
                 proc.WaitForExit();
+                var stdout = proc.StandardOutput.ReadToEnd();
+                var stderr = proc.StandardError.ReadToEnd();
                 Assert.True(cancelled,
                     $"Message Not Received.\n" + proc.StandardOutput.ReadToEnd() + "\n" +
-                    proc.StandardError.ReadToEnd());
-                Assert.NotEqual(0, handle);
+                    stderr + "\n" + stdout);
+                Assert.True(success, error);
+                if (method == "win32")
+                    Assert.NotEqual(0, handle);
+                
 
             }
         }
diff --git a/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/.gitignore b/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/.gitignore
new file mode 100644
index 0000000000..dc33b94747
--- /dev/null
+++ b/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/.gitignore
@@ -0,0 +1,3 @@
+build
+node_modules
+.nyc_output
\ No newline at end of file
diff --git a/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/Models/InputEventTests.ts b/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/Models/InputEventTests.ts
new file mode 100644
index 0000000000..e96c4d4731
--- /dev/null
+++ b/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/Models/InputEventTests.ts
@@ -0,0 +1,94 @@
+import { describe } from 'mocha';
+import { expect } from 'chai';
+import { Mock } from "moq.ts";
+import { MouseEvent, WheelEvent } from "react";
+import { InputModifiers } from "../../../../../../src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/InputModifiers";
+import { MouseButton } from "../../../../../../src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/MouseButton";
+import { PointerMovedEventMessage } from "../../../../../../src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/PointerMovedEventMessage";
+import { PointerPressedEventMessage } from "../../../../../../src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/PointerPressedEventMessage";
+import { PointerReleasedEventMessage } from "../../../../../../src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/PointerReleasedEventMessage";
+import { ScrollEventMessage } from "../../../../../../src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/ScrollEventMessage";
+import { getModifiers, getMouseButton } from '../../../../../../src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/src/Models/Input/MouseEventHelpers';
+
+describe("Input event tests", () => {
+    describe("Helpers", () => {
+        it("getModifiers", () => {
+            const event = new Mock<MouseEvent>()
+                .setup(x => x.altKey).returns(false)
+                .setup(x => x.ctrlKey).returns(true)
+                .setup(x => x.shiftKey).returns(false)
+                .setup(x => x.metaKey).returns(false)
+                .setup(x => x.buttons).returns(1)
+                .object()
+            var actual = getModifiers(event)
+
+            expect(actual)
+                .eql([InputModifiers.Control, InputModifiers.LeftMouseButton])
+        })
+        it("getMouseButton", () => {
+            const event = new Mock<MouseEvent>()
+                .setup(x => x.button).returns(1)
+                .object()
+            var actual = getMouseButton(event)
+
+            expect(actual)
+                .equal(MouseButton.Middle)
+        })
+    })
+
+    describe("Messages", () => {
+        const x = .3
+        const y = .42
+        const modifiers = "0,1,2,3,4,5,6"
+
+        const button = "1"
+
+        const deltaX = -3.
+        const deltaY = -3. 
+
+        const mouseEvent = new Mock<MouseEvent>()
+            .setup(x => x.altKey).returns(true)
+            .setup(x => x.ctrlKey).returns(true)
+            .setup(x => x.shiftKey).returns(true)
+            .setup(x => x.metaKey).returns(true)
+            .setup(x => x.buttons).returns(7)
+            .setup(x => x.button).returns(0)
+            .setup(x => x.clientX).returns(x)
+            .setup(x => x.clientY).returns(y)
+            .object()
+
+        it("PointerMovedEventMessage", () => {
+            const message = new PointerMovedEventMessage(mouseEvent)
+            expect(message.toString())
+                .equal(`pointer-moved:${modifiers}:${x}:${y}`)
+        })
+        it("PointerPressedEventMessage", () => {
+            const message = new PointerPressedEventMessage(mouseEvent)
+            expect(message.toString())
+                .equal(`pointer-pressed:${modifiers}:${x}:${y}:${button}`)
+        })
+        it("PointerReleasedEventMessage", () => {
+            const message = new PointerReleasedEventMessage(mouseEvent)
+            expect(message.toString())
+                .equal(`pointer-released:${modifiers}:${x}:${y}:${button}`)
+        })
+
+        it("ScrollEventMessage", () => {
+            const wheelEvent = new Mock<WheelEvent>()
+                .setup(x => x.altKey).returns(true)
+                .setup(x => x.ctrlKey).returns(true)
+                .setup(x => x.shiftKey).returns(true)
+                .setup(x => x.metaKey).returns(true)
+                .setup(x => x.buttons).returns(7)
+                .setup(x => x.clientX).returns(x)
+                .setup(x => x.clientY).returns(y)
+                .setup(x => x.deltaX).returns(-deltaX)
+                .setup(x => x.deltaY).returns(-deltaY)
+                .object()
+            const message = new ScrollEventMessage(wheelEvent)
+
+            expect(message.toString())
+                .equal(`scroll:${modifiers}:${x}:${y}:${deltaX}:${deltaY}`)
+        })
+    })
+})
diff --git a/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/package-lock.json b/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/package-lock.json
new file mode 100644
index 0000000000..eb707cb73f
--- /dev/null
+++ b/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/package-lock.json
@@ -0,0 +1,2414 @@
+{
+  "name": "simple-test",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "@babel/core": {
+      "version": "7.11.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz",
+      "integrity": "sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/generator": "^7.11.6",
+        "@babel/helper-module-transforms": "^7.11.0",
+        "@babel/helpers": "^7.10.4",
+        "@babel/parser": "^7.11.5",
+        "@babel/template": "^7.10.4",
+        "@babel/traverse": "^7.11.5",
+        "@babel/types": "^7.11.5",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.1",
+        "json5": "^2.1.2",
+        "lodash": "^4.17.19",
+        "resolve": "^1.3.2",
+        "semver": "^5.4.1",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/generator": {
+      "version": "7.11.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
+      "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.11.5",
+        "jsesc": "^2.5.1",
+        "source-map": "^0.5.0"
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+      "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-get-function-arity": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+      "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-member-expression-to-functions": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
+      "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.11.0"
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
+      "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
+      "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.10.4",
+        "@babel/helper-simple-access": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.11.0",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.11.0",
+        "lodash": "^4.17.19"
+      }
+    },
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
+      "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-replace-supers": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
+      "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-member-expression-to-functions": "^7.10.4",
+        "@babel/helper-optimise-call-expression": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-simple-access": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
+      "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+      "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.11.0"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+      "dev": true
+    },
+    "@babel/helpers": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz",
+      "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.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": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "escape-string-regexp": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "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"
+          }
+        }
+      }
+    },
+    "@babel/parser": {
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+      "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+      "dev": true
+    },
+    "@babel/template": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
+      "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/generator": "^7.11.5",
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.11.0",
+        "@babel/parser": "^7.11.5",
+        "@babel/types": "^7.11.5",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.19"
+      }
+    },
+    "@babel/types": {
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+      "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "lodash": "^4.17.19",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.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"
+          }
+        }
+      }
+    },
+    "@istanbuljs/schema": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
+      "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
+      "dev": true
+    },
+    "@types/chai": {
+      "version": "4.2.12",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.12.tgz",
+      "integrity": "sha512-aN5IAC8QNtSUdQzxu7lGBgYAOuU1tmRU4c9dIq5OKGf/SBVjXo+ffM2wEjudAWbgpOhy60nLoAGH1xm8fpCKFQ==",
+      "dev": true
+    },
+    "@types/color-name": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
+      "dev": true
+    },
+    "@types/mocha": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.0.3.tgz",
+      "integrity": "sha512-vyxR57nv8NfcU0GZu8EUXZLTbCMupIUwy95LJ6lllN+JRPG25CwMHoB1q5xKh8YKhQnHYRAn4yW2yuHbf/5xgg==",
+      "dev": true
+    },
+    "@types/prop-types": {
+      "version": "15.7.3",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz",
+      "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==",
+      "dev": true
+    },
+    "@types/react": {
+      "version": "16.9.49",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.49.tgz",
+      "integrity": "sha512-DtLFjSj0OYAdVLBbyjhuV9CdGVHCkHn2R+xr3XkBvK2rS1Y1tkc14XSGjYgm5Fjjr90AxH9tiSzc1pCFMGO06g==",
+      "dev": true,
+      "requires": {
+        "@types/prop-types": "*",
+        "csstype": "^3.0.2"
+      }
+    },
+    "aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
+      "requires": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      }
+    },
+    "ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+      "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+      "dev": true,
+      "requires": {
+        "@types/color-name": "^1.1.1",
+        "color-convert": "^2.0.1"
+      }
+    },
+    "anymatch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "dev": true,
+      "requires": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      }
+    },
+    "append-transform": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz",
+      "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==",
+      "dev": true,
+      "requires": {
+        "default-require-extensions": "^3.0.0"
+      }
+    },
+    "archy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
+      "dev": true
+    },
+    "arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "array.prototype.map": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.2.tgz",
+      "integrity": "sha512-Az3OYxgsa1g7xDYp86l0nnN4bcmuEITGe1rbdEBVkrqkzMgDcbdQ2R7r41pNzti+4NMces3H8gMmuioZUilLgw==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1",
+        "es-array-method-boxes-properly": "^1.0.0",
+        "is-string": "^1.0.4"
+      }
+    },
+    "assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "binary-extensions": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
+      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
+      "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"
+      }
+    },
+    "browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true
+    },
+    "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
+    },
+    "caching-transform": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz",
+      "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==",
+      "dev": true,
+      "requires": {
+        "hasha": "^5.0.0",
+        "make-dir": "^3.0.0",
+        "package-hash": "^4.0.0",
+        "write-file-atomic": "^3.0.0"
+      }
+    },
+    "camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true
+    },
+    "chai": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
+      "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
+      "dev": true,
+      "requires": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.2",
+        "deep-eql": "^3.0.1",
+        "get-func-name": "^2.0.0",
+        "pathval": "^1.1.0",
+        "type-detect": "^4.0.5"
+      }
+    },
+    "chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+      "dev": true
+    },
+    "chokidar": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
+      "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
+      "dev": true,
+      "requires": {
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "fsevents": "~2.1.2",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.4.0"
+      }
+    },
+    "clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true
+    },
+    "cliui": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "dev": true,
+      "requires": {
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
+      },
+      "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==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.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
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
+    "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
+    },
+    "convert-source-map": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.1"
+      },
+      "dependencies": {
+        "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
+        }
+      }
+    },
+    "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"
+      }
+    },
+    "csstype": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.3.tgz",
+      "integrity": "sha512-jPl+wbWPOWJ7SXsWyqGRk3lGecbar0Cb0OvZF/r/ZU011R4YqiRehgkQ9p4eQfo9DSDLqLL3wHwfxeJiuIsNag==",
+      "dev": true
+    },
+    "debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "dev": true,
+      "requires": {
+        "ms": "^2.1.1"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "deep-eql": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
+      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+      "dev": true,
+      "requires": {
+        "type-detect": "^4.0.0"
+      }
+    },
+    "default-require-extensions": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz",
+      "integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==",
+      "dev": true,
+      "requires": {
+        "strip-bom": "^4.0.0"
+      }
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
+    "diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "dev": true
+    },
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "es-abstract": {
+      "version": "1.17.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+      "dev": true,
+      "requires": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.0",
+        "is-regex": "^1.1.0",
+        "object-inspect": "^1.7.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.0",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      }
+    },
+    "es-array-method-boxes-properly": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
+      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
+      "dev": true
+    },
+    "es-get-iterator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.0.tgz",
+      "integrity": "sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==",
+      "dev": true,
+      "requires": {
+        "es-abstract": "^1.17.4",
+        "has-symbols": "^1.0.1",
+        "is-arguments": "^1.0.4",
+        "is-map": "^2.0.1",
+        "is-set": "^2.0.1",
+        "is-string": "^1.0.5",
+        "isarray": "^2.0.5"
+      }
+    },
+    "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"
+      }
+    },
+    "es6-error": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
+      "dev": 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
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "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-cache-dir": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+      "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+      "dev": true,
+      "requires": {
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      }
+    },
+    "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": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz",
+      "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==",
+      "dev": true,
+      "requires": {
+        "is-buffer": "~2.0.3"
+      }
+    },
+    "foreground-child": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz",
+      "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "fromentries": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.2.1.tgz",
+      "integrity": "sha512-Xu2Qh8yqYuDhQGOhD5iJGninErSfI9A3FrriD3tjUgV5VbJFeH8vfgZ9HnC6jWN80QDVNQK5vmxRAmEAp7Mevw==",
+      "dev": true
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "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
+    },
+    "gensync": {
+      "version": "1.0.0-beta.1",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
+      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
+      "dev": true
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true
+    },
+    "get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
+      "dev": true
+    },
+    "get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "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-parent": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true
+    },
+    "graceful-fs": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+      "dev": true
+    },
+    "growl": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+      "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
+    },
+    "hasha": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz",
+      "integrity": "sha512-2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw==",
+      "dev": true,
+      "requires": {
+        "is-stream": "^2.0.0",
+        "type-fest": "^0.8.0"
+      }
+    },
+    "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-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "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
+    },
+    "is-arguments": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
+      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
+      "dev": true
+    },
+    "is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^2.0.0"
+      }
+    },
+    "is-buffer": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
+      "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==",
+      "dev": true
+    },
+    "is-callable": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz",
+      "integrity": "sha512-wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg==",
+      "dev": true
+    },
+    "is-date-object": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.1.tgz",
+      "integrity": "sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==",
+      "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-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "is-set": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.1.tgz",
+      "integrity": "sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+      "dev": true
+    },
+    "is-string": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
+      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
+      "dev": true
+    },
+    "is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
+    "isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "istanbul-lib-coverage": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
+      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
+      "dev": true
+    },
+    "istanbul-lib-hook": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz",
+      "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==",
+      "dev": true,
+      "requires": {
+        "append-transform": "^2.0.0"
+      }
+    },
+    "istanbul-lib-instrument": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.7.5",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.0.0",
+        "semver": "^6.3.0"
+      }
+    },
+    "istanbul-lib-processinfo": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz",
+      "integrity": "sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==",
+      "dev": true,
+      "requires": {
+        "archy": "^1.0.0",
+        "cross-spawn": "^7.0.0",
+        "istanbul-lib-coverage": "^3.0.0-alpha.1",
+        "make-dir": "^3.0.0",
+        "p-map": "^3.0.0",
+        "rimraf": "^3.0.0",
+        "uuid": "^3.3.3"
+      }
+    },
+    "istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+      "dev": true,
+      "requires": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^3.0.0",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "istanbul-lib-source-maps": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
+      "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "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
+        }
+      }
+    },
+    "istanbul-reports": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
+      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
+      "dev": true,
+      "requires": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      }
+    },
+    "iterate-iterator": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/iterate-iterator/-/iterate-iterator-1.0.1.tgz",
+      "integrity": "sha512-3Q6tudGN05kbkDQDI4CqjaBf4qf85w6W6GnuZDtUVYwKgtC1q8yxYX7CZed7N+tLzQqS6roujWvszf13T+n9aw==",
+      "dev": true
+    },
+    "iterate-value": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/iterate-value/-/iterate-value-1.0.2.tgz",
+      "integrity": "sha512-A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ==",
+      "dev": true,
+      "requires": {
+        "es-get-iterator": "^1.0.2",
+        "iterate-iterator": "^1.0.1"
+      }
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true
+    },
+    "json5": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
+      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "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": {
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+      "dev": true
+    },
+    "lodash.flattendeep": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
+      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
+      "dev": true
+    },
+    "log-symbols": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
+      "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
+      "dev": true,
+      "requires": {
+        "chalk": "^4.0.0"
+      }
+    },
+    "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==",
+      "dev": true,
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "requires": {
+        "semver": "^6.0.0"
+      }
+    },
+    "make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
+    },
+    "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
+    },
+    "mocha": {
+      "version": "8.1.3",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.1.3.tgz",
+      "integrity": "sha512-ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "4.1.1",
+        "browser-stdout": "1.3.1",
+        "chokidar": "3.4.2",
+        "debug": "4.1.1",
+        "diff": "4.0.2",
+        "escape-string-regexp": "4.0.0",
+        "find-up": "5.0.0",
+        "glob": "7.1.6",
+        "growl": "1.10.5",
+        "he": "1.2.0",
+        "js-yaml": "3.14.0",
+        "log-symbols": "4.0.0",
+        "minimatch": "3.0.4",
+        "ms": "2.1.2",
+        "object.assign": "4.1.0",
+        "promise.allsettled": "1.0.2",
+        "serialize-javascript": "4.0.0",
+        "strip-json-comments": "3.0.1",
+        "supports-color": "7.1.0",
+        "which": "2.0.2",
+        "wide-align": "1.1.3",
+        "workerpool": "6.0.0",
+        "yargs": "13.3.2",
+        "yargs-parser": "13.1.2",
+        "yargs-unparser": "1.6.1"
+      }
+    },
+    "moq.ts": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/moq.ts/-/moq.ts-6.4.0.tgz",
+      "integrity": "sha512-g9siyKOvYGVhfDCl9mpLptch93egRC3yXIbPLssxukOROl368XBB+6M7YjLTkjVRHbKbpJBD6P7od+Ky/0xWIw==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.0.0"
+      }
+    },
+    "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
+    },
+    "node-preload": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz",
+      "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==",
+      "dev": true,
+      "requires": {
+        "process-on-spawn": "^1.0.0"
+      }
+    },
+    "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
+    },
+    "nyc": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz",
+      "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==",
+      "dev": true,
+      "requires": {
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "caching-transform": "^4.0.0",
+        "convert-source-map": "^1.7.0",
+        "decamelize": "^1.2.0",
+        "find-cache-dir": "^3.2.0",
+        "find-up": "^4.1.0",
+        "foreground-child": "^2.0.0",
+        "get-package-type": "^0.1.0",
+        "glob": "^7.1.6",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-hook": "^3.0.0",
+        "istanbul-lib-instrument": "^4.0.0",
+        "istanbul-lib-processinfo": "^2.0.2",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.0.2",
+        "make-dir": "^3.0.0",
+        "node-preload": "^0.2.1",
+        "p-map": "^3.0.0",
+        "process-on-spawn": "^1.0.0",
+        "resolve-from": "^5.0.0",
+        "rimraf": "^3.0.0",
+        "signal-exit": "^3.0.2",
+        "spawn-wrap": "^2.0.0",
+        "test-exclude": "^6.0.0",
+        "yargs": "^15.0.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "cliui": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^6.2.0"
+          }
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
+        },
+        "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"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "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"
+          }
+        },
+        "string-width": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "yargs": {
+          "version": "15.4.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+          "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+          "dev": true,
+          "requires": {
+            "cliui": "^6.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^4.1.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^4.2.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^18.1.2"
+          }
+        },
+        "yargs-parser": {
+          "version": "18.1.3",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
+    "object-inspect": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
+      "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.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "p-limit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz",
+      "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==",
+      "dev": true,
+      "requires": {
+        "p-try": "^2.0.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"
+      }
+    },
+    "p-map": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
+      "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
+      "dev": true,
+      "requires": {
+        "aggregate-error": "^3.0.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
+    },
+    "package-hash": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz",
+      "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.15",
+        "hasha": "^5.0.0",
+        "lodash.flattendeep": "^4.4.0",
+        "release-zalgo": "^1.0.0"
+      }
+    },
+    "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": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "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.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
+    "pathval": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
+      "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=",
+      "dev": true
+    },
+    "picomatch": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "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"
+      },
+      "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"
+          }
+        }
+      }
+    },
+    "process-on-spawn": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz",
+      "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==",
+      "dev": true,
+      "requires": {
+        "fromentries": "^1.2.0"
+      }
+    },
+    "promise.allsettled": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.2.tgz",
+      "integrity": "sha512-UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg==",
+      "dev": true,
+      "requires": {
+        "array.prototype.map": "^1.0.1",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1",
+        "function-bind": "^1.1.1",
+        "iterate-value": "^1.0.0"
+      }
+    },
+    "prop-types": {
+      "version": "15.7.2",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+      "dev": true,
+      "requires": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.8.1"
+      }
+    },
+    "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"
+      }
+    },
+    "react": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-16.13.1.tgz",
+      "integrity": "sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==",
+      "dev": true,
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2"
+      }
+    },
+    "react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "dev": true
+    },
+    "readdirp": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
+      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+      "dev": true,
+      "requires": {
+        "picomatch": "^2.2.1"
+      }
+    },
+    "release-zalgo": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz",
+      "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=",
+      "dev": true,
+      "requires": {
+        "es6-error": "^4.0.1"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "dev": true,
+      "requires": {
+        "path-parse": "^1.0.6"
+      }
+    },
+    "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": "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"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true
+    },
+    "semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true
+    },
+    "serialize-javascript": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "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
+    },
+    "signal-exit": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
+      "dev": true
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true
+    },
+    "source-map-support": {
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "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
+        }
+      }
+    },
+    "spawn-wrap": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz",
+      "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==",
+      "dev": true,
+      "requires": {
+        "foreground-child": "^2.0.0",
+        "is-windows": "^1.0.2",
+        "make-dir": "^3.0.0",
+        "rimraf": "^3.0.0",
+        "signal-exit": "^3.0.2",
+        "which": "^2.0.1"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      }
+    },
+    "string.prototype.trimend": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
+      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      }
+    },
+    "string.prototype.trimstart": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
+      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      }
+    },
+    "strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^3.0.0"
+      }
+    },
+    "strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "dev": true
+    },
+    "strip-json-comments": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
+      "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+      "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^4.0.0"
+      }
+    },
+    "test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "requires": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      }
+    },
+    "to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "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"
+      }
+    },
+    "ts-node": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-9.0.0.tgz",
+      "integrity": "sha512-/TqB4SnererCDR/vb4S/QvSZvzQMJN8daAslg7MeaiHvD8rDZsSfXmNeNumyZZzMned72Xoq/isQljYSt8Ynfg==",
+      "dev": true,
+      "requires": {
+        "arg": "^4.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "source-map-support": "^0.5.17",
+        "yn": "3.1.1"
+      }
+    },
+    "tslib": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
+      "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==",
+      "dev": true
+    },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true
+    },
+    "type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true
+    },
+    "typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "dev": true,
+      "requires": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "typescript": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz",
+      "integrity": "sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==",
+      "dev": true
+    },
+    "uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "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"
+      }
+    },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "dev": true,
+      "requires": {
+        "string-width": "^1.0.2 || 2"
+      }
+    },
+    "workerpool": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.0.0.tgz",
+      "integrity": "sha512-fU2OcNA/GVAJLLyKUoHkAgIhKb0JoCpSjLC/G2vYKxUjVmQwGbRVeoPJ1a8U4pnVofz4AQV5Y/NEw8oKqxEBtA==",
+      "dev": true
+    },
+    "wrap-ansi": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.0.0"
+      },
+      "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==",
+          "dev": true
+        },
+        "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"
+          }
+        },
+        "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": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "write-file-atomic": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "^0.1.4",
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
+      }
+    },
+    "y18n": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "dev": true
+    },
+    "yargs": {
+      "version": "13.3.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+      "dev": true,
+      "requires": {
+        "cliui": "^5.0.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^3.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^13.1.2"
+      },
+      "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==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.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": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "yargs-parser": {
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    },
+    "yargs-unparser": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.1.tgz",
+      "integrity": "sha512-qZV14lK9MWsGCmcr7u5oXGH0dbGqZAIxTDrWXZDo5zUr6b6iUmelNKO6x6R1dQT24AH3LgRxJpr8meWy2unolA==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.3.1",
+        "decamelize": "^1.2.0",
+        "flat": "^4.1.0",
+        "is-plain-obj": "^1.1.0",
+        "yargs": "^14.2.3"
+      },
+      "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==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.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": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
+        "yargs": {
+          "version": "14.2.3",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz",
+          "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==",
+          "dev": true,
+          "requires": {
+            "cliui": "^5.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^15.0.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "15.0.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz",
+          "integrity": "sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
+    "yn": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "dev": true
+    }
+  }
+}
diff --git a/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/package.json b/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/package.json
new file mode 100644
index 0000000000..dbb12e192a
--- /dev/null
+++ b/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/package.json
@@ -0,0 +1,26 @@
+{
+  "name": "simple-test",
+  "version": "1.0.0",
+  "main": "index.js",
+  "scripts": {
+    "test": "mocha -r ts-node/register ./**/*Tests.ts",
+    "coverage": "nyc -r text -e .ts -x \"./*Tests.ts\" npm run test"
+  },
+  "type": "module",
+  "keywords": [],
+  "author": "",
+  "license": "MIT",
+  "dependencies": {},
+  "devDependencies": {
+    "@types/chai": "4.2.12",
+    "@types/mocha": "8.0.3",
+    "@types/react": "^16.3.14",
+    "chai": "^4.2.0",
+    "mocha": "^8.1.3",
+    "moq.ts": "^6.4.0",
+    "nyc": "^15.1.0",
+    "react": "^16.3.2",
+    "ts-node": "^9.0.0",
+    "typescript": "^4.0.2"
+  }
+}
diff --git a/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/tsconfig.json b/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/tsconfig.json
new file mode 100644
index 0000000000..fdb82879fc
--- /dev/null
+++ b/tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es5",
+    "sourceMap": true,
+    "strict": true,
+    "esModuleInterop": true
+  },
+  "exclude": [
+    "node_modules"
+  ]
+}
diff --git a/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj b/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
index ecc928461e..c59e59be63 100644
--- a/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
+++ b/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
@@ -1,10 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\Avalonia.RenderTests\**\*.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <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" />
@@ -24,4 +27,5 @@
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\XUnit.props" />
   <Import Project="..\..\build\Magick.NET-Q16-AnyCPU.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 b09902332b..42229ba456 100644
--- a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj
+++ b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj
@@ -1,12 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
   </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>
+    <EmbeddedResource Include="..\Avalonia.RenderTests\**\*.ttf" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
@@ -19,4 +23,4 @@
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
     <ProjectReference Include="..\..\src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/Avalonia.Direct2D1.UnitTests/Controls/Shapes/PathTests.cs b/tests/Avalonia.Direct2D1.UnitTests/Controls/Shapes/PathTests.cs
index 7f8174562a..72a3ba7038 100644
--- a/tests/Avalonia.Direct2D1.UnitTests/Controls/Shapes/PathTests.cs
+++ b/tests/Avalonia.Direct2D1.UnitTests/Controls/Shapes/PathTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls.Shapes;
 using Avalonia.Layout;
 using Avalonia.Media;
diff --git a/tests/Avalonia.Direct2D1.UnitTests/Media/FontManagerImplTests.cs b/tests/Avalonia.Direct2D1.UnitTests/Media/FontManagerImplTests.cs
new file mode 100644
index 0000000000..c6ecc0a7e5
--- /dev/null
+++ b/tests/Avalonia.Direct2D1.UnitTests/Media/FontManagerImplTests.cs
@@ -0,0 +1,116 @@
+using Avalonia.Direct2D1.Media;
+using Avalonia.Media;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Direct2D1.UnitTests.Media
+{
+    public class FontManagerImplTests
+    {
+        private static string s_fontUri = "resm:Avalonia.Direct2D1.UnitTests.Assets?assembly=Avalonia.Direct2D1.UnitTests#Noto Mono";
+
+        [Fact]
+        public void Should_Create_Typeface_From_Fallback()
+        {
+            using (AvaloniaLocator.EnterScope())
+            {
+                Direct2D1Platform.Initialize();
+
+                var fontManager = new FontManagerImpl();
+
+                var glyphTypeface = (GlyphTypefaceImpl)fontManager.CreateGlyphTypeface(
+                    new Typeface(new FontFamily("A, B, Arial")));
+
+                var font = glyphTypeface.DWFont;
+
+                Assert.Equal("Arial", font.FontFamily.FamilyNames.GetString(0));
+
+                Assert.Equal(SharpDX.DirectWrite.FontWeight.Normal, font.Weight);
+
+                Assert.Equal(SharpDX.DirectWrite.FontStyle.Normal, font.Style);
+            }
+        }
+
+        [Fact]
+        public void Should_Create_Typeface_From_Fallback_Bold()
+        {
+            using (AvaloniaLocator.EnterScope())
+            {
+                Direct2D1Platform.Initialize();
+
+                var fontManager = new FontManagerImpl();
+
+                var glyphTypeface = (GlyphTypefaceImpl)fontManager.CreateGlyphTypeface(
+                    new Typeface(new FontFamily("A, B, Arial"), weight: FontWeight.Bold));
+
+                var font = glyphTypeface.DWFont;
+
+                Assert.Equal("Arial", font.FontFamily.FamilyNames.GetString(0));
+
+                Assert.Equal(SharpDX.DirectWrite.FontWeight.Bold, font.Weight);
+
+                Assert.Equal(SharpDX.DirectWrite.FontStyle.Normal, font.Style);
+            }
+        }
+
+        [Fact]
+        public void Should_Create_Typeface_For_Unknown_Font()
+        {
+            using (AvaloniaLocator.EnterScope())
+            {
+                Direct2D1Platform.Initialize();
+
+                var fontManager = new FontManagerImpl();
+
+                var glyphTypeface = (GlyphTypefaceImpl)fontManager.CreateGlyphTypeface(
+                    new Typeface(new FontFamily("Unknown")));
+
+                var font = glyphTypeface.DWFont;
+
+                var defaultName = fontManager.GetDefaultFontFamilyName();
+
+                Assert.Equal(defaultName, font.FontFamily.FamilyNames.GetString(0));
+
+                Assert.Equal(SharpDX.DirectWrite.FontWeight.Normal, font.Weight);
+
+                Assert.Equal(SharpDX.DirectWrite.FontStyle.Normal, font.Style);
+            }
+        }
+
+        [Fact]
+        public void Should_Load_Typeface_From_Resource()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Direct2D1Platform.Initialize();
+
+                var fontManager = new FontManagerImpl();
+
+                var glyphTypeface = (GlyphTypefaceImpl)fontManager.CreateGlyphTypeface(
+                    new Typeface(s_fontUri));
+
+                var font = glyphTypeface.DWFont;
+
+                Assert.Equal("Noto Mono", font.FontFamily.FamilyNames.GetString(0));
+            }
+        }
+
+        [Fact]
+        public void Should_Load_Nearest_Matching_Font()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                Direct2D1Platform.Initialize();
+
+                var fontManager = new FontManagerImpl();
+
+                var glyphTypeface = (GlyphTypefaceImpl)fontManager.CreateGlyphTypeface(
+                    new Typeface(s_fontUri, FontStyle.Italic, FontWeight.Black));
+
+                var font = glyphTypeface.DWFont;
+
+                Assert.Equal("Noto Mono", font.FontFamily.FamilyNames.GetString(0));
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Direct2D1.UnitTests/Media/GeometryTests.cs b/tests/Avalonia.Direct2D1.UnitTests/Media/GeometryTests.cs
index 963c75078b..d8b6b13b25 100644
--- a/tests/Avalonia.Direct2D1.UnitTests/Media/GeometryTests.cs
+++ b/tests/Avalonia.Direct2D1.UnitTests/Media/GeometryTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Media;
 using Xunit;
 
diff --git a/tests/Avalonia.Direct2D1.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Direct2D1.UnitTests/Properties/AssemblyInfo.cs
index a462e5b079..a0b39114d6 100644
--- a/tests/Avalonia.Direct2D1.UnitTests/Properties/AssemblyInfo.cs
+++ b/tests/Avalonia.Direct2D1.UnitTests/Properties/AssemblyInfo.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reflection;
 using Xunit;
 
diff --git a/tests/Avalonia.Direct2D1.UnitTests/RectComparer.cs b/tests/Avalonia.Direct2D1.UnitTests/RectComparer.cs
index 5115e4f413..9c289cf588 100644
--- a/tests/Avalonia.Direct2D1.UnitTests/RectComparer.cs
+++ b/tests/Avalonia.Direct2D1.UnitTests/RectComparer.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 
diff --git a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj
index ef515ce155..dd50eff2b6 100644
--- a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj
+++ b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net47</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net47</TargetFrameworks>
     <OutputType>Library</OutputType>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
diff --git a/tests/Avalonia.Input.UnitTests/GesturesTests.cs b/tests/Avalonia.Input.UnitTests/GesturesTests.cs
index 39c219a773..b2687c2555 100644
--- a/tests/Avalonia.Input.UnitTests/GesturesTests.cs
+++ b/tests/Avalonia.Input.UnitTests/GesturesTests.cs
@@ -1,13 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Generic;
 using Avalonia.Controls;
-using Avalonia.Input;
 using Avalonia.UnitTests;
 using Xunit;
 
-namespace Avalonia.Interactivity.UnitTests
+namespace Avalonia.Input.UnitTests
 {
     public class GesturesTests
     {
@@ -48,7 +44,7 @@ namespace Avalonia.Interactivity.UnitTests
         }
 
         [Fact]
-        public void Tapped_Should_Be_Raised_For_Middle_Button()
+        public void Tapped_Should_Not_Be_Raised_For_Middle_Button()
         {
             Border border = new Border();
             var decorator = new Decorator
@@ -61,7 +57,7 @@ namespace Avalonia.Interactivity.UnitTests
 
             _mouse.Click(border, MouseButton.Middle);
 
-            Assert.True(raised);
+            Assert.False(raised);
         }
 
         [Fact]
@@ -135,7 +131,7 @@ namespace Avalonia.Interactivity.UnitTests
         }
 
         [Fact]
-        public void DoubleTapped_Should_Be_Raised_For_Middle_Button()
+        public void DoubleTapped_Should_Not_Be_Raised_For_Middle_Button()
         {
             Border border = new Border();
             var decorator = new Decorator
@@ -149,7 +145,7 @@ namespace Avalonia.Interactivity.UnitTests
             _mouse.Click(border, MouseButton.Middle);
             _mouse.Down(border, MouseButton.Middle, clickCount: 2);
 
-            Assert.True(raised);
+            Assert.False(raised);
         }
 
         [Fact]
diff --git a/tests/Avalonia.Input.UnitTests/InputElement_Enabled.cs b/tests/Avalonia.Input.UnitTests/InputElement_Enabled.cs
index 5dd66e3190..11d68d307e 100644
--- a/tests/Avalonia.Input.UnitTests/InputElement_Enabled.cs
+++ b/tests/Avalonia.Input.UnitTests/InputElement_Enabled.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls;
 using Xunit;
 
diff --git a/tests/Avalonia.Input.UnitTests/InputElement_Focus.cs b/tests/Avalonia.Input.UnitTests/InputElement_Focus.cs
index e7bca52bf8..8b8f2fa775 100644
--- a/tests/Avalonia.Input.UnitTests/InputElement_Focus.cs
+++ b/tests/Avalonia.Input.UnitTests/InputElement_Focus.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls;
 using Avalonia.UnitTests;
 using Xunit;
@@ -45,5 +42,281 @@ namespace Avalonia.Input.UnitTests
                 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);
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Input.UnitTests/KeyGestureTests.cs b/tests/Avalonia.Input.UnitTests/KeyGestureTests.cs
index 95eaab30de..90f9a0a985 100644
--- a/tests/Avalonia.Input.UnitTests/KeyGestureTests.cs
+++ b/tests/Avalonia.Input.UnitTests/KeyGestureTests.cs
@@ -1,19 +1,31 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Xunit;
 
 namespace Avalonia.Input.UnitTests
 {
     public class KeyGestureTests
     {
-        public static readonly IEnumerable<object[]> SampleData = new object[][]
+        public static readonly IEnumerable<object[]> ParseData = new object[][]
         {
-            new object[]{"Ctrl+A", new KeyGesture(Key.A, InputModifiers.Control)},
-            new object[]{"  \tShift\t+Alt +B", new KeyGesture(Key.B, InputModifiers.Shift | InputModifiers.Alt) },
-            new object[]{"Control++", new KeyGesture(Key.OemPlus, InputModifiers.Control) }
+            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(SampleData))]
+        [MemberData(nameof(ParseData))]
         public void Key_Gesture_Is_Able_To_Parse_Sample_Data(string text, KeyGesture gesture)
         {
             Assert.Equal(gesture, KeyGesture.Parse(text));
@@ -32,5 +44,12 @@ namespace Avalonia.Input.UnitTests
                 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
index 3c8e800fca..df0a077c7f 100644
--- a/tests/Avalonia.Input.UnitTests/KeyboardDeviceTests.cs
+++ b/tests/Avalonia.Input.UnitTests/KeyboardDeviceTests.cs
@@ -35,7 +35,7 @@ namespace Avalonia.Input.UnitTests
             target.SetFocusedElement(
                 focused.Object,
                 NavigationMethod.Unspecified,
-                InputModifiers.None);
+                KeyModifiers.None);
 
             target.ProcessRawEvent(
                 new RawKeyEventArgs(
@@ -75,7 +75,7 @@ namespace Avalonia.Input.UnitTests
             target.SetFocusedElement(
                 focused.Object,
                 NavigationMethod.Unspecified,
-                InputModifiers.None);
+                KeyModifiers.None);
 
             target.ProcessRawEvent(
                 new RawTextInputEventArgs(
diff --git a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Custom.cs b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Custom.cs
index ab0f5e2155..f72d6ba9c9 100644
--- a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Custom.cs
+++ b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Custom.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls;
 using Xunit;
 
diff --git a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
index e779652322..1efbbed2e8 100644
--- a/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
+++ b/tests/Avalonia.Input.UnitTests/KeyboardNavigationTests_Tab.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls;
 using Xunit;
 
@@ -188,6 +185,35 @@ namespace Avalonia.Input.UnitTests
             Assert.Equal(next, result);
         }
 
+        [Fact]
+        public void Next_Skips_Non_TabStop_Siblings()
+        {
+            Button current;
+            Button next;
+
+            var top = new StackPanel
+            {
+                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()
         {
diff --git a/tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs b/tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs
index 214aead521..223f458f25 100644
--- a/tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs
+++ b/tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs
@@ -14,6 +14,7 @@ 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()
         {
@@ -31,6 +32,7 @@ namespace Avalonia.Input.UnitTests
 
             Assert.Same(root, target.Captured);
         }
+#pragma warning restore CS0618 // Type or member is obsolete
 
         [Fact]
         public void MouseMove_Should_Update_IsPointerOver()
@@ -207,7 +209,9 @@ namespace Avalonia.Input.UnitTests
 
                 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);
             }
         }
@@ -238,6 +242,9 @@ namespace Avalonia.Input.UnitTests
         {
             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)
diff --git a/tests/Avalonia.Input.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Input.UnitTests/Properties/AssemblyInfo.cs
index bf3e6aa251..3974559efc 100644
--- a/tests/Avalonia.Input.UnitTests/Properties/AssemblyInfo.cs
+++ b/tests/Avalonia.Input.UnitTests/Properties/AssemblyInfo.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reflection;
 using Xunit;
 
diff --git a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj b/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj
index 2bde78ad63..a9f5318e8f 100644
--- a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj
+++ b/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
-    <TargetFrameworks>netcoreapp2.0;net47</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net47</TargetFrameworks>
     <OutputType>Library</OutputType>
     <IsTestProject>true</IsTestProject>
     <LangVersion>latest</LangVersion>
diff --git a/tests/Avalonia.Interactivity.UnitTests/InteractiveTests.cs b/tests/Avalonia.Interactivity.UnitTests/InteractiveTests.cs
index 414e67bb94..b997ffbbd9 100644
--- a/tests/Avalonia.Interactivity.UnitTests/InteractiveTests.cs
+++ b/tests/Avalonia.Interactivity.UnitTests/InteractiveTests.cs
@@ -1,10 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Avalonia.Interactivity;
 using Avalonia.VisualTree;
 using Xunit;
 
@@ -358,6 +354,29 @@ namespace Avalonia.Interactivity.UnitTests
             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,
@@ -414,6 +433,7 @@ namespace Avalonia.Interactivity.UnitTests
 
                 set
                 {
+                    VisualChildren.Clear();
                     VisualChildren.AddRange(value.Cast<Visual>());
                 }
             }
diff --git a/tests/Avalonia.Interactivity.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Interactivity.UnitTests/Properties/AssemblyInfo.cs
index 318b40828e..c5bf2d8657 100644
--- a/tests/Avalonia.Interactivity.UnitTests/Properties/AssemblyInfo.cs
+++ b/tests/Avalonia.Interactivity.UnitTests/Properties/AssemblyInfo.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reflection;
 using Xunit;
 
diff --git a/tests/Avalonia.Interactivity.UnitTests/RoutedEventRegistryTests.cs b/tests/Avalonia.Interactivity.UnitTests/RoutedEventRegistryTests.cs
index b9ebdea064..8276039d09 100644
--- a/tests/Avalonia.Interactivity.UnitTests/RoutedEventRegistryTests.cs
+++ b/tests/Avalonia.Interactivity.UnitTests/RoutedEventRegistryTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Generic;
 using Avalonia.Controls;
 using Avalonia.Input;
diff --git a/tests/Avalonia.Layout.UnitTests/ArrangeTests.cs b/tests/Avalonia.Layout.UnitTests/ArrangeTests.cs
index 7562b7eff3..db0ead1b00 100644
--- a/tests/Avalonia.Layout.UnitTests/ArrangeTests.cs
+++ b/tests/Avalonia.Layout.UnitTests/ArrangeTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls;
 using Xunit;
 
diff --git a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj
index 63f7f3ec0e..74cc6e292b 100644
--- a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj
+++ b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
@@ -8,6 +8,7 @@
   <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" />
diff --git a/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs b/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs
index a683e5cfca..dcc29a9716 100644
--- a/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs
+++ b/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs
@@ -1,28 +1,12 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.Diagnostics;
-using System.IO;
 using System.Linq;
-using Moq;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
-using Avalonia.Diagnostics;
-using Avalonia.Input;
-using Avalonia.Platform;
-using Avalonia.Rendering;
-using Avalonia.Shared.PlatformSupport;
 using Avalonia.Styling;
-using Avalonia.Themes.Default;
+using Avalonia.UnitTests;
 using Avalonia.VisualTree;
 using Xunit;
-using Avalonia.Media;
-using System;
-using System.Collections.Generic;
-using Avalonia.Controls.UnitTests;
-using Avalonia.UnitTests;
 
 namespace Avalonia.Layout.UnitTests
 {
@@ -31,10 +15,8 @@ namespace Avalonia.Layout.UnitTests
         [Fact]
         public void Grandchild_Size_Changed()
         {
-            using (var context = AvaloniaLocator.EnterScope())
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
-                RegisterServices();
-
                 Border border;
                 TextBlock textBlock;
 
@@ -58,7 +40,6 @@ namespace Avalonia.Layout.UnitTests
                 };
 
                 window.Show();
-                window.LayoutManager.ExecuteInitialLayoutPass(window);
 
                 Assert.Equal(new Size(400, 400), border.Bounds.Size);
                 textBlock.Width = 200;
@@ -71,10 +52,8 @@ namespace Avalonia.Layout.UnitTests
         [Fact]
         public void Test_ScrollViewer_With_TextBlock()
         {
-            using (var context = AvaloniaLocator.EnterScope())
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
-                RegisterServices();
-
                 ScrollViewer scrollViewer;
                 TextBlock textBlock;
 
@@ -82,7 +61,6 @@ namespace Avalonia.Layout.UnitTests
                 {
                     Width = 800,
                     Height = 600,
-                    SizeToContent = SizeToContent.WidthAndHeight,
                     Content = scrollViewer = new ScrollViewer
                     {
                         Width = 200,
@@ -102,7 +80,6 @@ namespace Avalonia.Layout.UnitTests
                 window.Resources["ScrollBarThickness"] = 10.0;
 
                 window.Show();
-                window.LayoutManager.ExecuteInitialLayoutPass(window);
 
                 Assert.Equal(new Size(800, 600), window.Bounds.Size);
                 Assert.Equal(new Size(200, 200), scrollViewer.Bounds.Size);
@@ -134,85 +111,5 @@ namespace Avalonia.Layout.UnitTests
         {
             return v.Bounds.Position;
         }
-
-        class FormattedTextMock : IFormattedTextImpl
-        {
-            public FormattedTextMock(string text)
-            {
-                Text = text;
-            }
-
-            public Size Constraint { get; set; }
-
-            public string Text { get; }
-
-            public Rect Bounds => Rect.Empty;
-
-            public void Dispose()
-            {
-            }
-
-            public IEnumerable<FormattedTextLine> GetLines() => new FormattedTextLine[0];
-
-            public TextHitTestResult HitTestPoint(Point point) => new TextHitTestResult();
-
-            public Rect HitTestTextPosition(int index) => new Rect();
-
-            public IEnumerable<Rect> HitTestTextRange(int index, int length) => new Rect[0];
-
-            public Size Measure() => Constraint;
-        }
-
-        private void RegisterServices()
-        {
-            var globalStyles = new Mock<IGlobalStyles>();
-            var globalStylesResources = globalStyles.As<IResourceNode>();
-            var outObj = (object)10;
-            globalStylesResources.Setup(x => x.TryGetResource("FontSizeNormal", out outObj)).Returns(true);
-
-            var renderInterface = new Mock<IPlatformRenderInterface>();
-            renderInterface.Setup(x =>
-                x.CreateFormattedText(
-                    It.IsAny<string>(),
-                    It.IsAny<Typeface>(),
-                    It.IsAny<double>(),
-                    It.IsAny<TextAlignment>(),
-                    It.IsAny<TextWrapping>(),
-                    It.IsAny<Size>(),
-                    It.IsAny<IReadOnlyList<FormattedTextStyleSpan>>()))
-                .Returns(new FormattedTextMock("TEST"));
-
-            var streamGeometry = new Mock<IStreamGeometryImpl>();
-            streamGeometry.Setup(x =>
-                    x.Open())
-                .Returns(new Mock<IStreamGeometryContextImpl>().Object);
-
-            renderInterface.Setup(x =>
-                    x.CreateStreamGeometry())
-                .Returns(streamGeometry.Object);
-
-            var windowImpl = new Mock<IWindowImpl>();
-
-            Size clientSize = default(Size);
-
-            windowImpl.SetupGet(x => x.ClientSize).Returns(() => clientSize);
-            windowImpl.Setup(x => x.Resize(It.IsAny<Size>())).Callback<Size>(s => clientSize = s);
-            windowImpl.Setup(x => x.MaxClientSize).Returns(new Size(1024, 1024));
-            windowImpl.SetupGet(x => x.Scaling).Returns(1);
-
-            AvaloniaLocator.CurrentMutable
-                .Bind<IStandardCursorFactory>().ToConstant(new CursorFactoryMock())
-                .Bind<IAssetLoader>().ToConstant(new AssetLoader())
-                .Bind<IInputManager>().ToConstant(new Mock<IInputManager>().Object)
-                .Bind<IGlobalStyles>().ToConstant(globalStyles.Object)
-                .Bind<IRuntimePlatform>().ToConstant(new AppBuilder().RuntimePlatform)
-                .Bind<IPlatformRenderInterface>().ToConstant(renderInterface.Object)
-                .Bind<IStyler>().ToConstant(new Styler())
-                .Bind<IWindowingPlatform>().ToConstant(new Avalonia.Controls.UnitTests.WindowingPlatformMock(() => windowImpl.Object));
-
-            var theme = new DefaultTheme();
-            globalStyles.Setup(x => x.IsStylesInitialized).Returns(true);
-            globalStyles.Setup(x => x.Styles).Returns(theme);
-        }
     }
 }
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutHelperTests.cs b/tests/Avalonia.Layout.UnitTests/LayoutHelperTests.cs
new file mode 100644
index 0000000000..f9187edc42
--- /dev/null
+++ b/tests/Avalonia.Layout.UnitTests/LayoutHelperTests.cs
@@ -0,0 +1,27 @@
+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
index 3f20c9a76a..e429adce85 100644
--- a/tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs
+++ b/tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Controls;
@@ -16,7 +13,7 @@ namespace Avalonia.Layout.UnitTests
             var control = new LayoutTestControl();
             var root = new LayoutTestRoot { Child = control };
 
-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
             control.Measured = control.Arranged = false;
 
             control.InvalidateMeasure();
@@ -26,13 +23,29 @@ namespace Avalonia.Layout.UnitTests
             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(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
             control.Measured = control.Arranged = false;
 
             control.InvalidateArrange();
@@ -48,7 +61,7 @@ namespace Avalonia.Layout.UnitTests
             var control = new LayoutTestControl();
             var root = new LayoutTestRoot();
 
-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
             root.Child = control;
             root.Measured = root.Arranged = false;
 
@@ -83,7 +96,7 @@ namespace Avalonia.Layout.UnitTests
             root.DoMeasureOverride = MeasureOverride;
             control1.DoMeasureOverride = MeasureOverride;
             control2.DoMeasureOverride = MeasureOverride;
-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
 
             control2.InvalidateMeasure();
             control1.InvalidateMeasure();
@@ -118,7 +131,7 @@ namespace Avalonia.Layout.UnitTests
             root.DoMeasureOverride = MeasureOverride;
             control1.DoMeasureOverride = MeasureOverride;
             control2.DoMeasureOverride = MeasureOverride;
-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
 
             control2.InvalidateMeasure();
             root.InvalidateMeasure();
@@ -135,7 +148,7 @@ namespace Avalonia.Layout.UnitTests
             var control = new LayoutTestControl();
             var root = new LayoutTestRoot { Child = control };
 
-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
             root.Measured = root.Arranged = false;
             control.Measured = control.Arranged = false;
 
@@ -154,7 +167,7 @@ namespace Avalonia.Layout.UnitTests
             var control = new LayoutTestControl();
             var root = new LayoutTestRoot { Child = control };
 
-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
             control.Measured = control.Arranged = false;
 
             control.InvalidateMeasure();
@@ -180,7 +193,7 @@ namespace Avalonia.Layout.UnitTests
                 return new Size(100, 100);
             };
 
-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
 
             Assert.Equal(Size.Infinity, availableSize);
         }
@@ -202,7 +215,7 @@ namespace Avalonia.Layout.UnitTests
                 return s;
             };
 
-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
             Assert.Equal(new Size(100, 100), arrangeSize);
 
             root.Width = 120;
@@ -228,7 +241,7 @@ namespace Avalonia.Layout.UnitTests
                 }
             };
 
-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
             Assert.Equal(new Size(0, 0), root.DesiredSize);
 
             border.Width = 100;
@@ -244,7 +257,7 @@ namespace Avalonia.Layout.UnitTests
             var control = new LayoutTestControl();
             var root = new LayoutTestRoot { Child = control };
 
-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
             control.Measured = false;
 
             int cnt = 0;
@@ -275,7 +288,7 @@ namespace Avalonia.Layout.UnitTests
             var control = new LayoutTestControl();
             var root = new LayoutTestRoot { Child = control };
 
-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
             control.Arranged = false;
 
             int cnt = 0;
@@ -316,7 +329,7 @@ namespace Avalonia.Layout.UnitTests
             panel.Children.AddRange(nonArrageableTargets);
             panel.Children.AddRange(targets);
 
-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
 
             foreach (var c in panel.Children.OfType<LayoutTestControl>())
             {
@@ -350,7 +363,7 @@ namespace Avalonia.Layout.UnitTests
             var control = new LayoutTestControl();
             var root = new LayoutTestRoot { Child = control };
 
-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
             control.Measured = false;
 
             control.DoMeasureOverride = (l, s) =>
@@ -374,5 +387,38 @@ namespace Avalonia.Layout.UnitTests
             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/LayoutTestRoot.cs b/tests/Avalonia.Layout.UnitTests/LayoutTestRoot.cs
index 07476844e0..a94459df96 100644
--- a/tests/Avalonia.Layout.UnitTests/LayoutTestRoot.cs
+++ b/tests/Avalonia.Layout.UnitTests/LayoutTestRoot.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.UnitTests;
 
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutableTests.cs b/tests/Avalonia.Layout.UnitTests/LayoutableTests.cs
index 31310f7d42..a8aa0bbf0e 100644
--- a/tests/Avalonia.Layout.UnitTests/LayoutableTests.cs
+++ b/tests/Avalonia.Layout.UnitTests/LayoutableTests.cs
@@ -1,5 +1,6 @@
 using System;
 using Avalonia.Controls;
+using Avalonia.UnitTests;
 using Moq;
 using Xunit;
 
@@ -111,7 +112,7 @@ namespace Avalonia.Layout.UnitTests
 
             root.Measure(Size.Infinity);
             root.Arrange(new Rect(root.DesiredSize));
-            target.ResetCalls();
+            target.Invocations.Clear();
 
             control.InvalidateMeasure();
             control.InvalidateMeasure();
@@ -132,7 +133,7 @@ namespace Avalonia.Layout.UnitTests
 
             root.Measure(Size.Infinity);
             root.Arrange(new Rect(root.DesiredSize));
-            target.ResetCalls();
+            target.Invocations.Clear();
 
             control.InvalidateArrange();
             control.InvalidateArrange();
@@ -162,7 +163,7 @@ namespace Avalonia.Layout.UnitTests
             Assert.False(control.IsMeasureValid);
             Assert.True(root.IsMeasureValid);
 
-            target.ResetCalls();
+            target.Invocations.Clear();
 
             root.Child = control;
 
@@ -171,6 +172,154 @@ namespace Avalonia.Layout.UnitTests
             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; }
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutableTests_EffectiveViewportChanged.cs b/tests/Avalonia.Layout.UnitTests/LayoutableTests_EffectiveViewportChanged.cs
new file mode 100644
index 0000000000..f1cec24516
--- /dev/null
+++ b/tests/Avalonia.Layout.UnitTests/LayoutableTests_EffectiveViewportChanged.cs
@@ -0,0 +1,426 @@
+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() };
+                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() };
+                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
index 99983fd19b..140ebede15 100644
--- a/tests/Avalonia.Layout.UnitTests/MeasureTests.cs
+++ b/tests/Avalonia.Layout.UnitTests/MeasureTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls;
 using Xunit;
 
diff --git a/tests/Avalonia.Layout.UnitTests/NonVirtualizingStackLayoutTests.cs b/tests/Avalonia.Layout.UnitTests/NonVirtualizingStackLayoutTests.cs
new file mode 100644
index 0000000000..a7b378c322
--- /dev/null
+++ b/tests/Avalonia.Layout.UnitTests/NonVirtualizingStackLayoutTests.cs
@@ -0,0 +1,335 @@
+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
index b0d07f81f1..6f62e38bda 100644
--- a/tests/Avalonia.Layout.UnitTests/Properties/AssemblyInfo.cs
+++ b/tests/Avalonia.Layout.UnitTests/Properties/AssemblyInfo.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reflection;
 using Xunit;
 
diff --git a/tests/Avalonia.Layout.UnitTests/ShapeLayoutTests.cs b/tests/Avalonia.Layout.UnitTests/ShapeLayoutTests.cs
deleted file mode 100644
index 2ccd6fb04c..0000000000
--- a/tests/Avalonia.Layout.UnitTests/ShapeLayoutTests.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using System.Collections.Generic;
-using Avalonia.Controls;
-using Avalonia.Controls.Shapes;
-using Avalonia.Media;
-using Avalonia.Platform;
-using Avalonia.UnitTests;
-using Xunit;
-
-namespace Avalonia.Layout.UnitTests
-
-{
-    public class ShapeLayoutTests : TestWithServicesBase
-    {
-
-        public ShapeLayoutTests()
-        {
-            AvaloniaLocator.CurrentMutable
-                .Bind<IPlatformRenderInterface>().ToSingleton<MockPlatformRenderInterface>();
-        }
-
-        [Fact]
-        public void Shape_Transformation_Calculation_Should_Be_Deferred_To_Arrange_When_Strech_Is_Fill_And_Aviable_Size_Is_Infinite()
-        {
-            var shape = new Polygon()
-            {
-                Points = new List<Point>
-                {
-                    new Point(0, 0),
-                    new Point(10, 5),
-                    new Point(0, 10)
-                },
-                Stretch = Stretch.Fill
-            };
-
-            var availableSize = new Size(double.PositiveInfinity, double.PositiveInfinity);
-            shape.Measure(availableSize);
-            Geometry postMeasureGeometry = shape.RenderedGeometry;
-            Transform postMeasureTransform = postMeasureGeometry.Transform;
-
-            var finalSize = new Size(100, 50);
-            var finalRect = new Rect(finalSize);
-            shape.Arrange(finalRect);
-
-            Geometry postArrangeGeometry = shape.RenderedGeometry;
-            Transform postArrangeTransform = postArrangeGeometry.Transform;
-
-            Assert.NotEqual(postMeasureGeometry, postArrangeGeometry);
-            Assert.NotEqual(postMeasureTransform, postArrangeTransform);
-            Assert.Equal(finalSize, shape.Bounds.Size);
-        }
-
-        [Fact]
-        public void Shape_Transformation_Calculation_Should_Not_Be_Deferred_To_Arrange_When_Strech_Is_Fill_And_Aviable_Size_Is_Finite()
-        {
-            var shape = new Polygon()
-            {
-                Points = new List<Point>
-                {
-                    new Point(0, 0),
-                    new Point(10, 5),
-                    new Point(0, 10)
-                },
-                Stretch = Stretch.Fill
-            };
-
-            var availableSize = new Size(100, 50);
-            shape.Measure(availableSize);
-            Geometry postMeasureGeometry = shape.RenderedGeometry;
-            Transform postMeasureTransform = postMeasureGeometry.Transform;
-
-            var finalRect = new Rect(availableSize);
-            shape.Arrange(finalRect);
-
-            Geometry postArrangeGeometry = shape.RenderedGeometry;
-            Transform postArrangeTransform = postArrangeGeometry.Transform;
-
-            Assert.Equal(postMeasureGeometry, postArrangeGeometry);
-            Assert.Equal(postMeasureTransform, postArrangeTransform);
-            Assert.Equal(availableSize, shape.Bounds.Size);
-        }
-
-        [Fact]
-        public void Shape_Transformation_Calculation_Should_Not_Be_Deferred_To_Arrange_When_Strech_Is_None()
-        {
-            var shape = new Polygon()
-            {
-                Points = new List<Point>
-                {
-                    new Point(0, 0),
-                    new Point(10, 5),
-                    new Point(0, 10)
-                },
-                Stretch = Stretch.None
-            };
-
-            var availableSize = new Size(double.PositiveInfinity, double.PositiveInfinity);
-            shape.Measure(availableSize);
-            Geometry postMeasureGeometry = shape.RenderedGeometry;
-            Transform postMeasureTransform = postMeasureGeometry.Transform;
-
-            var finalSize = new Size(100, 50);
-            var finalRect = new Rect(finalSize);
-            shape.Arrange(finalRect);
-
-            Geometry postArrangeGeometry = shape.RenderedGeometry;
-            Transform postArrangeTransform = postArrangeGeometry.Transform;
-
-            Assert.Equal(postMeasureGeometry, postArrangeGeometry);
-            Assert.Equal(postMeasureTransform, postArrangeTransform);
-            Assert.Equal(finalSize, shape.Bounds.Size);
-        }
-    }
-}
diff --git a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
index 27f3223c6c..d49a859b89 100644
--- a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
+++ b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
@@ -7,6 +7,7 @@
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\XUnit.props" />
   <Import Project="..\..\build\NetFX.props" />
+  <Import Project="..\..\build\SharedVersion.props" />
   <ItemGroup>
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
@@ -25,4 +26,4 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/Avalonia.LeakTests/ControlTests.cs b/tests/Avalonia.LeakTests/ControlTests.cs
index 1da4746516..b03ae00cfe 100644
--- a/tests/Avalonia.LeakTests/ControlTests.cs
+++ b/tests/Avalonia.LeakTests/ControlTests.cs
@@ -1,15 +1,17 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Remoting.Contexts;
 using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
 using Avalonia.Controls.Templates;
 using Avalonia.Diagnostics;
+using Avalonia.Input;
 using Avalonia.Layout;
+using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Rendering;
+using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
 using JetBrains.dotMemoryUnit;
@@ -42,7 +44,7 @@ namespace Avalonia.LeakTests
                     window.Show();
 
                     // Do a layout and make sure that Canvas gets added to visual tree.
-                    window.LayoutManager.ExecuteInitialLayoutPass(window);
+                    window.LayoutManager.ExecuteInitialLayoutPass();
                     Assert.IsType<Canvas>(window.Presenter.Child);
 
                     // Clear the content and ensure the Canvas is removed.
@@ -80,7 +82,7 @@ namespace Avalonia.LeakTests
                     window.Show();
 
                     // Do a layout and make sure that Canvas gets added to visual tree.
-                    window.LayoutManager.ExecuteInitialLayoutPass(window);
+                    window.LayoutManager.ExecuteInitialLayoutPass();
                     Assert.IsType<Canvas>(window.Find<Canvas>("foo"));
                     Assert.IsType<Canvas>(window.Presenter.Child);
 
@@ -120,7 +122,7 @@ namespace Avalonia.LeakTests
 
                     // Do a layout and make sure that ScrollViewer gets added to visual tree and its 
                     // template applied.
-                    window.LayoutManager.ExecuteInitialLayoutPass(window);
+                    window.LayoutManager.ExecuteInitialLayoutPass();
                     Assert.IsType<ScrollViewer>(window.Presenter.Child);
                     Assert.IsType<Canvas>(((ScrollViewer)window.Presenter.Child).Presenter.Child);
 
@@ -157,7 +159,7 @@ namespace Avalonia.LeakTests
 
                     // Do a layout and make sure that TextBox gets added to visual tree and its 
                     // template applied.
-                    window.LayoutManager.ExecuteInitialLayoutPass(window);
+                    window.LayoutManager.ExecuteInitialLayoutPass();
                     Assert.IsType<TextBox>(window.Presenter.Child);
                     Assert.NotEmpty(window.Presenter.Child.GetVisualChildren());
 
@@ -201,7 +203,7 @@ namespace Avalonia.LeakTests
 
                     // Do a layout and make sure that TextBox gets added to visual tree and its 
                     // Text property set.
-                    window.LayoutManager.ExecuteInitialLayoutPass(window);
+                    window.LayoutManager.ExecuteInitialLayoutPass();
                     Assert.IsType<TextBox>(window.Presenter.Child);
                     Assert.Equal("foo", ((TextBox)window.Presenter.Child).Text);
 
@@ -239,7 +241,7 @@ namespace Avalonia.LeakTests
 
                 // Do a layout and make sure that TextBox gets added to visual tree and its 
                 // template applied.
-                window.LayoutManager.ExecuteInitialLayoutPass(window);
+                window.LayoutManager.ExecuteInitialLayoutPass();
                 Assert.Same(textBox, window.Presenter.Child);
 
                 // Get the border from the TextBox template.
@@ -293,7 +295,7 @@ namespace Avalonia.LeakTests
                     window.Show();
 
                     // Do a layout and make sure that TreeViewItems get realized.
-                    window.LayoutManager.ExecuteInitialLayoutPass(window);
+                    window.LayoutManager.ExecuteInitialLayoutPass();
                     Assert.Single(target.ItemContainerGenerator.Containers);
 
                     // Clear the content and ensure the TreeView is removed.
@@ -327,7 +329,7 @@ namespace Avalonia.LeakTests
                     window.Show();
 
                     // Do a layout and make sure that Slider gets added to visual tree.
-                    window.LayoutManager.ExecuteInitialLayoutPass(window);
+                    window.LayoutManager.ExecuteInitialLayoutPass();
                     Assert.IsType<Slider>(window.Presenter.Child);
 
                     // Clear the content and ensure the Slider is removed.
@@ -353,7 +355,7 @@ namespace Avalonia.LeakTests
                 var renderer = new Mock<IRenderer>();
                 renderer.Setup(x => x.Dispose());
                 var impl = new Mock<IWindowImpl>();
-                impl.SetupGet(x => x.Scaling).Returns(1);
+                impl.SetupGet(x => x.RenderScaling).Returns(1);
                 impl.SetupProperty(x => x.Closed);
                 impl.Setup(x => x.CreateRenderer(It.IsAny<IRenderRoot>())).Returns(renderer.Object);
                 impl.Setup(x => x.Dispose()).Callback(() => impl.Object.Closed());
@@ -370,9 +372,223 @@ namespace Avalonia.LeakTests
             }
         }
 
+        [Fact]
+        public void Control_With_Style_RenderTransform_Is_Freed()
+        {
+            // # Issue #3545
+            using (Start())
+            {
+                Func<Window> run = () =>
+                {
+                    var window = new Window
+                    {
+                        Styles =
+                        {
+                            new Style(x => x.OfType<Canvas>())
+                            {
+                                Setters =
+                                {
+                                    new Setter
+                                    {
+                                        Property = Visual.RenderTransformProperty,
+                                        Value = new RotateTransform(45),
+                                    }
+                                }
+                            }
+                        },
+                        Content = new Canvas()
+                    };
+
+                    window.Show();
+
+                    // Do a layout and make sure that Canvas gets added to visual tree with
+                    // its render transform.
+                    window.LayoutManager.ExecuteInitialLayoutPass();
+                    var canvas = Assert.IsType<Canvas>(window.Presenter.Child);
+                    Assert.IsType<RotateTransform>(canvas.RenderTransform);
+
+                    // Clear the content and ensure the Canvas is removed.
+                    window.Content = null;
+                    window.LayoutManager.ExecuteLayoutPass();
+                    Assert.Null(window.Presenter.Child);
+
+                    return window;
+                };
+
+                var result = run();
+
+                dotMemory.Check(memory =>
+                    Assert.Equal(0, memory.GetObjects(where => where.Type.Is<Canvas>()).ObjectsCount));
+            }
+        }
+
+        [Fact]
+        public void Attached_ContextMenu_Is_Freed()
+        {
+            using (Start())
+            {
+                void AttachShowAndDetachContextMenu(Control control)
+                {
+                    var contextMenu = new ContextMenu
+                    {
+                        Items = new[]
+                        {
+                            new MenuItem { Header = "Foo" },
+                            new MenuItem { Header = "Foo" },
+                        }
+                    };
+
+                    control.ContextMenu = contextMenu;
+                    contextMenu.Open(control);
+                    contextMenu.Close();
+                    control.ContextMenu = null;
+                }
+
+                var window = new Window();
+                window.Show();
+
+                Assert.Same(window, FocusManager.Instance.Current);
+
+                // Context menu in resources means the baseline may not be 0.
+                var initialMenuCount = 0;
+                var initialMenuItemCount = 0;
+                dotMemory.Check(memory =>
+                {
+                    initialMenuCount = memory.GetObjects(where => where.Type.Is<ContextMenu>()).ObjectsCount;
+                    initialMenuItemCount = memory.GetObjects(where => where.Type.Is<MenuItem>()).ObjectsCount;
+                });
+                
+                AttachShowAndDetachContextMenu(window);
+
+                Mock.Get(window.PlatformImpl).Invocations.Clear();
+                dotMemory.Check(memory =>
+                    Assert.Equal(initialMenuCount, memory.GetObjects(where => where.Type.Is<ContextMenu>()).ObjectsCount));
+                dotMemory.Check(memory =>
+                    Assert.Equal(initialMenuItemCount, memory.GetObjects(where => where.Type.Is<MenuItem>()).ObjectsCount));
+            }
+        }
+
+        [Fact]
+        public void Standalone_ContextMenu_Is_Freed()
+        {
+            using (Start())
+            {
+                void BuildAndShowContextMenu(Control control)
+                {
+                    var contextMenu = new ContextMenu
+                    {
+                        Items = new[]
+                        {
+                            new MenuItem { Header = "Foo" },
+                            new MenuItem { Header = "Foo" },
+                        }
+                    };
+
+                    contextMenu.Open(control);
+                    contextMenu.Close();
+                }
+
+                var window = new Window();
+                window.Show();
+
+                Assert.Same(window, FocusManager.Instance.Current);
+
+                // Context menu in resources means the baseline may not be 0.
+                var initialMenuCount = 0;
+                var initialMenuItemCount = 0;
+                dotMemory.Check(memory =>
+                {
+                    initialMenuCount = memory.GetObjects(where => where.Type.Is<ContextMenu>()).ObjectsCount;
+                    initialMenuItemCount = memory.GetObjects(where => where.Type.Is<MenuItem>()).ObjectsCount;
+                });
+                
+                BuildAndShowContextMenu(window);
+                BuildAndShowContextMenu(window);
+
+                Mock.Get(window.PlatformImpl).Invocations.Clear();
+                dotMemory.Check(memory =>
+                    Assert.Equal(initialMenuCount, memory.GetObjects(where => where.Type.Is<ContextMenu>()).ObjectsCount));
+                dotMemory.Check(memory =>
+                    Assert.Equal(initialMenuItemCount, memory.GetObjects(where => where.Type.Is<MenuItem>()).ObjectsCount));
+            }
+        }
+
+        [Fact]
+        public void Path_Is_Freed()
+        {
+            using (Start())
+            {
+                var geometry = new EllipseGeometry { Rect = new Rect(0, 0, 10, 10) };
+
+                Func<Window> run = () =>
+                {
+                    var window = new Window
+                    {
+                        Content = new Path
+                        {
+                            Data = geometry
+                        }
+                    };
+
+                    window.Show();
+
+                    window.LayoutManager.ExecuteInitialLayoutPass();
+                    Assert.IsType<Path>(window.Presenter.Child);
+
+                    window.Content = null;
+                    window.LayoutManager.ExecuteLayoutPass();
+                    Assert.Null(window.Presenter.Child);
+
+                    return window;
+                };
+
+                var result = run();
+
+                dotMemory.Check(memory =>
+                    Assert.Equal(0, memory.GetObjects(where => where.Type.Is<Path>()).ObjectsCount));
+
+                // We are keeping geometry alive to simulate a resource that outlives the control.
+                GC.KeepAlive(geometry);
+            }
+        }
+
+        [Fact]
+        public void ItemsRepeater_Is_Freed()
+        {
+            using (Start())
+            {
+                Func<Window> run = () =>
+                {
+                    var window = new Window
+                    {
+                        Content = new ItemsRepeater(),
+                    };
+
+                    window.Show();
+
+                    window.LayoutManager.ExecuteInitialLayoutPass();
+                    Assert.IsType<ItemsRepeater>(window.Presenter.Child);
+
+                    window.Content = null;
+                    window.LayoutManager.ExecuteLayoutPass();
+                    Assert.Null(window.Presenter.Child);
+
+                    return window;
+                };
+
+                var result = run();
+
+                dotMemory.Check(memory =>
+                    Assert.Equal(0, memory.GetObjects(where => where.Type.Is<ItemsRepeater>()).ObjectsCount));
+            }
+        }
+
         private IDisposable Start()
         {
-            return UnitTestApplication.Start(TestServices.StyledWindow);
+            return UnitTestApplication.Start(TestServices.StyledWindow.With(
+                focusManager: new FocusManager(),
+                keyboardDevice: () => new KeyboardDevice(),
+                inputManager: new InputManager()));
         }
 
         private class Node
@@ -385,8 +601,9 @@ namespace Avalonia.LeakTests
         {
             public bool DrawFps { get; set; }
             public bool DrawDirtyRects { get; set; }
+#pragma warning disable CS0067
             public event EventHandler<SceneInvalidatedEventArgs> SceneInvalidated;
-
+#pragma warning restore CS0067
             public void AddDirty(IVisual visual)
             {
             }
@@ -397,6 +614,8 @@ namespace Avalonia.LeakTests
 
             public IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool> filter) => null;
 
+            public IVisual HitTestFirst(Point p, IVisual root, Func<IVisual, bool> filter) => null;
+
             public void Paint(Rect rect)
             {
             }
diff --git a/tests/Avalonia.LeakTests/Properties/AssemblyInfo.cs b/tests/Avalonia.LeakTests/Properties/AssemblyInfo.cs
index 4cc100aa28..ffa077281c 100644
--- a/tests/Avalonia.LeakTests/Properties/AssemblyInfo.cs
+++ b/tests/Avalonia.LeakTests/Properties/AssemblyInfo.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reflection;
 using Xunit;
 
diff --git a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj
index aba5f2d469..7d1285c025 100644
--- a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj
+++ b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net47</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net47</TargetFrameworks>
     <OutputType>Library</OutputType>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
@@ -10,6 +10,7 @@
   <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\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
index 7e053392c7..a0dd565a87 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -405,6 +402,24 @@ namespace Avalonia.Markup.UnitTests.Data
             Assert.Equal(42, target.Value);
         }
 
+        [Fact]
+        public void Should_Return_TargetNullValue_When_Value_Is_Null()
+        {
+            var target = new TextBlock();
+            var source = new Source { Foo = null };
+
+            var binding = new Binding
+            {
+                Source = source,
+                Path = "Foo",
+                TargetNullValue = "(null)",
+            };
+
+            target.Bind(TextBlock.TextProperty, binding);
+
+            Assert.Equal("(null)", target.Text);
+        }
+
         [Fact]
         public void Null_Path_Should_Bind_To_DataContext()
         {
@@ -780,7 +795,7 @@ namespace Avalonia.Markup.UnitTests.Data
 
             public OldDataContextTest()
             {
-                Bind(BarProperty, this.GetObservable(FooProperty));
+                this.Bind(BarProperty, this.GetObservable(FooProperty));
             }
         }
 
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Converters.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Converters.cs
index 1ede4ee0b0..2a0750b131 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Converters.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Converters.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Controls;
 using Avalonia.Data;
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_DataValidation.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_DataValidation.cs
index 04b91b5f6a..13f2681584 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_DataValidation.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_DataValidation.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
 using Avalonia.Controls;
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_ElementName.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_ElementName.cs
index 0019b06911..69dfc6c062 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_ElementName.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_ElementName.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Controls;
 using Avalonia.Data;
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_RelativeSource.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_RelativeSource.cs
index 4c572acab1..4cbe80c580 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_RelativeSource.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_RelativeSource.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Reactive.Subjects;
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Self.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Self.cs
index 7b899472bb..344cd1d576 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Self.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Self.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Moq;
 using Avalonia.Controls;
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Source.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Source.cs
index 9cc02539ce..368c889003 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Source.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Source.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Moq;
 using Avalonia.Controls;
 using Avalonia.Data;
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_TemplatedParent.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_TemplatedParent.cs
index e9c3da5160..37721badb0 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_TemplatedParent.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_TemplatedParent.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
@@ -35,8 +32,7 @@ namespace Avalonia.Markup.UnitTests.Data
 
             target.Verify(x => x.Bind(
                 TextBox.TextProperty, 
-                It.IsAny<IObservable<object>>(), 
-                BindingPriority.TemplatedParent));
+                It.IsAny<IObservable<BindingValue<string>>>()));
         }
 
         [Fact]
@@ -55,8 +51,7 @@ namespace Avalonia.Markup.UnitTests.Data
 
             target.Verify(x => x.Bind(
                 TextBox.TextProperty,
-                It.IsAny<ISubject<object>>(),
-                BindingPriority.TemplatedParent));
+                It.IsAny<IObservable<BindingValue<string>>>()));
         }
 
         private Mock<IControl> CreateTarget(
@@ -66,9 +61,9 @@ namespace Avalonia.Markup.UnitTests.Data
             var result = new Mock<IControl>();
 
             result.Setup(x => x.GetValue(Control.TemplatedParentProperty)).Returns(templatedParent);
-            result.Setup(x => x.GetValue((AvaloniaProperty)Control.TemplatedParentProperty)).Returns(templatedParent);
-            result.Setup(x => x.GetValue((AvaloniaProperty)TextBox.TextProperty)).Returns(text);
-            result.Setup(x => x.Bind(It.IsAny<AvaloniaProperty>(), It.IsAny<IObservable<object>>(), It.IsAny<BindingPriority>()))
+            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;
         }
diff --git a/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests.cs b/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests.cs
index 78c538d99d..b87922aa1e 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -94,6 +91,95 @@ namespace Avalonia.Markup.UnitTests.Data
             Assert.Equal("fallback", target.Text);
         }
 
+        [Fact]
+        public void Should_Return_TargetNullValue_When_Value_Is_Null()
+        {
+            var target = new TextBlock();
+
+            var binding = new MultiBinding
+            {
+                Converter = new NullValueConverter(),
+                Bindings = new[]
+                {
+                    new Binding { Path = "A" },
+                    new Binding { Path = "B" },
+                    new Binding { Path = "C" },
+                },
+                TargetNullValue = "(null)",
+            };
+
+            target.Bind(TextBlock.TextProperty, binding);
+
+            Assert.Equal("(null)", target.Text);
+        }
+
+        [Fact]
+        public void Should_Pass_UnsetValue_To_Converter_For_Broken_Binding()
+        {
+            var source = new { A = 1, B = 2, C = 3 };
+            var target = new TextBlock { DataContext = source };
+
+            var binding = new MultiBinding
+            {
+                Converter = new ConcatConverter(),
+                Bindings = new[]
+                {
+                    new Binding { Path = "A" },
+                    new Binding { Path = "B" },
+                    new Binding { Path = "Missing" },
+                },
+            };
+
+            target.Bind(TextBlock.TextProperty, binding);
+
+            Assert.Equal("1,2,(unset)", target.Text);
+        }
+
+        [Fact]
+        public void Should_Pass_FallbackValue_To_Converter_For_Broken_Binding()
+        {
+            var source = new { A = 1, B = 2, C = 3 };
+            var target = new TextBlock { DataContext = source };
+
+            var binding = new MultiBinding
+            {
+                Converter = new ConcatConverter(),
+                Bindings = new[]
+                {
+                    new Binding { Path = "A" },
+                    new Binding { Path = "B" },
+                    new Binding { Path = "Missing", FallbackValue = "Fallback" },
+                },
+            };
+
+            target.Bind(TextBlock.TextProperty, binding);
+
+            Assert.Equal("1,2,Fallback", target.Text);
+        }
+
+        [Fact]
+        public void MultiBinding_Without_StringFormat_And_Converter()
+        {
+            var source = new { A = 1, B = 2, C = 3 };
+            var target = new ItemsControl {  };
+
+            var binding = new MultiBinding
+            {                
+                Bindings = new[]
+                {
+                    new Binding { Path = "A", Source = source },
+                    new Binding { Path = "B", Source = source },
+                    new Binding { Path = "C", Source = source },
+                },
+            };
+
+            target.Bind(ItemsControl.ItemsProperty, binding);
+            Assert.Equal(target.ItemCount, 3);
+            Assert.Equal(target.Items.ElementAt(0), source.A);
+            Assert.Equal(target.Items.ElementAt(1), source.B);
+            Assert.Equal(target.Items.ElementAt(2), source.C);
+        }
+
         private class ConcatConverter : IMultiValueConverter
         {
             public object Convert(IList<object> values, Type targetType, object parameter, CultureInfo culture)
@@ -109,5 +195,13 @@ namespace Avalonia.Markup.UnitTests.Data
                 return AvaloniaProperty.UnsetValue;
             }
         }
+
+        private class NullValueConverter : IMultiValueConverter
+        {
+            public object Convert(IList<object> values, Type targetType, object parameter, CultureInfo culture)
+            {
+                return null;
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests_Converters.cs b/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests_Converters.cs
index ee95463f1f..ac1dad194d 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests_Converters.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests_Converters.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See license.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
diff --git a/tests/Avalonia.Markup.UnitTests/Extensions/IEnummerableExtension.cs b/tests/Avalonia.Markup.UnitTests/Extensions/IEnummerableExtension.cs
new file mode 100644
index 0000000000..0d9e2969e1
--- /dev/null
+++ b/tests/Avalonia.Markup.UnitTests/Extensions/IEnummerableExtension.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections;
+
+namespace Avalonia.Markup.UnitTests
+{
+   internal static class IEnumerableExtensions
+    {
+        public static object ElementAt(this IEnumerable source, int index)
+        {
+            var i = -1;
+            var enumerator = source.GetEnumerator();
+
+            while (enumerator.MoveNext() && ++i < index);
+            if (i == index)
+            {
+                return enumerator.Current;
+            }
+            throw new ArgumentOutOfRangeException(nameof(index));
+        }
+    }
+}
diff --git a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionNodeBuilderTests.cs b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionNodeBuilderTests.cs
index 7061915a52..11036e472e 100644
--- a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionNodeBuilderTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionNodeBuilderTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Data.Core;
diff --git a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionNodeBuilderTests_Errors.cs b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionNodeBuilderTests_Errors.cs
index ac385b4cab..bcc2e6bfdb 100644
--- a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionNodeBuilderTests_Errors.cs
+++ b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionNodeBuilderTests_Errors.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Data.Core;
 using Avalonia.Markup.Parsers;
 using Xunit;
diff --git a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_AttachedProperty.cs b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_AttachedProperty.cs
index ff9e259eab..7c48a975ef 100644
--- a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_AttachedProperty.cs
+++ b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_AttachedProperty.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Reactive.Linq;
@@ -132,7 +129,7 @@ namespace Avalonia.Markup.UnitTests.Parsers
         {
             var data = new Class1();
 
-            Assert.Throws<ExpressionParseException>(() => ExpressionObserverBuilder.Build(data, "(Owner)", typeResolver: _typeResolver));
+            Assert.Throws<ExpressionParseException>(() => ExpressionObserverBuilder.Build(data, "(Owner.)", typeResolver: _typeResolver));
         }
 
         [Fact]
diff --git a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_AvaloniaProperty.cs b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_AvaloniaProperty.cs
index 816185cb64..5587389bc2 100644
--- a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_AvaloniaProperty.cs
+++ b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_AvaloniaProperty.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Reactive.Linq;
diff --git a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Negation.cs b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Negation.cs
index 24f6407908..0028502eeb 100644
--- a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Negation.cs
+++ b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Negation.cs
@@ -1,7 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
+using System.Collections;
+using System.ComponentModel;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.Data;
@@ -92,6 +91,69 @@ namespace Avalonia.Markup.UnitTests.Parsers
             GC.KeepAlive(data);
         }
 
+        [Fact]
+        public async Task Should_Negate_BindingNotification_Value()
+        {
+            var data = new { Foo = true };
+            var target = ExpressionObserverBuilder.Build(data, "!Foo", enableDataValidation: true);
+            var result = await target.Take(1);
+
+            Assert.Equal(new BindingNotification(false), result);
+
+            GC.KeepAlive(data);
+        }
+
+        [Fact]
+        public async Task Should_Pass_Through_BindingNotification_Error()
+        {
+            var data = new { };
+            var target = ExpressionObserverBuilder.Build(data, "!Foo", enableDataValidation: true);
+            var result = await target.Take(1);
+
+            Assert.Equal(
+                new BindingNotification(
+                    new MissingMemberException("Could not find a matching property accessor for 'Foo' on '{ }'"),
+                    BindingErrorType.Error),
+                result);
+
+            GC.KeepAlive(data);
+        }
+
+        [Fact]
+        public async Task Should_Negate_BindingNotification_Error_FallbackValue()
+        {
+            var data = new Test { DataValidationError = "Test error" };
+            var target = ExpressionObserverBuilder.Build(data, "!Foo", enableDataValidation: true);
+            var result = await target.Take(1);
+
+            Assert.Equal(
+                new BindingNotification(
+                    new DataValidationException("Test error"),
+                    BindingErrorType.DataValidationError,
+                    true),
+                result);
+
+            GC.KeepAlive(data);
+        }
+
+        [Fact]
+        public async Task Should_Add_Error_To_BindingNotification_For_FallbackValue_Not_Convertible_To_Boolean()
+        {
+            var data = new Test { Bar = new object(), DataValidationError = "Test error" };
+            var target = ExpressionObserverBuilder.Build(data, "!Bar", enableDataValidation: true);
+            var result = await target.Take(1);
+
+            Assert.Equal(
+                new BindingNotification(
+                    new AggregateException(
+                        new DataValidationException("Test error"),
+                        new InvalidCastException($"Unable to convert 'System.Object' to bool.")),
+                    BindingErrorType.Error),
+                result);
+
+            GC.KeepAlive(data);
+        }
+
         [Fact]
         public void SetValue_Should_Return_False_For_Invalid_Value()
         {
@@ -104,9 +166,33 @@ namespace Avalonia.Markup.UnitTests.Parsers
             GC.KeepAlive(data);
         }
 
-        private class Test
+        private class Test : INotifyDataErrorInfo
         {
+            private string _dataValidationError;
+
             public bool Foo { get; set; }
+            public object Bar { get; set; }
+
+            public string DataValidationError
+            {
+                get => _dataValidationError;
+                set
+                {
+                    if (value == _dataValidationError)
+                        return;
+                    _dataValidationError = value;
+                    ErrorsChanged?
+                        .Invoke(this, new DataErrorsChangedEventArgs(nameof(DataValidationError)));
+                }
+            }
+            public bool HasErrors => !string.IsNullOrWhiteSpace(DataValidationError);
+
+            public event EventHandler<DataErrorsChangedEventArgs> ErrorsChanged;
+
+            public IEnumerable GetErrors(string propertyName)
+            {
+                return DataValidationError is object ? new[] { DataValidationError } : null;
+            }
         }
     }
 }
diff --git a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Property.cs b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Property.cs
index 4f7264f2f2..8cf74c36f4 100644
--- a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Property.cs
+++ b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Property.cs
@@ -22,7 +22,7 @@ namespace Avalonia.Markup.UnitTests.Parsers
 
             Assert.Equal(
                 new BindingNotification(
-                    new MissingMemberException("Could not find CLR property 'Baz' on '1'"), BindingErrorType.Error),
+                    new MissingMemberException("Could not find a matching property accessor for 'Baz' on '1'"), BindingErrorType.Error),
                 result);
 
             GC.KeepAlive(data);
diff --git a/tests/Avalonia.Markup.UnitTests/Parsers/SelectorGrammarTests.cs b/tests/Avalonia.Markup.UnitTests/Parsers/SelectorGrammarTests.cs
index 216043aa20..03f1120796 100644
--- a/tests/Avalonia.Markup.UnitTests/Parsers/SelectorGrammarTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Parsers/SelectorGrammarTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Linq;
 using Avalonia.Data.Core;
 using Avalonia.Markup.Parsers;
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 3107f4cf22..44b604197d 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net47</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net47</TargetFrameworks>
     <OutputType>Library</OutputType>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
@@ -10,7 +10,9 @@
   <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\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" />
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs
index d82300b964..33bf72014c 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Moq;
 using Avalonia.Collections;
@@ -9,6 +6,7 @@ using Avalonia.Styling;
 using Xunit;
 using System.ComponentModel;
 using Avalonia.Markup.Xaml.XamlIl.Runtime;
+using System.Collections.Generic;
 
 namespace Avalonia.Markup.Xaml.UnitTests.Converters
 {
@@ -139,7 +137,25 @@ namespace Avalonia.Markup.Xaml.UnitTests.Converters
                 get { throw new NotImplementedException(); }
             }
 
-            IObservable<IStyleable> IStyleable.StyleDetach { get; }
+            public void DetachStyles()
+            {
+                throw new NotImplementedException();
+            }
+
+            public void DetachStyles(IReadOnlyList<IStyle> styles)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void InvalidateStyles()
+            {
+                throw new NotImplementedException();
+            }
+
+            public void StyleApplied(IStyleInstance instance)
+            {
+                throw new NotImplementedException();
+            }
         }
 
         private class AttachedOwner
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ConverterTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ConverterTests.cs
index b424003ed6..c9420f1696 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ConverterTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ConverterTests.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Converters
         public void Bug_2228_Relative_Uris_Should_Be_Correctly_Parsed()
         {
             var testClass = typeof(TestClassWithUri);
-            var parsed = AvaloniaXamlLoader.Parse<TestClassWithUri>(
+            var parsed = AvaloniaRuntimeXamlLoader.Parse<TestClassWithUri>(
                 $"<{testClass.Name} xmlns='clr-namespace:{testClass.Namespace}' Uri='/test'/>", testClass.Assembly);
 
             Assert.False(parsed.Uri.IsAbsoluteUri);
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/MultiValueConverterTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/MultiValueConverterTests.cs
index a77723afe1..466ae1bf7c 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/MultiValueConverterTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/MultiValueConverterTests.cs
@@ -29,8 +29,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Converters
         </TextBlock.Text>
     </TextBlock>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var textBlock = window.FindControl<TextBlock>("textBlock");
 
                 window.ApplyTemplate();
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/NullableConverterTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/NullableConverterTests.cs
index cdd40ed80f..eb8851c80b 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/NullableConverterTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/NullableConverterTests.cs
@@ -22,8 +22,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Converters
 xmlns='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Converters'
     Thickness = '5' Orientation='Vertical'
 ></ClassWithNullableProperties>";
-                var loader = new AvaloniaXamlLoader();
-                var data = (ClassWithNullableProperties)loader.Load(xaml, typeof(ClassWithNullableProperties).Assembly);
+                var data = (ClassWithNullableProperties)AvaloniaRuntimeXamlLoader.Load(xaml, typeof(ClassWithNullableProperties).Assembly);
                 Assert.Equal(new Thickness(5), data.Thickness);
                 Assert.Equal(Orientation.Vertical, data.Orientation);
             }                
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/PointsListTypeConverterTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/PointsListTypeConverterTests.cs
new file mode 100644
index 0000000000..3b729e9cd8
--- /dev/null
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/PointsListTypeConverterTests.cs
@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using Avalonia.Controls.Shapes;
+using Avalonia.Markup.Xaml.Converters;
+using Xunit;
+
+namespace Avalonia.Markup.Xaml.UnitTests.Converters
+{
+    public class PointsListTypeConverterTests
+    {
+        [Theory]
+        [InlineData("1,2 3,4")]
+        [InlineData("1 2 3 4")]
+        [InlineData("1 2,3 4")]
+        [InlineData("1,2,3,4")]
+        public void TypeConverter_Should_Parse(string input)
+        {
+            var conv = new PointsListTypeConverter();
+
+            var points = (IList<Point>)conv.ConvertFrom(input);
+
+            Assert.Equal(2, points.Count);
+            Assert.Equal(new Point(1, 2), points[0]);
+            Assert.Equal(new Point(3, 4), points[1]);
+        }
+
+        [Theory]
+        [InlineData("1,2 3,4")]
+        [InlineData("1 2 3 4")]
+        [InlineData("1 2,3 4")]
+        [InlineData("1,2,3,4")]
+        public void Should_Parse_Points_in_Xaml(string input)
+        {
+            var xaml = $"<Polygon xmlns='https://github.com/avaloniaui' Points='{input}' />";
+            var polygon = (Polygon)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+            var points = polygon.Points;
+
+            Assert.Equal(2, points.Count);
+            Assert.Equal(new Point(1, 2), points[0]);
+            Assert.Equal(new Point(3, 4), points[1]);
+        }
+    }
+}
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ValueConverterTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ValueConverterTests.cs
index 5e698117c3..4d5983e276 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ValueConverterTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ValueConverterTests.cs
@@ -21,8 +21,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Converters
         xmlns:c='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Converters;assembly=Avalonia.Markup.Xaml.UnitTests'>
     <TextBlock Name='textBlock' Text='{Binding Converter={x:Static c:TestConverter.Instance}, FallbackValue=bar}'/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var textBlock = window.FindControl<TextBlock>("textBlock");
 
                 window.ApplyTemplate();
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
index 5972920af3..afc4a36fea 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
@@ -1,9 +1,13 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
 using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
 using Avalonia.Data;
+using Avalonia.Data.Converters;
 using Avalonia.UnitTests;
+using Avalonia.VisualTree;
 using Xunit;
 
 namespace Avalonia.Markup.Xaml.UnitTests.Data
@@ -20,8 +24,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
     <TextBlock Name='textBlock' Text='{Binding}'/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var textBlock = window.FindControl<TextBlock>("textBlock");
 
                 window.DataContext = "foo";
@@ -41,8 +44,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
     <TextBlock Name='textBlock' Text='{Binding}'/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var textBlock = window.FindControl<TextBlock>("textBlock");
 
                 window.ApplyTemplate();
@@ -57,5 +59,50 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
                 Assert.Equal("bar", textBlock.Text);
             }
         }
+
+        [Fact]
+        public void MultiBinding_TemplatedParent_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.Data;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <TextBox Name='textBox' Text='Foo' Watermark='Bar'>
+        <TextBox.Template>
+            <ControlTemplate>
+                <TextPresenter Name='PART_TextPresenter'>
+                    <TextPresenter.Text>
+                        <MultiBinding Converter='{x:Static local:ConcatConverter.Instance}'>
+                            <Binding RelativeSource='{RelativeSource TemplatedParent}' Path='Text'/>
+                            <Binding RelativeSource='{RelativeSource TemplatedParent}' Path='Watermark'/>
+                        </MultiBinding>
+                    </TextPresenter.Text>
+                </TextPresenter>
+            </ControlTemplate>
+        </TextBox.Template>
+    </TextBox>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBox = window.FindControl<TextBox>("textBox");
+
+                window.ApplyTemplate();
+                textBox.ApplyTemplate();
+
+                var target = (TextPresenter)textBox.GetVisualChildren().Single();
+                Assert.Equal("Foo,Bar", target.Text);
+            }
+        }
+    }
+
+    public class ConcatConverter : IMultiValueConverter
+    {
+        public static ConcatConverter Instance { get; } = new ConcatConverter();
+
+        public object Convert(IList<object> values, Type targetType, object parameter, CultureInfo culture)
+        {
+            return string.Join(",", values);
+        }
     }
 }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs
index db45f1989b..7931912649 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs
@@ -1,8 +1,5 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.Reactive.Subjects;
-using System.Windows.Input;
+using System;
+using System.ComponentModel;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.UnitTests;
@@ -23,8 +20,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
         xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
     <Button Name='button' Command='{Binding Method}'/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
                 var vm = new ViewModel();
 
@@ -48,8 +44,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
         xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
     <Button Name='button' Command='{Binding Method1}' CommandParameter='5'/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
                 var vm = new ViewModel();
 
@@ -61,7 +56,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
                 Assert.Equal("Called 5", vm.Value);
             }
         }
-        
+
         [Fact]
         public void Binding_Method_To_TextBlock_Text_Works()
         {
@@ -73,8 +68,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
         xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
     <TextBlock Name='textBlock' Text='{Binding Method}'/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var textBlock = window.FindControl<TextBlock>("textBlock");
                 var vm = new ViewModel();
 
@@ -85,6 +79,111 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
             }
         }
 
+
+        [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.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <Button Name='button' Command='{Binding Do}' CommandParameter='{Binding Parameter, Mode=OneTime}'/>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = window.FindControl<Button>("button");
+                var vm = new ViewModel()
+                {
+                    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.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
+    <Button Name='button' Command='{Binding Do}' CommandParameter='{Binding Parameter, Mode=OneWay}'/>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = window.FindControl<Button>("button");
+                var vm = new ViewModel()
+                {
+                    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 Binding_Method_To_Command_Collected()
+        {
+            WeakReference<ViewModel> MakeRef()
+            {
+                var weakVm = new WeakReference<ViewModel>(null);
+                {
+                    var vm = new ViewModel()
+                    {
+                        Parameter = null,
+                    };
+                    weakVm.SetTarget(vm);
+                    var canExecuteCount = 0;
+                    var action = new Action<object>(vm.Do);
+                    var command = new Avalonia.Data.Converters.MethodToCommandConverter(action);
+                    command.CanExecuteChanged += (s, e) => canExecuteCount++;
+                    vm.Parameter = 0;
+                    Threading.Dispatcher.UIThread.RunJobs();
+                    vm.Parameter = null;
+                    Threading.Dispatcher.UIThread.RunJobs();
+                    Assert.Equal(2, canExecuteCount);
+                }
+                return weakVm;
+            }
+            bool IsAlive(WeakReference<ViewModel> @ref)
+            {
+                return @ref.TryGetTarget(out var instance)
+                    && instance is null == false;
+            }
+
+            var vmref = MakeRef();
+
+            var beforeCollect = IsAlive(vmref);
+
+            GC.Collect();
+            GC.WaitForPendingFinalizers();
+
+            var afterCollect = IsAlive(vmref);
+
+            Assert.True(beforeCollect, "Invalid ViewModel instance, it is already collected.");
+            Assert.False(afterCollect, "ViewModel instance was not collected");
+        }
+
         static void PerformClick(Button button)
         {
             button.RaiseEvent(new KeyEventArgs
@@ -94,12 +193,43 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
             });
         }
 
-        private class ViewModel
+        private class ViewModel : 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;
+            }
         }
     }
 }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs
index 86ca351d67..6236bceff4 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Linq;
 using System.Reactive.Linq;
 using Avalonia.Controls;
@@ -29,8 +26,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
        </Button.Template>
     </Button>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
 
                 window.ApplyTemplate();
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs
index c3bc649abb..20ed22e84f 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs
@@ -29,8 +29,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <TextBlock Name='textBlock' Text='{Binding Source={StaticResource text}}'/>
 </Window>";
 
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var textBlock = window.FindControl<TextBlock>("textBlock");
 
                 window.Show();
@@ -39,6 +38,105 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             }
         }
 
+        [Fact]
+        public void BindingExtension_Binds_To_TargetNullValue()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Resources>
+        <x:String x:Key='text'>foobar</x:String>
+    </Window.Resources>
+
+    <TextBlock Name='textBlock' Text='{Binding Foo, TargetNullValue={StaticResource text}}'/>
+</Window>";
+
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                window.DataContext = new FooBar();
+                window.Show();
+
+                Assert.Equal("foobar", textBlock.Text);
+            }
+        }
+
+        [Fact]
+        public void BindingExtension_TargetNullValue_UnsetByDefault()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <TextBlock Name='textBlock' IsVisible='{Binding Foo, Converter={x:Static ObjectConverters.IsNotNull}}'/>
+</Window>";
+
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                window.DataContext = new FooBar();
+                window.Show();
+
+                Assert.Equal(false, textBlock.IsVisible);
+            }
+        }
+
+        [Fact]
+        public void SupportCastToTypeInExpression()
+        {
+            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'
+        >
+    <ContentControl Content='{Binding $parent.((local:TestDataContext)DataContext).StringProperty}' Name='contentControl' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var contentControl = window.FindControl<ContentControl>("contentControl");
+
+                var dataContext = new TestDataContext
+                {
+                    StringProperty = "foobar"
+                };
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(dataContext.StringProperty, contentControl.Content);
+            }
+        }
+
+        [Fact]
+        public void SupportCastToTypeInExpression_DifferentTypeEvaluatesToNull()
+        {
+            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'
+        >
+    <ContentControl Content='{Binding $parent.((local:TestDataContext)DataContext)}' Name='contentControl' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var contentControl = window.FindControl<ContentControl>("contentControl");
+
+                var dataContext = "foo";
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(null, contentControl.Content);
+            }
+        }
+        private class FooBar
+        {
+            public object Foo { get; } = null;
+        }
+
         private IDisposable StyledWindow(params (string, string)[] assets)
         {
             var services = TestServices.StyledWindow.With(
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs
new file mode 100644
index 0000000000..6f549a4ffa
--- /dev/null
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs
@@ -0,0 +1,1030 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Reactive.Subjects;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Data.Converters;
+using Avalonia.Data.Core;
+using Avalonia.Markup.Data;
+using Avalonia.Media;
+using Avalonia.UnitTests;
+using XamlX;
+using Xunit;
+
+namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
+{
+    public class CompiledBindingExtensionTests
+    {
+        [Fact]
+        public void ResolvesClrPropertyBasedOnDataContextType()
+        {
+            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'>
+    <TextBlock Text='{CompiledBinding StringProperty}' 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 ResolvesClrPropertyBasedOnDataContextType_InterfaceInheritance()
+        {
+            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:IHasPropertyDerived'>
+    <TextBlock Text='{CompiledBinding StringProperty}' 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 ResolvesPathPassedByProperty()
+        {
+            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'>
+    <TextBlock Text='{CompiledBinding Path=StringProperty}' 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()
+        {
+            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'>
+    <TextBlock Text='{CompiledBinding TaskProperty^}' Name='textBlock' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                var dataContext = new TestDataContext
+                {
+                    TaskProperty = Task.FromResult("foobar")
+                };
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(dataContext.TaskProperty.Result, textBlock.Text);
+            }
+        }
+
+        [Fact]
+        public void ResolvesStreamObservableBindingCorrectly()
+        {
+            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'>
+    <TextBlock Text='{CompiledBinding ObservableProperty^}' Name='textBlock' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                DelayedBinding.ApplyBindings(textBlock);
+
+                var subject = new Subject<string>();
+                var dataContext = new TestDataContext
+                {
+                    ObservableProperty = subject
+                };
+
+                window.DataContext = dataContext;
+
+                subject.OnNext("foobar");
+
+                Assert.Equal("foobar", textBlock.Text);
+            }
+        }
+
+        [Fact]
+        public void ResolvesIndexerBindingCorrectly()
+        {
+            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'>
+    <TextBlock Text='{CompiledBinding ListProperty[3]}' Name='textBlock' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                var dataContext = new TestDataContext
+                {
+                    ListProperty = { "A", "B", "C", "D", "E" }
+                };
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(dataContext.ListProperty[3], textBlock.Text);
+            }
+        }
+
+        [Fact]
+        public void ResolvesArrayIndexerBindingCorrectly()
+        {
+            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'>
+    <TextBlock Text='{CompiledBinding ArrayProperty[3]}' Name='textBlock' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                var dataContext = new TestDataContext
+                {
+                    ArrayProperty = new[] { "A", "B", "C", "D", "E" }
+                };
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(dataContext.ArrayProperty[3], textBlock.Text);
+            }
+        }
+
+        [Fact]
+        public void ResolvesObservableIndexerBindingCorrectly()
+        {
+            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'>
+    <TextBlock Text='{CompiledBinding ObservableCollectionProperty[3]}' Name='textBlock' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                var dataContext = new TestDataContext
+                {
+                    ObservableCollectionProperty = { "A", "B", "C", "D", "E" }
+                };
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(dataContext.ObservableCollectionProperty[3], textBlock.Text);
+
+                dataContext.ObservableCollectionProperty[3] = "New Value";
+
+                Assert.Equal(dataContext.ObservableCollectionProperty[3], textBlock.Text);
+            }
+        }
+
+        [Fact]
+        public void InfersCompiledBindingDataContextFromDataContextBinding()
+        {
+            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'>
+    <TextBlock DataContext='{CompiledBinding StringProperty}' Text='{CompiledBinding}' Name='textBlock' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                window.ApplyTemplate();
+                window.Presenter.ApplyTemplate();
+
+                var dataContext = new TestDataContext
+                {
+                    StringProperty = "A"
+                };
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(dataContext.StringProperty, textBlock.Text);
+            }
+        }
+
+        [Fact]
+        public void ResolvesNonIntegerIndexerBindingCorrectly()
+        {
+            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'>
+    <TextBlock Text='{CompiledBinding NonIntegerIndexerProperty[Test]}' Name='textBlock' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                var dataContext = new TestDataContext();
+
+                dataContext.NonIntegerIndexerProperty["Test"] = "Initial Value";
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(dataContext.NonIntegerIndexerProperty["Test"], textBlock.Text);
+
+                dataContext.NonIntegerIndexerProperty["Test"] = "New Value";
+
+                Assert.Equal(dataContext.NonIntegerIndexerProperty["Test"], textBlock.Text);
+            }
+        }
+
+        [Fact]
+        public void ResolvesNonIntegerIndexerBindingFromParentInterfaceCorrectly()
+        {
+            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'>
+    <TextBlock Text='{CompiledBinding NonIntegerIndexerInterfaceProperty[Test]}' Name='textBlock' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                var dataContext = new TestDataContext();
+
+                dataContext.NonIntegerIndexerInterfaceProperty["Test"] = "Initial Value";
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(dataContext.NonIntegerIndexerInterfaceProperty["Test"], textBlock.Text);
+
+                dataContext.NonIntegerIndexerInterfaceProperty["Test"] = "New Value";
+
+                Assert.Equal(dataContext.NonIntegerIndexerInterfaceProperty["Test"], textBlock.Text);
+            }
+        }
+
+        [Fact]
+        public void InfersDataTemplateTypeFromDataTypeProperty()
+        {
+            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'>
+    <Window.DataTemplates>
+        <DataTemplate DataType='{x:Type x:String}'>
+            <TextBlock Text='{CompiledBinding}' Name='textBlock' />
+        </DataTemplate>
+    </Window.DataTemplates>
+    <ContentControl Name='target' Content='{CompiledBinding StringProperty}' />
+</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 ThrowsOnUninferrableLooseDataTemplateNoDataTypeWithCompiledBindingPath()
+        {
+            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'>
+    <Window.DataTemplates>
+        <DataTemplate>
+            <TextBlock Text='{CompiledBinding StringProperty}' Name='textBlock' />
+        </DataTemplate>
+    </Window.DataTemplates>
+    <ContentControl Name='target' Content='{CompiledBinding}' />
+</Window>";
+                ThrowsXamlTransformException(() => AvaloniaRuntimeXamlLoader.Load(xaml));
+            }
+        }
+
+        [Fact]
+        public void ThrowsOnUninferrableDataTypeFromNonCompiledDataContextBindingWithCompiledBindingPath()
+        {
+            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'>
+    <ContentControl Name='target' DataContext='{Binding}'>
+        <TextBlock Text='{CompiledBinding StringProperty}' Name='textBlock' />
+    </ContentControl>
+</Window>";
+                ThrowsXamlTransformException(() => AvaloniaRuntimeXamlLoader.Load(xaml));
+            }
+        }
+
+        [Fact]
+        public void InfersDataTemplateTypeFromParentCollectionItemsType()
+        {
+            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 Items='{CompiledBinding ListProperty}' Name='target'>
+        <ItemsControl.DataTemplates>
+            <DataTemplate>
+                <TextBlock Text='{CompiledBinding}' Name='textBlock' />
+            </DataTemplate>
+        </ItemsControl.DataTemplates>
+    </ItemsControl>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var target = window.FindControl<ItemsControl>("target");
+
+                var dataContext = new TestDataContext();
+
+                dataContext.ListProperty.Add("Test");
+
+                window.DataContext = dataContext;
+
+                window.ApplyTemplate();
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+
+                Assert.Equal(dataContext.ListProperty[0], (string)((ContentPresenter)target.Presenter.Panel.Children[0]).Content);
+            }
+        }
+
+        [Fact]
+        public void ThrowsOnUninferrableDataTemplateInItemsControlWithoutItemsBinding()
+        {
+            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='target'>
+        <ItemsControl.DataTemplates>
+            <DataTemplate>
+                <TextBlock Text='{CompiledBinding Property}' Name='textBlock' />
+            </DataTemplate>
+        </ItemsControl.DataTemplates>
+    </ItemsControl>
+</Window>";
+                ThrowsXamlTransformException(() => AvaloniaRuntimeXamlLoader.Load(xaml));
+            }
+        }
+
+        [Fact]
+        public void ResolvesElementNameBinding()
+        {
+            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'>
+    <StackPanel>
+        <TextBlock Text='{CompiledBinding StringProperty}' x:Name='text' />
+        <TextBlock Text='{CompiledBinding #text.Text}' x:Name='text2' />
+    </StackPanel>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("text2");
+
+                var dataContext = new TestDataContext
+                {
+                    StringProperty = "foobar"
+                };
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(dataContext.StringProperty, textBlock.Text);
+            }
+        }
+
+        [Fact]
+        public void ResolvesElementNameBindingFromLongForm()
+        {
+            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'>
+    <StackPanel>
+        <TextBlock Text='{CompiledBinding StringProperty}' x:Name='text' />
+        <TextBlock Text='{CompiledBinding Text, ElementName=text}' x:Name='text2' />
+    </StackPanel>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("text2");
+
+                var dataContext = new TestDataContext
+                {
+                    StringProperty = "foobar"
+                };
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(dataContext.StringProperty, textBlock.Text);
+            }
+        }
+
+        [Fact]
+        public void ResolvesRelativeSourceBindingLongForm()
+        {
+            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'
+        Title='test'>
+    <TextBlock Text='{CompiledBinding Title, RelativeSource={RelativeSource AncestorType=Window}}' x:Name='text'/>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var target = window.FindControl<TextBlock>("text");
+
+                window.ApplyTemplate();
+                window.Presenter.ApplyTemplate();
+                target.ApplyTemplate();
+
+                Assert.Equal("test", target.Text);
+            }
+        }
+
+        [Fact]
+        public void Binds_To_Source()
+        {
+            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'
+        Title='test'>
+    <TextBlock Text='{CompiledBinding Length, Source=Test}' x:Name='text'/>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var target = window.FindControl<TextBlock>("text");
+
+                window.ApplyTemplate();
+                window.Presenter.ApplyTemplate();
+                target.ApplyTemplate();
+
+                Assert.Equal("Test".Length.ToString(), target.Text);
+            }
+        }
+
+        [Fact]
+        public void Binds_To_Source_StaticResource()
+        {
+            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'
+             x:CompileBindings='True'>
+    <Window.Resources>
+        <local:TestDataContext x:Key='dataKey' StringProperty='foobar'/>
+    </Window.Resources>
+    <TextBlock Name='textBlock' Text='{Binding StringProperty, Source={StaticResource dataKey}}'/>
+</Window>";
+
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                Assert.Equal("foobar", textBlock.Text);
+            }
+        }
+
+        [Fact]
+        public void Binds_To_Source_StaticResource1()
+        {
+            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'
+             x:CompileBindings='True'>
+    <Window.Resources>
+        <local:TestDataContext x:Key='dataKey' StringProperty='foobar'/>
+        <x:String x:Key='otherObjectKey'>test</x:String>
+    </Window.Resources>
+    <TextBlock Name='textBlock' Text='{Binding StringProperty, Source={StaticResource dataKey}}'/>
+</Window>";
+
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                Assert.Equal("foobar", textBlock.Text);
+            }
+        }
+
+        [Fact]
+        public void Binds_To_Source_StaticResource_In_ResourceDictionary()
+        {
+            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'
+             x:DataType='local:TestDataContext' x:CompileBindings='True'>
+    <Window.Resources>
+        <ResourceDictionary>
+            <local:TestDataContext x:Key='dataKey' StringProperty='foobar'/>
+        </ResourceDictionary>
+    </Window.Resources>
+    <TextBlock Name='textBlock' Text='{Binding StringProperty, Source={StaticResource dataKey}}'/>
+</Window>";
+
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                Assert.Equal("foobar", textBlock.Text);
+            }
+        }
+
+        [Fact]
+        public void Binds_To_Source_StaticResource_In_ResourceDictionary1()
+        {
+            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'
+             x:DataType='local:TestDataContext' x:CompileBindings='True'>
+    <Window.Resources>
+        <ResourceDictionary>
+            <local:TestDataContext x:Key='dataKey' StringProperty='foobar'/>
+            <x:String x:Key='otherObjectKey'>test</x:String>
+        </ResourceDictionary>
+    </Window.Resources>
+    <TextBlock Name='textBlock' Text='{Binding StringProperty, Source={StaticResource dataKey}}'/>
+</Window>";
+
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                Assert.Equal("foobar", textBlock.Text);
+            }
+        }
+
+        [Fact]
+        public void Binds_To_Source_xStatic()
+        {
+            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'
+             x:CompileBindings='True'>
+    <ContentControl Name='contentControl' Content='{Binding Color, Source={x:Static Brushes.Red}}'/>
+</Window>";
+
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var contentControl = window.FindControl<ContentControl>("contentControl");
+
+                Assert.Equal(Brushes.Red.Color, contentControl.Content);
+            }
+        }
+
+        [Fact]
+        public void CompilesBindingWhenRequested()
+        {
+            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'
+        x:CompileBindings='true'>
+    <TextBlock Text='{Binding StringProperty}' 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 ThrowsOnInvalidBindingPathOnCompiledBindingEnabledViaDirective()
+        {
+            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'
+        x:CompileBindings='true'>
+    <TextBlock Text='{Binding InvalidPath}' Name='textBlock' />
+</Window>";
+                ThrowsXamlParseException(() => AvaloniaRuntimeXamlLoader.Load(xaml));
+            }
+        }
+
+        [Fact]
+        public void SupportParentInPath()
+        {
+            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'
+        Title='foo'
+        x:DataType='local:TestDataContext'>
+    <ContentControl Content='{CompiledBinding $parent.Title}' Name='contentControl' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var contentControl = window.FindControl<ContentControl>("contentControl");
+
+                Assert.Equal("foo", contentControl.Content);
+            }
+        }
+
+        [Fact]
+        public void SupportConverterWithParameter()
+        {
+            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' x:CompileBindings='True'>
+    <TextBlock Name='textBlock' Text='{Binding StringProperty, Converter={x:Static local:AppendConverter.Instance}, ConverterParameter=Bar}'/>
+</Window>";
+
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var textBlock = window.FindControl<TextBlock>("textBlock");
+
+                window.DataContext = new TestDataContext() { StringProperty = "Foo" };
+
+                Assert.Equal("Foo+Bar", textBlock.Text);
+            }
+        }
+
+        [Fact]
+        public void ThrowsOnInvalidCompileBindingsDirective()
+        {
+            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'
+        x:CompileBindings='notabool'>
+</Window>";
+                ThrowsXamlParseException(() => AvaloniaRuntimeXamlLoader.Load(xaml));
+            }
+        }
+
+        [Fact]
+        public void SupportCastToTypeInExpression()
+        {
+            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'
+        x:DataType='local:TestDataContext'>
+    <ContentControl Content='{CompiledBinding $parent.((local:TestDataContext)DataContext)}' Name='contentControl' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var contentControl = window.FindControl<ContentControl>("contentControl");
+
+                var dataContext = new TestDataContext();
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(dataContext, contentControl.Content);
+            }
+        }
+
+        [Fact]
+        public void SupportCastToTypeInExpression_DifferentTypeEvaluatesToNull()
+        {
+            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'
+        x:DataType='local:TestDataContext'>
+    <ContentControl Content='{CompiledBinding $parent.((local:TestDataContext)DataContext)}' Name='contentControl' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var contentControl = window.FindControl<ContentControl>("contentControl");
+
+                var dataContext = "foo";
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(null, contentControl.Content);
+            }
+        }
+
+        [Fact]
+        public void SupportCastToTypeInExpressionWithProperty()
+        {
+            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'
+        x:DataType='local:TestDataContext'>
+    <ContentControl Content='{CompiledBinding $parent.((local:TestDataContext)DataContext).StringProperty}' Name='contentControl' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var contentControl = window.FindControl<ContentControl>("contentControl");
+
+                var dataContext = new TestDataContext
+                {
+                    StringProperty = "foobar"
+                };
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(dataContext.StringProperty, contentControl.Content);
+            }
+        }
+
+        [Fact]
+        public void SupportCastToTypeInExpressionWithProperty1()
+        {
+            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'
+        x:DataType='local:TestDataContext'>
+    <ContentControl Content='{CompiledBinding $parent.DataContext(local:TestDataContext).StringProperty}' Name='contentControl' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var contentControl = window.FindControl<ContentControl>("contentControl");
+
+                var dataContext = new TestDataContext
+                {
+                    StringProperty = "foobar"
+                };
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(dataContext.StringProperty, contentControl.Content);
+            }
+        }
+
+        [Fact]
+        public void SupportCastToTypeInExpressionWithPropertyIndexer()
+        {
+            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'
+        x:DataType='local:TestDataContext'>
+    <ContentControl Content='{CompiledBinding ((local:TestData)ObjectsArrayProperty[0]).StringProperty}' Name='contentControl' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var contentControl = window.FindControl<ContentControl>("contentControl");
+
+                var data = new TestData()
+                {
+                    StringProperty = "Foo"
+                };
+                var dataContext = new TestDataContext
+                {
+                    ObjectsArrayProperty = new object[] { data }
+                };
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(data.StringProperty, contentControl.Content);
+            }
+        }
+
+        [Fact]
+        public void SupportCastToTypeInExpressionWithProperty_DifferentTypeEvaluatesToNull()
+        {
+            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'
+        x:DataType='local:TestDataContext'>
+    <ContentControl Content='{CompiledBinding $parent.((local:TestDataContext)DataContext).StringProperty}' Name='contentControl' />
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var contentControl = window.FindControl<ContentControl>("contentControl");
+
+                var dataContext = new TestDataContext
+                {
+                    StringProperty = "foobar"
+                };
+
+                window.DataContext = dataContext;
+
+                Assert.Equal(dataContext.StringProperty, contentControl.Content);
+
+                window.DataContext = "foo";
+
+                Assert.Equal(null, contentControl.Content);
+            }
+        }
+
+        void Throws(string type, Action cb)
+        {
+            try
+            {
+                cb();
+            }
+            catch (Exception e) when (e.GetType().Name == type)
+            {
+                return;
+            }
+
+            throw new Exception("Expected " + type);
+        }
+
+        void ThrowsXamlParseException(Action cb) => Throws("XamlParseException", cb);
+        void ThrowsXamlTransformException(Action cb) => Throws("XamlTransformException", cb);
+    }
+    
+    public interface INonIntegerIndexer
+    {
+        string this[string key] { get; set; }
+    }
+
+    public interface INonIntegerIndexerDerived : INonIntegerIndexer
+    { }
+
+    public interface IHasProperty
+    {
+        string StringProperty { get; set; }
+    }
+
+    public interface IHasPropertyDerived : IHasProperty
+    { }
+
+    public class AppendConverter : IValueConverter
+    {
+        public static IValueConverter Instance { get; } = new AppendConverter();
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+            => string.Format("{0}+{1}", value, parameter);
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+            => throw new NotImplementedException();
+
+    }
+
+    public class TestData
+    {
+        public string StringProperty { get; set; }
+    }
+
+    public class TestDataContext : IHasPropertyDerived
+    {
+        public string StringProperty { get; set; }
+
+        public Task<string> TaskProperty { get; set; }
+
+        public IObservable<string> ObservableProperty { get; set; }
+
+        public ObservableCollection<string> ObservableCollectionProperty { get; set; } = new ObservableCollection<string>();
+
+        public string[] ArrayProperty { get; set; }
+
+        public object[] ObjectsArrayProperty { get; set; }
+
+        public List<string> ListProperty { get; set; } = new List<string>();
+
+        public NonIntegerIndexer NonIntegerIndexerProperty { get; set; } = new NonIntegerIndexer();
+
+        public INonIntegerIndexerDerived NonIntegerIndexerInterfaceProperty => NonIntegerIndexerProperty;
+
+        public class NonIntegerIndexer : NotifyingBase, INonIntegerIndexerDerived
+        {
+            private readonly Dictionary<string, string> _storage = new Dictionary<string, string>();
+
+            public string this[string key]
+            {
+                get
+                {
+                    return _storage[key];
+                }
+                set
+                {
+                    _storage[key] = value;
+                    RaisePropertyChanged(CommonPropertyNames.IndexerName);
+                }
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs
index 96955539c1..9152131ab3 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
@@ -30,8 +27,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{DynamicResource brush}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var border = userControl.FindControl<Border>("border");
 
             DelayedBinding.ApplyBindings(border);
@@ -53,8 +49,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Grid.Column='{DynamicResource col}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var border = userControl.FindControl<Border>("border");
 
             DelayedBinding.ApplyBindings(border);
@@ -79,8 +74,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{DynamicResource brush}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var border = userControl.FindControl<Border>("border");
 
             DelayedBinding.ApplyBindings(border);
@@ -108,8 +102,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{DynamicResource brush}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var border = userControl.FindControl<Border>("border");
 
             DelayedBinding.ApplyBindings(border);
@@ -141,8 +134,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{DynamicResource brush}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var border = userControl.FindControl<Border>("border");
 
             DelayedBinding.ApplyBindings(border);
@@ -164,8 +156,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{DynamicResource brush}'/>
 </Window>";
 
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var border = window.FindControl<Border>("border");
 
                 var brush = (SolidColorBrush)border.Background;
@@ -186,8 +177,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{DynamicResource brush}'/>
 </UserControl>";
 
-                var loader = new AvaloniaXamlLoader();
-                var userControl = (UserControl)loader.Load(xaml);
+                var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var border = userControl.FindControl<Border>("border");
 
                 // We don't actually know where the global styles are until we attach the control
@@ -219,8 +209,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Button Name='button'/>
 </Window>";
 
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
                 var brush = (SolidColorBrush)button.Background;
 
@@ -249,8 +238,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Button Name='button'/>
 </Window>";
 
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
                 var brush = (SolidColorBrush)button.Background;
 
@@ -284,8 +272,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border'/>
 </Window>";
 
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var border = window.FindControl<Border>("border");
                 var brush = (SolidColorBrush)border.Background;
 
@@ -323,8 +310,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Button Name='button'/>
 </Window>";
 
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
 
                 window.Show();
@@ -350,8 +336,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{DynamicResource brush}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var border = userControl.FindControl<Border>("border");
 
             DelayedBinding.ApplyBindings(border);
@@ -360,6 +345,23 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             Assert.Equal(0xff506070, brush.Color.ToUint32());
         }
 
+        [Fact]
+        public void DynamicResource_Can_Be_Assigned_To_Resource_Property_In_Application()
+        {
+            var xaml = @"
+<Application xmlns='https://github.com/avaloniaui'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Application.Resources>
+        <Color x:Key='color'>#ff506070</Color>
+        <SolidColorBrush x:Key='brush' Color='{DynamicResource color}'/>
+    </Application.Resources>
+</Application>";
+
+            var application = (Application)AvaloniaRuntimeXamlLoader.Load(xaml);
+            var brush = (SolidColorBrush)application.Resources["brush"];
+
+            Assert.Equal(0xff506070, brush.Color.ToUint32());
+        }
 
         [Fact]
         public void DynamicResource_Can_Be_Assigned_To_ItemTemplate_Property()
@@ -376,8 +378,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <ListBox Name='listBox' ItemTemplate='{DynamicResource PurpleData}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var listBox = userControl.FindControl<ListBox>("listBox");
 
             DelayedBinding.ApplyBindings(listBox);
@@ -394,8 +395,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{DynamicResource brush}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var border = userControl.FindControl<Border>("border");
 
             DelayedBinding.ApplyBindings(border);
@@ -418,8 +418,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{DynamicResource brush}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var border = userControl.FindControl<Border>("border");
 
             DelayedBinding.ApplyBindings(border);
@@ -446,8 +445,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{DynamicResource brush}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var border = userControl.FindControl<Border>("border");
 
             DelayedBinding.ApplyBindings(border);
@@ -477,8 +475,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{DynamicResource brush}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var border = userControl.FindControl<Border>("border");
 
             DelayedBinding.ApplyBindings(border);
@@ -501,8 +498,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{DynamicResource brush}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var border = userControl.FindControl<Border>("border");
 
             DelayedBinding.ApplyBindings(border);
@@ -534,8 +530,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{DynamicResource brush}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var border = userControl.FindControl<Border>("border");
 
             DelayedBinding.ApplyBindings(border);
@@ -585,8 +580,45 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{DynamicResource RedBrush}'/>
 </Window>";
 
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var border = window.FindControl<Border>("border");
+                var borderBrush = (ISolidColorBrush)border.Background;
+
+                Assert.NotNull(borderBrush);
+                Assert.Equal(0xffff0000, borderBrush.Color.ToUint32());
+            }
+        }
+
+        [Fact]
+        public void DynamicResource_Can_Be_Found_In_Nested_Style_File()
+        {
+            var style1Xaml = @"
+<Styles xmlns='https://github.com/avaloniaui'
+       xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+  <StyleInclude Source='test:style2.xaml'/>
+</Styles>";
+            var style2Xaml = @"
+<Style xmlns='https://github.com/avaloniaui'
+       xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+  <Style.Resources>
+    <Color x:Key='Red'>Red</Color>
+    <SolidColorBrush x:Key='RedBrush' Color='{DynamicResource Red}'/>
+  </Style.Resources>
+</Style>";
+            using (StyledWindow(
+                ("test:style1.xaml", style1Xaml),
+                ("test:style2.xaml", style2Xaml)))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Styles>
+        <StyleInclude Source='test:style1.xaml'/>
+    </Window.Styles>
+    <Border Name='border' Background='{DynamicResource RedBrush}'/>
+</Window>";
+
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var border = window.FindControl<Border>("border");
                 var borderBrush = (ISolidColorBrush)border.Background;
 
@@ -597,33 +629,183 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
 
         [Fact]
         public void Control_Property_Is_Updated_When_Parent_Is_Changed()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Resources>
+        <SolidColorBrush x:Key='brush'>#ff506070</SolidColorBrush>
+    </Window.Resources>
+
+    <Border Name='border' Background='{DynamicResource brush}'/>
+</Window>";
+
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var border = window.FindControl<Border>("border");
+
+                DelayedBinding.ApplyBindings(border);
+
+                var brush = (SolidColorBrush)border.Background;
+                Assert.Equal(0xff506070, brush.Color.ToUint32());
+
+                window.Content = null;
+
+                Assert.Null(border.Background);
+
+                window.Content = border;
+
+                brush = (SolidColorBrush)border.Background;
+                Assert.Equal(0xff506070, brush.Color.ToUint32());
+            }
+        }
+
+        [Fact]
+        public void Resource_With_DynamicResource_Is_Updated_When_Added_To_Parent()
         {
             var xaml = @"
 <UserControl xmlns='https://github.com/avaloniaui'
              xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
     <UserControl.Resources>
-        <SolidColorBrush x:Key='brush'>#ff506070</SolidColorBrush>
+        <SolidColorBrush x:Key='brush' Color='{DynamicResource color}'/>
     </UserControl.Resources>
 
     <Border Name='border' Background='{DynamicResource brush}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var border = userControl.FindControl<Border>("border");
 
             DelayedBinding.ApplyBindings(border);
 
             var brush = (SolidColorBrush)border.Background;
-            Assert.Equal(0xff506070, brush.Color.ToUint32());
+            Assert.Equal(0u, brush.Color.ToUint32());
 
-            userControl.Content = null;
+            brush.GetObservable(SolidColorBrush.ColorProperty).Subscribe(_ => { });
 
-            Assert.Null(border.Background);
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var window = new Window
+                {
+                    Resources =
+                    {
+                        { "color", Colors.Red }
+                    },
+                    Content = userControl,
+                };
 
-            userControl.Content = border;
+                window.Show();
+
+                Assert.Equal(Colors.Red, brush.Color);
+            }
+        }
+
+        [Fact]
+        public void MergedDictionary_Resource_With_DynamicResource_Is_Updated_When_Added_To_Parent()
+        {
+            var xaml = @"
+<UserControl xmlns='https://github.com/avaloniaui'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary>
+                    <SolidColorBrush x:Key='brush' Color='{DynamicResource color}'/>
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+
+    <Border Name='border' Background='{DynamicResource brush}'/>
+</UserControl>";
+
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
+            var border = userControl.FindControl<Border>("border");
+
+            DelayedBinding.ApplyBindings(border);
+
+            var brush = (SolidColorBrush)border.Background;
+            Assert.Equal(0u, brush.Color.ToUint32());
+
+            brush.GetObservable(SolidColorBrush.ColorProperty).Subscribe(_ => { });
+
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var window = new Window
+                {
+                    Resources =
+                    {
+                        { "color", Colors.Red }
+                    },
+                    Content = userControl,
+                };
+
+                window.Show();
+
+                Assert.Equal(Colors.Red, brush.Color);
+            }
+        }
+
+        [Fact]
+        public void Style_Resource_With_DynamicResource_Is_Updated_When_Added_To_Parent()
+        {
+            var xaml = @"
+<UserControl xmlns='https://github.com/avaloniaui'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <UserControl.Styles>
+        <Style>
+            <Style.Resources>
+                <SolidColorBrush x:Key='brush' Color='{DynamicResource color}'/>
+            </Style.Resources>
+        </Style>
+    </UserControl.Styles>
+
+    <Border Name='border' Background='{DynamicResource brush}'/>
+</UserControl>";
+
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
+            var border = userControl.FindControl<Border>("border");
+
+            DelayedBinding.ApplyBindings(border);
+
+            var brush = (SolidColorBrush)border.Background;
+            Assert.Equal(0u, brush.Color.ToUint32());
+
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var window = new Window
+                {
+                    Resources =
+                    {
+                        { "color", Colors.Red }
+                    },
+                    Content = userControl,
+                };
+
+                window.Show();
+
+                Assert.Equal(Colors.Red, brush.Color);
+            }
+        }
+
+        [Fact]
+        public void Automatically_Converts_Color_To_SolidColorBrush()
+        {
+            var xaml = @"
+<UserControl xmlns='https://github.com/avaloniaui'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <UserControl.Resources>
+        <Color x:Key='color'>#ff506070</Color>
+    </UserControl.Resources>
+
+    <Border Name='border' Background='{DynamicResource color}'/>
+</UserControl>";
+
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
+            var border = userControl.FindControl<Border>("border");
 
-            brush = (SolidColorBrush)border.Background;
+            var brush = (ISolidColorBrush)border.Background;
             Assert.Equal(0xff506070, brush.Color.ToUint32());
         }
 
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs
index 7ab6c2de40..54e89ae37e 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Avalonia.Controls;
 using Avalonia.Media;
 using Avalonia.UnitTests;
@@ -6,7 +7,7 @@ using Xunit;
 
 namespace Avalonia.Markup.Xaml.UnitTests.MakrupExtensions
 {
-    public class ResourceIncludeTests
+    public class ResourceIncludeTests : XamlTestBase
     {
         public class StaticResourceExtensionTests : XamlTestBase
         {
@@ -35,8 +36,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MakrupExtensions
     <Border Name='border' Background='{StaticResource brush}'/>
 </UserControl>";
 
-                    var loader = new AvaloniaXamlLoader();
-                    var userControl = (UserControl)loader.Load(xaml);
+                    var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
                     var border = userControl.FindControl<Border>("border");
 
                     var brush = (SolidColorBrush)border.Background;
@@ -44,6 +44,42 @@ namespace Avalonia.Markup.Xaml.UnitTests.MakrupExtensions
                 }
             }
 
+            [Fact]
+            public void Missing_ResourceKey_In_ResourceInclude_Does_Not_Cause_StackOverflow()
+            {
+                var styleXaml = @"
+<ResourceDictionary xmlns='https://github.com/avaloniaui'
+                    xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <StaticResource x:Key='brush' ResourceKey='missing' />
+</ResourceDictionary>";
+
+                using (StartWithResources(("test:style.xaml", styleXaml)))
+                {
+                    var xaml = @"
+<Application xmlns='https://github.com/avaloniaui'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceInclude Source='test:style.xaml'/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>";
+
+                    var app = Application.Current;
+
+                    try
+                    {
+                        AvaloniaRuntimeXamlLoader.Load(xaml, null, app);
+                    }
+                    catch (KeyNotFoundException)
+                    {
+
+                    }
+                }
+            }
+
             private IDisposable StartWithResources(params (string, string)[] assets)
             {
                 var assetLoader = new MockAssetLoader(assets);
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs
index 58985af0ad..0ee7384c7d 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
@@ -29,8 +26,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{StaticResource brush}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var border = userControl.FindControl<Border>("border");
 
             var brush = (SolidColorBrush)border.Background;
@@ -50,8 +46,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Grid.Column='{StaticResource col}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var border = userControl.FindControl<Border>("border");
 
             Assert.Equal(5, Grid.GetColumn(border));
@@ -74,8 +69,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{StaticResource brush}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var border = userControl.FindControl<Border>("border");
 
             var brush = (SolidColorBrush)border.Background;
@@ -95,8 +89,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{StaticResource brush}'/>
 </Window>";
 
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var border = window.FindControl<Border>("border");
 
                 var brush = (SolidColorBrush)border.Background;
@@ -123,8 +116,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{StaticResource brush}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var border = userControl.FindControl<Border>("border");
 
             var brush = (SolidColorBrush)border.Background;
@@ -154,8 +146,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{StaticResource brush}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var border = userControl.FindControl<Border>("border");
 
             var brush = (SolidColorBrush)border.Background;
@@ -175,8 +166,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{StaticResource brush}'/>
 </UserControl>";
 
-                var loader = new AvaloniaXamlLoader();
-                var userControl = (UserControl)loader.Load(xaml);
+                var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var border = userControl.FindControl<Border>("border");
 
                 // We don't actually know where the global styles are until we attach the control
@@ -208,8 +198,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Button Name='button'/>
 </Window>";
 
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
                 var brush = (SolidColorBrush)button.Background;
 
@@ -238,8 +227,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Button Name='button'/>
 </Window>";
 
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
                 var brush = (SolidColorBrush)button.Background;
 
@@ -273,8 +261,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border'/>
 </Window>";
 
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var border = window.FindControl<Border>("border");
                 var brush = (SolidColorBrush)border.Background;
 
@@ -296,8 +283,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{StaticResource brush}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var border = userControl.FindControl<Border>("border");
 
             var brush = (SolidColorBrush)border.Background;
@@ -316,8 +302,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     </Styles.Resources>
 </Styles>";
 
-            var loader = new AvaloniaXamlLoader();
-            var styles = (Styles)loader.Load(xaml);
+            var styles = (Styles)AvaloniaRuntimeXamlLoader.Load(xaml);
             var brush = (SolidColorBrush)styles.Resources["brush"];
 
             Assert.Equal(0xff506070, brush.Color.ToUint32());
@@ -353,8 +338,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Button Name='button'/>
 </Window>";
 
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
 
                 window.Show();
@@ -381,8 +365,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <ListBox Name='listBox' ItemTemplate='{StaticResource PurpleData}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var listBox = userControl.FindControl<ListBox>("listBox");
 
             Assert.NotNull(listBox.ItemTemplate);
@@ -404,8 +387,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <TextBlock Name='textBlock' Text='{Binding Converter={StaticResource converter}}'/>
 </Window>";
 
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var textBlock = window.FindControl<TextBlock>("textBlock");
 
                 window.DataContext = "foo";
@@ -434,8 +416,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <ContentPresenter Name='presenter' Content='foo' ContentTemplate='{StaticResource PurpleData}'/>
 </Window>";
 
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
 
                 window.DataContext = "foo";
                 var presenter = window.FindControl<ContentPresenter>("presenter");
@@ -476,8 +457,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <ContentPresenter Content='foo' ContentTemplate='{StaticResource WhiteData}'/>
 </Window>";
 
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
 
                 window.Show();
 
@@ -501,8 +481,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <Border Name='border' Background='{StaticResource brush}'/>
 </UserControl>";
 
-            var loader = new AvaloniaXamlLoader();
-            var userControl = (UserControl)loader.Load(xaml);
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
             var border = userControl.FindControl<Border>("border");
 
             var brush = (SolidColorBrush)border.Background;
@@ -514,6 +493,26 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             Assert.Equal(0xff506070, brush.Color.ToUint32());
         }
 
+        [Fact]
+        public void Automatically_Converts_Color_To_SolidColorBrush()
+        {
+            var xaml = @"
+<UserControl xmlns='https://github.com/avaloniaui'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <UserControl.Resources>
+        <Color x:Key='color'>#ff506070</Color>
+    </UserControl.Resources>
+
+    <Border Name='border' Background='{StaticResource color}'/>
+</UserControl>";
+
+            var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
+            var border = userControl.FindControl<Border>("border");
+
+            var brush = (ISolidColorBrush)border.Background;
+            Assert.Equal(0xff506070, brush.Color.ToUint32());
+        }
+
         private IDisposable StyledWindow(params (string, string)[] assets)
         {
             var services = TestServices.StyledWindow.With(
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Properties/AssemblyInfo.cs
index 24cc853318..f740673645 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Properties/AssemblyInfo.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Properties/AssemblyInfo.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reflection;
 using Xunit;
 
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/SampleAvaloniaObject.cs b/tests/Avalonia.Markup.Xaml.UnitTests/SampleAvaloniaObject.cs
index c332f7e78b..b4c2bda935 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/SampleAvaloniaObject.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/SampleAvaloniaObject.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Markup.Xaml.UnitTests
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/StyleIncludeTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/StyleIncludeTests.cs
new file mode 100644
index 0000000000..d35a7e6107
--- /dev/null
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/StyleIncludeTests.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Markup.Xaml.UnitTests
+{
+    public class StyleIncludeTests : XamlTestBase
+    {
+        [Fact]
+        public void Missing_ResourceKey_In_StyleInclude_Does_Not_Cause_StackOverflow()
+        {
+            var styleXaml = @"
+<Style xmlns='https://github.com/avaloniaui'
+                    xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Style.Resources>
+        <StaticResource x:Key='brush' ResourceKey='missing' />
+    </Style.Resources>
+</Style>";
+
+            using (StartWithResources(("test:style.xaml", styleXaml)))
+            {
+                var xaml = @"
+<Application xmlns='https://github.com/avaloniaui'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Application.Styles>
+        <StyleInclude Source='test:style.xaml'/>
+    </Application.Styles>
+</Application>";
+
+                var app = Application.Current;
+
+                try
+                {
+                    AvaloniaRuntimeXamlLoader.Load(xaml, null, app);
+                }
+                catch (KeyNotFoundException)
+                {
+
+                }
+            }
+        }
+
+        private IDisposable StartWithResources(params (string, string)[] assets)
+        {
+            var assetLoader = new MockAssetLoader(assets);
+            var services = new TestServices(assetLoader: assetLoader);
+            return UnitTestApplication.Start(services);
+        }
+    }
+}
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/StyleTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/StyleTests.cs
index 2dc6c4a7fb..cb431ec87c 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/StyleTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/StyleTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Linq;
 using System.Reactive.Linq;
 using Avalonia.Controls;
@@ -20,8 +17,7 @@ namespace Avalonia.Markup.Xaml.UnitTests
             using (UnitTestApplication.Start(TestServices.MockPlatformWrapper))
             {
                 var xaml = "<Style Selector='Button' xmlns='https://github.com/avaloniaui'><Setter Property='Content' Value='{Binding}'/></Style>";
-                var loader = new AvaloniaXamlLoader();
-                var style = (Style)loader.Load(xaml);
+                var style = (Style)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var setter = (Setter)(style.Setters.First());
 
                 Assert.IsType<Binding>(setter.Value);
@@ -53,42 +49,7 @@ namespace Avalonia.Markup.Xaml.UnitTests
                     }
                 };
 
-                setter.Apply(null, control, null);
-                Assert.Equal("foo", control.Text);
-
-                control.Text = "bar";
-                Assert.Equal("bar", data.Foo);
-            }
-        }
-
-        [Fact]
-        public void Setter_With_TwoWay_Binding_And_Activator_Should_Update_Source()
-        {
-            using (UnitTestApplication.Start(TestServices.MockThreadingInterface))
-            {
-                var data = new Data
-                {
-                    Foo = "foo",
-                };
-
-                var control = new TextBox
-                {
-                    DataContext = data,
-                };
-
-                var setter = new Setter
-                {
-                    Property = TextBox.TextProperty,
-                    Value = new Binding
-                    {
-                        Path = "Foo",
-                        Mode = BindingMode.TwoWay
-                    }
-                };
-
-                var activator = Observable.Never<bool>().StartWith(true);
-
-                setter.Apply(null, control, activator);
+                setter.Instance(control).Start(false);
                 Assert.Equal("foo", control.Text);
 
                 control.Text = "bar";
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Templates/DataTemplateTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Templates/DataTemplateTests.cs
index 4b38a2c079..e79ac058fe 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Templates/DataTemplateTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Templates/DataTemplateTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Markup.Xaml.Templates;
 using Xunit;
 
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/TestViewModel.cs b/tests/Avalonia.Markup.Xaml.UnitTests/TestViewModel.cs
index 61baea6d1d..93232cd355 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/TestViewModel.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/TestViewModel.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.UnitTests;
 
 namespace Avalonia.Markup.Xaml.UnitTests
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
index f4d4a9dd2a..805d9e1b49 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Collections;
 using Avalonia.Controls;
@@ -29,7 +26,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         {
             var xaml = @"<ContentControl xmlns='https://github.com/avaloniaui' Content='Foo'/>";
 
-            var target = AvaloniaXamlLoader.Parse<ContentControl>(xaml);
+            var target = AvaloniaRuntimeXamlLoader.Parse<ContentControl>(xaml);
 
             Assert.NotNull(target);
             Assert.Equal("Foo", target.Content);
@@ -40,7 +37,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         {
             var xaml = @"<ContentControl xmlns='https://github.com/avaloniaui'>Foo</ContentControl>";
 
-            var target = AvaloniaXamlLoader.Parse<ContentControl>(xaml);
+            var target = AvaloniaRuntimeXamlLoader.Parse<ContentControl>(xaml);
 
             Assert.NotNull(target);
             Assert.Equal("Foo", target.Content);
@@ -52,7 +49,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             var xaml =
         @"<ContentControl xmlns='https://github.com/avaloniaui' TextBlock.FontSize='21'/>";
 
-            var target = AvaloniaXamlLoader.Parse<ContentControl>(xaml);
+            var target = AvaloniaRuntimeXamlLoader.Parse<ContentControl>(xaml);
 
             Assert.NotNull(target);
             Assert.Equal(21.0, TextBlock.GetFontSize(target));
@@ -68,7 +65,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
   <local:TestControl Grid.Column='2' />
 </UserControl>";
 
-            var target = AvaloniaXamlLoader.Parse<UserControl>(xaml);
+            var target = AvaloniaRuntimeXamlLoader.Parse<UserControl>(xaml);
 
             Assert.Equal(2, Grid.GetColumn((TestControl)target.Content));
         }
@@ -81,7 +78,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                     xmlns:test='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'
                     test:BasicTestsAttachedPropertyHolder.Foo='Bar'/>";
 
-            var target = AvaloniaXamlLoader.Parse<ContentControl>(xaml);
+            var target = AvaloniaRuntimeXamlLoader.Parse<ContentControl>(xaml);
 
             Assert.NotNull(target);
             Assert.Equal("Bar", BasicTestsAttachedPropertyHolder.GetFoo(target));
@@ -95,7 +92,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 var xaml =
             @"<Window xmlns='https://github.com/avaloniaui' TextBlock.FontSize='{Binding}'/>";
 
-                var target = AvaloniaXamlLoader.Parse<ContentControl>(xaml);
+                var target = AvaloniaRuntimeXamlLoader.Parse<ContentControl>(xaml);
 
                 target.DataContext = 21.0;
 
@@ -111,7 +108,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     <ToolTip.Tip>Foo</ToolTip.Tip>
 </Panel>";
 
-            var target = AvaloniaXamlLoader.Parse<Panel>(xaml);
+            var target = AvaloniaRuntimeXamlLoader.Parse<Panel>(xaml);
 
             Assert.Empty(target.Children);
 
@@ -124,7 +121,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             var xaml =
         @"<ContentControl xmlns='https://github.com/avaloniaui' DoesntExist='foo'/>";
 
-            XamlTestHelpers.AssertThrowsXamlException(() => AvaloniaXamlLoader.Parse<ContentControl>(xaml));
+            XamlTestHelpers.AssertThrowsXamlException(() => AvaloniaRuntimeXamlLoader.Parse<ContentControl>(xaml));
         }
 
         [Fact]
@@ -139,7 +136,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     </ContentControl.ContentTemplate>
 </ContentControl>";
 
-            var contentControl = AvaloniaXamlLoader.Parse<ContentControl>(xaml);
+            var contentControl = AvaloniaRuntimeXamlLoader.Parse<ContentControl>(xaml);
             var target = contentControl.ContentTemplate;
 
             Assert.NotNull(target);
@@ -157,7 +154,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     <Button Name='button'>Foo</Button>
 </UserControl>";
 
-            var control = AvaloniaXamlLoader.Parse<UserControl>(xaml);
+            var control = AvaloniaRuntimeXamlLoader.Parse<UserControl>(xaml);
             var button = control.FindControl<Button>("button");
 
             Assert.Equal("Foo", button.Content);
@@ -176,7 +173,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
       </ItemsControl>
 </Window>";
 
-                var control = AvaloniaXamlLoader.Parse<Window>(xaml);
+                var control = AvaloniaRuntimeXamlLoader.Parse<Window>(xaml);
 
                 var itemsControl = control.FindControl<ItemsControl>("items");
 
@@ -200,7 +197,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     </Panel>
 </UserControl>";
 
-            var control = AvaloniaXamlLoader.Parse<UserControl>(xaml);
+            var control = AvaloniaRuntimeXamlLoader.Parse<UserControl>(xaml);
 
             var panel = control.FindControl<Panel>("panel");
 
@@ -232,7 +229,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     </Grid.RowDefinitions>
 </Grid>";
 
-            var grid = AvaloniaXamlLoader.Parse<Grid>(xaml);
+            var grid = AvaloniaRuntimeXamlLoader.Parse<Grid>(xaml);
 
             Assert.Equal(4, grid.ColumnDefinitions.Count);
             Assert.Equal(4, grid.RowDefinitions.Count);
@@ -262,7 +259,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         RowDefinitions='100,Auto,*,100*'>
 </Grid>";
 
-            var grid = AvaloniaXamlLoader.Parse<Grid>(xaml);
+            var grid = AvaloniaRuntimeXamlLoader.Parse<Grid>(xaml);
 
 
             Assert.Equal(4, grid.ColumnDefinitions.Count);
@@ -294,7 +291,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     </ContentControl>
 </ControlTemplate>
 ";
-            var template = AvaloniaXamlLoader.Parse<ControlTemplate>(xaml);
+            var template = AvaloniaRuntimeXamlLoader.Parse<ControlTemplate>(xaml);
 
             var parent = (ContentControl)template.Build(new ContentControl()).Control;
 
@@ -307,6 +304,23 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             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()
         {
@@ -318,7 +332,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     </Panel>
 </ControlTemplate>
 ";
-            var template = AvaloniaXamlLoader.Parse<ControlTemplate>(xaml);
+            var template = AvaloniaRuntimeXamlLoader.Parse<ControlTemplate>(xaml);
 
             var panel = (Panel)template.Build(new ContentControl()).Control;
 
@@ -340,7 +354,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     <Button x:Name='button'>Foo</Button>
 </UserControl>";
 
-            var control = AvaloniaXamlLoader.Parse<UserControl>(xaml);
+            var control = AvaloniaRuntimeXamlLoader.Parse<UserControl>(xaml);
             var button = control.FindControl<Button>("button");
 
             Assert.Equal("Foo", button.Content);
@@ -351,7 +365,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         {
             var xaml = @"<UserControl xmlns='https://github.com/avaloniaui' Width='200.5' />";
 
-            var control = AvaloniaXamlLoader.Parse<UserControl>(xaml);
+            var control = AvaloniaRuntimeXamlLoader.Parse<UserControl>(xaml);
             Assert.Equal(200.5, control.Width);
         }
 
@@ -360,7 +374,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         {
             var xaml = @"<UserControl xmlns='https://github.com/avaloniaui' Background='White' />";
 
-            var control = AvaloniaXamlLoader.Parse<UserControl>(xaml);
+            var control = AvaloniaRuntimeXamlLoader.Parse<UserControl>(xaml);
             var bk = control.Background;
             Assert.IsType<ImmutableSolidColorBrush>(bk);
             Assert.Equal(Colors.White, (bk as ISolidColorBrush).Color);
@@ -378,7 +392,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     </Style>
 </Styles>";
 
-            var styles = AvaloniaXamlLoader.Parse<Styles>(xaml);
+            var styles = AvaloniaRuntimeXamlLoader.Parse<Styles>(xaml);
 
             Assert.Single(styles);
 
@@ -406,7 +420,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     </Style>
 </Styles>";
 
-            var styles = AvaloniaXamlLoader.Parse<Styles>(xaml);
+            var styles = AvaloniaRuntimeXamlLoader.Parse<Styles>(xaml);
 
             Assert.Single(styles);
 
@@ -460,7 +474,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
   </Style>
 </Styles>
 ";
-                var styles = AvaloniaXamlLoader.Parse<Styles>(xaml);
+                var styles = AvaloniaRuntimeXamlLoader.Parse<Styles>(xaml);
 
                 Assert.Single(styles);
 
@@ -491,7 +505,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     </Style.Resources>
 </Style>";
 
-            var style = AvaloniaXamlLoader.Parse<Style>(xaml);
+            var style = AvaloniaRuntimeXamlLoader.Parse<Style>(xaml);
 
             Assert.True(style.Resources.Count > 0);
 
@@ -517,7 +531,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     <StyleInclude Source='resm:Avalonia.Themes.Default.ContextMenu.xaml?assembly=Avalonia.Themes.Default'/>
 </Styles>";
 
-                var styles = AvaloniaXamlLoader.Parse<Styles>(xaml);
+                var styles = AvaloniaRuntimeXamlLoader.Parse<Styles>(xaml);
 
                 Assert.True(styles.Count == 1);
 
@@ -540,7 +554,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 var xaml =
 @"<Window xmlns='https://github.com/avaloniaui' Content='{Binding}'/>";
 
-                var target = AvaloniaXamlLoader.Parse<ContentControl>(xaml);
+                var target = AvaloniaRuntimeXamlLoader.Parse<ContentControl>(xaml);
 
                 Assert.Null(target.Content);
 
@@ -559,7 +573,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 var xaml =
 @"<Window xmlns='https://github.com/avaloniaui' Width='{Binding}'/>";
 
-                var target = AvaloniaXamlLoader.Parse<ContentControl>(xaml);
+                var target = AvaloniaRuntimeXamlLoader.Parse<ContentControl>(xaml);
 
                 Assert.Null(target.Content);
 
@@ -582,7 +596,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 </Window>
 ";
 
-                var target = AvaloniaXamlLoader.Parse<Window>(xaml);
+                var target = AvaloniaRuntimeXamlLoader.Parse<Window>(xaml);
 
                 Assert.NotNull(target.Content);
 
@@ -608,7 +622,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
      <Binding Path='Bar' />
 </MultiBinding>";
 
-            var target = AvaloniaXamlLoader.Parse<MultiBinding>(xaml);
+            var target = AvaloniaRuntimeXamlLoader.Parse<MultiBinding>(xaml);
 
             Assert.Equal(2, target.Bindings.Count);
 
@@ -637,7 +651,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     </Window.Template>
 </Window>";
 
-                var target = AvaloniaXamlLoader.Parse<ContentControl>(xaml);
+                var target = AvaloniaRuntimeXamlLoader.Parse<ContentControl>(xaml);
 
                 Assert.NotNull(target.Template);
 
@@ -667,7 +681,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
   </Setter>
 </Style> ";
 
-            var style = AvaloniaXamlLoader.Parse<Style>(xaml);
+            var style = AvaloniaRuntimeXamlLoader.Parse<Style>(xaml);
 
             Assert.Single(style.Setters);
 
@@ -697,18 +711,14 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     <Button Name='button'>Foo</Button>
 </Window>";
 
-                var window = AvaloniaXamlLoader.Parse<Window>(xaml);
+                var window = AvaloniaRuntimeXamlLoader.Parse<Window>(xaml);
                 var button = window.FindControl<Button>("button");
 
                 Assert.Equal("Foo", button.Content);
             }
         }
 
-
-        [Fact(Skip =
-@"Doesn't work with Portable.xaml, it's working in different creation order -
-Handled in test 'Control_Is_Added_To_Parent_Before_Final_EndInit'
-do we need it?")]
+        [Fact]
         public void Control_Is_Added_To_Parent_Before_Properties_Are_Set()
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
@@ -720,7 +730,7 @@ do we need it?")]
     <local:InitializationOrderTracker Width='100'/>
 </Window>";
 
-                var window = AvaloniaXamlLoader.Parse<Window>(xaml);
+                var window = AvaloniaRuntimeXamlLoader.Parse<Window>(xaml);
                 var tracker = (InitializationOrderTracker)window.Content;
 
                 var attached = tracker.Order.IndexOf("AttachedToLogicalTree");
@@ -744,7 +754,7 @@ do we need it?")]
     <local:InitializationOrderTracker Width='100'/>
 </Window>";
 
-                var window = AvaloniaXamlLoader.Parse<Window>(xaml);
+                var window = AvaloniaRuntimeXamlLoader.Parse<Window>(xaml);
                 var tracker = (InitializationOrderTracker)window.Content;
 
                 var attached = tracker.Order.IndexOf("AttachedToLogicalTree");
@@ -770,7 +780,7 @@ do we need it?")]
 </Window>";
 
 
-                var window = AvaloniaXamlLoader.Parse<Window>(xaml);
+                var window = AvaloniaRuntimeXamlLoader.Parse<Window>(xaml);
                 var tracker = (InitializationOrderTracker)window.Content;
 
                 //ensure binding is set and operational first
@@ -792,7 +802,7 @@ do we need it?")]
     <local:InitializationOrderTracker />
 </Window>";
 
-                var window = AvaloniaXamlLoader.Parse<Window>(xaml);
+                var window = AvaloniaRuntimeXamlLoader.Parse<Window>(xaml);
                 var tracker = (InitializationOrderTracker)window.Content;
 
                 Assert.Equal(0, tracker.InitState);
@@ -813,7 +823,7 @@ do we need it?")]
     </ContentControl.ContentTemplate>
 </ContentControl>";
 
-            var contentControl = AvaloniaXamlLoader.Parse<ContentControl>(xaml);
+            var contentControl = AvaloniaRuntimeXamlLoader.Parse<ContentControl>(xaml);
             var template = contentControl.ContentTemplate;
 
             Assert.NotNull(template);
@@ -833,7 +843,7 @@ do we need it?")]
     <ListBox Items='{Binding Items}' SelectedItems='{Binding SelectedItems}'/>
 </Window>";
 
-                var window = AvaloniaXamlLoader.Parse<Window>(xaml);
+                var window = AvaloniaRuntimeXamlLoader.Parse<Window>(xaml);
                 var listBox = (ListBox)window.Content;
 
                 var vm = new SelectedItemsViewModel()
@@ -861,7 +871,7 @@ do we need it?")]
     </TextBlock>
 </Window>";
 
-                var window = AvaloniaXamlLoader.Parse<Window>(xaml);
+                var window = AvaloniaRuntimeXamlLoader.Parse<Window>(xaml);
                 var textBlock = (TextBlock)window.Content;
 
                 Assert.Equal("Hello World!", textBlock.Text);
@@ -886,8 +896,7 @@ do we need it?")]
 </Window>";
                 foreach (var designMode in new[] {true, false})
                 {
-                    var loader = new AvaloniaXamlLoader {IsDesignMode = designMode};
-                    var obj = (Window)loader.Load(xaml);
+                    var obj = (Window)AvaloniaRuntimeXamlLoader.Load(xaml, designMode: designMode);
                     var context = Design.GetDataContext(obj);
                     var width = Design.GetWidth(obj);
                     var height = Design.GetHeight(obj);
@@ -917,7 +926,7 @@ do we need it?")]
     <Slider Width='400' Value='500' Minimum='0' Maximum='1000'/>
 </Window>";
 
-                var window = AvaloniaXamlLoader.Parse<Window>(xaml);
+                var window = AvaloniaRuntimeXamlLoader.Parse<Window>(xaml);
                 var slider = (Slider)window.Content;
 
                 Assert.Equal(0, slider.Minimum);
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs
index 77bb215ad5..4f2b580bce 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reactive.Subjects;
 using Avalonia.Controls;
 using Avalonia.UnitTests;
@@ -21,8 +18,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
     <Button Name='button' Content='{Binding Foo}'/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
 
                 button.DataContext = new { Foo = "foo" };
@@ -47,8 +43,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         </Button.Content>
     </Button>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
 
                 button.DataContext = new { Foo = "foo" };
@@ -73,8 +68,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         </Button.Tag>
     </Button>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
 
                 Assert.Same(button, ((NonControl)button.Tag).Control);
@@ -96,8 +90,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         </Button.Tag>
     </Button>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
 
                 button.DataContext = new { Foo = "foo" };
@@ -116,8 +109,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
         Title='{Binding Foo}'>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
 
                 window.DataContext = new { Foo = "foo" };
                 window.ApplyTemplate();
@@ -136,8 +128,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
     <Border DataContext='{Binding Foo}'/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var border = (Border)window.Content;
 
                 window.DataContext = new { Foo = "foo" };
@@ -160,7 +151,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     <TextBlock Name='textblock' Text='{Binding Tag, RelativeSource={RelativeSource Self}}'/>
 </Window>";
 
-                var window = AvaloniaXamlLoader.Parse<ContentControl>(xaml);
+                var window = AvaloniaRuntimeXamlLoader.Parse<ContentControl>(xaml);
                 var textBlock = (TextBlock)window.Content;
 
                 textBlock.Tag = "foo";
@@ -183,8 +174,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         </TextBlock.Text>
     </TextBlock>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var textBlock = (TextBlock)window.Content;
 
                 window.ApplyTemplate();
@@ -203,8 +193,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
     <TextBlock Name='textblock' Text='{Binding Observable^}'/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var textBlock = (TextBlock)window.Content;
                 var observable = new BehaviorSubject<string>("foo");
 
@@ -228,8 +217,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
     <TextBlock local:AttachedPropertyOwner.Double='{Binding}'/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var textBlock = (TextBlock)window.Content;
 
                 window.DataContext = 5.6;
@@ -250,8 +238,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
     <local:TestControl Double='{Binding}'/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var testControl = (TestControl)window.Content;
 
                 window.DataContext = 5.6;
@@ -272,8 +259,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
     <TextBlock local:TestControl.Double='{Binding}'/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var textBlock = (TextBlock)window.Content;
 
                 window.DataContext = 5.6;
@@ -299,8 +285,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     </Window.Styles>
     <TextBlock/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var textBlock = (TextBlock)window.Content;
 
                 window.DataContext = 5.6;
@@ -325,8 +310,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
     <TextBlock Name='textBlock' Text=""{Binding Foo, StringFormat=" + fmt + @"}""/> 
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml); 
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml); 
                 var textBlock = window.FindControl<TextBlock>("textBlock"); 
 
                 textBlock.DataContext = new { Foo = "world" };
@@ -356,8 +340,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         </TextBlock.Text>
     </TextBlock> 
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var textBlock = window.FindControl<TextBlock>("textBlock");
 
                 textBlock.DataContext = new WindowViewModel();
@@ -377,8 +360,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
         ShowInTaskbar='{Binding ShowInTaskbar, Mode=OneWayToSource}'>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var viewModel = new WindowViewModel();
 
                 window.DataContext = viewModel;
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs
index f8678ee22e..ee7b5d0628 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls;
 using Avalonia.UnitTests;
 using System;
@@ -21,8 +18,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
     <Button Name='button' Content='{Binding Foo, RelativeSource={RelativeSource DataContext}}'/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
 
                 button.DataContext = new { Foo = "foo" };
@@ -43,8 +39,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
     <Button Name='button' Content='{Binding Name, RelativeSource={RelativeSource Self}}'/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
 
                 window.ApplyTemplate();
@@ -68,8 +63,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
       </Border>
     </Border>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
 
                 window.ApplyTemplate();
@@ -94,8 +88,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
       </ContentControl>
     </Border>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                Assert.Throws<InvalidOperationException>( () => loader.Load(xaml));
+                Assert.Throws<InvalidOperationException>( () => AvaloniaRuntimeXamlLoader.Load(xaml));
             }
         }
 
@@ -114,8 +107,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
       </Border>
     </Border>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
 
                 window.ApplyTemplate();
@@ -139,8 +131,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
       </ContentControl>
     </Border>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var contentControl = window.FindControl<ContentControl>("contentControl");
                 var button = window.FindControl<Button>("button");
 
@@ -165,8 +156,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
       </Border>
     </Border>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
 
                 window.ApplyTemplate();
@@ -191,8 +181,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
       </ContentControl>
     </ContentControl>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var contentControl1 = window.FindControl<ContentControl>("contentControl1");
                 var contentControl2 = window.FindControl<ContentControl>("contentControl2");
                 var button = window.FindControl<Button>("button");
@@ -218,8 +207,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
       </Border>
     </Border>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
 
                 window.ApplyTemplate();
@@ -243,8 +231,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
       </Border>
     </Border>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
 
                 window.ApplyTemplate();
@@ -268,8 +255,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
       </Border>
     </Border>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
 
                 window.ApplyTemplate();
@@ -290,8 +276,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         Title='title'>
   <Button Name='button' Content='{Binding Title, RelativeSource={RelativeSource AncestorType=local:TestWindow}}'/>
 </local:TestWindow>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (TestWindow)loader.Load(xaml);
+                var window = (TestWindow)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
 
                 window.ApplyTemplate();
@@ -316,8 +301,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
       </Border>
     </Border>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
 
                 window.ApplyTemplate();
@@ -342,8 +326,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
       </Border>
     </Border>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var button = window.FindControl<Button>("button");
 
                 window.ApplyTemplate();
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs
index 0850f3fa78..8188b212e1 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Collections.Generic;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
@@ -21,8 +18,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 <Window xmlns='https://github.com/avaloniaui'>
     <ProgressBar Maximum='10' Value='{Binding Value, FallbackValue=3}'/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var progressBar = (ProgressBar)window.Content;
 
                 window.DataContext = new { Value = "foo" };
@@ -58,8 +54,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 <Window xmlns='https://github.com/avaloniaui'>
     <ProgressBar Maximum='10' Value='{Binding Value, FallbackValue=bar}'/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var progressBar = (ProgressBar)window.Content;
 
                 window.DataContext = new { Value = "foo" };
@@ -94,8 +89,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         </Carousel>
     </DockPanel>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var strip = window.FindControl<TabStrip>("strip");
                 var carousel = window.FindControl<Carousel>("carousel");
 
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs
index 4f2886582d..033b670bf4 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
 using Avalonia.UnitTests;
@@ -26,8 +23,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     </Window.DataTemplates>
     <ContentControl Name='target' Content='Foo'/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var target = window.FindControl<ContentControl>("target");
 
                 window.ApplyTemplate();
@@ -55,8 +51,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         </ItemsControl.ItemTemplate>
     </ItemsControl>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var itemsControl = window.FindControl<ItemsControl>("itemsControl");
 
                 window.DataContext = new[] { "item1", "item2" };
@@ -84,8 +79,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     </Window.DataTemplates>
     <ContentControl Name='target' Content='{Binding Child}'/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var target = window.FindControl<ContentControl>("target");
 
                 var viewModel = new TestViewModel
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/EventTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/EventTests.cs
index bde4e34643..c9e0a3d5f0 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/EventTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/EventTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -14,10 +11,9 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         public void Event_Is_Assigned()
         {
             var xaml = @"<Button xmlns='https://github.com/avaloniaui' Click='OnClick'/>";
-            var loader = new AvaloniaXamlLoader();
             var target = new MyButton();
 
-            loader.Load(xaml, rootInstance: target);
+            AvaloniaRuntimeXamlLoader.Load(xaml, rootInstance: target);
 
             target.RaiseEvent(new RoutedEventArgs
             {
@@ -31,10 +27,9 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         public void Attached_Event_Is_Assigned()
         {
             var xaml = @"<Button xmlns='https://github.com/avaloniaui' Gestures.Tapped='OnTapped'/>";
-            var loader = new AvaloniaXamlLoader();
             var target = new MyButton();
 
-            loader.Load(xaml, rootInstance: target);
+            AvaloniaRuntimeXamlLoader.Load(xaml, rootInstance: target);
 
             target.RaiseEvent(new RoutedEventArgs
             {
@@ -48,10 +43,9 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         public void Exception_Is_Thrown_If_Event_Not_Found()
         {
             var xaml = @"<Button xmlns='https://github.com/avaloniaui' Click='NotFound'/>";
-            var loader = new AvaloniaXamlLoader();
             var target = new MyButton();
 
-            XamlTestHelpers.AssertThrowsXamlException(() => loader.Load(xaml, rootInstance: target));
+            XamlTestHelpers.AssertThrowsXamlException(() => AvaloniaRuntimeXamlLoader.Load(xaml, rootInstance: target));
         }
 
         public class MyButton : Button
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/InitializationOrderTracker.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/InitializationOrderTracker.cs
index 104f46cbac..cb37dea220 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/InitializationOrderTracker.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/InitializationOrderTracker.cs
@@ -1,7 +1,5 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls;
+using Avalonia.Data;
 using Avalonia.LogicalTree;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -20,10 +18,10 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             base.OnAttachedToLogicalTree(e);
         }
 
-        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
         {
-            Order.Add($"Property {e.Property.Name} Changed");
-            base.OnPropertyChanged(e);
+            Order.Add($"Property {change.Property.Name} Changed");
+            base.OnPropertyChanged(change);
         }
 
         void ISupportInitialize.BeginInit()
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/NonControl.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/NonControl.cs
index 7a728203e6..09fa019634 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/NonControl.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/NonControl.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls;
 
 namespace Avalonia.Markup.Xaml.UnitTests.Xaml
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs
new file mode 100644
index 0000000000..578fa888a3
--- /dev/null
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs
@@ -0,0 +1,99 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
+using Avalonia.Media;
+using Avalonia.Styling;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Markup.Xaml.UnitTests.Xaml
+{
+    public class ResourceDictionaryTests : XamlTestBase
+    {
+        [Fact]
+        public void StaticResource_Works_In_ResourceDictionary()
+        {
+            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>
+  <SolidColorBrush x:Key='RedBrush' Color='{StaticResource Red}'/>
+</ResourceDictionary>";
+                var resources = (ResourceDictionary)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var brush = (SolidColorBrush)resources["RedBrush"];
+
+                Assert.Equal(Colors.Red, brush.Color);
+            }
+        }
+
+        [Fact]
+        public void DynamicResource_Finds_Resource_In_Parent_Dictionary()
+        {
+            var dictionaryXaml = @"
+<ResourceDictionary xmlns='https://github.com/avaloniaui'
+                    xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+  <SolidColorBrush x:Key='RedBrush' Color='{DynamicResource Red}'/>
+</ResourceDictionary>";
+
+            using (StyledWindow(assets: ("test:dict.xaml", dictionaryXaml)))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceInclude Source='test:dict.xaml'/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+        <Color x:Key='Red'>Red</Color>
+    </Window.Resources>
+    <Button Name='button' Background='{DynamicResource RedBrush}'/>
+</Window>";
+
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = window.FindControl<Button>("button");
+
+                var brush = Assert.IsType<SolidColorBrush>(button.Background);
+                Assert.Equal(Colors.Red, brush.Color);
+
+                window.Resources["Red"] = Colors.Green;
+
+                Assert.Equal(Colors.Green, brush.Color);
+            }
+        }
+
+        private IDisposable StyledWindow(params (string, string)[] assets)
+        {
+            var services = TestServices.StyledWindow.With(
+                assetLoader: new MockAssetLoader(assets),
+                theme: () => new Styles
+                {
+                    WindowStyle(),
+                });
+
+            return UnitTestApplication.Start(services);
+        }
+
+        private Style WindowStyle()
+        {
+            return new Style(x => x.OfType<Window>())
+            {
+                Setters =
+                {
+                    new Setter(
+                        Window.TemplateProperty,
+                        new FuncControlTemplate<Window>((x, scope) =>
+                            new ContentPresenter
+                            {
+                                Name = "PART_ContentPresenter",
+                                [!ContentPresenter.ContentProperty] = x[!Window.ContentProperty],
+                            }.RegisterInNameScope(scope)))
+                }
+            };
+        }
+    }
+}
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ShapeTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ShapeTests.cs
new file mode 100644
index 0000000000..bd577e84f8
--- /dev/null
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ShapeTests.cs
@@ -0,0 +1,24 @@
+using Avalonia.Controls;
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Markup.Xaml.UnitTests.Xaml
+{
+    public class ShapeTests : XamlTestBase
+    {
+        [Fact]
+        public void Can_Specify_DashStyle_In_XAML()
+        {
+            var xaml = @"
+<Pen xmlns='https://github.com/avaloniaui'>
+    <Pen.DashStyle>
+	    <DashStyle Offset='0' Dashes='1,3'/>
+    </Pen.DashStyle>
+</Pen>";
+
+            var target = AvaloniaRuntimeXamlLoader.Parse<Pen>(xaml);
+
+            Assert.NotNull(target);
+        }
+    }
+}
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
index b76022852c..950f429b84 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
@@ -1,10 +1,8 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Xml;
 using Avalonia.Controls;
 using Avalonia.Markup.Data;
 using Avalonia.Markup.Xaml.Styling;
+using Avalonia.Markup.Xaml.Templates;
 using Avalonia.Media;
 using Avalonia.Styling;
 using Avalonia.UnitTests;
@@ -30,14 +28,62 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         </Style>
     </UserControl.Styles>
 </UserControl>";
-                var loader = new AvaloniaXamlLoader();
-                var userControl = (UserControl)loader.Load(xaml);
+                var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var color = (Color)((Style)userControl.Styles[0]).Resources["color"];
 
                 Assert.Equal(0xff506070, color.ToUint32());
             }
         }
 
+        [Fact]
+        public void DataTemplate_Can_Be_Added_To_Style_Resources()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformWrapper))
+            {
+                var xaml = @"
+<UserControl xmlns='https://github.com/avaloniaui'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <UserControl.Styles>
+        <Style>
+            <Style.Resources>
+                <DataTemplate x:Key='dataTemplate'><TextBlock/></DataTemplate>
+            </Style.Resources>
+        </Style>
+    </UserControl.Styles>
+</UserControl>";
+                var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var dataTemplate = (DataTemplate)((Style)userControl.Styles[0]).Resources["dataTemplate"];
+
+                Assert.NotNull(dataTemplate);
+            }
+        }
+
+        [Fact]
+        public void ControlTemplate_Can_Be_Added_To_Style_Resources()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformWrapper))
+            {
+                var xaml = @"
+<UserControl xmlns='https://github.com/avaloniaui'
+             xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <UserControl.Styles>
+        <Style>
+            <Style.Resources>
+                 <ControlTemplate x:Key='controlTemplate' TargetType='{x:Type Button}'>
+                    <ContentPresenter Content='{TemplateBinding Content}'/>
+                 </ControlTemplate>
+            </Style.Resources>
+        </Style>
+    </UserControl.Styles>
+</UserControl>";
+                var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var controlTemplate = (ControlTemplate)((Style)userControl.Styles[0]).Resources["controlTemplate"];
+
+                Assert.NotNull(controlTemplate);
+                Assert.Equal(typeof(Button), controlTemplate.TargetType);
+            }
+        }
+
         [Fact]
         public void SolidColorBrush_Can_Be_Added_To_Style_Resources()
         {
@@ -54,8 +100,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         </Style>
     </UserControl.Styles>
 </UserControl>";
-                var loader = new AvaloniaXamlLoader();
-                var userControl = (UserControl)loader.Load(xaml);
+                var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var brush = (SolidColorBrush)((Style)userControl.Styles[0]).Resources["brush"];
 
                 Assert.Equal(0xff506070, brush.Color.ToUint32());
@@ -75,7 +120,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     </ContentControl.Styles>
 </ContentControl>";
 
-                var window = AvaloniaXamlLoader.Parse<ContentControl>(xaml);
+                var window = AvaloniaRuntimeXamlLoader.Parse<ContentControl>(xaml);
 
                 Assert.Single(window.Styles);
 
@@ -108,8 +153,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     <ContentControl Name='target'/>
 </Window>";
 
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var target = window.Find<ContentControl>("target");
 
                 Assert.IsType<TextBlock>(target.Content);
@@ -140,8 +184,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     <TextBlock Name='target'/>
 </Window>";
 
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var target = window.Find<TextBlock>("target");
 
                 Assert.NotNull(target.FocusAdorner);
@@ -164,8 +207,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     </Window.Styles>
     <TextBlock/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var textBlock = (TextBlock)window.Content;
 
                 window.ApplyTemplate();
@@ -190,8 +232,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     </Window.Styles>
     <TextBlock/>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var ex = Assert.Throws<XmlException>(() => loader.Load(xaml));
+                var ex = Assert.Throws<XmlException>(() => AvaloniaRuntimeXamlLoader.Load(xaml));
 
                 Assert.Equal(
                     "Property 'Button.IsDefault' is not registered on 'Avalonia.Controls.TextBlock'.",
@@ -217,8 +258,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         <Border Name='notFoo' Classes='bar'/>
     </StackPanel>
 </Window>";
-                var loader = new AvaloniaXamlLoader();
-                var window = (Window)loader.Load(xaml);
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var foo = window.FindControl<Border>("foo");
                 var notFoo = window.FindControl<Border>("notFoo");
 
@@ -226,5 +266,161 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 Assert.Equal(Colors.Red, ((ISolidColorBrush)notFoo.Background).Color);
             }
         }
+
+        [Fact]
+        public void Style_Can_Use_Or_Selector_1()
+        {
+            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.foo, Border.bar'>
+            <Setter Property='Background' Value='Red'/>
+        </Style>
+    </Window.Styles>
+    <StackPanel>
+        <Border Name='foo' Classes='foo'/>
+        <Border Name='bar' Classes='bar'/>
+        <Border Name='baz' Classes='baz'/>
+    </StackPanel>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var foo = window.FindControl<Border>("foo");
+                var bar = window.FindControl<Border>("bar");
+                var baz = window.FindControl<Border>("baz");
+
+                Assert.Equal(Brushes.Red, foo.Background);
+                Assert.Equal(Brushes.Red, bar.Background);
+                Assert.Null(baz.Background);
+            }
+        }
+
+        [Fact]
+        public void Style_Can_Use_Or_Selector_2()
+        {
+            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,Carousel,ListBox'>
+            <Setter Property='Background' Value='Red'/>
+        </Style>
+    </Window.Styles>
+    <StackPanel>
+        <Button Name='button'/>
+        <Carousel Name='carousel'/>
+        <ListBox Name='listBox'/>
+    </StackPanel>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = window.FindControl<Button>("button");
+                var carousel = window.FindControl<Carousel>("carousel");
+                var listBox = window.FindControl<ListBox>("listBox");
+
+                Assert.Equal(Brushes.Red, button.Background);
+                Assert.Equal(Brushes.Red, carousel.Background);
+                Assert.Equal(Brushes.Red, listBox.Background);
+            }
+        }
+
+        [Fact]
+        public void Transitions_Can_Be_Styled()
+        {
+            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'>
+            <Setter Property='Transitions'>
+                <Transitions>
+                    <DoubleTransition Property='Width' Duration='0:0:1'/>
+                </Transitions>
+            </Setter>
+        </Style>
+        <Style Selector='Border.foo'>
+            <Setter Property='Transitions'>
+                <Transitions>
+                    <DoubleTransition Property='Height' Duration='0:0:1'/>
+                </Transitions>
+            </Setter>
+        </Style>
+    </Window.Styles>
+    <Border/>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var border = (Border)window.Content;
+
+                Assert.Equal(1, border.Transitions.Count);
+                Assert.Equal(Border.WidthProperty, border.Transitions[0].Property);
+
+                border.Classes.Add("foo");
+
+                Assert.Equal(1, border.Transitions.Count);
+                Assert.Equal(Border.HeightProperty, border.Transitions[0].Property);
+
+                border.Classes.Remove("foo");
+
+                Assert.Equal(1, border.Transitions.Count);
+                Assert.Equal(Border.WidthProperty, border.Transitions[0].Property);
+            }
+        }
+
+        [Fact]
+        public void Style_Can_Use_Class_Selector_With_Dash()
+        {
+            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.foo-bar'>
+            <Setter Property='Background' Value='Red'/>
+        </Style>
+    </Window.Styles>
+    <StackPanel>
+        <Border Name='foo' Classes='foo-bar'/>
+    </StackPanel>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var foo = window.FindControl<Border>("foo");
+
+                Assert.Equal(Colors.Red, ((ISolidColorBrush)foo.Background).Color);
+            }
+        }
+
+        [Fact]
+        public void Style_Can_Use_Pseudolass_Selector_With_Dash()
+        {
+            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:foo-bar'>
+            <Setter Property='Background' Value='Red'/>
+        </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);
+
+                ((IPseudoClasses)foo.Classes).Add(":foo-bar");
+
+                Assert.Equal(Colors.Red, ((ISolidColorBrush)foo.Background).Color);
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs
index f5fed02899..3fdac49f31 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Linq;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
@@ -18,8 +15,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             using (UnitTestApplication.Start(TestServices.MockPlatformWrapper))
             {
                 var xaml = "<DataTemplates xmlns='https://github.com/avaloniaui'><TreeDataTemplate ItemsSource='{Binding}'/></DataTemplates>";
-                var loader = new AvaloniaXamlLoader();
-                var templates = (DataTemplates)loader.Load(xaml);
+                var templates = (DataTemplates)AvaloniaRuntimeXamlLoader.Load(xaml);
                 var template = (TreeDataTemplate)(templates.First());
 
                 Assert.IsType<Binding>(template.ItemsSource);
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs
index 4ff9e3db38..77a4932ccc 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs
@@ -6,7 +6,11 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using Avalonia.Controls;
 using Avalonia.Data.Converters;
+using Avalonia.Data.Core;
+using Avalonia.Input;
+using Avalonia.Interactivity;
 using Avalonia.Media;
+using Avalonia.Styling;
 using Avalonia.Threading;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
@@ -20,7 +24,7 @@ namespace Avalonia.Markup.Xaml.UnitTests
         [Fact]
         public void Binding_Button_IsPressed_ShouldWork()
         {
-            var parsed = (Button)AvaloniaXamlLoader.Parse(@"
+            var parsed = (Button)AvaloniaRuntimeXamlLoader.Parse(@"
 <Button xmlns='https://github.com/avaloniaui' IsPressed='{Binding IsPressed, Mode=TwoWay}' />");
             var ctx = new XamlIlBugTestsDataContext();
             parsed.DataContext = ctx;
@@ -31,12 +35,14 @@ namespace Avalonia.Markup.Xaml.UnitTests
         [Fact]
         public void Transitions_Should_Be_Properly_Parsed()
         {
-            var parsed = (Grid)AvaloniaXamlLoader.Parse(@"
+            var parsed = (Grid)AvaloniaRuntimeXamlLoader.Parse(@"
 <Grid xmlns='https://github.com/avaloniaui' >
   <Grid.Transitions>
-    <DoubleTransition Property='Opacity'
-       Easing='CircularEaseIn'
-       Duration='0:0:0.5' />
+    <Transitions>
+      <DoubleTransition Property='Opacity'
+        Easing='CircularEaseIn'
+        Duration='0:0:0.5' />
+    </Transitions>
   </Grid.Transitions>
 </Grid>");
             Assert.Equal(1, parsed.Transitions.Count);
@@ -49,7 +55,7 @@ namespace Avalonia.Markup.Xaml.UnitTests
             var precompiled = new XamlIlClassWithPrecompiledXaml();
             Assert.Equal(Brushes.Red, precompiled.Background);
             Assert.Equal(1, precompiled.Opacity);
-            var loaded = (XamlIlClassWithPrecompiledXaml)AvaloniaXamlLoader.Parse(@"
+            var loaded = (XamlIlClassWithPrecompiledXaml)AvaloniaRuntimeXamlLoader.Parse(@"
 <UserControl xmlns='https://github.com/avaloniaui'
              xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
              x:Class='Avalonia.Markup.Xaml.UnitTests.XamlIlClassWithPrecompiledXaml'
@@ -66,7 +72,7 @@ namespace Avalonia.Markup.Xaml.UnitTests
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
-                new AvaloniaXamlLoader().Load(@"
+                AvaloniaRuntimeXamlLoader.Load(@"
 <Application
   xmlns='https://github.com/avaloniaui'
   xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests;assembly=Avalonia.Markup.Xaml.UnitTests'
@@ -99,7 +105,7 @@ namespace Avalonia.Markup.Xaml.UnitTests
   </Application.Styles>
 </Application>",
                     null, Application.Current); 
-                var parsed = (Window)AvaloniaXamlLoader.Parse(@"
+                var parsed = (Window)AvaloniaRuntimeXamlLoader.Parse(@"
 <Window
   xmlns='https://github.com/avaloniaui'
   xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests;assembly=Avalonia.Markup.Xaml.UnitTests'
@@ -145,7 +151,7 @@ namespace Avalonia.Markup.Xaml.UnitTests
         {
             var precompiled = new XamlIlClassWithCustomProperty();
             Assert.Equal("123", precompiled.Test);
-            var loaded = (XamlIlClassWithCustomProperty)AvaloniaXamlLoader.Parse(@"
+            var loaded = (XamlIlClassWithCustomProperty)AvaloniaRuntimeXamlLoader.Parse(@"
 <UserControl xmlns='https://github.com/avaloniaui'
              xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
              x:Class='Avalonia.Markup.Xaml.UnitTests.XamlIlClassWithCustomProperty'
@@ -176,14 +182,15 @@ namespace Avalonia.Markup.Xaml.UnitTests
         public void Bug2570()
         {
             SomeStaticProperty = "123";
-            AssertThrows(() => new AvaloniaXamlLoader() {IsDesignMode = true}
+            AssertThrows(() => AvaloniaRuntimeXamlLoader
                     .Load(@"
 <UserControl 
     xmlns='https://github.com/avaloniaui'
     xmlns:d='http://schemas.microsoft.com/expression/blend/2008'
     xmlns:tests='clr-namespace:Avalonia.Markup.Xaml.UnitTests'
     d:DataContext='{x:Static tests:XamlIlTests.SomeStaticPropery}'
-    xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'/>", typeof(XamlIlTests).Assembly),
+    xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'/>", typeof(XamlIlTests).Assembly,
+                        designMode: true),
                 e => e.Message.Contains("Unable to resolve ")
                      && e.Message.Contains(" as static field, property, constant or enum value"));
 
@@ -194,14 +201,15 @@ namespace Avalonia.Markup.Xaml.UnitTests
         {
             SomeStaticProperty = "123";
             
-            var loaded = (UserControl)new AvaloniaXamlLoader() {IsDesignMode = true}
+            var loaded = (UserControl)AvaloniaRuntimeXamlLoader
                 .Load(@"
 <UserControl 
     xmlns='https://github.com/avaloniaui'
     xmlns:d='http://schemas.microsoft.com/expression/blend/2008'
     xmlns:tests='clr-namespace:Avalonia.Markup.Xaml.UnitTests'
     d:DataContext='{x:Static tests:XamlIlTests.SomeStaticProperty}'
-    xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'/>", typeof(XamlIlTests).Assembly);
+    xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'/>", typeof(XamlIlTests).Assembly,
+                    designMode: true);
             Assert.Equal(Design.GetDataContext(loaded), SomeStaticProperty);
         }
         
@@ -211,7 +219,7 @@ namespace Avalonia.Markup.Xaml.UnitTests
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
 
-                var parsed = (Window)AvaloniaXamlLoader.Parse(@"
+                var parsed = (Window)AvaloniaRuntimeXamlLoader.Parse(@"
 <Window
   xmlns='https://github.com/avaloniaui'
   xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests;assembly=Avalonia.Markup.Xaml.UnitTests'
@@ -232,12 +240,36 @@ namespace Avalonia.Markup.Xaml.UnitTests
             }
         }
 
+        [Fact]
+        public void Provide_Value_Target_Should_Provide_Clr_Property_Info()
+        {
+            var parsed = AvaloniaRuntimeXamlLoader.Parse<XamlIlClassWithClrPropertyWithValue>(@"
+<XamlIlClassWithClrPropertyWithValue 
+    xmlns='clr-namespace:Avalonia.Markup.Xaml.UnitTests'
+    Count='{XamlIlCheckClrPropertyInfo ExpectedPropertyName=Count}'
+/>", typeof(XamlIlClassWithClrPropertyWithValue).Assembly);
+            Assert.Equal(6, parsed.Count);
+        }
+
+        [Fact]
+        public void DataContextType_Resolution()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var parsed = AvaloniaRuntimeXamlLoader.Parse<UserControl>(@"
+<UserControl 
+    xmlns='https://github.com/avaloniaui'
+    xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests;assembly=Avalonia.Markup.Xaml.UnitTests'
+    xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml' x:DataType='local:XamlIlBugTestsDataContext' />");
+            }
+        }
+
         [Fact]
         public void DataTemplates_Should_Resolve_Named_Controls_From_Parent_Scope()
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
-                var parsed = (Window)AvaloniaXamlLoader.Parse(@"
+                var parsed = (Window)AvaloniaRuntimeXamlLoader.Parse(@"
 <Window
   xmlns='https://github.com/avaloniaui'
   xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
@@ -263,8 +295,27 @@ namespace Avalonia.Markup.Xaml.UnitTests
                 Assert.Equal("Test", templated.Text);
             }
         }
+
+        [Fact]
+        public void Should_Work_With_Base_Property()
+        {
+            var parsed = (ListBox)AvaloniaRuntimeXamlLoader.Load(@"
+<ListBox
+  xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+  xmlns='https://github.com/avaloniaui'
+  xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests;assembly=Avalonia.Markup.Xaml.UnitTests'
+>
+    <ItemsControl.ItemTemplate>
+      <DataTemplate>
+        <ContentControl Content='{Binding}' />
+      </DataTemplate>
+    </ItemsControl.ItemTemplate>
+</ListBox>");
+
+            Assert.NotNull(parsed.ItemTemplate);
+        }
     }
-    
+
     public class XamlIlBugTestsEventHandlerCodeBehind : Window
     {
         public object SavedContext;
@@ -275,7 +326,7 @@ namespace Avalonia.Markup.Xaml.UnitTests
 
         public XamlIlBugTestsEventHandlerCodeBehind()
         {
-            new AvaloniaXamlLoader().Load(@"
+            AvaloniaRuntimeXamlLoader.Load(@"
 <Window x:Class='Avalonia.Markup.Xaml.UnitTests.XamlIlBugTestsEventHandlerCodeBehind'
   xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
   xmlns='https://github.com/avaloniaui'
@@ -343,4 +394,22 @@ namespace Avalonia.Markup.Xaml.UnitTests
             return (int)control.GetValue(TestIntProperty);
         }
     }
+
+    public class XamlIlCheckClrPropertyInfoExtension
+    {
+        public string ExpectedPropertyName { get; set; }
+
+        public object ProvideValue(IServiceProvider prov)
+        {
+            var pvt = prov.GetService<IProvideValueTarget>();
+            var info = (ClrPropertyInfo)pvt.TargetProperty;
+            var v = (int)info.Get(pvt.TargetObject);
+            return v + 1;
+        }
+    }
+
+    public class XamlIlClassWithClrPropertyWithValue
+    {
+        public int Count { get; set; }= 5;
+    }
 }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/XamlTestBase.cs b/tests/Avalonia.Markup.Xaml.UnitTests/XamlTestBase.cs
index 5172b2e830..2bc82d1353 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/XamlTestBase.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/XamlTestBase.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
 using System.Text;
 using Avalonia.Data;
 
@@ -11,6 +13,15 @@ namespace Avalonia.Markup.Xaml.UnitTests
         {
             // Ensure necessary assemblies are loaded.
             var _ = typeof(TemplateBinding);
+            if (AvaloniaLocator.Current.GetService<AvaloniaXamlLoader.IRuntimeXamlLoader>() == null)
+                AvaloniaLocator.CurrentMutable.Bind<AvaloniaXamlLoader.IRuntimeXamlLoader>()
+                    .ToConstant(new TestXamlLoaderShim());
+        }
+        
+        class TestXamlLoaderShim : AvaloniaXamlLoader.IRuntimeXamlLoader
+        {
+            public object Load(Stream stream, Assembly localAsm, object o, Uri baseUri, bool designMode) 
+                => AvaloniaRuntimeXamlLoader.Load(stream, localAsm, o, baseUri, designMode);
         }
     }
 }
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/Attributes.cs b/tests/Avalonia.ReactiveUI.UnitTests/Attributes.cs
index a79647d355..79e58f63e9 100644
--- a/tests/Avalonia.ReactiveUI.UnitTests/Attributes.cs
+++ b/tests/Avalonia.ReactiveUI.UnitTests/Attributes.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Xunit;
 
 // Required to avoid InvalidOperationException sometimes thrown
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/AutoDataTemplateBindingHookTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/AutoDataTemplateBindingHookTest.cs
index d300877f0b..53bdff5dff 100644
--- a/tests/Avalonia.ReactiveUI.UnitTests/AutoDataTemplateBindingHookTest.cs
+++ b/tests/Avalonia.ReactiveUI.UnitTests/AutoDataTemplateBindingHookTest.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Xunit;
 using ReactiveUI;
 using Avalonia.ReactiveUI;
@@ -31,10 +28,17 @@ namespace Avalonia.ReactiveUI.UnitTests
 
         public class ExampleView : ReactiveUserControl<ExampleViewModel>
         {
-            public ItemsControl List { get; } = new ItemsControl();
+            public ItemsControl List { get; } = new ItemsControl
+            {
+                Template = GetTemplate()
+            };
 
-            public ExampleView()
+            public ExampleView(Action<ItemsControl> adjustItemsControl = null)
             {
+                adjustItemsControl?.Invoke(List);
+                List.ApplyTemplate();
+                List.Presenter.ApplyTemplate();
+                
                 Content = List;
                 ViewModel = new ExampleViewModel();
                 this.OneWayBind(ViewModel, x => x.Items, x => x.List.Items);
@@ -53,18 +57,15 @@ namespace Avalonia.ReactiveUI.UnitTests
         {
             var view = new ExampleView();
             Assert.NotNull(view.List.ItemTemplate);
+            Assert.IsType<FuncDataTemplate<object>>(view.List.ItemTemplate);
         }
 
         [Fact]
-        public void Should_Use_View_Model_View_Host_As_Data_Template()
+        public void Should_Use_ViewModelViewHost_As_Data_Template_By_Default()
         {
             var view = new ExampleView();
             view.ViewModel.Items.Add(new NestedViewModel());
 
-            view.List.Template = GetTemplate();
-            view.List.ApplyTemplate();
-            view.List.Presenter.ApplyTemplate();
-
             var child = view.List.Presenter.Panel.Children[0];
             var container = (ContentPresenter) child;
             container.UpdateChild();
@@ -73,16 +74,11 @@ namespace Avalonia.ReactiveUI.UnitTests
         }
 
         [Fact]
-        public void Should_Resolve_And_Embedd_Appropriate_View_Model()
+        public void ViewModelViewHost_Should_Resolve_And_Embedd_Appropriate_View_Model()
         {
             var view = new ExampleView();
-            var root = new TestRoot { Child = view };
             view.ViewModel.Items.Add(new NestedViewModel());
 
-            view.List.Template = GetTemplate();
-            view.List.ApplyTemplate();
-            view.List.Presenter.ApplyTemplate();
-
             var child = view.List.Presenter.Panel.Children[0];
             var container = (ContentPresenter) child;
             container.UpdateChild();
@@ -96,19 +92,55 @@ namespace Avalonia.ReactiveUI.UnitTests
             Assert.IsType<string>(host.DataContext);
         }
 
-        private FuncControlTemplate GetTemplate()
+        [Fact]
+        public void Should_Not_Override_Data_Template_Binding_When_Item_Template_Is_Set()
+        {
+            var view = new ExampleView(control => control.ItemTemplate = GetItemTemplate());
+            Assert.NotNull(view.List.ItemTemplate);
+            Assert.IsType<FuncDataTemplate<TextBlock>>(view.List.ItemTemplate);
+        }
+
+        [Fact]
+        public void Should_Not_Use_View_Model_View_Host_When_Item_Template_Is_Set()
+        {
+            var view = new ExampleView(control => control.ItemTemplate = GetItemTemplate());
+            view.ViewModel.Items.Add(new NestedViewModel());
+
+            var child = view.List.Presenter.Panel.Children[0];
+            var container = (ContentPresenter) child;
+            container.UpdateChild();
+
+            Assert.IsType<TextBlock>(container.Child);
+        }
+        
+        [Fact]
+        public void Should_Not_Use_View_Model_View_Host_When_Data_Templates_Are_Not_Empty()
+        {
+            var view = new ExampleView(control => control.DataTemplates.Add(GetItemTemplate()));
+            view.ViewModel.Items.Add(new NestedViewModel());
+
+            var child = view.List.Presenter.Panel.Children[0];
+            var container = (ContentPresenter) child;
+            container.UpdateChild();
+
+            Assert.IsType<TextBlock>(container.Child);
+        }
+
+        private static FuncDataTemplate GetItemTemplate()
+        {
+            return new FuncDataTemplate<TextBlock>((parent, scope) => new TextBlock());
+        }
+
+        private static FuncControlTemplate GetTemplate()
         {
-            return new FuncControlTemplate<ItemsControl>((parent, scope) =>
+            return new FuncControlTemplate<ItemsControl>((parent, scope) => new Border
             {
-                return new Border
+                Background = new Media.SolidColorBrush(0xffffffff),
+                Child = new ItemsPresenter
                 {
-                    Background = new Media.SolidColorBrush(0xffffffff),
-                    Child = new ItemsPresenter
-                    {
-                        Name = "PART_ItemsPresenter",
-                        [~ItemsPresenter.ItemsProperty] = parent[~ItemsControl.ItemsProperty],
-                    }.RegisterInNameScope(scope)
-                };
+                    Name = "PART_ItemsPresenter",
+                    [~ItemsPresenter.ItemsProperty] = parent[~ItemsControl.ItemsProperty],
+                }.RegisterInNameScope(scope)
             });
         }
     }
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/AutoSuspendHelperTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/AutoSuspendHelperTest.cs
index c263a80ef3..c10f0ffcdb 100644
--- a/tests/Avalonia.ReactiveUI.UnitTests/AutoSuspendHelperTest.cs
+++ b/tests/Avalonia.ReactiveUI.UnitTests/AutoSuspendHelperTest.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Concurrency;
 using System.Reactive.Disposables;
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/Avalonia.ReactiveUI.UnitTests.csproj b/tests/Avalonia.ReactiveUI.UnitTests/Avalonia.ReactiveUI.UnitTests.csproj
index 7c0ff79183..95e10d7a2f 100644
--- a/tests/Avalonia.ReactiveUI.UnitTests/Avalonia.ReactiveUI.UnitTests.csproj
+++ b/tests/Avalonia.ReactiveUI.UnitTests/Avalonia.ReactiveUI.UnitTests.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
   <Import Project="..\..\build\Moq.props" />
@@ -8,7 +9,8 @@
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
   <ItemGroup>
+    <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml.Loader\Avalonia.Markup.Xaml.Loader.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj"/>
+    <ProjectReference Include="..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj" />
   </ItemGroup>
 </Project>
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs
index 643dd3efac..c66a3c4ba1 100644
--- a/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs
+++ b/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Concurrency;
 using System.Reactive.Disposables;
@@ -77,46 +74,26 @@ namespace Avalonia.ReactiveUI.UnitTests
         {
             public ActivatableWindow()
             {
-                InitializeComponent();
-                Assert.IsType<Border>(Content);
+                Content = new Border();
                 this.WhenActivated(disposables => { });
             }
-
-            private void InitializeComponent()
-            {
-                var loader = new AvaloniaXamlLoader();
-                loader.Load(@"
-<Window xmlns='https://github.com/avaloniaui'>
-    <Border/>
-</Window>", null, this);
-            }
         }
 
         public class ActivatableUserControl : ReactiveUserControl<ActivatableViewModel>
         {
             public ActivatableUserControl()
             {
-                InitializeComponent();
-                Assert.IsType<Border>(Content);
+                Content = new Border();
                 this.WhenActivated(disposables => { });
             }
-
-            private void InitializeComponent()
-            {
-                var loader = new AvaloniaXamlLoader();
-                loader.Load(@"
-<UserControl xmlns='https://github.com/avaloniaui'>
-    <Border/>
-</UserControl>", null, this);
-            }
         }
 
-        public AvaloniaActivationForViewFetcherTest()
-        {
-            Locator.CurrentMutable.RegisterConstant(
-                new AvaloniaActivationForViewFetcher(), 
-                typeof(IActivationForViewFetcher));
-        }
+        public AvaloniaActivationForViewFetcherTest() =>
+            Locator
+                .CurrentMutable
+                .RegisterConstant(
+                    new AvaloniaActivationForViewFetcher(),
+                    typeof(IActivationForViewFetcher));
 
         [Fact]
         public void Visual_Element_Is_Activated_And_Deactivated()
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/ReactiveUserControlTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/ReactiveUserControlTest.cs
index 328b749ba1..4dd60e21c5 100644
--- a/tests/Avalonia.ReactiveUI.UnitTests/ReactiveUserControlTest.cs
+++ b/tests/Avalonia.ReactiveUI.UnitTests/ReactiveUserControlTest.cs
@@ -1,6 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.UnitTests;
 using ReactiveUI;
@@ -11,14 +9,37 @@ namespace Avalonia.ReactiveUI.UnitTests
 {
     public class ReactiveUserControlTest
     {
-        public class ExampleViewModel : ReactiveObject { }
+        public class ExampleViewModel : ReactiveObject, IActivatableViewModel
+        {
+            public bool IsActive { get; private set; }
+
+            public ViewModelActivator Activator { get; } = new ViewModelActivator();
+
+            public ExampleViewModel() => this.WhenActivated(disposables =>
+            {
+                IsActive = true;
+                Disposable
+                    .Create(() => IsActive = false)
+                    .DisposeWith(disposables);
+            });
+        }
 
         public class ExampleView : ReactiveUserControl<ExampleViewModel> { }
 
+        public ReactiveUserControlTest() =>
+            Locator
+                .CurrentMutable
+                .RegisterConstant(
+                    new AvaloniaActivationForViewFetcher(),
+                    typeof(IActivationForViewFetcher));
+
         [Fact]
         public void Data_Context_Should_Stay_In_Sync_With_Reactive_User_Control_View_Model() 
         {
+            var root = new TestRoot();
             var view = new ExampleView();
+            root.Child = view;
+
             var viewModel = new ExampleViewModel();
             Assert.Null(view.ViewModel);
 
@@ -29,6 +50,126 @@ namespace Avalonia.ReactiveUI.UnitTests
             view.DataContext = null;
             Assert.Null(view.ViewModel);
             Assert.Null(view.DataContext);
+
+            view.ViewModel = viewModel;
+            Assert.Equal(viewModel, view.ViewModel);
+            Assert.Equal(viewModel, view.DataContext);
+
+            view.ViewModel = null;
+            Assert.Null(view.ViewModel);
+            Assert.Null(view.DataContext);
+        }
+
+        [Fact]
+        public void Should_Start_With_NotNull_Activated_ViewModel()
+        {
+            var root = new TestRoot();
+            var view = new ExampleView {ViewModel = new ExampleViewModel()};
+
+            Assert.False(view.ViewModel.IsActive);
+
+            root.Child = view;
+
+            Assert.NotNull(view.ViewModel);
+            Assert.NotNull(view.DataContext);
+            Assert.True(view.ViewModel.IsActive);
+
+            root.Child = null;
+
+            Assert.NotNull(view.ViewModel);
+            Assert.NotNull(view.DataContext);
+            Assert.False(view.ViewModel.IsActive);
+        }
+
+        [Fact]
+        public void Should_Start_With_NotNull_Activated_DataContext()
+        {
+            var root = new TestRoot();
+            var view = new ExampleView {DataContext = new ExampleViewModel()};
+
+            Assert.False(view.ViewModel.IsActive);
+
+            root.Child = view;
+
+            Assert.NotNull(view.ViewModel);
+            Assert.NotNull(view.DataContext);
+            Assert.True(view.ViewModel.IsActive);
+
+            root.Child = null;
+
+            Assert.NotNull(view.ViewModel);
+            Assert.NotNull(view.DataContext);
+            Assert.False(view.ViewModel.IsActive);
+        }
+        
+        [Fact]
+        public void Should_Inherit_DataContext()
+        {
+            var vm1 = new ExampleViewModel();
+            var vm2 = new ExampleViewModel();
+            var view = new ExampleView();
+            var root = new TestRoot(view);
+            
+            Assert.Null(view.DataContext);
+            Assert.Null(view.ViewModel);
+            
+            root.DataContext = vm1;
+            
+            Assert.Same(vm1, view.DataContext);
+            Assert.Same(vm1, view.ViewModel);
+            
+            root.DataContext = null;
+            
+            Assert.Null(view.DataContext);
+            Assert.Null(view.ViewModel);
+            
+            root.DataContext = vm2;
+            
+            Assert.Same(vm2, view.DataContext);
+            Assert.Same(vm2, view.ViewModel);
+        }
+
+        [Fact]
+        public void Should_Not_Overlap_Change_Notifications()
+        {
+            var vm1 = new ExampleViewModel();
+            var vm2 = new ExampleViewModel();
+
+            var view1 = new ExampleView();
+            var view2 = new ExampleView();
+            
+            Assert.Null(view1.DataContext);
+            Assert.Null(view2.DataContext);
+            Assert.Null(view1.ViewModel);
+            Assert.Null(view2.ViewModel);
+
+            view1.DataContext = vm1;
+            
+            Assert.Same(vm1, view1.DataContext);
+            Assert.Same(vm1, view1.ViewModel);
+            Assert.Null(view2.DataContext);
+            Assert.Null(view2.ViewModel);
+
+            view2.DataContext = vm2;
+
+            Assert.Same(vm1, view1.DataContext);
+            Assert.Same(vm1, view1.ViewModel);
+            Assert.Same(vm2, view2.DataContext);
+            Assert.Same(vm2, view2.ViewModel);
+
+            view1.ViewModel = null;
+
+            Assert.Null(view1.DataContext);
+            Assert.Null(view1.ViewModel);
+            Assert.Same(vm2, view2.DataContext);
+            Assert.Same(vm2, view2.ViewModel);
+
+            view2.ViewModel = null;
+
+            Assert.Null(view1.DataContext);
+            Assert.Null(view2.DataContext);
+            Assert.Null(view1.ViewModel);
+            Assert.Null(view2.ViewModel);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/ReactiveWindowTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/ReactiveWindowTest.cs
index ff77de8d28..18a8a33f09 100644
--- a/tests/Avalonia.ReactiveUI.UnitTests/ReactiveWindowTest.cs
+++ b/tests/Avalonia.ReactiveUI.UnitTests/ReactiveWindowTest.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using Avalonia.Controls;
+using System.Reactive.Disposables;
 using Avalonia.UnitTests;
 using ReactiveUI;
 using Splat;
@@ -11,10 +8,30 @@ namespace Avalonia.ReactiveUI.UnitTests
 {
     public class ReactiveWindowTest
     {
-        public class ExampleViewModel : ReactiveObject { }
+        public class ExampleViewModel : ReactiveObject, IActivatableViewModel
+        {
+            public bool IsActive { get; private set; }
+
+            public ViewModelActivator Activator { get; } = new ViewModelActivator();
+
+            public ExampleViewModel() => this.WhenActivated(disposables =>
+            {
+                IsActive = true;
+                Disposable
+                    .Create(() => IsActive = false)
+                    .DisposeWith(disposables);
+            });
+        }
 
         public class ExampleWindow : ReactiveWindow<ExampleViewModel> { }
 
+        public ReactiveWindowTest() =>
+            Locator
+                .CurrentMutable
+                .RegisterConstant(
+                    new AvaloniaActivationForViewFetcher(),
+                    typeof(IActivationForViewFetcher));
+
         [Fact]
         public void Data_Context_Should_Stay_In_Sync_With_Reactive_Window_View_Model() 
         {
@@ -22,16 +39,73 @@ namespace Avalonia.ReactiveUI.UnitTests
             {
                 var view = new ExampleWindow();
                 var viewModel = new ExampleViewModel();
+                view.Show();
+
                 Assert.Null(view.ViewModel);
+                Assert.Null(view.DataContext);
 
                 view.DataContext = viewModel;
-                Assert.Equal(view.ViewModel, viewModel);
-                Assert.Equal(view.DataContext, viewModel);
+                Assert.Equal(viewModel, view.ViewModel);
+                Assert.Equal(viewModel, view.DataContext);
 
                 view.DataContext = null;
                 Assert.Null(view.ViewModel);
                 Assert.Null(view.DataContext);
+
+                view.ViewModel = viewModel;
+                Assert.Equal(viewModel, view.ViewModel);
+                Assert.Equal(viewModel, view.DataContext);
+
+                view.ViewModel = null;
+                Assert.Null(view.ViewModel);
+                Assert.Null(view.DataContext);
+            }
+        }
+
+        [Fact]
+        public void Should_Start_With_NotNull_Activated_ViewModel()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var view = new ExampleWindow { ViewModel = new ExampleViewModel() };
+
+                Assert.False(view.ViewModel.IsActive);
+
+                view.Show();
+
+                Assert.NotNull(view.ViewModel);
+                Assert.NotNull(view.DataContext);
+                Assert.True(view.ViewModel.IsActive);
+
+                view.Close();
+
+                Assert.NotNull(view.ViewModel);
+                Assert.NotNull(view.DataContext);
+                Assert.False(view.ViewModel.IsActive);
+            }
+        }
+
+        [Fact]
+        public void Should_Start_With_NotNull_Activated_DataContext()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var view = new ExampleWindow { DataContext = new ExampleViewModel() };
+
+                Assert.False(view.ViewModel.IsActive);
+
+                view.Show();
+
+                Assert.NotNull(view.ViewModel);
+                Assert.NotNull(view.DataContext);
+                Assert.True(view.ViewModel.IsActive);
+
+                view.Close();
+
+                Assert.NotNull(view.ViewModel);
+                Assert.NotNull(view.DataContext);
+                Assert.False(view.ViewModel.IsActive);
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/RoutedViewHostTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/RoutedViewHostTest.cs
index 8c5b5083e8..b82b1b1acc 100644
--- a/tests/Avalonia.ReactiveUI.UnitTests/RoutedViewHostTest.cs
+++ b/tests/Avalonia.ReactiveUI.UnitTests/RoutedViewHostTest.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Concurrency;
 using System.Reactive.Disposables;
@@ -65,51 +62,85 @@ namespace Avalonia.ReactiveUI.UnitTests
                 PageTransition = null
             };
 
-            var root = new TestRoot 
-            { 
-                Child = host 
+            var root = new TestRoot
+            {
+                Child = host
             };
             
             Assert.NotNull(host.Content);
-            Assert.Equal(typeof(TextBlock), host.Content.GetType());
+            Assert.IsType<TextBlock>(host.Content);
             Assert.Equal(defaultContent, host.Content);
 
             var first = new FirstRoutableViewModel();
-            screen.Router.Navigate
-                .Execute(first)
-                .Subscribe();
+            screen.Router.Navigate.Execute(first).Subscribe();
 
             Assert.NotNull(host.Content);
-            Assert.Equal(typeof(FirstRoutableView), host.Content.GetType());
+            Assert.IsType<FirstRoutableView>(host.Content);
             Assert.Equal(first, ((FirstRoutableView)host.Content).DataContext);
             Assert.Equal(first, ((FirstRoutableView)host.Content).ViewModel);
 
             var second = new SecondRoutableViewModel();
-            screen.Router.Navigate
-                .Execute(second)
-                .Subscribe();
+            screen.Router.Navigate.Execute(second).Subscribe();
 
             Assert.NotNull(host.Content);
-            Assert.Equal(typeof(SecondRoutableView), host.Content.GetType());
+            Assert.IsType<SecondRoutableView>(host.Content);
             Assert.Equal(second, ((SecondRoutableView)host.Content).DataContext);
             Assert.Equal(second, ((SecondRoutableView)host.Content).ViewModel);
 
-            screen.Router.NavigateBack
-                .Execute(Unit.Default)
-                .Subscribe();
+            screen.Router.NavigateBack.Execute(Unit.Default).Subscribe();
 
             Assert.NotNull(host.Content);
-            Assert.Equal(typeof(FirstRoutableView), host.Content.GetType());
+            Assert.IsType<FirstRoutableView>(host.Content);
             Assert.Equal(first, ((FirstRoutableView)host.Content).DataContext);
             Assert.Equal(first, ((FirstRoutableView)host.Content).ViewModel);
 
-            screen.Router.NavigateBack
-                .Execute(Unit.Default)
-                .Subscribe();
+            screen.Router.NavigateBack.Execute(Unit.Default).Subscribe();
+
+            Assert.NotNull(host.Content);
+            Assert.IsType<TextBlock>(host.Content);
+            Assert.Equal(defaultContent, host.Content);
+        }
+
+        [Fact]
+        public void RoutedViewHost_Should_Show_Default_Content_When_Router_Is_Null()
+        {
+            var screen = new ScreenViewModel();
+            var defaultContent = new TextBlock();
+            var host = new RoutedViewHost 
+            { 
+                DefaultContent = defaultContent,
+                PageTransition = null,
+                Router = null
+            };
+
+            var root = new TestRoot
+            {
+                Child = host
+            };
+
+            Assert.NotNull(host.Content);
+            Assert.Equal(defaultContent, host.Content);
+
+            host.Router = screen.Router;
+
+            Assert.NotNull(host.Content);
+            Assert.Equal(defaultContent, host.Content);
+            
+            var first = new FirstRoutableViewModel();
+            screen.Router.Navigate.Execute(first).Subscribe();
+
+            Assert.NotNull(host.Content);
+            Assert.IsType<FirstRoutableView>(host.Content);
 
+            host.Router = null;
+            
             Assert.NotNull(host.Content);
-            Assert.Equal(typeof(TextBlock), host.Content.GetType());
             Assert.Equal(defaultContent, host.Content);
+
+            host.Router = screen.Router;
+            
+            Assert.NotNull(host.Content);
+            Assert.IsType<FirstRoutableView>(host.Content);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs
index 302ab5e71d..6ca617d2d4 100644
--- a/tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs
+++ b/tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/ViewModelViewHostTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/ViewModelViewHostTest.cs
index 8bed5adcd4..35d1cbf62d 100644
--- a/tests/Avalonia.ReactiveUI.UnitTests/ViewModelViewHostTest.cs
+++ b/tests/Avalonia.ReactiveUI.UnitTests/ViewModelViewHostTest.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls;
 using Avalonia.UnitTests;
 using ReactiveUI;
diff --git a/tests/Avalonia.RenderTests/Assets/NotoMono-Regular.ttf b/tests/Avalonia.RenderTests/Assets/NotoMono-Regular.ttf
new file mode 100644
index 0000000000..3560a3a0c8
Binary files /dev/null and b/tests/Avalonia.RenderTests/Assets/NotoMono-Regular.ttf differ
diff --git a/tests/Avalonia.RenderTests/Assets/NotoSans-Italic.ttf b/tests/Avalonia.RenderTests/Assets/NotoSans-Italic.ttf
new file mode 100644
index 0000000000..1639ad7d40
Binary files /dev/null and b/tests/Avalonia.RenderTests/Assets/NotoSans-Italic.ttf differ
diff --git a/tests/Avalonia.RenderTests/Assets/TwitterColorEmoji-SVGinOT.ttf b/tests/Avalonia.RenderTests/Assets/TwitterColorEmoji-SVGinOT.ttf
new file mode 100644
index 0000000000..f88c643122
Binary files /dev/null and b/tests/Avalonia.RenderTests/Assets/TwitterColorEmoji-SVGinOT.ttf differ
diff --git a/tests/Avalonia.RenderTests/Controls/BorderTests.cs b/tests/Avalonia.RenderTests/Controls/BorderTests.cs
index 4f4004e159..cde39e8bfd 100644
--- a/tests/Avalonia.RenderTests/Controls/BorderTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/BorderTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Layout;
diff --git a/tests/Avalonia.RenderTests/Controls/CustomRenderTests.cs b/tests/Avalonia.RenderTests/Controls/CustomRenderTests.cs
index d3a935c281..8002b572bd 100644
--- a/tests/Avalonia.RenderTests/Controls/CustomRenderTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/CustomRenderTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Threading.Tasks;
 using Avalonia.Controls;
diff --git a/tests/Avalonia.RenderTests/Controls/ImageTests.cs b/tests/Avalonia.RenderTests/Controls/ImageTests.cs
index 593593ba3c..3bf935d199 100644
--- a/tests/Avalonia.RenderTests/Controls/ImageTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/ImageTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.IO;
 using System.Threading.Tasks;
 using Avalonia.Controls;
diff --git a/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs b/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs
index 14f6f78a8d..53a2959848 100644
--- a/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Layout;
@@ -43,5 +40,59 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
             await RenderToFile(target);
             CompareImages();
         }
+
+
+        [Win32Fact("Has text")]
+        public async Task RestrictedHeight_VerticalAlign()
+        {
+            IControl text(VerticalAlignment verticalAlingnment, bool clip = true, bool restrictHeight = true)
+            {
+                return new Border()
+                {
+                    BorderBrush = Brushes.Blue,
+                    BorderThickness = new Thickness(1),
+                    VerticalAlignment = VerticalAlignment.Center,
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    Height = restrictHeight ? 20 : double.NaN,
+                    Margin = new Thickness(1),
+                    Child = new TextBlock
+                    {
+                        FontFamily = new FontFamily("Courier New"),
+                        Background = Brushes.Red,
+                        FontSize = 24,
+                        Foreground = Brushes.Black,
+                        Text = "L",
+                        VerticalAlignment = verticalAlingnment,
+                        ClipToBounds = clip
+                    }
+                };
+            }
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 180,
+                Height = 80,
+
+                Child = new StackPanel()
+                {
+                    Orientation = Orientation.Horizontal,
+                    Children =
+                    {
+                        text(VerticalAlignment.Stretch, restrictHeight: false),
+                        text(VerticalAlignment.Center),
+                        text(VerticalAlignment.Stretch),
+                        text(VerticalAlignment.Top),
+                        text(VerticalAlignment.Bottom),
+                        text(VerticalAlignment.Center, clip:false),
+                        text(VerticalAlignment.Stretch, clip:false),
+                        text(VerticalAlignment.Top, clip:false),
+                        text(VerticalAlignment.Bottom, clip:false),
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
     }
 }
diff --git a/tests/Avalonia.RenderTests/Media/BitmapTests.cs b/tests/Avalonia.RenderTests/Media/BitmapTests.cs
index e6cd800529..b629304b77 100644
--- a/tests/Avalonia.RenderTests/Media/BitmapTests.cs
+++ b/tests/Avalonia.RenderTests/Media/BitmapTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
@@ -78,23 +75,23 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             {
                 ctx.Clear(Colors.Transparent);
                 ctx.PushOpacity(0.8);
-                ctx.FillRectangle(Brushes.Chartreuse, new Rect(0, 0, 20, 100));
-                ctx.FillRectangle(Brushes.Crimson, new Rect(20, 0, 20, 100));
-                ctx.FillRectangle(Brushes.Gold, new Rect(40, 0, 20, 100));
+                ctx.DrawRectangle(Brushes.Chartreuse, null, new Rect(0, 0, 20, 100));
+                ctx.DrawRectangle(Brushes.Crimson, null, new Rect(20, 0, 20, 100));
+                ctx.DrawRectangle(Brushes.Gold,null, new Rect(40, 0, 20, 100));
                 ctx.PopOpacity();
             }
 
-            var bmp = new Bitmap(fmt, fb.Address, fb.Size, new Vector(96, 96), fb.RowBytes);
+            var bmp = new Bitmap(fmt, AlphaFormat.Premul, fb.Address, fb.Size, new Vector(96, 96), fb.RowBytes);
             fb.Deallocate();
             using (var rtb = new RenderTargetBitmap(new PixelSize(100, 100), new Vector(96, 96)))
             {
                 using (var ctx = rtb.CreateDrawingContext(null))
                 {
-                    ctx.FillRectangle(Brushes.Blue, new Rect(0, 0, 100, 100));
-                    ctx.FillRectangle(Brushes.Pink, new Rect(0, 20, 100, 10));
+                    ctx.DrawRectangle(Brushes.Blue, null, new Rect(0, 0, 100, 100));
+                    ctx.DrawRectangle(Brushes.Pink, null, new Rect(0, 20, 100, 10));
 
                     var rc = new Rect(0, 0, 60, 60);
-                    ctx.DrawImage(bmp.PlatformImpl, 1, rc, rc);
+                    ctx.DrawBitmap(bmp.PlatformImpl, 1, rc, rc);
                 }
                 rtb.Save(System.IO.Path.Combine(OutputPath, testName + ".out.png"));
             }
@@ -105,7 +102,9 @@ 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/ConicGradientBrushTests.cs b/tests/Avalonia.RenderTests/Media/ConicGradientBrushTests.cs
new file mode 100644
index 0000000000..db69a0a028
--- /dev/null
+++ b/tests/Avalonia.RenderTests/Media/ConicGradientBrushTests.cs
@@ -0,0 +1,178 @@
+using Avalonia.Controls;
+using Avalonia.Media;
+using System.Threading.Tasks;
+using Xunit;
+
+#if AVALONIA_SKIA
+namespace Avalonia.Skia.RenderTests
+#else
+namespace Avalonia.Direct2D1.RenderTests.Media
+#endif
+{
+    public class ConicGradientBrushTests : TestBase
+    {
+        public ConicGradientBrushTests() : base(@"Media\ConicGradientBrush")
+        {
+        }
+
+        [Fact]
+        public async Task ConicGradientBrush_RedBlue()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 200,
+                Child = new Border
+                {
+                    Background = new ConicGradientBrush
+                    {
+                        GradientStops =
+                        {
+                            new GradientStop { Color = Colors.Red, Offset = 0 },
+                            new GradientStop { Color = Colors.Blue, Offset = 1 }
+                        }
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
+        [Fact]
+        public async Task ConicGradientBrush_RedBlue_Rotation()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 200,
+                Child = new Border
+                {
+                    Background = new ConicGradientBrush
+                    {
+                        GradientStops =
+                        {
+                            new GradientStop { Color = Colors.Red, Offset = 0 },
+                            new GradientStop { Color = Colors.Blue, Offset = 1 }
+                        },
+                        Angle = 90
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
+        [Fact]
+        public async Task ConicGradientBrush_RedBlue_Center()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 200,
+                Child = new Border
+                {
+                    Background = new ConicGradientBrush
+                    {
+                        GradientStops =
+                        {
+                            new GradientStop { Color = Colors.Red, Offset = 0 },
+                            new GradientStop { Color = Colors.Blue, Offset = 1 }
+                        },
+                        Center = new RelativePoint(0.25, 0.25, RelativeUnit.Relative)
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
+        [Fact]
+        public async Task ConicGradientBrush_RedBlue_Center_and_Rotation()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 200,
+                Child = new Border
+                {
+                    Background = new ConicGradientBrush
+                    {
+                        GradientStops =
+                        {
+                            new GradientStop { Color = Colors.Red, Offset = 0 },
+                            new GradientStop { Color = Colors.Blue, Offset = 1 }
+                        },
+                        Center = new RelativePoint(0.25, 0.25, RelativeUnit.Relative),
+                        Angle = 90
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
+        [Fact]
+        public async Task ConicGradientBrush_RedBlue_SoftEdge()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 200,
+                Child = new Border
+                {
+                    Background = new ConicGradientBrush
+                    {
+                        GradientStops =
+                        {
+                            new GradientStop { Color = Colors.Red, Offset = 0 },
+                            new GradientStop { Color = Colors.Blue, Offset = 0.5 },
+                            new GradientStop { Color = Colors.Red, Offset = 1 },
+                        }
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
+        [Fact]
+        public async Task ConicGradientBrush_Umbrella()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 200,
+                Child = new Border
+                {
+                    Background = new ConicGradientBrush
+                    {
+                        GradientStops =
+                        {
+                            new GradientStop { Color = Colors.Red, Offset = 0 },
+                            new GradientStop { Color = Colors.Yellow, Offset = 0.1667 },
+                            new GradientStop { Color = Colors.Lime, Offset = 0.3333 },
+                            new GradientStop { Color = Colors.Aqua, Offset = 0.5000 },
+                            new GradientStop { Color = Colors.Blue, Offset = 0.6667 },
+                            new GradientStop { Color = Colors.Magenta, Offset = 0.8333 },
+                            new GradientStop { Color = Colors.Red, Offset = 1 },
+                        }
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+    }
+}
diff --git a/tests/Avalonia.RenderTests/Media/FormattedTextImplTests.cs b/tests/Avalonia.RenderTests/Media/FormattedTextImplTests.cs
index bca34dd69d..7528424521 100644
--- a/tests/Avalonia.RenderTests/Media/FormattedTextImplTests.cs
+++ b/tests/Avalonia.RenderTests/Media/FormattedTextImplTests.cs
@@ -1,6 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-using Avalonia.Media;
+using Avalonia.Media;
 using Avalonia.Platform;
 using System;
 using System.Collections.Generic;
@@ -53,7 +51,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
         {
             var r = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
             return r.CreateFormattedText(text,
-                new Typeface(fontFamily, fontWeight, fontStyle),
+                new Typeface(fontFamily, fontStyle, fontWeight),
                 fontSize,
                 textAlignment,
                 wrapping,
diff --git a/tests/Avalonia.RenderTests/Media/ImageBrushTests.cs b/tests/Avalonia.RenderTests/Media/ImageBrushTests.cs
index 3a41585d04..09564cfe83 100644
--- a/tests/Avalonia.RenderTests/Media/ImageBrushTests.cs
+++ b/tests/Avalonia.RenderTests/Media/ImageBrushTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Shapes;
@@ -195,11 +192,8 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             await RenderToFile(target);
             CompareImages();
         }
-#if AVALONIA_SKIA_SKIP_FAIL
-        [Fact(Skip = "FIXME")]
-#else
+
         [Fact]
-#endif
         public async Task ImageBrush_Fill_NoTile()
         {
             Decorator target = new Decorator
@@ -222,11 +216,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
-#if AVALONIA_SKIA_SKIP_FAIL
-        [Fact(Skip = "FIXME")]
-#else
         [Fact]
-#endif
         public async Task ImageBrush_Uniform_NoTile()
         {
             Decorator target = new Decorator
@@ -249,11 +239,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
-#if AVALONIA_SKIA_SKIP_FAIL
-        [Fact(Skip = "FIXME")]
-#else
         [Fact]
-#endif
         public async Task ImageBrush_UniformToFill_NoTile()
         {
             Decorator target = new Decorator
diff --git a/tests/Avalonia.RenderTests/Media/LinearGradientBrushTests.cs b/tests/Avalonia.RenderTests/Media/LinearGradientBrushTests.cs
index a0d6f1e423..af7b4f130f 100644
--- a/tests/Avalonia.RenderTests/Media/LinearGradientBrushTests.cs
+++ b/tests/Avalonia.RenderTests/Media/LinearGradientBrushTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls;
 using Avalonia.Media;
 using System;
diff --git a/tests/Avalonia.RenderTests/Media/RadialGradientBrushTests.cs b/tests/Avalonia.RenderTests/Media/RadialGradientBrushTests.cs
index bd1d26ce70..2941b8dc34 100644
--- a/tests/Avalonia.RenderTests/Media/RadialGradientBrushTests.cs
+++ b/tests/Avalonia.RenderTests/Media/RadialGradientBrushTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls;
 using Avalonia.Media;
 using System;
@@ -21,7 +18,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
         public RadialGradientBrushTests() : base(@"Media\RadialGradientBrush")
         {
         }
-        
+
         [Fact]
         public async Task RadialGradientBrush_RedBlue()
         {
@@ -46,5 +43,127 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             await RenderToFile(target);
             CompareImages();
         }
+
+        /// <summary>
+        /// Tests using a GradientOrigin that falls inside of the circle described by Center/Radius.
+        /// </summary>
+        [Fact]
+        public async Task RadialGradientBrush_RedBlue_Offset_Inside()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 200,
+                Child = new Border
+                {
+                    Background = new RadialGradientBrush
+                    {
+                        GradientStops =
+                        {
+                            new GradientStop { Color = Colors.Red, Offset = 0 },
+                            new GradientStop { Color = Colors.Blue, Offset = 1 }
+                        },
+                        GradientOrigin = new RelativePoint(0.25, 0.25, RelativeUnit.Relative)
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
+        /// <summary>
+        /// Tests using a GradientOrigin that falls outside of the circle described by Center/Radius.
+        /// </summary>
+        [Fact]
+        public async Task RadialGradientBrush_RedBlue_Offset_Outside()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 200,
+                Child = new Border
+                {
+                    Background = new RadialGradientBrush
+                    {
+                        GradientStops =
+                        {
+                            new GradientStop { Color = Colors.Red, Offset = 0 },
+                            new GradientStop { Color = Colors.Blue, Offset = 1 }
+                        },
+                        GradientOrigin = new RelativePoint(0.1, 0.1, RelativeUnit.Relative)
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
+        /// <summary>
+        /// Tests using a GradientOrigin that falls inside of the circle described by Center/Radius.
+        /// </summary>
+        [Fact]
+        public async Task RadialGradientBrush_RedGreenBlue_Offset_Inside()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 200,
+                Child = new Border
+                {
+                    Background = new RadialGradientBrush
+                    {
+                        GradientStops =
+                        {
+                            new GradientStop { Color = Colors.Red, Offset = 0 },
+                            new GradientStop { Color = Colors.Green, Offset = 0.5 },
+                            new GradientStop { Color = Colors.Blue, Offset = 1 }
+                        },
+                        GradientOrigin = new RelativePoint(0.25, 0.25, RelativeUnit.Relative),
+                        Center = new RelativePoint(0.5, 0.5, RelativeUnit.Relative),
+                        Radius = 0.5                        
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
+        /// <summary>
+        /// Tests using a GradientOrigin that falls outside of the circle described by Center/Radius.
+        /// </summary>
+        [Fact]
+        public async Task RadialGradientBrush_RedGreenBlue_Offset_Outside()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 200,
+                Child = new Border
+                {
+                    Background = new RadialGradientBrush
+                    {
+                        GradientStops =
+                        {
+                            new GradientStop { Color = Colors.Red, Offset = 0 },
+                            new GradientStop { Color = Colors.Green, Offset = 0.25 },
+                            new GradientStop { Color = Colors.Blue, Offset = 1 }
+                        },
+                        GradientOrigin = new RelativePoint(0.1, 0.1, RelativeUnit.Relative),
+                        Center = new RelativePoint(0.5, 0.5, RelativeUnit.Relative),
+                        Radius = 0.5
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
     }
 }
diff --git a/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs b/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs
index 7c53f4516a..42ec392066 100644
--- a/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs
+++ b/tests/Avalonia.RenderTests/Media/VisualBrushTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Shapes;
@@ -17,6 +14,10 @@ namespace Avalonia.Direct2D1.RenderTests.Media
 {
     public class VisualBrushTests : TestBase
     {
+        //Whitespaces are used here to be able to compare rendering results in a platform independent way.
+        //Otherwise tests will fail because of slightly different glyph rendering.
+        private static readonly string s_visualBrushText = "           ";
+
         public VisualBrushTests()
             : base(@"Media\VisualBrush")
         {
@@ -48,10 +49,10 @@ namespace Avalonia.Direct2D1.RenderTests.Media
                             Child = new TextBlock
                             {
                                 FontSize = 24,
-                                FontFamily = new FontFamily("Arial"),
+                                FontFamily = TestFontFamily,
                                 Background = Brushes.Green,
                                 Foreground = Brushes.Yellow,
-                                Text = "VisualBrush",
+                                Text = s_visualBrushText
                             }
                         }
                     }
@@ -84,11 +85,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
-#if AVALONIA_SKIA_SKIP_FAIL
-        [Fact(Skip = "FIXME")]
-#else
         [Fact]
-#endif
         public async Task VisualBrush_NoStretch_NoTile_Alignment_Center()
         {
             Decorator target = new Decorator
@@ -138,11 +135,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
-#if AVALONIA_SKIA_SKIP_FAIL
-        [Fact(Skip = "FIXME")]
-#else
         [Fact]
-#endif
         public async Task VisualBrush_Fill_NoTile()
         {
             Decorator target = new Decorator
@@ -165,11 +158,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
-#if AVALONIA_SKIA_SKIP_FAIL
-        [Fact(Skip = "FIXME")]
-#else
         [Fact]
-#endif
         public async Task VisualBrush_Uniform_NoTile()
         {
             Decorator target = new Decorator
@@ -192,11 +181,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
-#if AVALONIA_SKIA_SKIP_FAIL
-        [Fact(Skip = "FIXME")]
-#else
         [Fact]
-#endif
         public async Task VisualBrush_UniformToFill_NoTile()
         {
             Decorator target = new Decorator
@@ -243,11 +228,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
-#if AVALONIA_SKIA_SKIP_FAIL
-        [Fact(Skip = "FIXME")]
-#else
         [Fact]
-#endif
         public async Task VisualBrush_NoStretch_NoTile_BottomRightQuarterDest()
         {
             Decorator target = new Decorator
@@ -321,11 +302,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
-#if AVALONIA_SKIA_SKIP_FAIL
-        [Fact(Skip = "FIXME")]
-#else
         [Fact]
-#endif
         public async Task VisualBrush_NoStretch_FlipX_TopLeftDest()
         {
             Decorator target = new Decorator
@@ -349,11 +326,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
-#if AVALONIA_SKIA_SKIP_FAIL
-        [Fact(Skip = "FIXME")]
-#else
         [Fact]
-#endif
         public async Task VisualBrush_NoStretch_FlipY_TopLeftDest()
         {
             Decorator target = new Decorator
@@ -377,11 +350,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
-#if AVALONIA_SKIA_SKIP_FAIL
-        [Fact(Skip = "FIXME")]
-#else
         [Fact]
-#endif
         public async Task VisualBrush_NoStretch_FlipXY_TopLeftDest()
         {
             Decorator target = new Decorator
@@ -405,11 +374,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
-#if AVALONIA_SKIA_SKIP_FAIL
-        [Fact(Skip = "FIXME")]
-#else
         [Fact]
-#endif
         public async Task VisualBrush_InTree_Visual()
         {
             Border source;
@@ -429,8 +394,8 @@ namespace Avalonia.Direct2D1.RenderTests.Media
                             HorizontalAlignment = HorizontalAlignment.Left,
                             Child = new TextBlock
                             {
-                                FontFamily = new FontFamily("Courier New"),
-                                Text = "Visual"
+                                FontFamily = TestFontFamily,
+                                Text = s_visualBrushText
                             }
                         }),
                         new Border
diff --git a/tests/Avalonia.RenderTests/Properties/AssemblyInfo.cs b/tests/Avalonia.RenderTests/Properties/AssemblyInfo.cs
index a462e5b079..a0b39114d6 100644
--- a/tests/Avalonia.RenderTests/Properties/AssemblyInfo.cs
+++ b/tests/Avalonia.RenderTests/Properties/AssemblyInfo.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reflection;
 using Xunit;
 
diff --git a/tests/Avalonia.RenderTests/Shapes/EllipseTests.cs b/tests/Avalonia.RenderTests/Shapes/EllipseTests.cs
index 257607d5b5..43f15e0fad 100644
--- a/tests/Avalonia.RenderTests/Shapes/EllipseTests.cs
+++ b/tests/Avalonia.RenderTests/Shapes/EllipseTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Shapes;
diff --git a/tests/Avalonia.RenderTests/Shapes/LineTests.cs b/tests/Avalonia.RenderTests/Shapes/LineTests.cs
index a30882fb0d..617d46c777 100644
--- a/tests/Avalonia.RenderTests/Shapes/LineTests.cs
+++ b/tests/Avalonia.RenderTests/Shapes/LineTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Shapes;
diff --git a/tests/Avalonia.RenderTests/Shapes/PathTests.cs b/tests/Avalonia.RenderTests/Shapes/PathTests.cs
index 2fa93b49e2..bac16cca88 100644
--- a/tests/Avalonia.RenderTests/Shapes/PathTests.cs
+++ b/tests/Avalonia.RenderTests/Shapes/PathTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Controls;
 using Avalonia.Controls.Shapes;
 using Avalonia.Layout;
diff --git a/tests/Avalonia.RenderTests/Shapes/PolygonTests.cs b/tests/Avalonia.RenderTests/Shapes/PolygonTests.cs
index aae5706810..3ac884df7d 100644
--- a/tests/Avalonia.RenderTests/Shapes/PolygonTests.cs
+++ b/tests/Avalonia.RenderTests/Shapes/PolygonTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Shapes;
diff --git a/tests/Avalonia.RenderTests/Shapes/PolylineTests.cs b/tests/Avalonia.RenderTests/Shapes/PolylineTests.cs
index 8afaeb8838..d02d494ff2 100644
--- a/tests/Avalonia.RenderTests/Shapes/PolylineTests.cs
+++ b/tests/Avalonia.RenderTests/Shapes/PolylineTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Shapes;
diff --git a/tests/Avalonia.RenderTests/Shapes/RectangleTests.cs b/tests/Avalonia.RenderTests/Shapes/RectangleTests.cs
index 6d4a840641..026fd0d898 100644
--- a/tests/Avalonia.RenderTests/Shapes/RectangleTests.cs
+++ b/tests/Avalonia.RenderTests/Shapes/RectangleTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Shapes;
diff --git a/tests/Avalonia.RenderTests/TestBase.cs b/tests/Avalonia.RenderTests/TestBase.cs
index 2efd28c2d5..a0fbf704cf 100644
--- a/tests/Avalonia.RenderTests/TestBase.cs
+++ b/tests/Avalonia.RenderTests/TestBase.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.IO;
 using System.Runtime.CompilerServices;
 using ImageMagick;
@@ -13,6 +10,7 @@ using Avalonia.Platform;
 using System.Threading.Tasks;
 using System;
 using System.Threading;
+using Avalonia.Media;
 using Avalonia.Threading;
 #if AVALONIA_SKIA
 using Avalonia.Skia;
@@ -26,11 +24,22 @@ namespace Avalonia.Skia.RenderTests
 namespace Avalonia.Direct2D1.RenderTests
 #endif
 {
+    using Avalonia.Shared.PlatformSupport;
+
     public class TestBase
     {
+#if AVALONIA_SKIA
+        private static string s_fontUri = "resm:Avalonia.Skia.RenderTests.Assets?assembly=Avalonia.Skia.RenderTests#Noto Mono";
+#else
+        private static string s_fontUri = "resm:Avalonia.Direct2D1.RenderTests.Assets?assembly=Avalonia.Direct2D1.RenderTests#Noto Mono";
+#endif
+        public static FontFamily TestFontFamily = new FontFamily(s_fontUri);
+
         private static readonly TestThreadingInterface threadingInterface =
             new TestThreadingInterface();
 
+        private static readonly IAssetLoader assetLoader = new AssetLoader();
+
         static TestBase()
         {
 #if AVALONIA_SKIA
@@ -42,6 +51,9 @@ namespace Avalonia.Direct2D1.RenderTests
                 .Bind<IPlatformThreadingInterface>()
                 .ToConstant(threadingInterface);
 
+            AvaloniaLocator.CurrentMutable
+                .Bind<IAssetLoader>()
+                .ToConstant(assetLoader);
         }
 
         public TestBase(string outputPath)
@@ -172,7 +184,7 @@ namespace Avalonia.Direct2D1.RenderTests
 
             public void Signal(DispatcherPriority prio)
             {
-                throw new NotImplementedException();
+                // No-op
             }
 
             public IDisposable StartTimer(DispatcherPriority priority, TimeSpan interval, Action tick)
diff --git a/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj b/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
index a9452b4def..14d0f4debf 100644
--- a/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
+++ b/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
@@ -1,11 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <DefineConstants>AVALONIA_SKIA;AVALONIA_SKIA_SKIP_FAIL</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\Avalonia.RenderTests\**\*.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <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" />
@@ -26,4 +29,5 @@
   <Import Project="..\..\build\XUnit.props" />
   <Import Project="..\..\build\Magick.NET-Q16-AnyCPU.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 0473355fcd..ef69865e32 100644
--- a/tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj
+++ b/tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj
@@ -1,12 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <LangVersion>latest</LangVersion>
   </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>
+    <EmbeddedResource Include="..\Avalonia.RenderTests\**\*.ttf" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
@@ -19,4 +24,4 @@
     <ProjectReference Include="..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/Avalonia.Skia.UnitTests/Media/CustomFontManagerImpl.cs b/tests/Avalonia.Skia.UnitTests/Media/CustomFontManagerImpl.cs
new file mode 100644
index 0000000000..a0fe348166
--- /dev/null
+++ b/tests/Avalonia.Skia.UnitTests/Media/CustomFontManagerImpl.cs
@@ -0,0 +1,100 @@
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Avalonia.Media;
+using Avalonia.Media.Fonts;
+using Avalonia.Platform;
+using SkiaSharp;
+
+namespace Avalonia.Skia.UnitTests.Media
+{
+    public class CustomFontManagerImpl : IFontManagerImpl
+    {
+        private readonly Typeface[] _customTypefaces;
+        private readonly string _defaultFamilyName;
+
+        private readonly Typeface _defaultTypeface =
+            new Typeface("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#Noto Mono");
+        private readonly Typeface _italicTypeface =
+            new Typeface("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#Noto Sans");
+        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 };
+            _defaultFamilyName = _defaultTypeface.FontFamily.FamilyNames.PrimaryFamilyName;
+        }
+
+        public string GetDefaultFontFamilyName()
+        {
+            return _defaultFamilyName;
+        }
+
+        public IEnumerable<string> GetInstalledFontFamilyNames(bool checkForUpdates = false)
+        {
+            return _customTypefaces.Select(x => x.FontFamily.Name);
+        }
+
+        private readonly string[] _bcp47 = { CultureInfo.CurrentCulture.ThreeLetterISOLanguageName, CultureInfo.CurrentCulture.TwoLetterISOLanguageName };
+
+        public bool TryMatchCharacter(int codepoint, FontStyle fontStyle, FontWeight fontWeight, FontFamily fontFamily,
+            CultureInfo culture, out Typeface typeface)
+        {
+            foreach (var customTypeface in _customTypefaces)
+            {
+                if (customTypeface.GlyphTypeface.GetGlyph((uint)codepoint) == 0)
+                {
+                    continue;
+                }
+
+                typeface = new Typeface(customTypeface.FontFamily.Name, fontStyle, fontWeight);
+
+                return true;
+            }
+
+            var fallback = SKFontManager.Default.MatchCharacter(fontFamily?.Name, (SKFontStyleWeight)fontWeight,
+                SKFontStyleWidth.Normal, (SKFontStyleSlant)fontStyle, _bcp47, codepoint);
+
+            typeface = new Typeface(fallback?.FamilyName ?? _defaultFamilyName, fontStyle, fontWeight);
+
+            return true;
+        }
+
+        public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)
+        {
+            SKTypeface skTypeface;
+
+            switch (typeface.FontFamily.Name)
+            {
+                case "Twitter Color Emoji":
+                    {
+                        var typefaceCollection = SKTypefaceCollectionCache.GetOrAddTypefaceCollection(_emojiTypeface.FontFamily);
+                        skTypeface = typefaceCollection.Get(typeface);
+                        break;
+                    }
+                case "Noto Sans":
+                    {
+                        var typefaceCollection = SKTypefaceCollectionCache.GetOrAddTypefaceCollection(_italicTypeface.FontFamily);
+                        skTypeface = typefaceCollection.Get(typeface);
+                        break;
+                    }
+                case FontFamily.DefaultFontFamilyName:
+                case "Noto Mono":
+                    {
+                        var typefaceCollection = SKTypefaceCollectionCache.GetOrAddTypefaceCollection(_defaultTypeface.FontFamily);
+                        skTypeface = typefaceCollection.Get(typeface);
+                        break;
+                    }
+                default:
+                    {
+                        skTypeface = SKTypeface.FromFamilyName(typeface.FontFamily.Name,
+                            (SKFontStyleWeight)typeface.Weight, SKFontStyleWidth.Normal, (SKFontStyleSlant)typeface.Style);
+                        break;
+                    }
+            }
+
+            return new GlyphTypefaceImpl(skTypeface);
+        }
+    }
+}
diff --git a/tests/Avalonia.Skia.UnitTests/Media/FontManagerImplTests.cs b/tests/Avalonia.Skia.UnitTests/Media/FontManagerImplTests.cs
new file mode 100644
index 0000000000..df286d709e
--- /dev/null
+++ b/tests/Avalonia.Skia.UnitTests/Media/FontManagerImplTests.cs
@@ -0,0 +1,110 @@
+using System;
+using System.Linq;
+using Avalonia.Media;
+using Avalonia.UnitTests;
+using SkiaSharp;
+using Xunit;
+
+namespace Avalonia.Skia.UnitTests.Media
+{
+    public class FontManagerImplTests
+    {
+        private static string s_fontUri = "resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#Noto Mono";
+
+        [Fact]
+        public void Should_Create_Typeface_From_Fallback()
+        {
+            var fontManager = new FontManagerImpl();
+
+            var glyphTypeface = (GlyphTypefaceImpl)fontManager.CreateGlyphTypeface(
+                new Typeface(new FontFamily("A, B, " + fontManager.GetDefaultFontFamilyName())));
+
+            var skTypeface = glyphTypeface.Typeface;
+
+            Assert.Equal(SKTypeface.Default.FamilyName, skTypeface.FamilyName);
+
+            Assert.Equal(SKTypeface.Default.FontWeight, skTypeface.FontWeight);
+
+            Assert.Equal(SKTypeface.Default.FontSlant, skTypeface.FontSlant);
+        }
+
+        [Fact]
+        public void Should_Create_Typeface_From_Fallback_Bold()
+        {
+            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));
+
+            var skTypeface = glyphTypeface.Typeface;
+
+            Assert.Equal(fontName, skTypeface.FamilyName);
+            Assert.True(skTypeface.FontWeight >= 600);
+        }
+
+        [Fact]
+        public void Should_Create_Typeface_For_Unknown_Font()
+        {
+            var fontManager = new FontManagerImpl();
+
+            var glyphTypeface = (GlyphTypefaceImpl)fontManager.CreateGlyphTypeface(
+                new Typeface(new FontFamily("Unknown")));
+
+            var skTypeface = glyphTypeface.Typeface;
+
+            Assert.Equal(SKTypeface.Default.FamilyName, skTypeface.FamilyName);
+
+            Assert.Equal(SKTypeface.Default.FontWeight, skTypeface.FontWeight);
+
+            Assert.Equal(SKTypeface.Default.FontSlant, skTypeface.FontSlant);
+        }
+
+        [Fact]
+        public void Should_Load_Typeface_From_Resource()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var fontManager = new FontManagerImpl();
+
+                var glyphTypeface = (GlyphTypefaceImpl)fontManager.CreateGlyphTypeface(
+                    new Typeface(s_fontUri));
+
+                var skTypeface = glyphTypeface.Typeface;
+
+                Assert.Equal("Noto Mono", skTypeface.FamilyName);
+            }
+        }
+
+        [Fact]
+        public void Should_Load_Nearest_Matching_Font()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var fontManager = new FontManagerImpl();
+
+                var glyphTypeface = (GlyphTypefaceImpl)fontManager.CreateGlyphTypeface(
+                    new Typeface(s_fontUri, FontStyle.Italic, FontWeight.Black));
+
+                var skTypeface = glyphTypeface.Typeface;
+
+                Assert.Equal("Noto Mono", skTypeface.FamilyName);
+            }
+        }
+
+        [Fact]
+        public void Should_Throw_For_Invalid_Custom_Font()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var fontManager = new FontManagerImpl();
+
+                Assert.Throws<InvalidOperationException>(() =>
+                    fontManager.CreateGlyphTypeface(
+                        new Typeface("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#Unknown")));
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Skia.UnitTests/Media/SKTypefaceCollectionCacheTests.cs b/tests/Avalonia.Skia.UnitTests/Media/SKTypefaceCollectionCacheTests.cs
new file mode 100644
index 0000000000..f9f924e782
--- /dev/null
+++ b/tests/Avalonia.Skia.UnitTests/Media/SKTypefaceCollectionCacheTests.cs
@@ -0,0 +1,32 @@
+using Avalonia.Media;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Skia.UnitTests.Media
+{
+    public class SKTypefaceCollectionCacheTests
+    {
+        [Fact]
+        public void Should_Load_Typefaces_From_Invalid_Name()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var notoMono =
+                    new FontFamily("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#Noto Mono");
+
+                var colorEmoji =
+                    new FontFamily("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#Twitter Color Emoji");
+
+                var notoMonoCollection = SKTypefaceCollectionCache.GetOrAddTypefaceCollection(notoMono);
+
+                var typeface = new Typeface("ABC", FontStyle.Italic, FontWeight.Bold);
+
+                Assert.Equal("Noto Mono", notoMonoCollection.Get(typeface).FamilyName);
+
+                var notoColorEmojiCollection = SKTypefaceCollectionCache.GetOrAddTypefaceCollection(colorEmoji);
+
+                Assert.Equal("Twitter Color Emoji", notoColorEmojiCollection.Get(typeface).FamilyName);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/FormattableTextSource.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/FormattableTextSource.cs
new file mode 100644
index 0000000000..6a5065939e
--- /dev/null
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/FormattableTextSource.cs
@@ -0,0 +1,38 @@
+using System;
+using Avalonia.Media.TextFormatting;
+using Avalonia.Utilities;
+
+namespace Avalonia.Skia.UnitTests.Media.TextFormatting
+{
+    internal class FormattableTextSource : ITextSource
+    {
+        private readonly ReadOnlySlice<char> _text;
+        private readonly TextRunProperties _defaultStyle;
+        private ReadOnlySlice<ValueSpan<TextRunProperties>> _styleSpans;
+
+        public FormattableTextSource(string text, TextRunProperties defaultStyle,
+            ReadOnlySlice<ValueSpan<TextRunProperties>> styleSpans)
+        {
+            _text = text.AsMemory();
+
+            _defaultStyle = defaultStyle;
+
+            _styleSpans = styleSpans;
+        }
+
+        public TextRun GetTextRun(int textSourceIndex)
+        {
+            if (_styleSpans.IsEmpty)
+            {
+                return new TextEndOfParagraph();
+            }
+
+            var currentSpan = _styleSpans[0];
+
+            _styleSpans = _styleSpans.Skip(1);
+
+            return new TextCharacters(_text.AsSlice(currentSpan.Start, currentSpan.Length),
+                _defaultStyle);
+        }
+    }
+}
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/MultiBufferTextSource.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/MultiBufferTextSource.cs
new file mode 100644
index 0000000000..40aa862906
--- /dev/null
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/MultiBufferTextSource.cs
@@ -0,0 +1,36 @@
+using System;
+using Avalonia.Media.TextFormatting;
+using Avalonia.Utilities;
+
+namespace Avalonia.Skia.UnitTests.Media.TextFormatting
+{
+    internal class MultiBufferTextSource : ITextSource
+    {
+        private readonly string[] _runTexts;
+        private readonly GenericTextRunProperties _defaultStyle;
+
+        public MultiBufferTextSource(GenericTextRunProperties defaultStyle)
+        {
+            _defaultStyle = defaultStyle;
+
+            _runTexts = new[] { "A123456789", "B123456789", "C123456789", "D123456789", "E123456789" };
+        }
+
+        public static TextRange TextRange => new TextRange(0, 50);
+
+        public TextRun GetTextRun(int textSourceIndex)
+        {
+            if (textSourceIndex == 50)
+            {
+                return new TextEndOfParagraph();
+            }
+
+            var index = textSourceIndex / 10;
+
+            var runText = _runTexts[index];
+
+            return new TextCharacters(
+                new ReadOnlySlice<char>(runText.AsMemory(), textSourceIndex, runText.Length), _defaultStyle);
+        }
+    }
+}
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/SingleBufferTextSource.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/SingleBufferTextSource.cs
new file mode 100644
index 0000000000..045deacd0b
--- /dev/null
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/SingleBufferTextSource.cs
@@ -0,0 +1,30 @@
+using System;
+using Avalonia.Media.TextFormatting;
+using Avalonia.Utilities;
+
+namespace Avalonia.Skia.UnitTests.Media.TextFormatting
+{
+    internal class SingleBufferTextSource : ITextSource
+    {
+        private readonly ReadOnlySlice<char> _text;
+        private readonly GenericTextRunProperties _defaultGenericPropertiesRunProperties;
+
+        public SingleBufferTextSource(string text, GenericTextRunProperties defaultProperties)
+        {
+            _text = text.AsMemory();
+            _defaultGenericPropertiesRunProperties = defaultProperties;
+        }
+
+        public TextRun GetTextRun(int textSourceIndex)
+        {
+            var runText = _text.Skip(textSourceIndex);
+
+            if (runText.IsEmpty)
+            {
+                return new TextEndOfParagraph();
+            }
+
+            return new TextCharacters(runText, _defaultGenericPropertiesRunProperties);
+        }
+    }
+}
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs
new file mode 100644
index 0000000000..7f9713930a
--- /dev/null
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs
@@ -0,0 +1,336 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Media;
+using Avalonia.Media.TextFormatting;
+using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.UnitTests;
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Skia.UnitTests.Media.TextFormatting
+{
+    public class TextFormatterTests
+    {
+        [Fact]
+        public void Should_Format_TextRuns_With_Default_Style()
+        {
+            using (Start())
+            {
+                const string text = "0123456789";
+
+                var defaultProperties =
+                    new GenericTextRunProperties(Typeface.Default, 12, foregroundBrush: Brushes.Black);
+
+                var textSource = new SingleBufferTextSource(text, defaultProperties);
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine = formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                    new GenericTextParagraphProperties(defaultProperties));
+
+                Assert.Single(textLine.TextRuns);
+
+                var textRun = textLine.TextRuns[0];
+
+                Assert.Equal(defaultProperties.Typeface, textRun.Properties.Typeface);
+
+                Assert.Equal(defaultProperties.ForegroundBrush, textRun.Properties.ForegroundBrush);
+
+                Assert.Equal(text.Length, textRun.Text.Length);
+            }
+        }
+
+        [Fact]
+        public void Should_Format_TextRuns_With_Multiple_Buffers()
+        {
+            using (Start())
+            {
+                var defaultProperties =
+                    new GenericTextRunProperties(Typeface.Default, 12, foregroundBrush: Brushes.Black);
+
+                var textSource = new MultiBufferTextSource(defaultProperties);
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine = formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                    new GenericTextParagraphProperties(defaultProperties));
+
+                Assert.Equal(5, textLine.TextRuns.Count);
+
+                Assert.Equal(50, textLine.TextRange.Length);
+            }
+        }
+
+        [Fact]
+        public void Should_Format_TextRuns_With_TextRunStyles()
+        {
+            using (Start())
+            {
+                const string text = "0123456789";
+
+                var defaultProperties =
+                    new GenericTextRunProperties(Typeface.Default, 12, foregroundBrush: Brushes.Black);
+
+                var GenericTextRunPropertiesRuns = new[]
+                {
+                    new ValueSpan<TextRunProperties>(0, 3, defaultProperties),
+                    new ValueSpan<TextRunProperties>(3, 3,
+                        new GenericTextRunProperties(Typeface.Default, 13, foregroundBrush: Brushes.Black)),
+                    new ValueSpan<TextRunProperties>(6, 3,
+                        new GenericTextRunProperties(Typeface.Default, 14, foregroundBrush: Brushes.Black)),
+                    new ValueSpan<TextRunProperties>(9, 1, defaultProperties)
+                };
+
+                var textSource = new FormattableTextSource(text, defaultProperties, GenericTextRunPropertiesRuns);
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine = formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                    new GenericTextParagraphProperties(defaultProperties));
+
+                Assert.Equal(text.Length, textLine.TextRange.Length);
+
+                for (var i = 0; i < GenericTextRunPropertiesRuns.Length; i++)
+                {
+                    var GenericTextRunPropertiesRun = GenericTextRunPropertiesRuns[i];
+
+                    var textRun = textLine.TextRuns[i];
+
+                    Assert.Equal(GenericTextRunPropertiesRun.Length, textRun.Text.Length);
+                }
+            }
+        }
+
+        [Theory]
+        [InlineData("0123", 1)]
+        [InlineData("\r\n", 1)]
+        [InlineData("👍b", 2)]
+        [InlineData("a👍b", 3)]
+        [InlineData("a👍子b", 4)]
+        public void Should_Produce_Unique_Runs(string text, int numberOfRuns)
+        {
+            using (Start())
+            {
+                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));
+
+                Assert.Equal(numberOfRuns, textLine.TextRuns.Count);
+            }
+        }
+
+        [Fact]
+        public void Should_Split_Run_On_Script()
+        {
+            using (Start())
+            {
+                const string text = "ABCDالدولي";
+
+                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));
+
+                Assert.Equal(4, textLine.TextRuns[0].Text.Length);
+            }
+        }
+
+        [InlineData("𐐷𐐷𐐷𐐷𐐷", 10, 1)]
+        [InlineData("01234 56789 01234 56789", 6, 4)]
+        [Theory]
+        public void Should_Wrap_With_Overflow(string text, int expectedCharactersPerLine, int expectedNumberOfLines)
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+
+                var textSource = new SingleBufferTextSource(text, defaultProperties);
+
+                var formatter = new TextFormatterImpl();
+
+                var numberOfLines = 0;
+
+                var currentPosition = 0;
+
+                while (currentPosition < text.Length)
+                {
+                    var textLine =
+                        formatter.FormatLine(textSource, currentPosition, 1,
+                            new GenericTextParagraphProperties(defaultProperties, textWrapping: TextWrapping.WrapWithOverflow));
+
+                    if (text.Length - currentPosition > expectedCharactersPerLine)
+                    {
+                        Assert.Equal(expectedCharactersPerLine, textLine.TextRange.Length);
+                    }
+
+                    currentPosition += textLine.TextRange.Length;
+
+                    numberOfLines++;
+                }
+
+                Assert.Equal(expectedNumberOfLines, numberOfLines);
+            }
+        }
+
+        [InlineData("Whether to turn off HTTPS. This option only applies if Individual, " +
+                    "IndividualB2C, SingleOrg, or MultiOrg aren't used for &#8209;&#8209;auth."
+            , "Noto Sans", 40)]
+        [InlineData("01234 56789 01234 56789", "Noto Mono", 7)]
+        [Theory]
+        public void Should_Wrap(string text, string familyName, int numberOfCharactersPerLine)
+        {
+            using (Start())
+            {
+                var lineBreaker = new LineBreakEnumerator(text.AsMemory());
+
+                var expected = new List<int>();
+
+                while (lineBreaker.MoveNext())
+                {
+                    expected.Add(lineBreaker.Current.PositionWrap - 1);
+                }
+
+                var typeface = new Typeface("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#" +
+                                            familyName);
+
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+
+                var textSource = new SingleBufferTextSource(text, defaultProperties);
+
+                var formatter = new TextFormatterImpl();
+
+                var glyph = typeface.GlyphTypeface.GetGlyph('a');
+
+                var advance = typeface.GlyphTypeface.GetGlyphAdvance(glyph) *
+                              (12.0 / typeface.GlyphTypeface.DesignEmHeight);
+
+                var paragraphWidth = advance * numberOfCharactersPerLine;
+
+                var currentPosition = 0;
+
+                while (currentPosition < text.Length)
+                {
+                    var textLine =
+                        formatter.FormatLine(textSource, currentPosition, paragraphWidth,
+                            new GenericTextParagraphProperties(defaultProperties, textWrapping: TextWrapping.Wrap));
+
+                    Assert.True(expected.Contains(textLine.TextRange.End));
+
+                    var index = expected.IndexOf(textLine.TextRange.End);
+
+                    for (var i = 0; i <= index; i++)
+                    {
+                        expected.RemoveAt(0);
+                    }
+
+                    currentPosition += textLine.TextRange.Length;
+                }
+            }
+        }
+
+        [Fact]
+        public void Should_Produce_Fixed_Height_Lines()
+        {
+            using (Start())
+            {
+                const string text = "012345";
+
+                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, lineHeight: 50));
+
+                Assert.Equal(50, textLine.LineMetrics.Size.Height);
+            }
+        }
+
+        [Fact]
+        public void Should_Not_Produce_TextLine_Wider_Than_ParagraphWidth()
+        {
+            using (Start())
+            {
+                const string text =
+                    "Multiline TextBlock with TextWrapping.\r\rLorem 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.";
+
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+
+                var paragraphProperties = new GenericTextParagraphProperties(defaultProperties, textWrapping: TextWrapping.Wrap);
+
+                var textSource = new SingleBufferTextSource(text, defaultProperties);
+
+                var formatter = new TextFormatterImpl();
+
+                var textSourceIndex = 0;
+
+                while (textSourceIndex < text.Length)
+                {
+                    var textLine =
+                        formatter.FormatLine(textSource, textSourceIndex, 200, paragraphProperties);
+
+                    Assert.True(textLine.LineMetrics.Size.Width <= 200);
+
+                    textSourceIndex += textLine.TextRange.Length;
+                }
+            }
+        }
+
+        [Fact]
+        public void Wrap_Should_Not_Produce_Empty_Lines()
+        {
+            using (Start())
+            {
+                const string text = "012345";
+
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var paragraphProperties = new GenericTextParagraphProperties(defaultProperties, textWrapping: TextWrapping.Wrap);
+                var textSource = new SingleBufferTextSource(text, defaultProperties);
+                var formatter = new TextFormatterImpl();
+
+                var textSourceIndex = 0;
+
+                while (textSourceIndex < text.Length)
+                {
+                    var textLine =
+                        formatter.FormatLine(textSource, textSourceIndex, 3, paragraphProperties);
+
+                    Assert.NotEqual(0, textLine.TextRange.Length);
+
+                    textSourceIndex += textLine.TextRange.Length;
+                }
+
+                Assert.Equal(text.Length, textSourceIndex);
+            }
+        }
+
+        public static IDisposable Start()
+        {
+            var disposable = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
+                .With(renderInterface: new PlatformRenderInterface(null),
+                    textShaperImpl: new TextShaperImpl()));
+
+            AvaloniaLocator.CurrentMutable
+                .Bind<FontManager>().ToConstant(new FontManager(new CustomFontManagerImpl()));
+
+            return disposable;
+        }
+    }
+}
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
new file mode 100644
index 0000000000..f7bc75c05d
--- /dev/null
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
@@ -0,0 +1,626 @@
+using System;
+using System.Linq;
+using Avalonia.Media;
+using Avalonia.Media.TextFormatting;
+using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.UnitTests;
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Skia.UnitTests.Media.TextFormatting
+{
+    public class TextLayoutTests
+    {
+        private static readonly string s_singleLineText = "0123456789";
+        private static readonly string s_multiLineText = "012345678\r\r0123456789";
+
+        [InlineData("01234\r01234\r", 3)]
+        [InlineData("01234\r01234", 2)]
+        [Theory]
+        public void Should_Break_Lines(string text, int numberOfLines)
+        {
+            using (Start())
+            {
+                var layout = new TextLayout(
+                    text,
+                    Typeface.Default,
+                    12.0f,
+                    Brushes.Black);
+
+                Assert.Equal(numberOfLines, layout.TextLines.Count);
+            }
+        }
+
+        [Fact]
+        public void Should_Apply_TextStyleSpan_To_Text_In_Between()
+        {
+            using (Start())
+            {
+                var foreground = new SolidColorBrush(Colors.Red).ToImmutable();
+
+                var spans = new[]
+                {
+                    new ValueSpan<TextRunProperties>(1, 2,
+                        new GenericTextRunProperties(Typeface.Default, 12, foregroundBrush: foreground))
+                };
+
+                var layout = new TextLayout(
+                    s_multiLineText,
+                    Typeface.Default,
+                    12.0f,
+                    Brushes.Black.ToImmutable(),
+                    textStyleOverrides: spans);
+
+                var textLine = layout.TextLines[0];
+
+                Assert.Equal(3, textLine.TextRuns.Count);
+
+                var textRun = textLine.TextRuns[1];
+
+                Assert.Equal(2, textRun.Text.Length);
+
+                var actual = textRun.Text.Buffer.Span.ToString();
+
+                Assert.Equal("12", actual);
+
+                Assert.Equal(foreground, textRun.Properties.ForegroundBrush);
+            }
+        }
+
+        [Fact]
+        public void Should_Not_Alter_Lines_After_TextStyleSpan_Was_Applied()
+        {
+            using (Start())
+            {
+                var foreground = new SolidColorBrush(Colors.Red).ToImmutable();
+
+                for (var i = 4; i < s_multiLineText.Length; i++)
+                {
+                    var spans = new[]
+                    {
+                        new ValueSpan<TextRunProperties>(0, i,
+                            new GenericTextRunProperties(Typeface.Default, 12, foregroundBrush: foreground))
+                    };
+
+                    var expected = new TextLayout(
+                        s_multiLineText,
+                        Typeface.Default,
+                        12.0f,
+                        Brushes.Black.ToImmutable(),
+                        textWrapping: TextWrapping.Wrap,
+                        maxWidth: 25);
+
+                    var actual = new TextLayout(
+                        s_multiLineText,
+                        Typeface.Default,
+                        12.0f,
+                        Brushes.Black.ToImmutable(),
+                        textWrapping: TextWrapping.Wrap,
+                        maxWidth: 25,
+                        textStyleOverrides: spans);
+
+                    Assert.Equal(expected.TextLines.Count, actual.TextLines.Count);
+
+                    for (var j = 0; j < actual.TextLines.Count; j++)
+                    {
+                        Assert.Equal(expected.TextLines[j].TextRange.Length, actual.TextLines[j].TextRange.Length);
+
+                        Assert.Equal(expected.TextLines[j].TextRuns.Sum(x => x.Text.Length),
+                            actual.TextLines[j].TextRuns.Sum(x => x.Text.Length));
+                    }
+                }
+            }
+        }
+
+        [Fact]
+        public void Should_Apply_TextStyleSpan_To_Text_At_Start()
+        {
+            using (Start())
+            {
+                var foreground = new SolidColorBrush(Colors.Red).ToImmutable();
+
+                var spans = new[]
+                {
+                    new ValueSpan<TextRunProperties>(0, 2,
+                        new GenericTextRunProperties(Typeface.Default, 12, foregroundBrush: foreground))
+                };
+
+                var layout = new TextLayout(
+                    s_singleLineText,
+                    Typeface.Default,
+                    12.0f,
+                    Brushes.Black.ToImmutable(),
+                    textStyleOverrides: spans);
+
+                var textLine = layout.TextLines[0];
+
+                Assert.Equal(2, textLine.TextRuns.Count);
+
+                var textRun = textLine.TextRuns[0];
+
+                Assert.Equal(2, textRun.Text.Length);
+
+                var actual = s_singleLineText.Substring(textRun.Text.Start,
+                    textRun.Text.Length);
+
+                Assert.Equal("01", actual);
+
+                Assert.Equal(foreground, textRun.Properties.ForegroundBrush);
+            }
+        }
+
+        [Fact]
+        public void Should_Apply_TextStyleSpan_To_Text_At_End()
+        {
+            using (Start())
+            {
+                var foreground = new SolidColorBrush(Colors.Red).ToImmutable();
+
+                var spans = new[]
+                {
+                    new ValueSpan<TextRunProperties>(8, 2,
+                        new GenericTextRunProperties(Typeface.Default, 12, foregroundBrush: foreground)),
+                };
+
+                var layout = new TextLayout(
+                    s_singleLineText,
+                    Typeface.Default,
+                    12.0f,
+                    Brushes.Black.ToImmutable(),
+                    textStyleOverrides: spans);
+
+                var textLine = layout.TextLines[0];
+
+                Assert.Equal(2, textLine.TextRuns.Count);
+
+                var textRun = textLine.TextRuns[1];
+
+                Assert.Equal(2, textRun.Text.Length);
+
+                var actual = textRun.Text.Buffer.Span.ToString();
+
+                Assert.Equal("89", actual);
+
+                Assert.Equal(foreground, textRun.Properties.ForegroundBrush);
+            }
+        }
+
+        [Fact]
+        public void Should_Apply_TextStyleSpan_To_Single_Character()
+        {
+            using (Start())
+            {
+                var foreground = new SolidColorBrush(Colors.Red).ToImmutable();
+
+                var spans = new[]
+                {
+                    new ValueSpan<TextRunProperties>(0, 1,
+                        new GenericTextRunProperties(Typeface.Default, 12, foregroundBrush: foreground))
+                };
+
+                var layout = new TextLayout(
+                    "0",
+                    Typeface.Default,
+                    12.0f,
+                    Brushes.Black.ToImmutable(),
+                    textStyleOverrides: spans);
+
+                var textLine = layout.TextLines[0];
+
+                Assert.Equal(1, textLine.TextRuns.Count);
+
+                var textRun = textLine.TextRuns[0];
+
+                Assert.Equal(1, textRun.Text.Length);
+
+                Assert.Equal(foreground, textRun.Properties.ForegroundBrush);
+            }
+        }
+
+        [Fact]
+        public void Should_Apply_TextSpan_To_Unicode_String_In_Between()
+        {
+            using (Start())
+            {
+                const string text = "😄😄😄😄";
+
+                var foreground = new SolidColorBrush(Colors.Red).ToImmutable();
+
+                var spans = new[]
+                {
+                    new ValueSpan<TextRunProperties>(2, 2,
+                        new GenericTextRunProperties(Typeface.Default, 12, foregroundBrush: foreground))
+                };
+
+                var layout = new TextLayout(
+                    text,
+                    Typeface.Default,
+                    12.0f,
+                    Brushes.Black.ToImmutable(),
+                    textStyleOverrides: spans);
+
+                var textLine = layout.TextLines[0];
+
+                Assert.Equal(3, textLine.TextRuns.Count);
+
+                var textRun = textLine.TextRuns[1];
+
+                Assert.Equal(2, textRun.Text.Length);
+
+                var actual = textRun.Text.Buffer.Span.ToString();
+
+                Assert.Equal("😄", actual);
+
+                Assert.Equal(foreground, textRun.Properties.ForegroundBrush);
+            }
+        }
+
+        [Fact]
+        public void TextLength_Should_Be_Equal_To_TextLine_Length_Sum()
+        {
+            using (Start())
+            {
+                var layout = new TextLayout(
+                    s_multiLineText,
+                    Typeface.Default,
+                    12.0f,
+                    Brushes.Black.ToImmutable());
+
+                Assert.Equal(s_multiLineText.Length, layout.TextLines.Sum(x => x.TextRange.Length));
+            }
+        }
+
+        [Fact]
+        public void TextLength_Should_Be_Equal_To_TextRun_TextLength_Sum()
+        {
+            using (Start())
+            {
+                var layout = new TextLayout(
+                    s_multiLineText,
+                    Typeface.Default,
+                    12.0f,
+                    Brushes.Black.ToImmutable());
+
+                Assert.Equal(
+                    s_multiLineText.Length,
+                    layout.TextLines.Select(textLine =>
+                            textLine.TextRuns.Sum(textRun => textRun.Text.Length))
+                        .Sum());
+            }
+        }
+
+        [Fact]
+        public void TextLength_Should_Be_Equal_To_TextRun_TextLength_Sum_After_Wrap_With_Style_Applied()
+        {
+            using (Start())
+            {
+                const string text =
+                    "Multiline TextBox with TextWrapping.\r\rLorem 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.";
+
+                var foreground = new SolidColorBrush(Colors.Red).ToImmutable();
+
+                var spans = new[]
+                {
+                    new ValueSpan<TextRunProperties>(0, 24,
+                        new GenericTextRunProperties(Typeface.Default, 12, foregroundBrush: foreground))
+                };
+
+                var layout = new TextLayout(
+                    text,
+                    Typeface.Default,
+                    12.0f,
+                    Brushes.Black.ToImmutable(),
+                    textWrapping: TextWrapping.Wrap,
+                    maxWidth: 180,
+                    textStyleOverrides: spans);
+
+                Assert.Equal(
+                    text.Length,
+                    layout.TextLines.Select(textLine =>
+                            textLine.TextRuns.Sum(textRun => textRun.Text.Length))
+                        .Sum());
+            }
+        }
+
+        [Fact]
+        public void Should_Apply_TextStyleSpan_To_MultiLine()
+        {
+            using (Start())
+            {
+                var foreground = new SolidColorBrush(Colors.Red).ToImmutable();
+
+                var spans = new[]
+                {
+                    new ValueSpan<TextRunProperties>(5, 20,
+                        new GenericTextRunProperties(Typeface.Default, 12, foregroundBrush: foreground))
+                };
+
+                var layout = new TextLayout(
+                    s_multiLineText,
+                    Typeface.Default,
+                    12.0f,
+                    Brushes.Black.ToImmutable(),
+                    maxWidth: 200,
+                    maxHeight: 125,
+                    textStyleOverrides: spans);
+
+                Assert.Equal(foreground, layout.TextLines[0].TextRuns[1].Properties.ForegroundBrush);
+                Assert.Equal(foreground, layout.TextLines[1].TextRuns[0].Properties.ForegroundBrush);
+                Assert.Equal(foreground, layout.TextLines[2].TextRuns[0].Properties.ForegroundBrush);
+            }
+        }
+
+        [Fact]
+        public void Should_Hit_Test_SurrogatePair()
+        {
+            using (Start())
+            {
+                const string text = "😄😄";
+
+                var layout = new TextLayout(
+                    text,
+                    Typeface.Default,
+                    12.0f,
+                    Brushes.Black.ToImmutable());
+
+                var shapedRun = (ShapedTextCharacters)layout.TextLines[0].TextRuns[0];
+
+                var glyphRun = shapedRun.GlyphRun;
+
+                var width = glyphRun.Size.Width;
+
+                var characterHit = glyphRun.GetCharacterHitFromDistance(width, out _);
+
+                Assert.Equal(2, characterHit.FirstCharacterIndex);
+
+                Assert.Equal(2, characterHit.TrailingLength);
+            }
+        }
+
+
+        [Theory]
+        [InlineData("☝🏿", new ushort[] { 0 })]
+        [InlineData("☝🏿 ab", new ushort[] { 0, 3, 4, 5 })]
+        [InlineData("ab ☝🏿", new ushort[] { 0, 1, 2, 3 })]
+        public void Should_Create_Valid_Clusters_For_Text(string text, ushort[] clusters)
+        {
+            using (Start())
+            {
+                var layout = new TextLayout(
+                    text,
+                    Typeface.Default,
+                    12.0f,
+                    Brushes.Black.ToImmutable());
+
+                var textLine = layout.TextLines[0];
+
+                var index = 0;
+
+                foreach (var textRun in textLine.TextRuns)
+                {
+                    var shapedRun = (ShapedTextCharacters)textRun;
+
+                    var glyphRun = shapedRun.GlyphRun;
+
+                    var glyphClusters = glyphRun.GlyphClusters;
+
+                    var expected = clusters.Skip(index).Take(glyphClusters.Length).ToArray();
+
+                    Assert.Equal(expected, glyphRun.GlyphClusters);
+
+                    index += glyphClusters.Length;
+                }
+            }
+        }
+
+        [Theory]
+        [InlineData("abcde\r\n", 7)] // Carriage Return + Line Feed
+        [InlineData("abcde\u000A", 6)] // Line Feed
+        [InlineData("abcde\u000B", 6)] // Vertical Tab
+        [InlineData("abcde\u000C", 6)] // Form Feed
+        [InlineData("abcde\u000D", 6)] // Carriage Return
+        public void Should_Break_With_BreakChar(string text, int expectedLength)
+        {
+            using (Start())
+            {
+                var layout = new TextLayout(
+                    text,
+                    Typeface.Default,
+                    12.0f,
+                    Brushes.Black.ToImmutable());
+
+                Assert.Equal(2, layout.TextLines.Count);
+
+                Assert.Equal(1, layout.TextLines[0].TextRuns.Count);
+
+                Assert.Equal(expectedLength, ((ShapedTextCharacters)layout.TextLines[0].TextRuns[0]).GlyphRun.GlyphClusters.Length);
+
+                Assert.Equal(5, ((ShapedTextCharacters)layout.TextLines[0].TextRuns[0]).GlyphRun.GlyphClusters[5]);
+
+                if (expectedLength == 7)
+                {
+                    Assert.Equal(5, ((ShapedTextCharacters)layout.TextLines[0].TextRuns[0]).GlyphRun.GlyphClusters[6]);
+                }
+            }
+        }
+
+        [Fact]
+        public void Should_Have_One_Run_With_Common_Script()
+        {
+            using (Start())
+            {
+                var layout = new TextLayout(
+                    "abcde\r\n",
+                    Typeface.Default,
+                    12.0f,
+                    Brushes.Black.ToImmutable());
+
+                Assert.Equal(1, layout.TextLines[0].TextRuns.Count);
+            }
+        }
+
+        [Fact]
+        public void Should_Layout_Corrupted_Text()
+        {
+            using (Start())
+            {
+                var text = new string(new[] { '\uD802', '\uD802', '\uD802', '\uD802', '\uD802', '\uD802', '\uD802' });
+
+                var layout = new TextLayout(
+                    text,
+                    Typeface.Default,
+                    12,
+                    Brushes.Black.ToImmutable());
+
+                var textLine = layout.TextLines[0];
+
+                var textRun = (ShapedTextCharacters)textLine.TextRuns[0];
+
+                Assert.Equal(7, textRun.Text.Length);
+
+                var replacementGlyph = Typeface.Default.GlyphTypeface.GetGlyph(Codepoint.ReplacementCodepoint);
+
+                foreach (var glyph in textRun.GlyphRun.GlyphIndices)
+                {
+                    Assert.Equal(replacementGlyph, glyph);
+                }
+            }
+        }
+
+        [InlineData("0123456789\r0123456789")]
+        [InlineData("0123456789")]
+        [Theory]
+        public void Should_Include_First_Line_When_Constraint_Is_Surpassed(string text)
+        {
+            using (Start())
+            {
+                var glyphTypeface = Typeface.Default.GlyphTypeface;
+
+                var emHeight = glyphTypeface.DesignEmHeight;
+
+                var lineHeight = (glyphTypeface.Descent - glyphTypeface.Ascent) * (12.0 / emHeight);
+
+                var layout = new TextLayout(
+                    text,
+                    Typeface.Default,
+                    12,
+                    Brushes.Black.ToImmutable(),
+                    maxHeight: lineHeight - lineHeight * 0.5);
+
+                Assert.Equal(1, layout.TextLines.Count);
+
+                Assert.Equal(lineHeight, layout.Size.Height);
+            }
+        }
+
+        [InlineData("0123456789\r\n0123456789\r\n0123456789", 0, 3)]
+        [InlineData("0123456789\r\n0123456789\r\n0123456789", 1, 1)]
+        [InlineData("0123456789\r\n0123456789\r\n0123456789", 4, 3)]
+        [Theory]
+        public void Should_Not_Exceed_MaxLines(string text, int maxLines, int expectedLines)
+        {
+            using (Start())
+            {
+                var layout = new TextLayout(
+                    text,
+                    Typeface.Default,
+                    12,
+                    Brushes.Black,
+                    maxWidth: 50,
+                    maxLines: maxLines);
+
+                Assert.Equal(expectedLines, layout.TextLines.Count);
+            }
+        }
+
+        [Fact]
+        public void Should_Produce_Fixed_Height_Lines()
+        {
+            using (Start())
+            {
+                var layout = new TextLayout(
+                    s_multiLineText,
+                    Typeface.Default,
+                    12,
+                    Brushes.Black,
+                    lineHeight: 50);
+
+                foreach (var line in layout.TextLines)
+                {
+                    Assert.Equal(50, line.LineMetrics.Size.Height);
+                }
+            }
+        }
+
+        private const string Text = "日本でTest一番読まれている英字新聞・ジャパンタイムズが発信する国内外ニュースと、様々なジャンルの特集記事。";
+
+        [Fact(Skip = "Only used for profiling.")]
+        public void Should_Wrap()
+        {
+            using (Start())
+            {
+                for (var i = 0; i < 2000; i++)
+                {
+                    var layout = new TextLayout(
+                        Text,
+                        Typeface.Default,
+                        12,
+                        Brushes.Black,
+                        textWrapping: TextWrapping.Wrap,
+                        maxWidth: 50);
+                }
+            }
+        }
+
+        [Fact]
+        public void Should_Process_Multiple_NewLines_Properly()
+        {
+            using (Start())
+            {
+                var text = "123\r\n\r\n456\r\n\r\n";
+                var layout = new TextLayout(
+                    text,
+                    Typeface.Default,
+                    12.0f,
+                    Brushes.Black);
+
+                Assert.Equal(5, layout.TextLines.Count);
+
+                Assert.Equal("123\r\n", layout.TextLines[0].TextRuns[0].Text);
+                Assert.Equal("\r\n", layout.TextLines[1].TextRuns[0].Text);
+                Assert.Equal("456\r\n", layout.TextLines[2].TextRuns[0].Text);
+                Assert.Equal("\r\n", layout.TextLines[3].TextRuns[0].Text);
+            }
+        }
+
+        [Fact]
+        public void Should_Wrap_Min_OneCharacter_EveryLine()
+        {
+            using (Start())
+            {
+                var layout = new TextLayout(
+                    s_singleLineText,
+                    Typeface.Default,
+                    12,
+                    Brushes.Black,
+                    textWrapping: TextWrapping.Wrap,
+                    maxWidth: 3);
+
+                //every character should be new line as there not enough space for even one character
+                Assert.Equal(s_singleLineText.Length, layout.TextLines.Count);
+            }
+        }
+
+        private static IDisposable Start()
+        {
+            var disposable = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
+                .With(renderInterface: new PlatformRenderInterface(null),
+                    textShaperImpl: new TextShaperImpl(),
+                    fontManagerImpl: new CustomFontManagerImpl()));
+
+            return disposable;
+        }
+    }
+}
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs
new file mode 100644
index 0000000000..8f1bd5979a
--- /dev/null
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs
@@ -0,0 +1,370 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Avalonia.Media;
+using Avalonia.Media.TextFormatting;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Skia.UnitTests.Media.TextFormatting
+{
+    public class TextLineTests
+    {
+        private static readonly string s_multiLineText = "012345678\r\r0123456789";
+
+        [Fact]
+        public void Should_Get_First_CharacterHit()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+
+                var textSource = new SingleBufferTextSource(s_multiLineText, defaultProperties);
+
+                var formatter = new TextFormatterImpl();
+
+                var currentIndex = 0;
+
+                while (currentIndex < s_multiLineText.Length)
+                {
+                    var textLine =
+                        formatter.FormatLine(textSource, currentIndex, double.PositiveInfinity,
+                            new GenericTextParagraphProperties(defaultProperties));
+
+                    var firstCharacterHit = textLine.GetPreviousCaretCharacterHit(new CharacterHit(int.MinValue));
+
+                    Assert.Equal(textLine.TextRange.Start, firstCharacterHit.FirstCharacterIndex);
+
+                    currentIndex += textLine.TextRange.Length;
+                }
+            }
+        }
+
+        [Fact]
+        public void Should_Get_Last_CharacterHit()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+
+                var textSource = new SingleBufferTextSource(s_multiLineText, defaultProperties);
+
+                var formatter = new TextFormatterImpl();
+
+                var currentIndex = 0;
+
+                while (currentIndex < s_multiLineText.Length)
+                {
+                    var textLine =
+                        formatter.FormatLine(textSource, currentIndex, double.PositiveInfinity,
+                            new GenericTextParagraphProperties(defaultProperties));
+
+                    var lastCharacterHit = textLine.GetNextCaretCharacterHit(new CharacterHit(int.MaxValue));
+
+                    Assert.Equal(textLine.TextRange.Start + textLine.TextRange.Length,
+                        lastCharacterHit.FirstCharacterIndex + lastCharacterHit.TrailingLength);
+
+                    currentIndex += textLine.TextRange.Length;
+                }
+            }
+        }
+
+        [InlineData("𐐷𐐷𐐷𐐷𐐷")]
+        [InlineData("𐐷1234")]
+        [Theory]
+        public void Should_Get_Next_Caret_CharacterHit(string text)
+        {
+            using (Start())
+            {
+                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));
+
+                var clusters = textLine.TextRuns.Cast<ShapedTextCharacters>().SelectMany(x => x.GlyphRun.GlyphClusters)
+                    .ToArray();
+
+                var nextCharacterHit = new CharacterHit(0);
+
+                for (var i = 0; i < clusters.Length; i++)
+                {
+                    Assert.Equal(clusters[i], nextCharacterHit.FirstCharacterIndex);
+
+                    nextCharacterHit = textLine.GetNextCaretCharacterHit(nextCharacterHit);
+                }
+
+                var lastCharacterHit = nextCharacterHit;
+
+                nextCharacterHit = textLine.GetNextCaretCharacterHit(lastCharacterHit);
+
+                Assert.Equal(lastCharacterHit.FirstCharacterIndex, nextCharacterHit.FirstCharacterIndex);
+
+                Assert.Equal(lastCharacterHit.TrailingLength, nextCharacterHit.TrailingLength);
+
+                nextCharacterHit = new CharacterHit(0, clusters[1] - clusters[0]);
+
+                for (var i = 0; i < clusters.Length; i++)
+                {
+                    Assert.Equal(clusters[i], nextCharacterHit.FirstCharacterIndex);
+
+                    nextCharacterHit = textLine.GetNextCaretCharacterHit(nextCharacterHit);
+                }
+
+                lastCharacterHit = nextCharacterHit;
+
+                nextCharacterHit = textLine.GetNextCaretCharacterHit(lastCharacterHit);
+
+                Assert.Equal(lastCharacterHit.FirstCharacterIndex, nextCharacterHit.FirstCharacterIndex);
+
+                Assert.Equal(lastCharacterHit.TrailingLength, nextCharacterHit.TrailingLength);
+            }
+        }
+
+        [InlineData("𐐷𐐷𐐷𐐷𐐷")]
+        [InlineData("𐐷1234")]
+        [Theory]
+        public void Should_Get_Previous_Caret_CharacterHit(string text)
+        {
+            using (Start())
+            {
+                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));
+
+                var clusters = textLine.TextRuns.Cast<ShapedTextCharacters>().SelectMany(x => x.GlyphRun.GlyphClusters)
+                    .ToArray();
+
+                var previousCharacterHit = new CharacterHit(text.Length);
+
+                for (var i = clusters.Length - 1; i >= 0; i--)
+                {
+                    previousCharacterHit = textLine.GetPreviousCaretCharacterHit(previousCharacterHit);
+
+                    Assert.Equal(clusters[i],
+                        previousCharacterHit.FirstCharacterIndex + previousCharacterHit.TrailingLength);
+                }
+
+                var firstCharacterHit = previousCharacterHit;
+
+                previousCharacterHit = textLine.GetPreviousCaretCharacterHit(firstCharacterHit);
+
+                Assert.Equal(firstCharacterHit.FirstCharacterIndex, previousCharacterHit.FirstCharacterIndex);
+
+                Assert.Equal(0, previousCharacterHit.TrailingLength);
+
+                previousCharacterHit = new CharacterHit(clusters[^1], text.Length - clusters[^1]);
+
+                for (var i = clusters.Length - 1; i > 0; i--)
+                {
+                    previousCharacterHit = textLine.GetPreviousCaretCharacterHit(previousCharacterHit);
+
+                    Assert.Equal(clusters[i],
+                        previousCharacterHit.FirstCharacterIndex + previousCharacterHit.TrailingLength);
+                }
+
+                firstCharacterHit = previousCharacterHit;
+
+                previousCharacterHit = textLine.GetPreviousCaretCharacterHit(firstCharacterHit);
+
+                Assert.Equal(firstCharacterHit.FirstCharacterIndex, previousCharacterHit.FirstCharacterIndex);
+
+                Assert.Equal(0, previousCharacterHit.TrailingLength);
+            }
+        }
+
+        [Fact]
+        public void Should_Get_Distance_From_CharacterHit()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+
+                var textSource = new MultiBufferTextSource(defaultProperties);
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                        new GenericTextParagraphProperties(defaultProperties));
+
+                var currentDistance = 0.0;
+
+                foreach (var run in textLine.TextRuns)
+                {
+                    var textRun = (ShapedTextCharacters)run;
+
+                    var glyphRun = textRun.GlyphRun;
+
+                    for (var i = 0; i < glyphRun.GlyphClusters.Length; i++)
+                    {
+                        var cluster = glyphRun.GlyphClusters[i];
+
+                        var glyph = glyphRun.GlyphIndices[i];
+
+                        var advance = glyphRun.GlyphTypeface.GetGlyphAdvance(glyph) * glyphRun.Scale;
+
+                        var distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(cluster));
+
+                        Assert.Equal(currentDistance, distance);
+
+                        currentDistance += advance;
+                    }
+                }
+
+                Assert.Equal(currentDistance,
+                    textLine.GetDistanceFromCharacterHit(new CharacterHit(MultiBufferTextSource.TextRange.Length)));
+            }
+        }
+
+        [Fact]
+        public void Should_Get_CharacterHit_From_Distance()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+
+                var textSource = new MultiBufferTextSource(defaultProperties);
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                        new GenericTextParagraphProperties(defaultProperties));
+
+                var currentDistance = 0.0;
+
+                CharacterHit characterHit;
+
+                foreach (var run in textLine.TextRuns)
+                {
+                    var textRun = (ShapedTextCharacters)run;
+
+                    var glyphRun = textRun.GlyphRun;
+
+                    for (var i = 0; i < glyphRun.GlyphClusters.Length; i++)
+                    {
+                        var cluster = glyphRun.GlyphClusters[i];
+
+                        var glyph = glyphRun.GlyphIndices[i];
+
+                        var advance = glyphRun.GlyphTypeface.GetGlyphAdvance(glyph) * glyphRun.Scale;
+
+                        characterHit = textLine.GetCharacterHitFromDistance(currentDistance);
+
+                        Assert.Equal(cluster, characterHit.FirstCharacterIndex + characterHit.TrailingLength);
+
+                        currentDistance += advance;
+                    }
+                }
+
+                characterHit = textLine.GetCharacterHitFromDistance(textLine.LineMetrics.Size.Width);
+
+                Assert.Equal(MultiBufferTextSource.TextRange.End, characterHit.FirstCharacterIndex);
+            }
+        }
+
+        [InlineData("01234 01234", 8, TextCollapsingStyle.TrailingCharacter, "01234 0\u2026")]
+        [InlineData("01234 01234", 8, TextCollapsingStyle.TrailingWord, "01234 \u2026")]
+        [Theory]
+        public void Should_Collapse_Line(string text, int numberOfCharacters, TextCollapsingStyle style, string expected)
+        {
+            using (Start())
+            {
+                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));
+
+                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);
+                }
+
+                var collapsedLine = textLine.Collapse(collapsingProperties);
+
+                Assert.True(collapsedLine.HasCollapsed);
+
+                var trimmedText = collapsedLine.TextRuns.SelectMany(x => x.Text).ToArray();
+
+                Assert.Equal(expected.Length, trimmedText.Length);
+
+                for (var i = 0; i < expected.Length; i++)
+                {
+                    Assert.Equal(expected[i], trimmedText[i]);
+                }
+            }
+        }
+
+        [Fact]
+        public void Should_Ignore_Invisible_Characters()
+        {
+            using (Start())
+            {
+                var defaultTextRunProperties =
+                    new GenericTextRunProperties(Typeface.Default);
+
+                const string text = "01234567🎉\n";
+
+                var source = new SingleBufferTextSource(text, defaultTextRunProperties);
+
+                var textParagraphProperties = new GenericTextParagraphProperties(defaultTextRunProperties);
+
+                var formatter = TextFormatter.Current;
+
+                var textLine = formatter.FormatLine(source, 0, double.PositiveInfinity, textParagraphProperties);
+
+                var nextCharacterHit = textLine.GetNextCaretCharacterHit(new CharacterHit(8, 2));
+
+                Assert.Equal(new CharacterHit(8, 2), nextCharacterHit);
+            }
+        }
+
+        private static IDisposable Start()
+        {
+            var disposable = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
+                .With(renderInterface: new PlatformRenderInterface(null),
+                    textShaperImpl: new TextShaperImpl(),
+                    fontManagerImpl: new CustomFontManagerImpl()));
+
+            return disposable;
+        }
+    }
+}
diff --git a/tests/Avalonia.Skia.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Skia.UnitTests/Properties/AssemblyInfo.cs
index a462e5b079..a0b39114d6 100644
--- a/tests/Avalonia.Skia.UnitTests/Properties/AssemblyInfo.cs
+++ b/tests/Avalonia.Skia.UnitTests/Properties/AssemblyInfo.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reflection;
 using Xunit;
 
diff --git a/tests/Avalonia.Styling.UnitTests/ActivatedObservableTests.cs b/tests/Avalonia.Styling.UnitTests/ActivatedObservableTests.cs
deleted file mode 100644
index 7773d4767a..0000000000
--- a/tests/Avalonia.Styling.UnitTests/ActivatedObservableTests.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Collections.Generic;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class ActivatedObservableTests
-    {
-        [Fact]
-        public void Should_Produce_Correct_Values()
-        {
-            var activator = new BehaviorSubject<bool>(false);
-            var source = new BehaviorSubject<object>(1);
-            var target = new ActivatedObservable(activator, source, string.Empty);
-            var result = new List<object>();
-
-            target.Subscribe(x => result.Add(x));
-
-            activator.OnNext(true);
-            source.OnNext(2);
-            activator.OnNext(false);
-            source.OnNext(3);
-            activator.OnNext(true);
-
-            Assert.Equal(
-                new[] 
-                {
-                    AvaloniaProperty.UnsetValue,
-                    1,
-                    2,
-                    AvaloniaProperty.UnsetValue,
-                    3,
-                }, 
-                result);
-        }
-
-        [Fact]
-        public void Should_Complete_When_Source_Completes()
-        {
-            var activator = new BehaviorSubject<bool>(false);
-            var source = new BehaviorSubject<object>(1);
-            var target = new ActivatedObservable(activator, source, string.Empty);
-            var completed = false;
-
-            target.Subscribe(_ => { }, () => completed = true);
-            source.OnCompleted();
-
-            Assert.True(completed);
-        }
-
-        [Fact]
-        public void Should_Error_When_Source_Errors()
-        {
-            var activator = new BehaviorSubject<bool>(false);
-            var source = new BehaviorSubject<object>(1);
-            var target = new ActivatedObservable(activator, source, string.Empty);
-            var error = new Exception();
-            var completed = false;
-
-            target.Subscribe(_ => { }, x => completed = true);
-            source.OnError(error);
-
-            Assert.True(completed);
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/ActivatedSubjectTests.cs b/tests/Avalonia.Styling.UnitTests/ActivatedSubjectTests.cs
deleted file mode 100644
index 03f91d97a1..0000000000
--- a/tests/Avalonia.Styling.UnitTests/ActivatedSubjectTests.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Reactive.Disposables;
-using System.Reactive.Subjects;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class ActivatedSubjectTests
-    {
-        [Fact]
-        public void Should_Set_Values()
-        {
-            var activator = new BehaviorSubject<bool>(false);
-            var source = new TestSubject();
-            var target = new ActivatedSubject(activator, source, string.Empty);
-
-            target.Subscribe();
-            target.OnNext("bar");
-            Assert.Equal(AvaloniaProperty.UnsetValue, source.Value);
-            activator.OnNext(true);
-            target.OnNext("baz");
-            Assert.Equal("baz", source.Value);
-            activator.OnNext(false);
-            Assert.Equal(AvaloniaProperty.UnsetValue, source.Value);
-            target.OnNext("bax");
-            activator.OnNext(true);
-            Assert.Equal("bax", source.Value);
-        }
-
-        [Fact]
-        public void Should_Invoke_OnCompleted_On_Activator_Completed()
-        {
-            var activator = new BehaviorSubject<bool>(false);
-            var source = new TestSubject();
-            var target = new ActivatedSubject(activator, source, string.Empty);
-
-            target.Subscribe();
-            activator.OnCompleted();
-
-            Assert.True(source.Completed);
-        }
-
-        [Fact]
-        public void Should_Invoke_OnError_On_Activator_Error()
-        {
-            var activator = new BehaviorSubject<bool>(false);
-            var source = new TestSubject();
-            var target = new ActivatedSubject(activator, source, string.Empty);
-            var targetError = default(Exception);
-            var error = new Exception();
-
-            target.Subscribe(_ => { }, e => targetError = e);
-            activator.OnError(error);
-
-            Assert.Same(error, source.Error);
-            Assert.Same(error, targetError);
-        }
-
-        private class TestSubject : ISubject<object>
-        {
-            private IObserver<object> _observer;
-
-            public bool Completed { get; set; }
-            public Exception Error { get; set; }
-            public object Value { get; set; } = AvaloniaProperty.UnsetValue;
-
-            public void OnCompleted()
-            {
-                Completed = true;
-            }
-
-            public void OnError(Exception error)
-            {
-                Error = error;
-            }
-
-            public void OnNext(object value)
-            {
-                Value = value;
-            }
-
-            public IDisposable Subscribe(IObserver<object> observer)
-            {
-                _observer = observer;
-                return Disposable.Empty;
-            }
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/ActivatedValueTests.cs b/tests/Avalonia.Styling.UnitTests/ActivatedValueTests.cs
deleted file mode 100644
index 92a7c1bd1f..0000000000
--- a/tests/Avalonia.Styling.UnitTests/ActivatedValueTests.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Collections.Generic;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using Microsoft.Reactive.Testing;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class ActivatedValueTests
-    {
-        [Fact]
-        public void Should_Produce_Correct_Values()
-        {
-            var activator = new BehaviorSubject<bool>(false);
-            var target = new ActivatedValue(activator, 1, string.Empty);
-            var result = new List<object>();
-
-            target.Subscribe(x => result.Add(x));
-
-            activator.OnNext(true);
-            activator.OnNext(false);
-
-            Assert.Equal(new[] { AvaloniaProperty.UnsetValue, 1, AvaloniaProperty.UnsetValue }, result);
-        }
-
-        [Fact]
-        public void Should_Complete_When_Activator_Completes()
-        {
-            var activator = new BehaviorSubject<bool>(false);
-            var target = new ActivatedValue(activator, 1, string.Empty);
-            var completed = false;
-
-            target.Subscribe(_ => { }, () => completed = true);
-            activator.OnCompleted();
-
-            Assert.True(completed);
-        }
-
-        [Fact]
-        public void Should_Error_When_Activator_Errors()
-        {
-            var activator = new BehaviorSubject<bool>(false);
-            var target = new ActivatedValue(activator, 1, string.Empty);
-            var error = new Exception();
-            var completed = false;
-
-            target.Subscribe(_ => { }, x => completed = true);
-            activator.OnError(error);
-
-            Assert.True(completed);
-        }
-
-        [Fact]
-        public void Should_Unsubscribe_From_Activator_When_All_Subscriptions_Disposed()
-        {
-            var scheduler = new TestScheduler();
-            var activator1 = scheduler.CreateColdObservable<bool>();
-            var activator2 = scheduler.CreateColdObservable<bool>();
-            var activator = StyleActivator.And(new[] { activator1, activator2 });
-            var target = new ActivatedValue(activator, 1, string.Empty);
-
-            var subscription = target.Subscribe(_ => { });
-            Assert.Equal(1, activator1.Subscriptions.Count);
-            Assert.Equal(Subscription.Infinite, activator1.Subscriptions[0].Unsubscribe);
-
-            subscription.Dispose();
-            Assert.Equal(1, activator1.Subscriptions.Count);
-            Assert.Equal(0, activator1.Subscriptions[0].Unsubscribe);
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj b/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj
index 3fd280f7ab..a07ec050a6 100644
--- a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj
+++ b/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net47</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net47</TargetFrameworks>
     <OutputType>Library</OutputType>
     <NoWarn>CS0067</NoWarn>
     <IsTestProject>true</IsTestProject>
@@ -11,6 +11,7 @@
   <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" />
diff --git a/tests/Avalonia.Styling.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Styling.UnitTests/Properties/AssemblyInfo.cs
index aa077c1a06..3bdb8a2f2e 100644
--- a/tests/Avalonia.Styling.UnitTests/Properties/AssemblyInfo.cs
+++ b/tests/Avalonia.Styling.UnitTests/Properties/AssemblyInfo.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reflection;
 using Xunit;
 
diff --git a/tests/Avalonia.Styling.UnitTests/ResourceDictionaryTests.cs b/tests/Avalonia.Styling.UnitTests/ResourceDictionaryTests.cs
index 1eb3cd9750..d91d1fab9e 100644
--- a/tests/Avalonia.Styling.UnitTests/ResourceDictionaryTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/ResourceDictionaryTests.cs
@@ -1,14 +1,26 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+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()
         {
@@ -79,83 +91,129 @@ namespace Avalonia.Styling.UnitTests
         }
 
         [Fact]
-        public void ResourcesChanged_Should_Be_Raised_On_Resource_Add()
+        public void NotifyHostedResourcesChanged_Should_Be_Called_On_AddOwner()
         {
-            var target = new ResourceDictionary();
-            var raised = false;
+            var host = new Mock<IResourceHost>();
+            var target = new ResourceDictionary { { "foo", "bar" } };
+
+            ((IResourceProvider)target).AddOwner(host.Object);
 
-            target.ResourcesChanged += (_, __) => raised = true;
+            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");
 
-            Assert.True(raised);
+            host.Verify(x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()));
         }
 
         [Fact]
-        public void ResourcesChanged_Should_Be_Raised_On_MergedDictionary_Add()
+        public void NotifyHostedResourcesChanged_Should_Be_Called_On_MergedDictionary_Add()
         {
-            var target = new ResourceDictionary();
-            var raised = false;
+            var host = new Mock<IResourceHost>();
+            var target = new ResourceDictionary(host.Object);
 
-            target.ResourcesChanged += (_, __) => raised = true;
+            host.Invocations.Clear();
             target.MergedDictionaries.Add(new ResourceDictionary
             {
                 { "foo", "bar" },
             });
 
-            Assert.True(raised);
+            host.Verify(
+                x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()),
+                Times.Once);
         }
 
         [Fact]
-        public void ResourcesChanged_Should_Not_Be_Raised_On_Empty_MergedDictionary_Add()
+        public void NotifyHostedResourcesChanged_Should_Not_Be_Called_On_Empty_MergedDictionary_Add()
         {
-            var target = new ResourceDictionary();
-            var raised = false;
+            var host = new Mock<IResourceHost>();
+            var target = new ResourceDictionary(host.Object);
 
-            target.ResourcesChanged += (_, __) => raised = true;
+            host.Invocations.Clear();
             target.MergedDictionaries.Add(new ResourceDictionary());
 
-            Assert.False(raised);
+            host.Verify(
+                x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()),
+                Times.Never);
         }
 
         [Fact]
-        public void ResourcesChanged_Should_Be_Raised_On_MergedDictionary_Remove()
+        public void NotifyHostedResourcesChanged_Should_Be_Called_On_MergedDictionary_Remove()
         {
-            var target = new ResourceDictionary
+            var host = new Mock<IResourceHost>();
+            var target = new ResourceDictionary(host.Object)
             {
                 MergedDictionaries =
                 {
                     new ResourceDictionary { { "foo", "bar" } },
                 }
             };
-            var raised = false;
 
-            target.ResourcesChanged += (_, __) => raised = true;
+            host.Invocations.Clear();
             target.MergedDictionaries.RemoveAt(0);
 
-            Assert.True(raised);
+            host.Verify(
+                x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()),
+                Times.Once);
         }
 
         [Fact]
-        public void ResourcesChanged_Should_Not_Be_Raised_On_Empty_MergedDictionary_Remove()
+        public void NotifyHostedResourcesChanged_Should_Be_Called_On_MergedDictionary_Resource_Add()
         {
-            var target = new ResourceDictionary
+            var host = new Mock<IResourceHost>();
+            var target = new ResourceDictionary(host.Object)
             {
                 MergedDictionaries =
                 {
                     new ResourceDictionary(),
                 }
             };
-            var raised = false;
 
-            target.ResourcesChanged += (_, __) => raised = true;
-            target.MergedDictionaries.RemoveAt(0);
+            host.Invocations.Clear();
+            ((IResourceDictionary)target.MergedDictionaries[0]).Add("foo", "bar");
 
-            Assert.False(raised);
+            host.Verify(
+                x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()),
+                Times.Once);
         }
 
         [Fact]
-        public void ResourcesChanged_Should_Be_Raised_On_MergedDictionary_Resource_Add()
+        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 =
@@ -164,12 +222,30 @@ namespace Avalonia.Styling.UnitTests
                 }
             };
 
-            var raised = false;
+            ((IResourceProvider)target).AddOwner(host.Object);
 
-            target.ResourcesChanged += (_, __) => raised = true;
-            ((IResourceDictionary)target.MergedDictionaries[0]).Add("foo", "bar");
+            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>();
 
-            Assert.True(raised);
+            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
index c6eeb1ec0e..d011c16ebb 100644
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Child.cs
+++ b/tests/Avalonia.Styling.UnitTests/SelectorTests_Child.cs
@@ -1,15 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Reactive;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
-using Avalonia.Collections;
 using Avalonia.Controls;
-using Avalonia.Data;
 using Avalonia.LogicalTree;
 using Xunit;
 
@@ -81,89 +73,12 @@ namespace Avalonia.Styling.UnitTests
             Assert.Equal("TestLogical1 > TestLogical3", selector.ToString());
         }
 
-        public abstract class TestLogical : ILogical, IStyleable
+        public abstract class TestLogical : Control
         {
-            public TestLogical()
-            {
-                Classes = new Classes();
-            }
-
-            public event EventHandler<AvaloniaPropertyChangedEventArgs> PropertyChanged;
-            public event EventHandler<AvaloniaPropertyChangedEventArgs> InheritablePropertyChanged;
-            public event EventHandler<LogicalTreeAttachmentEventArgs> AttachedToLogicalTree;
-            public event EventHandler<LogicalTreeAttachmentEventArgs> DetachedFromLogicalTree;
-
-            public Classes Classes { get; }
-
-            public string Name { get; set; }
-
-            public bool IsAttachedToLogicalTree { get; }
-
-            public IAvaloniaReadOnlyList<ILogical> LogicalChildren { get; set; }
-
-            public ILogical LogicalParent { get; set; }
-
-            public Type StyleKey { get; }
-
-            public ITemplatedControl TemplatedParent { get; }
-
-            IObservable<IStyleable> IStyleable.StyleDetach { get; }
-
-            IAvaloniaReadOnlyList<string> IStyleable.Classes => Classes;
-
-            public object GetValue(AvaloniaProperty property)
-            {
-                throw new NotImplementedException();
-            }
-
-            public T GetValue<T>(AvaloniaProperty<T> property)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void SetValue(AvaloniaProperty property, object value, BindingPriority priority)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void SetValue<T>(AvaloniaProperty<T> property, T value, BindingPriority priority = BindingPriority.LocalValue)
-            {
-                throw new NotImplementedException();
-            }
-
-            public IDisposable Bind(AvaloniaProperty property, IObservable<object> source, BindingPriority priority)
-            {
-                throw new NotImplementedException();
-            }
-
-            public bool IsAnimating(AvaloniaProperty property)
-            {
-                throw new NotImplementedException();
-            }
-
-            public bool IsSet(AvaloniaProperty property)
-            {
-                throw new NotImplementedException();
-            }
-
-            public IDisposable Bind<T>(AvaloniaProperty<T> property, IObservable<T> source, BindingPriority priority = BindingPriority.LocalValue)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void NotifyAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void NotifyDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void NotifyResourcesChanged(ResourcesChangedEventArgs e)
+            public ILogical LogicalParent
             {
-                throw new NotImplementedException();
+                get => Parent;
+                set => ((ISetLogicalParent)this).SetParent(value);
             }
         }
 
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Class.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Class.cs
index 496998ecd9..72383501be 100644
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Class.cs
+++ b/tests/Avalonia.Styling.UnitTests/SelectorTests_Class.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Linq;
 using System.Reactive.Linq;
@@ -36,7 +33,7 @@ namespace Avalonia.Styling.UnitTests
         {
             var control = new Control1
             {
-                Classes = new Classes { "foo" },
+                Classes = { "foo" },
             };
 
             var target = default(Selector).Class("foo");
@@ -51,7 +48,7 @@ namespace Avalonia.Styling.UnitTests
         {
             var control = new Control1
             {
-                Classes = new Classes { "bar" },
+                Classes = { "bar" },
             };
 
             var target = default(Selector).Class("foo");
@@ -66,7 +63,7 @@ namespace Avalonia.Styling.UnitTests
         {
             var control = new Control1
             {
-                Classes = new Classes { "foo" },
+                Classes = { "foo" },
                 TemplatedParent = new Mock<ITemplatedControl>().Object,
             };
 
@@ -83,7 +80,7 @@ namespace Avalonia.Styling.UnitTests
             var control = new Control1();
 
             var target = default(Selector).Class("foo");
-            var activator = target.Match(control).Activator;
+            var activator = target.Match(control).Activator.ToObservable();
 
             Assert.False(await activator.Take(1));
             control.Classes.Add("foo");
@@ -95,11 +92,11 @@ namespace Avalonia.Styling.UnitTests
         {
             var control = new Control1
             {
-                Classes = new Classes { "foo" },
+                Classes = { "foo" },
             };
 
             var target = default(Selector).Class("foo");
-            var activator = target.Match(control).Activator;
+            var activator = target.Match(control).Activator.ToObservable();
 
             Assert.True(await activator.Take(1));
             control.Classes.Remove("foo");
@@ -111,7 +108,7 @@ namespace Avalonia.Styling.UnitTests
         {
             var control = new Control1();
             var target = default(Selector).Class("foo").Class("bar");
-            var activator = target.Match(control).Activator;
+            var activator = target.Match(control).Activator.ToObservable();
 
             Assert.False(await activator.Take(1));
             control.Classes.Add("foo");
@@ -128,7 +125,7 @@ namespace Avalonia.Styling.UnitTests
             // Test for #1698
             var control = new Control1
             {
-                Classes = new Classes { "foo" },
+                Classes = { "foo" },
             };
 
             var target = default(Selector).Class("foo");
@@ -144,7 +141,7 @@ namespace Avalonia.Styling.UnitTests
             Assert.Equal(new[] { true, false }, result);
         }
 
-        public class Control1 : TestControlBase
+        public class Control1 : Control
         {
         }
     }
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Descendent.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Descendent.cs
index aef539becd..aacf2ce223 100644
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Descendent.cs
+++ b/tests/Avalonia.Styling.UnitTests/SelectorTests_Descendent.cs
@@ -1,14 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
 using System.Linq;
-using System.Reactive;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
-using Avalonia.Collections;
 using Avalonia.Controls;
-using Avalonia.Data;
 using Avalonia.LogicalTree;
 using Xunit;
 
@@ -90,7 +83,7 @@ namespace Avalonia.Styling.UnitTests
             child.LogicalParent = parent;
 
             var selector = default(Selector).OfType<TestLogical1>().Class("foo").Descendant().OfType<TestLogical3>();
-            var activator = selector.Match(child).Activator;
+            var activator = selector.Match(child).Activator.ToObservable();
 
             Assert.False(await activator.Take(1));
             parent.Classes.Add("foo");
@@ -111,89 +104,12 @@ namespace Avalonia.Styling.UnitTests
             Assert.Equal("TestLogical1.foo TestLogical3", selector.ToString());
         }
 
-        public abstract class TestLogical : ILogical, IStyleable
+        public abstract class TestLogical : Control
         {
-            public TestLogical()
-            {
-                Classes = new Classes();
-            }
-
-            public event EventHandler<AvaloniaPropertyChangedEventArgs> PropertyChanged;
-            public event EventHandler<AvaloniaPropertyChangedEventArgs> InheritablePropertyChanged;
-            public event EventHandler<LogicalTreeAttachmentEventArgs> AttachedToLogicalTree;
-            public event EventHandler<LogicalTreeAttachmentEventArgs> DetachedFromLogicalTree;
-
-            public Classes Classes { get; }
-
-            public string Name { get; set; }
-
-            public bool IsAttachedToLogicalTree { get; }
-
-            public IAvaloniaReadOnlyList<ILogical> LogicalChildren { get; set; }
-
-            public ILogical LogicalParent { get; set; }
-
-            public Type StyleKey { get; }
-
-            public ITemplatedControl TemplatedParent { get; }
-
-            IAvaloniaReadOnlyList<string> IStyleable.Classes => Classes;
-
-            IObservable<IStyleable> IStyleable.StyleDetach { get; }
-
-            public object GetValue(AvaloniaProperty property)
-            {
-                throw new NotImplementedException();
-            }
-
-            public T GetValue<T>(AvaloniaProperty<T> property)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void SetValue(AvaloniaProperty property, object value, BindingPriority priority)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void SetValue<T>(AvaloniaProperty<T> property, T value, BindingPriority priority = BindingPriority.LocalValue)
-            {
-                throw new NotImplementedException();
-            }
-
-            public IDisposable Bind(AvaloniaProperty property, IObservable<object> source, BindingPriority priority = BindingPriority.LocalValue)
-            {
-                throw new NotImplementedException();
-            }
-
-            public bool IsAnimating(AvaloniaProperty property)
-            {
-                throw new NotImplementedException();
-            }
-
-            public bool IsSet(AvaloniaProperty property)
-            {
-                throw new NotImplementedException();
-            }
-
-            public IDisposable Bind<T>(AvaloniaProperty<T> property, IObservable<T> source, BindingPriority priority = BindingPriority.LocalValue)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void NotifyAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void NotifyDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void NotifyResourcesChanged(ResourcesChangedEventArgs e)
+            public ILogical LogicalParent
             {
-                throw new NotImplementedException();
+                get => Parent;
+                set => ((ISetLogicalParent)this).SetParent(value);
             }
         }
 
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Multiple.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Multiple.cs
index e8be44ed3b..4436f02429 100644
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Multiple.cs
+++ b/tests/Avalonia.Styling.UnitTests/SelectorTests_Multiple.cs
@@ -1,9 +1,7 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Avalonia.VisualTree;
@@ -85,6 +83,35 @@ namespace Avalonia.Styling.UnitTests
             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()
         {
@@ -123,6 +150,31 @@ namespace Avalonia.Styling.UnitTests
             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()
         {
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Name.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Name.cs
index 1c8a3a406e..308070c52f 100644
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Name.cs
+++ b/tests/Avalonia.Styling.UnitTests/SelectorTests_Name.cs
@@ -1,6 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using Avalonia.Controls;
 using Moq;
 using Xunit;
 
@@ -52,7 +50,7 @@ namespace Avalonia.Styling.UnitTests
             Assert.Equal("Control1#foo", target.ToString());
         }
 
-        public class Control1 : TestControlBase
+        public class Control1 : Control
         {
         }
     }
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Not.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Not.cs
index 2f3e2b8f34..23b711725a 100644
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Not.cs
+++ b/tests/Avalonia.Styling.UnitTests/SelectorTests_Not.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls;
@@ -41,7 +38,7 @@ namespace Avalonia.Styling.UnitTests
         {
             var control = new Control1
             {
-                Classes = new Classes { "foo" },
+                Classes = { "foo" },
             };
 
             var target = default(Selector).Not(x => x.Class("foo"));
@@ -56,7 +53,7 @@ namespace Avalonia.Styling.UnitTests
         {
             var control = new Control1
             {
-                Classes = new Classes { "bar" },
+                Classes = { "bar" },
             };
 
             var target = default(Selector).Not(x => x.Class("foo"));
@@ -71,7 +68,7 @@ namespace Avalonia.Styling.UnitTests
         {
             var control = new Control1
             {
-                Classes = new Classes { "bar" },
+                Classes = { "bar" },
             };
 
             var target = default(Selector).OfType<Control1>().Not(x => x.Class("foo"));
@@ -86,7 +83,7 @@ namespace Avalonia.Styling.UnitTests
         {
             var control = new Control2
             {
-                Classes = new Classes { "foo" },
+                Classes = { "foo" },
             };
 
             var target = default(Selector).OfType<Control1>().Not(x => x.Class("foo"));
@@ -103,11 +100,11 @@ namespace Avalonia.Styling.UnitTests
             Assert.Equal(typeof(Control1), target.TargetType);
         }
 
-        public class Control1 : TestControlBase
+        public class Control1 : Control
         {
         }
 
-        public class Control2 : TestControlBase
+        public class Control2 : Control
         {
         }
     }
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_OfType.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_OfType.cs
index 05f3544366..2aef46575d 100644
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_OfType.cs
+++ b/tests/Avalonia.Styling.UnitTests/SelectorTests_OfType.cs
@@ -1,6 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using Avalonia.Controls;
 using Moq;
 using Xunit;
 
@@ -44,11 +42,11 @@ namespace Avalonia.Styling.UnitTests
             Assert.Equal(SelectorMatchResult.AlwaysThisType, target.Match(control).Result);
         }
 
-        public class Control1 : TestControlBase
+        public class Control1 : Control
         {
         }
 
-        public class Control2 : TestControlBase
+        public class Control2 : Control
         {
         }
     }
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Or.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Or.cs
index 521c73ce27..2b55482593 100644
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Or.cs
+++ b/tests/Avalonia.Styling.UnitTests/SelectorTests_Or.cs
@@ -1,6 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
+using Avalonia.Controls;
 using Xunit;
 
 namespace Avalonia.Styling.UnitTests
@@ -78,7 +76,7 @@ namespace Avalonia.Styling.UnitTests
                 default(Selector).OfType<Control1>().Class("foo"),
                 default(Selector).OfType<Control2>().Class("bar"));
 
-            Assert.Equal(typeof(TestControlBase), target.TargetType);
+            Assert.Equal(typeof(Control), target.TargetType);
         }
 
         [Fact]
@@ -91,15 +89,15 @@ namespace Avalonia.Styling.UnitTests
             Assert.Equal(null, target.TargetType);
         }
 
-        public class Control1 : TestControlBase
+        public class Control1 : Control
         {
         }
 
-        public class Control2 : TestControlBase
+        public class Control2 : Control
         {
         }
 
-        public class Control3 : TestControlBase
+        public class Control3 : Control
         {
         }
     }
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_PropertyEquals.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_PropertyEquals.cs
index e1fb479e5c..e149410152 100644
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_PropertyEquals.cs
+++ b/tests/Avalonia.Styling.UnitTests/SelectorTests_PropertyEquals.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
@@ -16,7 +13,7 @@ namespace Avalonia.Styling.UnitTests
         {
             var control = new TextBlock();
             var target = default(Selector).PropertyEquals(TextBlock.TextProperty, "foo");
-            var activator = target.Match(control).Activator;
+            var activator = target.Match(control).Activator.ToObservable();
 
             Assert.False(await activator.Take(1));
             control.Text = "foo";
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Template.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Template.cs
index c446902563..13cb2578cf 100644
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Template.cs
+++ b/tests/Avalonia.Styling.UnitTests/SelectorTests_Template.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Linq;
 using System.Reactive.Linq;
diff --git a/tests/Avalonia.Styling.UnitTests/SetterTests.cs b/tests/Avalonia.Styling.UnitTests/SetterTests.cs
index 52f75627f9..901233801e 100644
--- a/tests/Avalonia.Styling.UnitTests/SetterTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/SetterTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
 using System.Reactive.Subjects;
@@ -33,11 +30,26 @@ namespace Avalonia.Styling.UnitTests
             var style = Mock.Of<IStyle>();
             var setter = new Setter(TextBlock.TextProperty, binding);
 
-            setter.Apply(style, control, null);
+            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()
         {
@@ -46,7 +58,7 @@ namespace Avalonia.Styling.UnitTests
             var style = Mock.Of<IStyle>();
             var setter = new Setter(Decorator.ChildProperty, template);
 
-            setter.Apply(style, control, null);
+            setter.Instance(control).Start(false);
 
             Assert.IsType<Canvas>(control.Child);
         }
@@ -62,13 +74,15 @@ namespace Avalonia.Styling.UnitTests
                 RelativeSource = new RelativeSource(RelativeSourceMode.Self),
             };
             var setter = new Setter(Decorator.TagProperty, binding);
-            var activator = new BehaviorSubject<bool>(true);
 
-            setter.Apply(style, control, activator);
+            var instance = setter.Instance(control);
+            instance.Start(true);
+            instance.Activate();
+
             Assert.Equal("foobar", control.Tag);
 
             // Issue #1218 caused TestConverter.ConvertBack to throw here.
-            activator.OnNext(false);
+            instance.Deactivate();
             Assert.Null(control.Tag);
         }
 
@@ -77,29 +91,31 @@ namespace Avalonia.Styling.UnitTests
         {
             var control = new Mock<IStyleable>();
             var style = Mock.Of<Style>();
-            var setter = new Setter(TextBlock.TextProperty, "foo");
+            var setter = new Setter(TextBlock.TagProperty, "foo");
 
-            setter.Apply(style, control.Object, null);
+            setter.Instance(control.Object).Start(false);
 
-            control.Verify(x => x.Bind(
-                TextBlock.TextProperty,
-                It.IsAny<IObservable<object>>(),
+            control.Verify(x => x.SetValue(
+                TextBlock.TagProperty,
+                "foo",
                 BindingPriority.Style));
         }
 
         [Fact]
-        public void Setter_Should_Apply_Value_With_Activator_With_StyleTrigger_Priority()
+        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.TextProperty, "foo");
+            var setter = new Setter(TextBlock.TagProperty, "foo");
             var activator = new Subject<bool>();
 
-            setter.Apply(style, control.Object, activator);
+            var instance = setter.Instance(control.Object);
+            instance.Start(true);
+            instance.Activate();
 
             control.Verify(x => x.Bind(
-                TextBlock.TextProperty,
-                It.IsAny<IObservable<object>>(),
+                TextBlock.TagProperty,
+                It.IsAny<IObservable<BindingValue<object>>>(),
                 BindingPriority.StyleTrigger));
         }
 
@@ -108,13 +124,13 @@ namespace Avalonia.Styling.UnitTests
         {
             var control = new Mock<IStyleable>();
             var style = Mock.Of<Style>();
-            var setter = new Setter(TextBlock.TextProperty, CreateMockBinding(TextBlock.TextProperty));
+            var setter = new Setter(TextBlock.TagProperty, CreateMockBinding(TextBlock.TagProperty));
 
-            setter.Apply(style, control.Object, null);
+            setter.Instance(control.Object).Start(false);
 
             control.Verify(x => x.Bind(
-                TextBlock.TextProperty,
-                It.IsAny<IObservable<object>>(),
+                TextBlock.TagProperty,
+                It.IsAny<PropertySetterBindingInstance<object>>(),
                 BindingPriority.Style));
         }
 
@@ -123,14 +139,15 @@ namespace Avalonia.Styling.UnitTests
         {
             var control = new Mock<IStyleable>();
             var style = Mock.Of<Style>();
-            var setter = new Setter(TextBlock.TextProperty, CreateMockBinding(TextBlock.TextProperty));
-            var activator = new Subject<bool>();
+            var setter = new Setter(TextBlock.TagProperty, CreateMockBinding(TextBlock.TagProperty));
 
-            setter.Apply(style, control.Object, activator);
+            var instance = setter.Instance(control.Object);
+            instance.Start(true);
+            instance.Activate();
 
             control.Verify(x => x.Bind(
-                TextBlock.TextProperty,
-                It.IsAny<IObservable<object>>(),
+                TextBlock.TagProperty,
+                It.IsAny<IObservable<BindingValue<object>>>(),
                 BindingPriority.StyleTrigger));
         }
 
diff --git a/tests/Avalonia.Styling.UnitTests/StyleActivatorExtensions.cs b/tests/Avalonia.Styling.UnitTests/StyleActivatorExtensions.cs
new file mode 100644
index 0000000000..eb3dabce0b
--- /dev/null
+++ b/tests/Avalonia.Styling.UnitTests/StyleActivatorExtensions.cs
@@ -0,0 +1,42 @@
+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)
+        {
+            return new ObservableAdapter(activator);
+        }
+
+        private class ObservableAdapter : LightweightObservableBase<bool>, IStyleActivatorSink
+        {
+            private readonly IStyleActivator _source;
+            private bool _value;
+            
+            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)
+            {
+                _value = value;
+                PublishNext(value);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Styling.UnitTests/StyleActivatorTests.cs b/tests/Avalonia.Styling.UnitTests/StyleActivatorTests.cs
deleted file mode 100644
index d1761d687a..0000000000
--- a/tests/Avalonia.Styling.UnitTests/StyleActivatorTests.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Collections.Generic;
-using System.Reactive;
-using System.Reactive.Linq;
-using Microsoft.Reactive.Testing;
-using Xunit;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class StyleActivatorTests : ReactiveTest
-    {
-        [Fact]
-        public void Activator_Should_Subscribe_To_Inputs_On_First_Subscription()
-        {
-            var scheduler = new TestScheduler();
-            var source = scheduler.CreateColdObservable<bool>();
-            var target = StyleActivator.And(new[] { source });
-
-            Assert.Equal(0, source.Subscriptions.Count);
-            target.Subscribe(_ => { });
-            Assert.Equal(1, source.Subscriptions.Count);
-        }
-
-        [Fact]
-        public void Activator_Should_Unsubscribe_From_Inputs_After_Last_Subscriber_Completes()
-        {
-            var scheduler = new TestScheduler();
-            var source = scheduler.CreateColdObservable<bool>();
-            var target = StyleActivator.And(new[] { source });
-
-            var dispose = target.Subscribe(_ => { });
-            Assert.Equal(1, source.Subscriptions.Count);
-            Assert.Equal(Subscription.Infinite, source.Subscriptions[0].Unsubscribe);
-
-            dispose.Dispose();
-            Assert.Equal(1, source.Subscriptions.Count);
-            Assert.Equal(0, source.Subscriptions[0].Unsubscribe);
-        }
-
-        [Fact]
-        public void Activator_And_Should_Follow_Single_Input()
-        {
-            var inputs = new[] { new TestSubject<bool>(false) };
-            var target = StyleActivator.And(inputs);
-            var result = new TestObserver<bool>();
-
-            target.Subscribe(result);
-            Assert.False(result.GetValue());
-            inputs[0].OnNext(true);
-            Assert.True(result.GetValue());
-            inputs[0].OnNext(false);
-            Assert.False(result.GetValue());
-            inputs[0].OnNext(true);
-            Assert.True(result.GetValue());
-
-            Assert.Equal(1, inputs[0].SubscriberCount);
-        }
-
-        [Fact]
-        public void Activator_And_Should_AND_Multiple_Inputs()
-        {
-            var inputs = new[]
-            {
-                new TestSubject<bool>(false),
-                new TestSubject<bool>(false),
-                new TestSubject<bool>(true),
-            };
-            var target = StyleActivator.And(inputs);
-            var result = new TestObserver<bool>();
-
-            target.Subscribe(result);
-            Assert.False(result.GetValue());
-            inputs[0].OnNext(true);
-            inputs[1].OnNext(true);
-            Assert.True(result.GetValue());
-            inputs[0].OnNext(false);
-            Assert.False(result.GetValue());
-
-            Assert.Equal(1, inputs[0].SubscriberCount);
-            Assert.Equal(1, inputs[1].SubscriberCount);
-            Assert.Equal(1, inputs[2].SubscriberCount);
-        }
-
-        [Fact]
-        public void Activator_Or_Should_Follow_Single_Input()
-        {
-            var inputs = new[] { new TestSubject<bool>(false) };
-            var target = StyleActivator.Or(inputs);
-            var result = new TestObserver<bool>();
-
-            target.Subscribe(result);
-            Assert.False(result.GetValue());
-            inputs[0].OnNext(true);
-            Assert.True(result.GetValue());
-            inputs[0].OnNext(false);
-            Assert.False(result.GetValue());
-            inputs[0].OnNext(true);
-            Assert.True(result.GetValue());
-
-            Assert.Equal(1, inputs[0].SubscriberCount);
-        }
-
-        [Fact]
-        public void Activator_Or_Should_OR_Multiple_Inputs()
-        {
-            var inputs = new[]
-            {
-                new TestSubject<bool>(false),
-                new TestSubject<bool>(false),
-                new TestSubject<bool>(true),
-            };
-            var target = StyleActivator.Or(inputs);
-            var result = new TestObserver<bool>();
-
-            target.Subscribe(result);
-            Assert.True(result.GetValue());
-            inputs[2].OnNext(false);
-            Assert.False(result.GetValue());
-            inputs[0].OnNext(true);
-            Assert.True(result.GetValue());
-
-            Assert.Equal(1, inputs[0].SubscriberCount);
-            Assert.Equal(1, inputs[1].SubscriberCount);
-            Assert.Equal(1, inputs[2].SubscriberCount);
-        }
-
-        [Fact]
-        public void Activator_Or_Should_Not_Unsubscribe_All_When_Input_Completes_On_False()
-        {
-            var inputs = new[]
-            {
-                new TestSubject<bool>(false),
-                new TestSubject<bool>(false),
-                new TestSubject<bool>(true),
-            };
-            var target = StyleActivator.Or(inputs);
-            var result = new TestObserver<bool>();
-
-            target.Subscribe(result);
-            Assert.True(result.GetValue());
-            inputs[2].OnNext(false);
-            Assert.False(result.GetValue());
-            inputs[2].OnCompleted();
-
-            Assert.Equal(1, inputs[0].SubscriberCount);
-            Assert.Equal(1, inputs[1].SubscriberCount);
-            Assert.Equal(0, inputs[2].SubscriberCount);
-        }
-
-        [Fact]
-        public void Completed_Activator_Should_Signal_OnCompleted()
-        {
-            var inputs = new[]
-            {
-                Observable.Return(false),
-            };
-
-            var target = StyleActivator.Or(inputs);
-            var completed = false;
-
-            target.Subscribe(_ => { }, () => completed = true);
-
-            Assert.True(completed);
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/StyleTests.cs b/tests/Avalonia.Styling.UnitTests/StyleTests.cs
index 53e0ae5db7..df94887340 100644
--- a/tests/Avalonia.Styling.UnitTests/StyleTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/StyleTests.cs
@@ -1,11 +1,9 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
-using System.Reactive.Subjects;
 using Avalonia.Controls;
+using Avalonia.Data;
 using Avalonia.UnitTests;
+using Moq;
 using Xunit;
 
 namespace Avalonia.Styling.UnitTests
@@ -17,7 +15,7 @@ namespace Avalonia.Styling.UnitTests
         {
             Style style = new Style(x => x.OfType<Class1>())
             {
-                Setters = new[]
+                Setters =
                 {
                     new Setter(Class1.FooProperty, "Foo"),
                 },
@@ -25,7 +23,7 @@ namespace Avalonia.Styling.UnitTests
 
             var target = new Class1();
 
-            style.Attach(target, null);
+            style.TryAttach(target, null);
 
             Assert.Equal("Foo", target.Foo);
         }
@@ -35,7 +33,7 @@ namespace Avalonia.Styling.UnitTests
         {
             Style style = new Style(x => x.OfType<Class1>().Class("foo"))
             {
-                Setters = new[]
+                Setters =
                 {
                     new Setter(Class1.FooProperty, "Foo"),
                 },
@@ -43,7 +41,7 @@ namespace Avalonia.Styling.UnitTests
 
             var target = new Class1();
 
-            style.Attach(target, null);
+            style.TryAttach(target, null);
             Assert.Equal("foodefault", target.Foo);
             target.Classes.Add("foo");
             Assert.Equal("Foo", target.Foo);
@@ -56,7 +54,7 @@ namespace Avalonia.Styling.UnitTests
         {
             Style style = new Style
             {
-                Setters = new[]
+                Setters =
                 {
                     new Setter(Class1.FooProperty, "Foo"),
                 },
@@ -64,7 +62,7 @@ namespace Avalonia.Styling.UnitTests
 
             var target = new Class1();
 
-            style.Attach(target, target);
+            style.TryAttach(target, target);
 
             Assert.Equal("Foo", target.Foo);
         }
@@ -74,7 +72,7 @@ namespace Avalonia.Styling.UnitTests
         {
             Style style = new Style
             {
-                Setters = new[]
+                Setters =
                 {
                     new Setter(Class1.FooProperty, "Foo"),
                 },
@@ -83,7 +81,7 @@ namespace Avalonia.Styling.UnitTests
             var target = new Class1();
             var other = new Class1();
 
-            style.Attach(target, other);
+            style.TryAttach(target, other);
 
             Assert.Equal("foodefault", target.Foo);
         }
@@ -93,7 +91,7 @@ namespace Avalonia.Styling.UnitTests
         {
             Style style = new Style(x => x.OfType<Class1>())
             {
-                Setters = new[]
+                Setters =
                 {
                     new Setter(Class1.FooProperty, "Foo"),
                 },
@@ -104,7 +102,7 @@ namespace Avalonia.Styling.UnitTests
                 Foo = "Original",
             };
 
-            style.Attach(target, null);
+            style.TryAttach(target, null);
             Assert.Equal("Original", target.Foo);
         }
 
@@ -115,7 +113,7 @@ namespace Avalonia.Styling.UnitTests
             {
                 new Style(x => x.OfType<Class1>().Class("foo"))
                 {
-                    Setters = new[]
+                    Setters =
                     {
                         new Setter(Class1.FooProperty, "Foo"),
                     },
@@ -123,7 +121,7 @@ namespace Avalonia.Styling.UnitTests
 
                 new Style(x => x.OfType<Class1>().Class("foo"))
                 {
-                    Setters = new[]
+                    Setters =
                     {
                         new Setter(Class1.FooProperty, "Bar"),
                     },
@@ -135,7 +133,7 @@ namespace Avalonia.Styling.UnitTests
             List<string> values = new List<string>();
             target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
 
-            styles.Attach(target, null);
+            styles.TryAttach(target, null);
             target.Classes.Add("foo");
             target.Classes.Remove("foo");
 
@@ -143,38 +141,90 @@ namespace Avalonia.Styling.UnitTests
         }
 
         [Fact]
-        public void Style_Should_Detach_When_Removed_From_Logical_Tree()
+        public void Later_Styles_Should_Override_Earlier_2()
         {
-            Border border;
+            Styles styles = new Styles
+            {
+                new Style(x => x.OfType<Class1>().Class("foo"))
+                {
+                    Setters =
+                    {
+                        new Setter(Class1.FooProperty, "Foo"),
+                    },
+                },
 
-            var style = new Style(x => x.OfType<Border>())
+                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
             {
-                Setters = new[]
+                new Style(x => x.OfType<Class1>().Class("foo"))
                 {
-                    new Setter(Border.BorderThicknessProperty, new Thickness(4)),
+                    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 root = new TestRoot
+            var target = new Class1
             {
-                Child = border = new Border(),
+                DataContext = new
+                {
+                    Foo = "Foo",
+                    Bar = "Bar",
+                }
             };
 
-            style.Attach(border, null);
+            List<string> values = new List<string>();
+            target.GetObservable(Class1.FooProperty).Subscribe(x => values.Add(x));
 
-            Assert.Equal(new Thickness(4), border.BorderThickness);
-            root.Child = null;
-            Assert.Equal(new Thickness(0), border.BorderThickness);
+            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 Style_Should_Detach_Setters_When_Detach_Is_Called()
+        public void Style_Should_Detach_When_Control_Removed_From_Logical_Tree()
         {
             Border border;
 
             var style = new Style(x => x.OfType<Border>())
             {
-                Setters = new[]
+                Setters =
                 {
                     new Setter(Border.BorderThicknessProperty, new Thickness(4)),
                 }
@@ -185,13 +235,219 @@ namespace Avalonia.Styling.UnitTests
                 Child = border = new Border(),
             };
 
-            style.Attach(border, null);
+            style.TryAttach(border, null);
 
             Assert.Equal(new Thickness(4), border.BorderThickness);
-            style.Detach();
+            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 =
diff --git a/tests/Avalonia.Styling.UnitTests/StyledElementTests.cs b/tests/Avalonia.Styling.UnitTests/StyledElementTests.cs
index c40e6c735e..fcbccba695 100644
--- a/tests/Avalonia.Styling.UnitTests/StyledElementTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/StyledElementTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Reactive.Linq;
@@ -11,6 +8,10 @@ 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
 {
@@ -77,7 +78,30 @@ namespace Avalonia.Styling.UnitTests
         }
 
         [Fact]
-        public void AttachedToLogicalParent_Should_Be_Called_When_Added_To_Tree()
+        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();
@@ -104,9 +128,9 @@ namespace Avalonia.Styling.UnitTests
             Assert.True(childRaised);
             Assert.True(grandchildRaised);
         }
-
+        
         [Fact]
-        public void AttachedToLogicalParent_Should_Be_Called_Before_Parent_Change_Signalled()
+        public void AttachedToLogicalTree_Should_Be_Called_Before_Parent_Change_Signalled()
         {
             var root = new TestRoot();
             var child = new Border();
@@ -126,7 +150,7 @@ namespace Avalonia.Styling.UnitTests
         }
 
         [Fact]
-        public void AttachedToLogicalParent_Should_Not_Be_Called_With_GlobalStyles_As_Root()
+        public void AttachedToLogicalTree_Should_Not_Be_Called_With_GlobalStyles_As_Root()
         {
             var globalStyles = Mock.Of<IGlobalStyles>();
             var root = new TestRoot { StylingParent = globalStyles };
@@ -145,7 +169,51 @@ namespace Avalonia.Styling.UnitTests
         }
 
         [Fact]
-        public void DetachedFromLogicalParent_Should_Be_Called_When_Removed_From_Tree()
+        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();
@@ -171,7 +239,7 @@ namespace Avalonia.Styling.UnitTests
         }
 
         [Fact]
-        public void DetachedFromLogicalParent_Should_Not_Be_Called_With_GlobalStyles_As_Root()
+        public void DetachedFromLogicalTree_Should_Not_Be_Called_With_GlobalStyles_As_Root()
         {
             var globalStyles = Mock.Of<IGlobalStyles>();
             var root = new TestRoot { StylingParent = globalStyles };
@@ -190,6 +258,25 @@ namespace Avalonia.Styling.UnitTests
             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()
         {
@@ -266,7 +353,7 @@ namespace Avalonia.Styling.UnitTests
         }
 
         [Fact]
-        public void StyleDetach_Is_Triggered_When_Control_Removed_From_Logical_Tree()
+        public void StyleInstance_Is_Disposed_When_Control_Removed_From_Logical_Tree()
         {
             using (AvaloniaLocator.EnterScope())
             {
@@ -275,11 +362,12 @@ namespace Avalonia.Styling.UnitTests
 
                 root.Child = child;
 
-                bool styleDetachTriggered = false;
-                ((IStyleable)child).StyleDetach.Subscribe(_ => styleDetachTriggered = true);
+                var styleInstance = new Mock<IStyleInstance>();
+                ((IStyleable)child).StyleApplied(styleInstance.Object);
+
                 root.Child = null;
 
-                Assert.True(styleDetachTriggered);
+                styleInstance.Verify(x => x.Dispose(), Times.Once);
             }
         }
 
@@ -403,6 +491,105 @@ namespace Avalonia.Styling.UnitTests
                 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;
diff --git a/tests/Avalonia.Styling.UnitTests/StyledElementTests_Resources.cs b/tests/Avalonia.Styling.UnitTests/StyledElementTests_Resources.cs
index b8d53b38b2..05315380fd 100644
--- a/tests/Avalonia.Styling.UnitTests/StyledElementTests_Resources.cs
+++ b/tests/Avalonia.Styling.UnitTests/StyledElementTests_Resources.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
@@ -157,18 +154,15 @@ namespace Avalonia.Controls.UnitTests
             };
 
             var raisedOnTarget = false;
-            var raisedOnPresenter = false;
             var raisedOnChild = false;
 
             target.Measure(Size.Infinity);
             target.ResourcesChanged += (_, __) => raisedOnTarget = true;
-            target.Presenter.ResourcesChanged += (_, __) => raisedOnPresenter = true;
             child.ResourcesChanged += (_, __) => raisedOnChild = true;
 
             target.Resources.Add("foo", "bar");
 
             Assert.True(raisedOnTarget);
-            Assert.True(raisedOnPresenter);
             Assert.True(raisedOnChild);
         }
 
@@ -204,22 +198,6 @@ namespace Avalonia.Controls.UnitTests
             Assert.True(raised);
         }
 
-        [Fact]
-        public void Setting_Logical_Parent_Subscribes_To_Parents_ResourceChanged_Event()
-        {
-            var parent = new ContentControl();
-            var child = new StyledElement();
-
-            ((ISetLogicalParent)child).SetParent(parent);
-            var raisedOnChild = false;
-
-            child.ResourcesChanged += (_, __) => raisedOnChild = true;
-
-            parent.Resources.Add("foo", "bar");
-
-            Assert.True(raisedOnChild);
-        }
-
         private IControlTemplate ContentControlTemplate()
         {
             return new FuncControlTemplate<ContentControl>((x, scope) =>
diff --git a/tests/Avalonia.Styling.UnitTests/StylesTests.cs b/tests/Avalonia.Styling.UnitTests/StylesTests.cs
index 82b6b81759..88ab124e01 100644
--- a/tests/Avalonia.Styling.UnitTests/StylesTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/StylesTests.cs
@@ -1,8 +1,6 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Controls;
+using Moq;
 using Xunit;
 
 namespace Avalonia.Styling.UnitTests
@@ -10,110 +8,89 @@ namespace Avalonia.Styling.UnitTests
     public class StylesTests
     {
         [Fact]
-        public void Adding_Style_With_Resources_Should_Raise_ResourceChanged()
+        public void Adding_Style_Should_Set_Owner()
         {
-            var style = new Style
-            {
-                Resources = { { "foo", "bar" } },
-            };
-
-            var target = new Styles();
-            var raised = false;
+            var host = new Mock<IResourceHost>();
+            var target = new Styles(host.Object);
+            var style = new Mock<IStyle>();
+            var rp = style.As<IResourceProvider>();
 
-            target.ResourcesChanged += (_, __) => raised = true;
-            target.Add(style);
+            host.Invocations.Clear();
+            target.Add(style.Object);
 
-            Assert.True(raised);
+            rp.Verify(x => x.AddOwner(host.Object));
         }
 
         [Fact]
-        public void Removing_Style_With_Resources_Should_Raise_ResourceChanged()
+        public void Removing_Style_Should_Clear_Owner()
         {
-            var target = new Styles
-            {
-                new Style
-                {
-                    Resources = { { "foo", "bar" } },
-                }
-            };
+            var host = new Mock<IResourceHost>();
+            var target = new Styles(host.Object);
+            var style = new Mock<IStyle>();
+            var rp = style.As<IResourceProvider>();
 
-            var raised = false;
+            host.Invocations.Clear();
+            target.Add(style.Object);
+            target.Remove(style.Object);
 
-            target.ResourcesChanged += (_, __) => raised = true;
-            target.Clear();
-
-            Assert.True(raised);
+            rp.Verify(x => x.RemoveOwner(host.Object));
         }
 
         [Fact]
-        public void Adding_Style_Without_Resources_Should_Not_Raise_ResourceChanged()
+        public void Should_Set_Owner_On_Assigned_Resources()
         {
-            var style = new Style();
+            var host = new Mock<IResourceHost>();
             var target = new Styles();
-            var raised = false;
+            ((IResourceProvider)target).AddOwner(host.Object);
 
-            target.ResourcesChanged += (_, __) => raised = true;
-            target.Add(style);
+            var resources = new Mock<IResourceDictionary>();
+            target.Resources = resources.Object;
 
-            Assert.False(raised);
+            resources.Verify(x => x.AddOwner(host.Object), Times.Once);
         }
 
         [Fact]
-        public void Adding_Resource_Should_Raise_Child_ResourceChanged()
+        public void Should_Set_Owner_On_Assigned_Resources_2()
         {
-            Style child;
-            var target = new Styles
-            {
-                (child = new Style()),
-            };
-
-            var raised = false;
+            var host = new Mock<IResourceHost>();
+            var target = new Styles();
 
-            child.ResourcesChanged += (_, __) => raised = true;
-            target.Resources.Add("foo", "bar");
+            var resources = new Mock<IResourceDictionary>();
+            target.Resources = resources.Object;
 
-            Assert.True(raised);
+            host.Invocations.Clear();
+            ((IResourceProvider)target).AddOwner(host.Object);
+            resources.Verify(x => x.AddOwner(host.Object), Times.Once);
         }
 
         [Fact]
-        public void Adding_Resource_To_Younger_Sibling_Style_Should_Raise_ResourceChanged()
+        public void Should_Set_Owner_On_Child_Style()
         {
-            Style style1;
-            Style style2;
-            var target = new Styles
-            {
-                (style1 = new Style()),
-                (style2 = new Style()),
-            };
-
-            var raised = false;
+            var host = new Mock<IResourceHost>();
+            var target = new Styles();
+            ((IResourceProvider)target).AddOwner(host.Object);
 
-            style2.ResourcesChanged += (_, __) => raised = true;
-            style1.Resources.Add("foo", "bar");
+            var style = new Mock<IStyle>();
+            var resourceProvider = style.As<IResourceProvider>();
+            target.Add(style.Object);
 
-            Assert.True(raised);
+            resourceProvider.Verify(x => x.AddOwner(host.Object), Times.Once);
         }
 
         [Fact]
-        public void Adding_Resource_To_Older_Sibling_Style_Should_Raise_ResourceChanged()
+        public void Should_Set_Owner_On_Child_Style_2()
         {
-            Style style1;
-            Style style2;
-            var target = new Styles
-            {
-                (style1 = new Style()),
-                (style2 = new Style()),
-            };
-
-            var raised = false;
+            var host = new Mock<IResourceHost>();
+            var target = new Styles();
 
-            style1.ResourcesChanged += (_, __) => raised = true;
-            style2.Resources.Add("foo", "bar");
+            var style = new Mock<IStyle>();
+            var resourceProvider = style.As<IResourceProvider>();
+            target.Add(style.Object);
 
-            Assert.False(raised);
+            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()
         {
@@ -131,8 +108,7 @@ namespace Avalonia.Styling.UnitTests
                 }
             };
 
-            var result = target.FindResource("foo");
-
+            Assert.True(target.TryGetResource("foo", out var result));
             Assert.Equal("bar", result);
         }
     }
diff --git a/tests/Avalonia.Styling.UnitTests/TestControlBase.cs b/tests/Avalonia.Styling.UnitTests/TestControlBase.cs
deleted file mode 100644
index d9fabf6f5d..0000000000
--- a/tests/Avalonia.Styling.UnitTests/TestControlBase.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Reactive;
-using Avalonia.Collections;
-using Avalonia.Controls;
-using Avalonia.Data;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public class TestControlBase : IStyleable
-    {
-        public TestControlBase()
-        {
-            Classes = new Classes();
-            SubscribeCheckObservable = new TestObservable();
-        }
-
-#pragma warning disable CS0067 // Event not used
-        public event EventHandler<AvaloniaPropertyChangedEventArgs> PropertyChanged;
-        public event EventHandler<AvaloniaPropertyChangedEventArgs> InheritablePropertyChanged;
-#pragma warning restore CS0067
-
-        public string Name { get; set; }
-
-        public virtual Classes Classes { get; set; }
-
-        public Type StyleKey => GetType();
-
-        public TestObservable SubscribeCheckObservable { get; private set; }
-
-        public ITemplatedControl TemplatedParent
-        {
-            get;
-            set;
-        }
-
-        IAvaloniaReadOnlyList<string> IStyleable.Classes => Classes;
-
-        IObservable<IStyleable> IStyleable.StyleDetach { get; }
-
-        public object GetValue(AvaloniaProperty property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public T GetValue<T>(AvaloniaProperty<T> property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetValue(AvaloniaProperty property, object value, BindingPriority priority)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetValue<T>(AvaloniaProperty<T> property, T value, BindingPriority priority = BindingPriority.LocalValue)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool IsAnimating(AvaloniaProperty property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool IsSet(AvaloniaProperty property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IDisposable Bind(AvaloniaProperty property, IObservable<object> source, BindingPriority priority = BindingPriority.LocalValue)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IDisposable Bind<T>(AvaloniaProperty<T> property, IObservable<T> source, BindingPriority priority = BindingPriority.LocalValue)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/tests/Avalonia.Styling.UnitTests/TestObservable.cs b/tests/Avalonia.Styling.UnitTests/TestObservable.cs
index 036575a298..7a07f12883 100644
--- a/tests/Avalonia.Styling.UnitTests/TestObservable.cs
+++ b/tests/Avalonia.Styling.UnitTests/TestObservable.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Disposables;
 
diff --git a/tests/Avalonia.Styling.UnitTests/TestObserver.cs b/tests/Avalonia.Styling.UnitTests/TestObserver.cs
index dbce00b8d0..c18fa8618f 100644
--- a/tests/Avalonia.Styling.UnitTests/TestObserver.cs
+++ b/tests/Avalonia.Styling.UnitTests/TestObserver.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 
 namespace Avalonia.Styling.UnitTests
diff --git a/tests/Avalonia.Styling.UnitTests/TestSelectors.cs b/tests/Avalonia.Styling.UnitTests/TestSelectors.cs
index 891c7af8b6..44a087af19 100644
--- a/tests/Avalonia.Styling.UnitTests/TestSelectors.cs
+++ b/tests/Avalonia.Styling.UnitTests/TestSelectors.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Styling;
 
diff --git a/tests/Avalonia.Styling.UnitTests/TestSubject.cs b/tests/Avalonia.Styling.UnitTests/TestSubject.cs
index e6feefffbe..7550b545b6 100644
--- a/tests/Avalonia.Styling.UnitTests/TestSubject.cs
+++ b/tests/Avalonia.Styling.UnitTests/TestSubject.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Reactive.Disposables;
diff --git a/tests/Avalonia.Styling.UnitTests/TestTemplatedControl.cs b/tests/Avalonia.Styling.UnitTests/TestTemplatedControl.cs
deleted file mode 100644
index e92ac36e8f..0000000000
--- a/tests/Avalonia.Styling.UnitTests/TestTemplatedControl.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Reactive;
-using Avalonia.Collections;
-using Avalonia.Controls;
-using Avalonia.Data;
-
-namespace Avalonia.Styling.UnitTests
-{
-    public abstract class TestTemplatedControl : ITemplatedControl, IStyleable
-    {
-        public event EventHandler<AvaloniaPropertyChangedEventArgs> PropertyChanged;
-        public event EventHandler<AvaloniaPropertyChangedEventArgs> InheritablePropertyChanged;
-
-        public abstract Classes Classes
-        {
-            get;
-        }
-
-        public abstract string Name
-        {
-            get;
-        }
-
-        public abstract Type StyleKey
-        {
-            get;
-        }
-
-        public abstract ITemplatedControl TemplatedParent
-        {
-            get;
-        }
-
-        IAvaloniaReadOnlyList<string> IStyleable.Classes => Classes;
-
-        IObservable<IStyleable> IStyleable.StyleDetach { get; }
-
-        public object GetValue(AvaloniaProperty property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public T GetValue<T>(AvaloniaProperty<T> property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetValue(AvaloniaProperty property, object value, BindingPriority priority)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetValue<T>(AvaloniaProperty<T> property, T value, BindingPriority priority = BindingPriority.LocalValue)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IDisposable Bind(AvaloniaProperty property, IObservable<object> source, BindingPriority priority = BindingPriority.LocalValue)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IDisposable Bind<T>(AvaloniaProperty<T> property, IObservable<T> source, BindingPriority priority = BindingPriority.LocalValue)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool IsAnimating(AvaloniaProperty property)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool IsSet(AvaloniaProperty property)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
index 272b1fc489..d4abf9416a 100644
--- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
+++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
@@ -6,7 +6,12 @@
     <OutputType>Library</OutputType>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
+    <AssemblyOriginatorKeyFile>..\..\build\avalonia.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\Avalonia.UnitTests\Assets\*.ttf" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
@@ -20,7 +25,8 @@
     <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
   </ItemGroup>
+  <Import Project="..\..\src\Shared\PlatformSupport\PlatformSupport.projitems" Label="Shared" />
   <Import Project="..\..\build\Moq.props" />
   <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\src\Shared\PlatformSupport\PlatformSupport.projitems" Label="Shared" />
+  <Import Project="..\..\build\SharedVersion.props" />
 </Project>
diff --git a/tests/Avalonia.UnitTests/InvariantCultureFixture.cs b/tests/Avalonia.UnitTests/InvariantCultureFixture.cs
index b00b16e2bb..6dfc6d4202 100644
--- a/tests/Avalonia.UnitTests/InvariantCultureFixture.cs
+++ b/tests/Avalonia.UnitTests/InvariantCultureFixture.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Globalization;
 using System.Threading;
 
diff --git a/tests/Avalonia.UnitTests/MockFontManagerImpl.cs b/tests/Avalonia.UnitTests/MockFontManagerImpl.cs
new file mode 100644
index 0000000000..ba3b346f1b
--- /dev/null
+++ b/tests/Avalonia.UnitTests/MockFontManagerImpl.cs
@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using System.Globalization;
+using Avalonia.Media;
+using Avalonia.Platform;
+
+namespace Avalonia.UnitTests
+{
+    public class MockFontManagerImpl : IFontManagerImpl
+    {
+        private readonly string _defaultFamilyName;
+
+        public MockFontManagerImpl(string defaultFamilyName = "Default")
+        {
+            _defaultFamilyName = defaultFamilyName;
+        }
+
+        public string GetDefaultFontFamilyName()
+        {
+            return _defaultFamilyName;
+        }
+
+        public IEnumerable<string> GetInstalledFontFamilyNames(bool checkForUpdates = false)
+        {
+            return new[] { _defaultFamilyName };
+        }
+
+        public bool TryMatchCharacter(int codepoint, FontStyle fontStyle, FontWeight fontWeight, FontFamily fontFamily,
+            CultureInfo culture, out Typeface fontKey)
+        {
+            fontKey = new Typeface(_defaultFamilyName);
+
+            return false;
+        }
+
+        public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)
+        {
+            return new MockGlyphTypeface();
+        }
+    }
+}
diff --git a/tests/Avalonia.UnitTests/MockGlyphTypeface.cs b/tests/Avalonia.UnitTests/MockGlyphTypeface.cs
new file mode 100644
index 0000000000..9c16041205
--- /dev/null
+++ b/tests/Avalonia.UnitTests/MockGlyphTypeface.cs
@@ -0,0 +1,47 @@
+using System;
+using Avalonia.Platform;
+
+namespace Avalonia.UnitTests
+{
+    public class MockGlyphTypeface : IGlyphTypefaceImpl
+    {
+        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 ushort GetGlyph(uint codepoint)
+        {
+            return 0;
+        }
+
+        public ushort[] GetGlyphs(ReadOnlySpan<uint> codepoints)
+        {
+            return new ushort[codepoints.Length];
+        }
+
+        public int GetGlyphAdvance(ushort glyph)
+        {
+            return 8;
+        }
+
+        public int[] GetGlyphAdvances(ReadOnlySpan<ushort> glyphs)
+        {
+            var advances = new int[glyphs.Length];
+
+            for (var i = 0; i < advances.Length; i++)
+            {
+                advances[i] = 8;
+            }
+
+            return advances;
+        }
+
+        public void Dispose() { }
+    }
+}
diff --git a/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs b/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
index 187853283f..e73a76357a 100644
--- a/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
+++ b/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using Avalonia.Media;
 using Avalonia.Platform;
+using Avalonia.Visuals.Media.Imaging;
 using Moq;
 
 namespace Avalonia.UnitTests
@@ -33,7 +34,7 @@ namespace Avalonia.UnitTests
 
         public IGeometryImpl CreateRectangleGeometry(Rect rect)
         {
-            return Mock.Of<IGeometryImpl>();
+            return Mock.Of<IGeometryImpl>(x => x.Bounds == rect);
         }
 
         public IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces)
@@ -54,7 +55,8 @@ namespace Avalonia.UnitTests
         public IWriteableBitmapImpl CreateWriteableBitmap(
             PixelSize size,
             Vector dpi,
-            PixelFormat? format = default(PixelFormat?))
+            PixelFormat format,
+            AlphaFormat alphaFormat)
         {
             throw new NotImplementedException();
         }
@@ -69,8 +71,24 @@ namespace Avalonia.UnitTests
             return Mock.Of<IBitmapImpl>();
         }
 
+        public IBitmapImpl LoadBitmapToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            return Mock.Of<IBitmapImpl>();
+        }
+
+        public IBitmapImpl LoadBitmapToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            return Mock.Of<IBitmapImpl>();
+        }
+
+        public IBitmapImpl ResizeBitmap(IBitmapImpl bitmapImpl, PixelSize destinationSize, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        {
+            return Mock.Of<IBitmapImpl>();
+        }
+
         public IBitmapImpl LoadBitmap(
             PixelFormat format,
+            AlphaFormat alphaFormat,
             IntPtr data,
             PixelSize size,
             Vector dpi,
@@ -79,9 +97,16 @@ namespace Avalonia.UnitTests
             throw new NotImplementedException();
         }
 
-        public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)
+        public IGlyphRunImpl CreateGlyphRun(GlyphRun glyphRun, out double width)
         {
-            return Mock.Of<IGlyphTypefaceImpl>();
+            width = 0;
+            return Mock.Of<IGlyphRunImpl>();
         }
+
+        public bool SupportsIndividualRoundRects { get; set; }
+
+        public AlphaFormat DefaultAlphaFormat => AlphaFormat.Premul;
+
+        public PixelFormat DefaultPixelFormat => PixelFormat.Rgba8888;
     }
 }
diff --git a/tests/Avalonia.UnitTests/MockTextShaperImpl.cs b/tests/Avalonia.UnitTests/MockTextShaperImpl.cs
new file mode 100644
index 0000000000..fe1c34385f
--- /dev/null
+++ b/tests/Avalonia.UnitTests/MockTextShaperImpl.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Globalization;
+using Avalonia.Media;
+using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.Platform;
+using Avalonia.Utilities;
+
+namespace Avalonia.UnitTests
+{
+    public class MockTextShaperImpl : ITextShaperImpl
+    {
+        public GlyphRun ShapeText(ReadOnlySlice<char> text, Typeface typeface, double fontRenderingEmSize, CultureInfo culture)
+        {
+            var glyphTypeface = typeface.GlyphTypeface;
+            var glyphIndices = new ushort[text.Length];
+            var glyphCount = 0;
+
+            for (var i = 0; i < text.Length;)
+            {
+                var index = i;
+
+                var codepoint = Codepoint.ReadAt(text, i, out var count);
+
+                i += count;
+
+                var glyph = glyphTypeface.GetGlyph(codepoint);
+
+                glyphIndices[index] = glyph;
+
+                glyphCount++;
+            }
+
+            return new GlyphRun(glyphTypeface, fontRenderingEmSize,
+                new ReadOnlySlice<ushort>(glyphIndices.AsMemory(0, glyphCount)), characters: text);
+        }
+    }
+}
diff --git a/tests/Avalonia.UnitTests/MockWindowingPlatform.cs b/tests/Avalonia.UnitTests/MockWindowingPlatform.cs
index c33ec72141..8a24a8366f 100644
--- a/tests/Avalonia.UnitTests/MockWindowingPlatform.cs
+++ b/tests/Avalonia.UnitTests/MockWindowingPlatform.cs
@@ -3,62 +3,131 @@ using Avalonia.Controls.Primitives.PopupPositioning;
 using Avalonia.Input;
 using Moq;
 using Avalonia.Platform;
+using Avalonia.Rendering;
 
 namespace Avalonia.UnitTests
 {
     public class MockWindowingPlatform : IWindowingPlatform
     {
+        private static readonly Size s_screenSize = new Size(1280, 1024);
         private readonly Func<IWindowImpl> _windowImpl;
-        private readonly Func<IPopupImpl> _popupImpl;
+        private readonly Func<IWindowBaseImpl, IPopupImpl> _popupImpl;
 
-        public MockWindowingPlatform(Func<IWindowImpl> windowImpl = null, Func<IPopupImpl> popupImpl = null )
+        public MockWindowingPlatform(
+            Func<IWindowImpl> windowImpl = null,
+            Func<IWindowBaseImpl, IPopupImpl> popupImpl = null )
         {
             _windowImpl = windowImpl;
             _popupImpl = popupImpl;
         }
 
-        public static Mock<IWindowImpl> CreateWindowMock(Func<IPopupImpl> popupImpl = null)
+        public static Mock<IWindowImpl> CreateWindowMock()
         {
-            var win = Mock.Of<IWindowImpl>(x => x.Scaling == 1);
-            var mock = Mock.Get(win);
-            mock.Setup(x => x.CreatePopup()).Returns(() =>
+            var windowImpl = new Mock<IWindowImpl>();
+            var position = new PixelPoint();
+            var clientSize = new Size(800, 600);
+
+            windowImpl.SetupAllProperties();
+            windowImpl.Setup(x => x.ClientSize).Returns(() => clientSize);
+            windowImpl.Setup(x => x.MaxAutoSizeHint).Returns(s_screenSize);
+            windowImpl.Setup(x => x.DesktopScaling).Returns(1);
+            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(() =>
+            {
+                return CreatePopupMock(windowImpl.Object).Object;
+            });
+
+            windowImpl.Setup(x => x.Dispose()).Callback(() =>
+            {
+                windowImpl.Object.Closed?.Invoke();
+            });
+
+            windowImpl.Setup(x => x.Move(It.IsAny<PixelPoint>())).Callback<PixelPoint>(x =>
             {
-                if (popupImpl != null)
-                    return popupImpl();
-                return CreatePopupMock().Object;
+                position = x;
+                windowImpl.Object.PositionChanged?.Invoke(x);
+            });
+
+            windowImpl.Setup(x => x.Resize(It.IsAny<Size>())).Callback<Size>(x =>
+            {
+                clientSize = x.Constrain(s_screenSize);
+                windowImpl.Object.Resized?.Invoke(clientSize);
+            });
 
+            windowImpl.Setup(x => x.Show(true)).Callback(() =>
+            {
+                windowImpl.Object.Activated?.Invoke();
             });
-            PixelPoint pos = default;
-            mock.SetupGet(x => x.Position).Returns(() => pos);
-            mock.Setup(x => x.Move(It.IsAny<PixelPoint>())).Callback(new Action<PixelPoint>(np => pos = np));
-            SetupToplevel(mock);
-            return mock;
+
+            return windowImpl;
         }
 
-        static void SetupToplevel<T>(Mock<T> mock) where T : class, ITopLevelImpl
+        public static Mock<IPopupImpl> CreatePopupMock(IWindowBaseImpl parent)
         {
-            mock.SetupGet(x => x.MouseDevice).Returns(new MouseDevice());
+            var popupImpl = new Mock<IPopupImpl>();
+            var clientSize = new Size();
+
+            var positionerHelper = new ManagedPopupPositionerPopupImplHelper(parent, (pos, size, scale) =>
+            {
+                clientSize = size.Constrain(s_screenSize);
+                popupImpl.Object.PositionChanged?.Invoke(pos);
+                popupImpl.Object.Resized?.Invoke(clientSize);
+            });
+            
+            var positioner = new ManagedPopupPositioner(positionerHelper);
+
+            popupImpl.SetupAllProperties();
+            popupImpl.Setup(x => x.ClientSize).Returns(() => clientSize);
+            popupImpl.Setup(x => x.MaxAutoSizeHint).Returns(s_screenSize);
+            popupImpl.Setup(x => x.RenderScaling).Returns(1);
+            popupImpl.Setup(x => x.PopupPositioner).Returns(positioner);
+            
+            SetupToplevel(popupImpl);
+            
+            return popupImpl;
         }
 
-        public static Mock<IPopupImpl> CreatePopupMock()
+        public static Mock<IScreenImpl> CreateScreenMock()
         {
-            var positioner = Mock.Of<IPopupPositioner>();
-            var popup = Mock.Of<IPopupImpl>(x => x.Scaling == 1);
-            var mock = Mock.Get(popup);
-            mock.SetupGet(x => x.PopupPositioner).Returns(positioner);
-            SetupToplevel(mock);
-            
-            return mock;
+            var screenImpl = new Mock<IScreenImpl>();
+            var bounds = new PixelRect(0, 0, (int)s_screenSize.Width, (int)s_screenSize.Height);
+            var screen = new Screen(96, bounds, bounds, true);
+            screenImpl.Setup(x => x.AllScreens).Returns(new[] { screen });
+            screenImpl.Setup(x => x.ScreenCount).Returns(1);
+            return screenImpl;
         }
 
         public IWindowImpl CreateWindow()
         {
-            return _windowImpl?.Invoke() ?? CreateWindowMock(_popupImpl).Object;
+            if (_windowImpl is object)
+            {
+                return _windowImpl();
+            }
+            else
+            {
+                var mock = CreateWindowMock();
+
+                if (_popupImpl is object)
+                {
+                    mock.Setup(x => x.CreatePopup()).Returns(() => _popupImpl(mock.Object));
+                }
+
+                return mock.Object;
+            }
         }
 
-        public IEmbeddableWindowImpl CreateEmbeddableWindow()
+        public IWindowImpl CreateEmbeddableWindow()
         {
             throw new NotImplementedException();
         }
+
+        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 f6454a9cd2..6c2d6d4b62 100644
--- a/tests/Avalonia.UnitTests/MouseTestHelper.cs
+++ b/tests/Avalonia.UnitTests/MouseTestHelper.cs
@@ -6,19 +6,25 @@ namespace Avalonia.UnitTests
 {
     public class MouseTestHelper
     {
-        private Pointer _pointer = new Pointer(Pointer.GetNextFreeId(), PointerType.Mouse, true);
+        private readonly Pointer _pointer = new Pointer(Pointer.GetNextFreeId(), PointerType.Mouse, true);
         private ulong _nextStamp = 1;
         private ulong Timestamp() => _nextStamp++;
 
-        private InputModifiers _pressedButtons;
+        private RawInputModifiers _pressedButtons;
         public IInputElement Captured => _pointer.Captured;
 
-        InputModifiers Convert(MouseButton mouseButton)
-            => (mouseButton == MouseButton.Left ? InputModifiers.LeftMouseButton
-                : mouseButton == MouseButton.Middle ? InputModifiers.MiddleMouseButton
-                : mouseButton == MouseButton.Right ? InputModifiers.RightMouseButton : InputModifiers.None);
-        
-        int ButtonCount(PointerPointProperties props)
+        private RawInputModifiers Convert(MouseButton mouseButton)
+        {
+            return mouseButton switch
+            {
+                MouseButton.Left => RawInputModifiers.LeftMouseButton,
+                MouseButton.Right => RawInputModifiers.RightMouseButton,
+                MouseButton.Middle => RawInputModifiers.MiddleMouseButton,
+                _ => RawInputModifiers.None,
+            };
+        }
+
+        private int ButtonCount(PointerPointProperties props)
         {
             var rv = 0;
             if (props.IsLeftButtonPressed)
@@ -32,17 +38,14 @@ namespace Avalonia.UnitTests
 
         private MouseButton _pressedButton;
 
-        KeyModifiers GetModifiers(InputModifiers modifiers) =>
-            (KeyModifiers)((int)modifiers & (int)RawInputModifiers.KeyboardMask);
-        
         public void Down(IInteractive target, MouseButton mouseButton = MouseButton.Left, Point position = default,
-            InputModifiers modifiers = default, int clickCount = 1)
+            KeyModifiers modifiers = default, int clickCount = 1)
         {
             Down(target, target, mouseButton, position, modifiers, clickCount);
         }
 
         public void Down(IInteractive target, IInteractive source, MouseButton mouseButton = MouseButton.Left, 
-            Point position = default, InputModifiers modifiers = default, int clickCount = 1)
+            Point position = default, KeyModifiers modifiers = default, int clickCount = 1)
         {
             _pressedButtons |= Convert(mouseButton);
             var props = new PointerPointProperties((RawInputModifiers)_pressedButtons,
@@ -56,24 +59,24 @@ namespace Avalonia.UnitTests
             {
                 _pressedButton = mouseButton;
                 _pointer.Capture((IInputElement)target);
-                target.RaiseEvent(new PointerPressedEventArgs(source, _pointer, (IVisual)source, position, Timestamp(), props,
-                    GetModifiers(modifiers), clickCount));
+                source.RaiseEvent(new PointerPressedEventArgs(source, _pointer, (IVisual)source, position, Timestamp(), props,
+                    modifiers, clickCount));
             }
         }
 
-        public void Move(IInteractive target, in Point position, InputModifiers modifiers = default) => Move(target, target, position, modifiers);
-        public void Move(IInteractive target, IInteractive source, in Point position, InputModifiers modifiers = default)
+        public void Move(IInteractive target, in Point position, KeyModifiers modifiers = default) => Move(target, target, position, modifiers);
+        public void Move(IInteractive target, IInteractive source, in Point position, KeyModifiers modifiers = default)
         {
             target.RaiseEvent(new PointerEventArgs(InputElement.PointerMovedEvent, source, _pointer, (IVisual)target, position,
-                Timestamp(), new PointerPointProperties((RawInputModifiers)_pressedButtons, PointerUpdateKind.Other), GetModifiers(modifiers)));
+                Timestamp(), new PointerPointProperties((RawInputModifiers)_pressedButtons, PointerUpdateKind.Other), modifiers));
         }
 
         public void Up(IInteractive target, MouseButton mouseButton = MouseButton.Left, Point position = default,
-            InputModifiers modifiers = default)
+            KeyModifiers modifiers = default)
             => Up(target, target, mouseButton, position, modifiers);
         
         public void Up(IInteractive target, IInteractive source, MouseButton mouseButton = MouseButton.Left,
-            Point position = default, InputModifiers modifiers = default)
+            Point position = default, KeyModifiers modifiers = default)
         {
             var conv = Convert(mouseButton);
             _pressedButtons = (_pressedButtons | conv) ^ conv;
@@ -85,7 +88,7 @@ namespace Avalonia.UnitTests
             if (ButtonCount(props) == 0)
             {
                 target.RaiseEvent(new PointerReleasedEventArgs(source, _pointer, (IVisual)target, position,
-                    Timestamp(), props, GetModifiers(modifiers), _pressedButton));
+                    Timestamp(), props, modifiers, _pressedButton));
                 _pointer.Capture(null);
             }
             else
@@ -93,10 +96,10 @@ namespace Avalonia.UnitTests
         }
 
         public void Click(IInteractive target, MouseButton button = MouseButton.Left, Point position = default,
-            InputModifiers modifiers = default)
+            KeyModifiers modifiers = default)
             => Click(target, target, button, position, modifiers);
         public void Click(IInteractive target, IInteractive source, MouseButton button = MouseButton.Left, 
-            Point position = default, InputModifiers modifiers = default)
+            Point position = default, KeyModifiers modifiers = default)
         {
             Down(target, source, button, position, modifiers);
             Up(target, source, button, position, modifiers);
diff --git a/tests/Avalonia.UnitTests/NotifyingBase.cs b/tests/Avalonia.UnitTests/NotifyingBase.cs
index c91e55d34f..9542e023d5 100644
--- a/tests/Avalonia.UnitTests/NotifyingBase.cs
+++ b/tests/Avalonia.UnitTests/NotifyingBase.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.ComponentModel;
 using System.Linq;
 using System.Runtime.CompilerServices;
diff --git a/tests/Avalonia.UnitTests/TestLogSink.cs b/tests/Avalonia.UnitTests/TestLogSink.cs
index a2b188c273..e10292a59b 100644
--- a/tests/Avalonia.UnitTests/TestLogSink.cs
+++ b/tests/Avalonia.UnitTests/TestLogSink.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Reactive.Disposables;
 using Avalonia.Logging;
@@ -30,7 +27,7 @@ namespace Avalonia.UnitTests
             return Disposable.Create(() => Logger.Sink = null);
         }
 
-        public bool IsEnabled(LogEventLevel level)
+        public bool IsEnabled(LogEventLevel level, string area)
         {
             return true;
         }
diff --git a/tests/Avalonia.UnitTests/TestRoot.cs b/tests/Avalonia.UnitTests/TestRoot.cs
index 56d7f028f2..b69bf990d9 100644
--- a/tests/Avalonia.UnitTests/TestRoot.cs
+++ b/tests/Avalonia.UnitTests/TestRoot.cs
@@ -1,10 +1,8 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Layout;
+using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Rendering;
@@ -14,13 +12,15 @@ using Moq;
 
 namespace Avalonia.UnitTests
 {
-    public class TestRoot : Decorator, IFocusScope, ILayoutRoot, IInputRoot, IRenderRoot, IStyleRoot
+    public class TestRoot : Decorator, IFocusScope, ILayoutRoot, IInputRoot, IRenderRoot, IStyleHost, ILogicalRoot
     {
         private readonly NameScope _nameScope = new NameScope();
 
         public TestRoot()
         {
             Renderer = Mock.Of<IRenderer>();
+            LayoutManager = new LayoutManager(this);
+            IsVisible = true;
         }
 
         public TestRoot(IControl child)
@@ -44,9 +44,9 @@ namespace Avalonia.UnitTests
 
         public Size MaxClientSize { get; set; } = Size.Infinity;
 
-        public double LayoutScaling => 1;
+        public double LayoutScaling { get; set; } = 1;
 
-        public ILayoutManager LayoutManager { get; set; } = new LayoutManager();
+        public ILayoutManager LayoutManager { get; set; }
 
         public double RenderScaling => 1;
 
@@ -72,7 +72,7 @@ namespace Avalonia.UnitTests
             dc.Setup(x => x.CreateLayer(It.IsAny<Size>())).Returns(() =>
             {
                 var layerDc = new Mock<IDrawingContextImpl>();
-                var layer = new Mock<IRenderTargetBitmapImpl>();
+                var layer = new Mock<IDrawingContextLayerImpl>();
                 layer.Setup(x => x.CreateDrawingContext(It.IsAny<IVisualBrushRenderer>())).Returns(layerDc.Object);
                 return layer.Object;
             });
diff --git a/tests/Avalonia.UnitTests/TestServices.cs b/tests/Avalonia.UnitTests/TestServices.cs
index d189aa3165..012cab23dc 100644
--- a/tests/Avalonia.UnitTests/TestServices.cs
+++ b/tests/Avalonia.UnitTests/TestServices.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Moq;
 using Avalonia.Input;
@@ -30,10 +27,15 @@ namespace Avalonia.UnitTests
             styler: new Styler(),
             theme: () => CreateDefaultTheme(),
             threadingInterface: Mock.Of<IPlatformThreadingInterface>(x => x.CurrentThreadIsLoopThread == true),
+            fontManagerImpl: new MockFontManagerImpl(),
+            textShaperImpl: new MockTextShaperImpl(),
             windowingPlatform: new MockWindowingPlatform());
 
         public static readonly TestServices MockPlatformRenderInterface = new TestServices(
-            renderInterface: new MockPlatformRenderInterface());
+            assetLoader: new AssetLoader(),
+            renderInterface: new MockPlatformRenderInterface(),
+            fontManagerImpl: new MockFontManagerImpl(),
+            textShaperImpl: new MockTextShaperImpl());
 
         public static readonly TestServices MockPlatformWrapper = new TestServices(
             platform: Mock.Of<IRuntimePlatform>());
@@ -52,7 +54,7 @@ namespace Avalonia.UnitTests
             keyboardDevice: () => new KeyboardDevice(),
             keyboardNavigation: new KeyboardNavigationHandler(),
             inputManager: new InputManager());
-        
+
         public static readonly TestServices RealStyler = new TestServices(
             styler: new Styler());
 
@@ -72,6 +74,8 @@ namespace Avalonia.UnitTests
             IStyler styler = null,
             Func<Styles> theme = null,
             IPlatformThreadingInterface threadingInterface = null,
+            IFontManagerImpl fontManagerImpl = null,
+            ITextShaperImpl textShaperImpl = null,
             IWindowImpl windowImpl = null,
             IWindowingPlatform windowingPlatform = null)
         {
@@ -84,6 +88,8 @@ namespace Avalonia.UnitTests
             MouseDevice = mouseDevice;
             Platform = platform;
             RenderInterface = renderInterface;
+            FontManagerImpl = fontManagerImpl;
+            TextShaperImpl = textShaperImpl;
             Scheduler = scheduler;
             StandardCursorFactory = standardCursorFactory;
             Styler = styler;
@@ -102,6 +108,8 @@ namespace Avalonia.UnitTests
         public Func<IMouseDevice> MouseDevice { get; }
         public IRuntimePlatform Platform { get; }
         public IPlatformRenderInterface RenderInterface { get; }
+        public IFontManagerImpl FontManagerImpl { get; }
+        public ITextShaperImpl TextShaperImpl { get; }
         public IScheduler Scheduler { get; }
         public IStandardCursorFactory StandardCursorFactory { get; }
         public IStyler Styler { get; }
@@ -126,6 +134,8 @@ namespace Avalonia.UnitTests
             IStyler styler = null,
             Func<Styles> theme = null,
             IPlatformThreadingInterface threadingInterface = null,
+            IFontManagerImpl fontManagerImpl = null,
+            ITextShaperImpl textShaperImpl = null,
             IWindowImpl windowImpl = null,
             IWindowingPlatform windowingPlatform = null)
         {
@@ -139,6 +149,8 @@ namespace Avalonia.UnitTests
                 mouseDevice: mouseDevice ?? MouseDevice,
                 platform: platform ?? Platform,
                 renderInterface: renderInterface ?? RenderInterface,
+                fontManagerImpl: fontManagerImpl ?? FontManagerImpl,
+                textShaperImpl: textShaperImpl ?? TextShaperImpl,
                 scheduler: scheduler ?? Scheduler,
                 standardCursorFactory: standardCursorFactory ?? StandardCursorFactory,
                 styler: styler ?? Styler,
@@ -155,8 +167,7 @@ namespace Avalonia.UnitTests
                 new DefaultTheme(),
             };
 
-            var loader = new AvaloniaXamlLoader();
-            var baseLight = (IStyle)loader.Load(
+            var baseLight = (IStyle)AvaloniaXamlLoader.Load(
                 new Uri("resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"));
             result.Add(baseLight);
 
@@ -165,7 +176,7 @@ namespace Avalonia.UnitTests
 
         private static IPlatformRenderInterface CreateRenderInterfaceMock()
         {
-            return Mock.Of<IPlatformRenderInterface>(x => 
+            return Mock.Of<IPlatformRenderInterface>(x =>
                 x.CreateFormattedText(
                     It.IsAny<string>(),
                     It.IsAny<Typeface>(),
diff --git a/tests/Avalonia.UnitTests/TestTemplatedRoot.cs b/tests/Avalonia.UnitTests/TestTemplatedRoot.cs
index b7e7a0276a..38ab3c3c5d 100644
--- a/tests/Avalonia.UnitTests/TestTemplatedRoot.cs
+++ b/tests/Avalonia.UnitTests/TestTemplatedRoot.cs
@@ -1,23 +1,22 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
 using Avalonia.Layout;
+using Avalonia.LogicalTree;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Styling;
 
 namespace Avalonia.UnitTests
 {
-    public class TestTemplatedRoot : ContentControl, ILayoutRoot, IRenderRoot, IStyleRoot
+    public class TestTemplatedRoot : ContentControl, ILayoutRoot, IRenderRoot, ILogicalRoot
     {
         private readonly NameScope _nameScope = new NameScope();
 
         public TestTemplatedRoot()
         {
+            LayoutManager = new LayoutManager(this);
             Template = new FuncControlTemplate<TestTemplatedRoot>((x, scope) => new ContentPresenter
             {
                 Name = "PART_ContentPresenter",
@@ -30,7 +29,7 @@ namespace Avalonia.UnitTests
 
         public double LayoutScaling => 1;
 
-        public ILayoutManager LayoutManager { get; set; } = new LayoutManager();
+        public ILayoutManager LayoutManager { get; set; }
 
         public double RenderScaling => 1;
 
diff --git a/tests/Avalonia.UnitTests/UnitTestApplication.cs b/tests/Avalonia.UnitTests/UnitTestApplication.cs
index a516facb92..e4a65f105d 100644
--- a/tests/Avalonia.UnitTests/UnitTestApplication.cs
+++ b/tests/Avalonia.UnitTests/UnitTestApplication.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Input;
 using Avalonia.Layout;
@@ -22,9 +19,9 @@ namespace Avalonia.UnitTests
 
         public UnitTestApplication() : this(null)
         {
-            
+
         }
-        
+
         public UnitTestApplication(TestServices services)
         {
             _services = services ?? new TestServices();
@@ -61,6 +58,8 @@ namespace Avalonia.UnitTests
                 .Bind<IMouseDevice>().ToConstant(Services.MouseDevice?.Invoke())
                 .Bind<IRuntimePlatform>().ToConstant(Services.Platform)
                 .Bind<IPlatformRenderInterface>().ToConstant(Services.RenderInterface)
+                .Bind<IFontManagerImpl>().ToConstant(Services.FontManagerImpl)
+                .Bind<ITextShaperImpl>().ToConstant(Services.TextShaperImpl)
                 .Bind<IPlatformThreadingInterface>().ToConstant(Services.ThreadingInterface)
                 .Bind<IScheduler>().ToConstant(Services.Scheduler)
                 .Bind<IStandardCursorFactory>().ToConstant(Services.StandardCursorFactory)
diff --git a/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj b/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj
index 50c2e580b0..13a04be5db 100644
--- a/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj
+++ b/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj
@@ -1,15 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net47</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net47</TargetFrameworks>
     <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" />
diff --git a/tests/Avalonia.Visuals.UnitTests/CornerRadiusTests.cs b/tests/Avalonia.Visuals.UnitTests/CornerRadiusTests.cs
index 56f9907409..21633b1cec 100644
--- a/tests/Avalonia.Visuals.UnitTests/CornerRadiusTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/CornerRadiusTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Globalization;
 using Xunit;
 
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/BoxShadowTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/BoxShadowTests.cs
new file mode 100644
index 0000000000..e3b703baf2
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Media/BoxShadowTests.cs
@@ -0,0 +1,45 @@
+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
index a6015c52e5..1a2f7732dd 100644
--- a/tests/Avalonia.Visuals.UnitTests/Media/BrushTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Media/BrushTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Media;
 using Xunit;
@@ -80,5 +77,17 @@ namespace Avalonia.Visuals.UnitTests.Media
         {
             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
index 5f0144ffc5..d68c2fd5fd 100644
--- a/tests/Avalonia.Visuals.UnitTests/Media/ColorTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Media/ColorTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using Avalonia.Media;
 using Xunit;
@@ -20,6 +17,41 @@ namespace Avalonia.Visuals.UnitTests.Media
             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()
         {
@@ -31,6 +63,41 @@ namespace Avalonia.Visuals.UnitTests.Media
             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()
         {
@@ -42,6 +109,18 @@ namespace Avalonia.Visuals.UnitTests.Media
             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()
         {
@@ -53,22 +132,72 @@ namespace Avalonia.Visuals.UnitTests.Media
             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
index 5d47333d51..8ed5e408fa 100644
--- a/tests/Avalonia.Visuals.UnitTests/Media/FontFamilyTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Media/FontFamilyTests.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Linq;
 using Avalonia.Media;
 using Avalonia.Media.Fonts;
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/FontManagerTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/FontManagerTests.cs
new file mode 100644
index 0000000000..2b0ffa4ed6
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Media/FontManagerTests.cs
@@ -0,0 +1,34 @@
+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);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FamilyNameCollectionTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FamilyNameCollectionTests.cs
index e7aa9daab3..f2fcd51629 100644
--- a/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FamilyNameCollectionTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FamilyNameCollectionTests.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using Avalonia.Media.Fonts;
 using Xunit;
 
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyKeyTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyKeyTests.cs
index b57ba781ed..d99301ea6c 100644
--- a/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyKeyTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyKeyTests.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using Avalonia.Media.Fonts;
 using Xunit;
 
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyLoaderTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyLoaderTests.cs
index e65c78e285..a83c0562e7 100644
--- a/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyLoaderTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Media/Fonts/FontFamilyLoaderTests.cs
@@ -1,9 +1,8 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Linq;
+using Avalonia.Media;
 using Avalonia.Media.Fonts;
+using Avalonia.Platform;
 using Avalonia.UnitTests;
 using Xunit;
 
@@ -71,6 +70,28 @@ namespace Avalonia.Visuals.UnitTests.Media.Fonts
             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);
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/GeometryTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/GeometryTests.cs
index b046910f34..7b1ed7f977 100644
--- a/tests/Avalonia.Visuals.UnitTests/Media/GeometryTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Media/GeometryTests.cs
@@ -84,7 +84,7 @@ namespace Avalonia.Visuals.UnitTests.Media
 
         private class TestGeometry : Geometry
         {
-            public static readonly AvaloniaProperty<bool> FooProperty =
+            public static readonly StyledProperty<bool> FooProperty =
                 AvaloniaProperty.Register<TestGeometry, bool>(nameof(Foo));
 
             static TestGeometry()
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/GlyphRunTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/GlyphRunTests.cs
new file mode 100644
index 0000000000..58feb4714a
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Media/GlyphRunTests.cs
@@ -0,0 +1,185 @@
+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[] { 10, 10, 10 }, new ushort[] { 0, 0, 0 }, 0, 0, 0)]
+        [InlineData(new double[] { 10, 10, 10 }, new ushort[] { 0, 0, 0 }, 0, 3, 30)]
+        [InlineData(new double[] { 10, 10, 10 }, new ushort[] { 0, 1, 2 }, 1, 0, 10)]
+        [InlineData(new double[] { 10, 10, 10 }, new ushort[] { 0, 1, 2 }, 2, 0, 20)]
+        [InlineData(new double[] { 10, 10, 10 }, new ushort[] { 0, 1, 2 }, 2, 1, 30)]
+        [Theory]
+        public void Should_Get_Distance_From_CharacterHit(double[] advances, ushort[] clusters, int start, int trailingLength, double expectedDistance)
+        {
+            using (var glyphRun = CreateGlyphRun(advances, clusters))
+            {
+                var characterHit = new CharacterHit(start, trailingLength);
+
+                var distance = glyphRun.GetDistanceFromCharacterHit(characterHit);
+
+                Assert.Equal(expectedDistance, distance);
+            }
+        }
+
+        [InlineData(new double[] { 10, 10, 10 }, new ushort[] { 0, 0, 0 }, 25.0, 0, 3, true)]
+        [InlineData(new double[] { 10, 10, 10 }, new ushort[] { 0, 1, 2 }, 20.0, 1, 1, true)]
+        [InlineData(new double[] { 10, 10, 10 }, new ushort[] { 0, 1, 2 }, 26.0, 2, 1, true)]
+        [InlineData(new double[] { 10, 10, 10 }, new ushort[] { 0, 1, 2 }, 35.0, 2, 1, false)]
+        [Theory]
+        public void Should_Get_CharacterHit_FromDistance(double[] advances, ushort[] clusters, double distance, int start,
+            int trailingLengthExpected, bool isInsideExpected)
+        {
+            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 ushort[] { 10, 11, 12 }, 0, -1, 10, 1, 10)]
+        [InlineData(new double[] { 10, 10, 10 }, new ushort[] { 10, 11, 12 }, 0, 15, 12, 1, 10)]
+        [InlineData(new double[] { 10, 10, 10 }, new ushort[] { 0, 0, 0 }, 0, 0, 0, 3, 30.0)]
+        [InlineData(new double[] { 10, 10, 10 }, new ushort[] { 0, 1, 2 }, 0, 1, 1, 1, 10.0)]
+        [InlineData(new double[] { 10, 10, 10, 10 }, new ushort[] { 0, 1, 1, 3 }, 0, 2, 1, 2, 20.0)]
+        [InlineData(new double[] { 10, 10, 10, 10 }, new ushort[] { 0, 1, 1, 3 }, 0, 1, 1, 2, 20.0)]
+        [InlineData(new double[] { 10, 10, 10, 10 }, new ushort[] { 3, 1, 1, 0 }, 1, 1, 1, 2, 20.0)]
+        [Theory]
+        public void Should_Find_Nearest_CharacterHit(double[] advances, ushort[] clusters, int bidiLevel,
+            int index, int expectedIndex, int expectedLength, double expectedWidth)
+        {
+            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[] { 10, 10, 10 }, new ushort[] { 0, 0, 0 }, 0, 0, 0, 3, 0)]
+        [InlineData(new double[] { 10, 10, 10 }, new ushort[] { 0, 0, 0 }, 0, 0, 0, 3, 1)]
+        [InlineData(new double[] { 10, 10, 10, 10 }, new ushort[] { 0, 0, 0, 3 }, 3, 0, 3, 1, 0)]
+        [InlineData(new double[] { 10, 10, 10, 10 }, new ushort[] { 3, 0, 0, 0 }, 3, 0, 3, 1, 1)]
+        [InlineData(new double[] { 10, 10, 10, 10, 10 }, new ushort[] { 0, 1, 1, 1, 4 }, 4, 0, 4, 1, 0)]
+        [InlineData(new double[] { 10, 10, 10, 10, 10 }, new ushort[] { 4, 1, 1, 1, 0 }, 4, 0, 4, 1, 1)]
+        [Theory]
+        public void Should_Get_Next_CharacterHit(double[] advances, ushort[] clusters,
+            int currentIndex, int currentLength,
+            int nextIndex, int nextLength,
+            int bidiLevel)
+        {
+            using (var glyphRun = CreateGlyphRun(advances, clusters, bidiLevel))
+            {
+                var characterHit = glyphRun.GetNextCaretCharacterHit(new CharacterHit(currentIndex, currentLength));
+
+                Assert.Equal(nextIndex, characterHit.FirstCharacterIndex);
+
+                Assert.Equal(nextLength, characterHit.TrailingLength);
+            }
+        }
+
+        [InlineData(new double[] { 10, 10, 10 }, new ushort[] { 0, 0, 0 }, 0, 0, 0, 0, 0)]
+        [InlineData(new double[] { 10, 10, 10 }, new ushort[] { 0, 0, 0 }, 0, 0, 0, 0, 1)]
+        [InlineData(new double[] { 10, 10, 10, 10 }, new ushort[] { 0, 0, 0, 3 }, 3, 1, 3, 0, 0)]
+        [InlineData(new double[] { 10, 10, 10, 10 }, new ushort[] { 3, 0, 0, 0 }, 3, 1, 3, 0, 1)]
+        [InlineData(new double[] { 10, 10, 10, 10, 10 }, new ushort[] { 0, 1, 1, 1, 4 }, 4, 1, 4, 0, 0)]
+        [InlineData(new double[] { 10, 10, 10, 10, 10 }, new ushort[] { 4, 1, 1, 1, 0 }, 4, 1, 4, 0, 1)]
+        [Theory]
+        public void Should_Get_Previous_CharacterHit(double[] advances, ushort[] clusters,
+            int currentIndex, int currentLength,
+            int previousIndex, int previousLength,
+            int bidiLevel)
+        {
+            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[] { 10, 10, 10 }, new ushort[] { 0, 0, 0 }, 0)]
+        [InlineData(new double[] { 10, 10, 10 }, new ushort[] { 0, 0, 0 }, 1)]
+        [InlineData(new double[] { 10, 10, 10, 10 }, new ushort[] { 0, 0, 0, 3 }, 0)]
+        [InlineData(new double[] { 10, 10, 10, 10 }, new ushort[] { 3, 0, 0, 0 }, 1)]
+        [InlineData(new double[] { 10, 10, 10, 10, 10 }, new ushort[] { 0, 1, 1, 1, 4 }, 0)]
+        [InlineData(new double[] { 10, 10, 10, 10, 10 }, new ushort[] { 4, 1, 1, 1, 0 }, 1)]
+        [Theory]
+        public void Should_Find_Glyph_Index(double[] advances, ushort[] clusters, int bidiLevel)
+        {
+            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, ushort[] glyphClusters, int bidiLevel = 0)
+        {
+            var count = glyphAdvances.Length;
+            var glyphIndices = new ushort[count];
+
+            var start = bidiLevel == 0 ? glyphClusters[0] : glyphClusters[glyphClusters.Length - 1];
+
+            var characters = new ReadOnlySlice<char>(new char[count], start, count);
+
+            return new GlyphRun(new GlyphTypeface(new MockGlyphTypeface()), 10, glyphIndices, glyphAdvances,
+                glyphClusters: glyphClusters, characters: characters, biDiLevel: bidiLevel);
+        }
+    }
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/MatrixTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/MatrixTests.cs
index ff1d17164e..6ef48b6161 100644
--- a/tests/Avalonia.Visuals.UnitTests/Media/MatrixTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Media/MatrixTests.cs
@@ -1,4 +1,5 @@
-using System.Globalization;
+using System;
+using Avalonia.Utilities;
 using Xunit;
 
 namespace Avalonia.Visuals.UnitTests.Media
@@ -6,11 +7,93 @@ namespace Avalonia.Visuals.UnitTests.Media
     public class MatrixTests
     {
         [Fact]
-        public void Parse_Parses()
+        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;
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs
index e1475dce80..c5ad705654 100644
--- a/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Avalonia.Media;
 using Avalonia.Visuals.Platform;
 using Xunit;
@@ -221,6 +218,48 @@ namespace Avalonia.Visuals.UnitTests.Media
             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")]
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/PathSegmentTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/PathSegmentTests.cs
new file mode 100644
index 0000000000..0737b4dc88
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Media/PathSegmentTests.cs
@@ -0,0 +1,34 @@
+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
index 418ac7576b..c2a1a5f9e4 100644
--- a/tests/Avalonia.Visuals.UnitTests/Media/PenTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Media/PenTests.cs
@@ -1,4 +1,5 @@
-using Avalonia.Media;
+using Avalonia.Collections;
+using Avalonia.Media;
 using Avalonia.Media.Immutable;
 using Xunit;
 
@@ -39,7 +40,20 @@ namespace Avalonia.Visuals.UnitTests.Media
             var raised = false;
 
             target.Invalidated += (s, e) => raised = true;
-            dashes.Dashes = new[] { 0.1, 0.2 };
+            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);
         }
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/PixelRectTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/PixelRectTests.cs
new file mode 100644
index 0000000000..c6da9b77e9
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Media/PixelRectTests.cs
@@ -0,0 +1,46 @@
+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/TextDecorationTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextDecorationTests.cs
new file mode 100644
index 0000000000..60a41baaa7
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Media/TextDecorationTests.cs
@@ -0,0 +1,28 @@
+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/BreakPairTable.txt b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BreakPairTable.txt
new file mode 100644
index 0000000000..814ce15d0a
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/BreakPairTable.txt
@@ -0,0 +1,34 @@
+	OP	CL	CP	QU	GL	NS	EX	SY	IS	PR	PO	NU	AL	HL	ID	IN	HY	BA	BB	B2	ZW	CM	WJ	H2	H3	JL	JV	JT	RI	EB	EM	ZWJ	CB
+OP	^	^	^	^	^	^	^	^	^	^	^	^	^	^	^	^	^	^	^	^	^	@	^	^	^	^	^	^	^	^	^	^	^
+CL	_	^	^	%	%	^	^	^	^	%	%	_	_	_	_	^	%	%	_	_	^	#	^	_	_	_	_	_	_	_	_	%	_
+CP	_	^	^	%	%	^	^	^	^	%	%	%	%	%	_	^	%	%	_	_	^	#	^	_	_	_	_	_	_	_	_	%	_
+QU	^	^	^	%	%	%	^	^	^	%	%	%	%	%	%	%	%	%	%	%	^	#	^	%	%	%	%	%	%	%	%	%	%
+GL	%	^	^	%	%	%	^	^	^	%	%	%	%	%	%	%	%	%	%	%	^	#	^	%	%	%	%	%	%	%	%	%	%
+NS	_	^	^	%	%	%	^	^	^	_	_	_	_	_	_	_	%	%	_	_	^	#	^	_	_	_	_	_	_	_	_	%	_
+EX	_	^	^	%	%	%	^	^	^	_	_	_	_	_	_	%	%	%	_	_	^	#	^	_	_	_	_	_	_	_	_	%	_
+SY	_	^	^	%	%	%	^	^	^	_	_	%	_	%	_	_	%	%	_	_	^	#	^	_	_	_	_	_	_	_	_	%	_
+IS	_	^	^	%	%	%	^	^	^	_	_	%	%	%	_	_	%	%	_	_	^	#	^	_	_	_	_	_	_	_	_	%	_
+PR	%	^	^	%	%	%	^	^	^	_	_	%	%	%	%	_	%	%	_	_	^	#	^	%	%	%	%	%	_	%	%	%	_
+PO	%	^	^	%	%	%	^	^	^	_	_	%	%	%	_	_	%	%	_	_	^	#	^	_	_	_	_	_	_	_	_	%	_
+NU	%	^	^	%	%	%	^	^	^	%	%	%	%	%	_	%	%	%	_	_	^	#	^	_	_	_	_	_	_	_	_	%	_
+AL	%	^	^	%	%	%	^	^	^	%	%	%	%	%	_	%	%	%	_	_	^	#	^	_	_	_	_	_	_	_	_	%	_
+HL	%	^	^	%	%	%	^	^	^	%	%	%	%	%	_	%	%	%	_	_	^	#	^	_	_	_	_	_	_	_	_	%	_
+ID	_	^	^	%	%	%	^	^	^	_	%	_	_	_	_	%	%	%	_	_	^	#	^	_	_	_	_	_	_	_	_	%	_
+IN	_	^	^	%	%	%	^	^	^	_	_	_	_	_	_	%	%	%	_	_	^	#	^	_	_	_	_	_	_	_	_	%	_
+HY	_	^	^	%	_	%	^	^	^	_	_	%	_	_	_	_	%	%	_	_	^	#	^	_	_	_	_	_	_	_	_	%	_
+BA	_	^	^	%	_	%	^	^	^	_	_	_	_	_	_	_	%	%	_	_	^	#	^	_	_	_	_	_	_	_	_	%	_
+BB	%	^	^	%	%	%	^	^	^	%	%	%	%	%	%	%	%	%	%	%	^	#	^	%	%	%	%	%	%	%	%	%	_
+B2	_	^	^	%	%	%	^	^	^	_	_	_	_	_	_	_	%	%	_	^	^	#	^	_	_	_	_	_	_	_	_	%	_
+ZW	_	_	_	_	_	_	_	_	_	_	_	_	_	_	_	_	_	_	_	_	^	_	_	_	_	_	_	_	_	_	_	_	_
+CM	%	^	^	%	%	%	^	^	^	%	%	%	%	%	_	%	%	%	_	_	^	#	^	_	_	_	_	_	_	_	_	%	_
+WJ	%	^	^	%	%	%	^	^	^	%	%	%	%	%	%	%	%	%	%	%	^	#	^	%	%	%	%	%	%	%	%	%	%
+H2	_	^	^	%	%	%	^	^	^	_	%	_	_	_	_	%	%	%	_	_	^	#	^	_	_	_	%	%	_	_	_	%	_
+H3	_	^	^	%	%	%	^	^	^	_	%	_	_	_	_	%	%	%	_	_	^	#	^	_	_	_	_	%	_	_	_	%	_
+JL	_	^	^	%	%	%	^	^	^	_	%	_	_	_	_	%	%	%	_	_	^	#	^	%	%	%	%	_	_	_	_	%	_
+JV	_	^	^	%	%	%	^	^	^	_	%	_	_	_	_	%	%	%	_	_	^	#	^	_	_	_	%	%	_	_	_	%	_
+JT	_	^	^	%	%	%	^	^	^	_	%	_	_	_	_	%	%	%	_	_	^	#	^	_	_	_	_	%	_	_	_	%	_
+RI	_	^	^	%	%	%	^	^	^	_	_	_	_	_	_	_	%	%	_	_	^	#	^	_	_	_	_	_	%	_	_	%	_
+EB	_	^	^	%	%	%	^	^	^	_	%	_	_	_	_	%	%	%	_	_	^	#	^	_	_	_	_	_	_	_	%	%	_
+EM	_	^	^	%	%	%	^	^	^	_	%	_	_	_	_	%	%	%	_	_	^	#	^	_	_	_	_	_	_	_	_	%	_
+ZWJ	%	^	^	%	%	%	^	^	^	%	%	%	%	%	_	%	%	%	_	_	^	#	^	_	_	_	_	_	_	_	_	%	_
+CB	_	^	^	%	%	_	^	^	^	_	_	_	_	_	_	_	_	_	_	_	^	#	^	_	_	_	_	_	_	_	_	%	_
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs
new file mode 100644
index 0000000000..c074e5a1f1
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs
@@ -0,0 +1,112 @@
+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
new file mode 100644
index 0000000000..848b60b341
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGeneratorTests.cs
@@ -0,0 +1,61 @@
+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/LineBreakerTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/LineBreakerTests.cs
new file mode 100644
index 0000000000..3d489af3a2
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/LineBreakerTests.cs
@@ -0,0 +1,56 @@
+using System;
+using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
+{
+    public class LineBreakerTests
+    {
+        [Fact]
+        public void Should_Split_Text_By_Explicit_Breaks()
+        {
+            //ABC [0 3]
+            //DEF\r[4 7]
+            //\r[8]
+            //Hello\r\n[9 15]
+            const string text = "ABC DEF\r\rHELLO\r\n";
+
+            var buffer = new ReadOnlySlice<char>(text.AsMemory());
+
+            var lineBreaker = new LineBreakEnumerator(buffer);
+
+            var current = 0;
+
+            Assert.True(lineBreaker.MoveNext());
+
+            var a = text.Substring(current, lineBreaker.Current.PositionMeasure - current + 1);
+
+            Assert.Equal("ABC ", a);
+
+            current += a.Length;
+
+            Assert.True(lineBreaker.MoveNext());
+
+            var b = text.Substring(current, lineBreaker.Current.PositionMeasure - current + 1);
+
+            Assert.Equal("DEF\r", b);
+
+            current += b.Length;
+
+            Assert.True(lineBreaker.MoveNext());
+
+            var c = text.Substring(current, lineBreaker.Current.PositionMeasure - current + 1);
+
+            Assert.Equal("\r", c);
+
+            current += c.Length;
+
+            Assert.True(lineBreaker.MoveNext());
+
+            var d = text.Substring(current, text.Length - current);
+
+            Assert.Equal("HELLO\r\n", d);
+        }
+    }
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/TestDataGenerator.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/TestDataGenerator.cs
new file mode 100644
index 0000000000..058de909df
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/TestDataGenerator.cs
@@ -0,0 +1,85 @@
+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
new file mode 100644
index 0000000000..cbe8edefb6
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs
@@ -0,0 +1,287 @@
+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
+{
+    internal static class UnicodeDataGenerator
+    {
+        public const string Ucd = "https://www.unicode.org/Public/13.0.0/ucd/";
+
+        public static void Execute()
+        {
+            var codepoints = new Dictionary<int, UnicodeDataItem>();
+
+            var generalCategoryEntries =
+                UnicodeEnumsGenerator.CreateGeneralCategoryEnum();
+
+            var generalCategoryMappings = CreateTagToIndexMappings(generalCategoryEntries);
+
+            var generalCategoryData = ReadGeneralCategoryData();
+
+            foreach (var (range, name) in generalCategoryData)
+            {
+                var generalCategory = generalCategoryMappings[name];
+
+                AddGeneralCategoryRange(codepoints, range, generalCategory);
+            }
+
+            var scriptEntries = UnicodeEnumsGenerator.CreateScriptEnum();
+
+            var scriptMappings = CreateNameToIndexMappings(scriptEntries);
+
+            var scriptData = ReadScriptData();
+
+            foreach (var (range, name) in scriptData)
+            {
+                var script = scriptMappings[name];
+
+                AddScriptRange(codepoints, range, script);
+            }
+
+            var biDiClassEntries =
+                    UnicodeEnumsGenerator.CreateBiDiClassEnum();
+
+            var biDiClassMappings = CreateTagToIndexMappings(biDiClassEntries);
+
+            var biDiData = ReadBiDiData();
+
+            foreach (var (range, name) in biDiData)
+            {
+                var biDiClass = biDiClassMappings[name];
+
+                AddBiDiClassRange(codepoints, range, biDiClass);
+            }
+
+            var lineBreakClassEntries =
+                UnicodeEnumsGenerator.CreateLineBreakClassEnum();
+
+            var lineBreakClassMappings = CreateTagToIndexMappings(lineBreakClassEntries);
+
+            var lineBreakClassData = ReadLineBreakClassData();
+
+            foreach (var (range, name) in lineBreakClassData)
+            {
+                var lineBreakClass = lineBreakClassMappings[name];
+
+                AddLineBreakClassRange(codepoints, range, lineBreakClass);
+            }
+
+            //const int initialValue = (0 << UnicodeData.LINEBREAK_SHIFT) |
+            //                          (0 << UnicodeData.BIDI_SHIFT) |
+            //                          (0 << UnicodeData.SCRIPT_SHIFT) | (int)GeneralCategory.Other;
+
+            var builder = new UnicodeTrieBuilder(/*initialValue*/);
+
+            foreach (var properties in codepoints.Values)
+            {
+                //[line break]|[biDi]|[script]|[category]
+                var value = (properties.LineBreakClass << UnicodeData.LINEBREAK_SHIFT) |
+                            (properties.BiDiClass << UnicodeData.BIDI_SHIFT) |
+                            (properties.Script << UnicodeData.SCRIPT_SHIFT) | properties.GeneralCategory;
+
+                builder.Set(properties.Codepoint, (uint)value);
+            }
+
+            using (var stream = File.Create("Generated\\UnicodeData.trie"))
+            {
+                var trie = builder.Freeze();
+
+                trie.Save(stream);
+            }
+
+            UnicodeEnumsGenerator.CreatePropertyValueAliasHelper(scriptEntries, generalCategoryEntries,
+                biDiClassEntries, lineBreakClassEntries);
+        }
+
+        private static Dictionary<string, int> CreateTagToIndexMappings(List<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(List<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, UnicodeDataItem> codepoints, CodepointRange range,
+            int biDiClass)
+        {
+            for (var i = range.Start; i <= range.End; i++)
+            {
+                if (!codepoints.ContainsKey(i))
+                {
+                    codepoints.Add(i, new UnicodeDataItem { Codepoint = i, BiDiClass = biDiClass });
+                }
+                else
+                {
+                    codepoints[i].BiDiClass = biDiClass;
+                }
+            }
+        }
+
+        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");
+        }
+
+        private static List<(CodepointRange, string)> ReadUnicodeData(string file)
+        {
+            var data = new List<(CodepointRange, string)>();
+
+            var rx = 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 = 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);
+                            }
+
+                            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 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
new file mode 100644
index 0000000000..5c705ba0c7
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeDataGeneratorTests.cs
@@ -0,0 +1,40 @@
+using System;
+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()
+        {
+            UnicodeDataGenerator.Execute();
+        }
+        [Theory(Skip = "Only run when we update the trie.")]
+        [ClassData(typeof(LineBreakTestDataGenerator))]
+
+        public void Should_Enumerate_LineBreaks(string text, int expectedLength)
+        {
+            var textMemory = text.AsMemory();
+
+            var enumerator = new LineBreakEnumerator(textMemory);
+
+            Assert.True(enumerator.MoveNext());
+
+            Assert.Equal(expectedLength, enumerator.Current.PositionWrap);
+        }
+
+        private class LineBreakTestDataGenerator : TestDataGenerator
+        {
+            public LineBreakTestDataGenerator()
+                : base("auxiliary/LineBreakTest.txt")
+            {
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs
new file mode 100644
index 0000000000..3a936ff3b0
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs
@@ -0,0 +1,445 @@
+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 void CreatePropertyValueAliasHelper(List<DataEntry> scriptEntries, IEnumerable<DataEntry> generalCategoryEntries,
+            IEnumerable<DataEntry> biDiClassEntries, IEnumerable<DataEntry> lineBreakClassEntries)
+        {
+            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, scriptEntries, "Script", "Zzzz");
+
+                WritePropertyValueAlias(writer, scriptEntries, "Script", "Unknown");
+
+                WritePropertyValueAlias(writer, generalCategoryEntries, "GeneralCategory", "Other");
+
+                WritePropertyValueAlias(writer, biDiClassEntries, "BiDiClass", "LeftToRight");
+
+                WritePropertyValueAlias(writer, lineBreakClassEntries, "LineBreakClass", "Unknown");
+
+                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
new file mode 100644
index 0000000000..856b4615a5
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Media/TransformOperationsTests.cs
@@ -0,0 +1,229 @@
+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);
+        }
+    }
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TypefaceTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/TypefaceTests.cs
index 0e43c76da1..e526172622 100644
--- a/tests/Avalonia.Visuals.UnitTests/Media/TypefaceTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Media/TypefaceTests.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Visuals.UnitTests.Media
         [Fact]
         public void Exception_Should_Be_Thrown_If_FontWeight_LessThanEqualTo_Zero()
         {
-            Assert.Throws<ArgumentException>(() => new Typeface("foo", 0, (FontStyle)12));
+            Assert.Throws<ArgumentException>(() => new Typeface("foo", (FontStyle)12, 0));
         }
 
         [Fact]
diff --git a/tests/Avalonia.Visuals.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Visuals.UnitTests/Properties/AssemblyInfo.cs
index dc29e93ea2..2251cc6e92 100644
--- a/tests/Avalonia.Visuals.UnitTests/Properties/AssemblyInfo.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Properties/AssemblyInfo.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Reflection;
 using Xunit;
 
diff --git a/tests/Avalonia.Visuals.UnitTests/RectTests.cs b/tests/Avalonia.Visuals.UnitTests/RectTests.cs
index 6e3f654bfb..a2b0569949 100644
--- a/tests/Avalonia.Visuals.UnitTests/RectTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/RectTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Xunit;
 
 namespace Avalonia.Visuals.UnitTests
@@ -38,5 +35,24 @@ namespace Avalonia.Visuals.UnitTests
 
             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
index b9eecc809f..c871b8ee87 100644
--- a/tests/Avalonia.Visuals.UnitTests/RelativePointTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/RelativePointTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Globalization;
 using Xunit;
 
diff --git a/tests/Avalonia.Visuals.UnitTests/RelativeRectComparer.cs b/tests/Avalonia.Visuals.UnitTests/RelativeRectComparer.cs
index 9cca2bfc19..bf3bf39367 100644
--- a/tests/Avalonia.Visuals.UnitTests/RelativeRectComparer.cs
+++ b/tests/Avalonia.Visuals.UnitTests/RelativeRectComparer.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 
diff --git a/tests/Avalonia.Visuals.UnitTests/RelativeRectTests.cs b/tests/Avalonia.Visuals.UnitTests/RelativeRectTests.cs
index 68a0df2d9b..9753e0779a 100644
--- a/tests/Avalonia.Visuals.UnitTests/RelativeRectTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/RelativeRectTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Globalization;
 using Xunit;
diff --git a/tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs b/tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs
index b87e72516b..ba632b791a 100644
--- a/tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs
+++ b/tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs
@@ -1,12 +1,10 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Moq;
 using Avalonia.Controls;
 using Avalonia.Media;
 using Avalonia.Rendering;
 using Xunit;
 using Avalonia.Platform;
+using Avalonia.UnitTests;
 
 namespace Avalonia.Visuals.UnitTests
 {
@@ -15,147 +13,162 @@ namespace Avalonia.Visuals.UnitTests
         [Fact]
         public void In_Bounds_Control_Should_Be_Rendered()
         {
-            TestControl target;
-            var container = new Canvas
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                Width = 100,
-                Height = 100,
-                ClipToBounds = true,
-                Children =
+                TestControl target;
+
+                var container = new Canvas
                 {
-                    (target = new TestControl
+                    Width = 100,
+                    Height = 100,
+                    ClipToBounds = true,
+                    Children =
                     {
-                        Width = 10,
-                        Height = 10,
-                        [Canvas.LeftProperty] = 98,
-                        [Canvas.TopProperty] = 98,
-                    })
-                }
-            };
+                        (target = new TestControl
+                        {
+                            Width = 10, Height = 10, [Canvas.LeftProperty] = 98, [Canvas.TopProperty] = 98,
+                        })
+                    }
+                };
 
-            Render(container);
+                Render(container);
 
-            Assert.True(target.Rendered);
+                Assert.True(target.Rendered);
+            }
         }
 
         [Fact]
         public void Out_Of_Bounds_Control_Should_Not_Be_Rendered()
         {
-            TestControl target;
-            var container = new Canvas
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                Width = 100,
-                Height = 100,
-                ClipToBounds = true,
-                Children =
+                TestControl target;
+
+                var container = new Canvas
                 {
-                    (target = new TestControl
+                    Width = 100,
+                    Height = 100,
+                    ClipToBounds = true,
+                    Children =
                     {
-                        Width = 10,
-                        Height = 10,
-                        ClipToBounds = true,
-                        [Canvas.LeftProperty] = 110,
-                        [Canvas.TopProperty] = 110,
-                    })
-                }
-            };
-
-            Render(container);
-
-            Assert.False(target.Rendered);
+                        (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()
         {
-            TestControl target;
-            var container = new Canvas
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                Width = 100,
-                Height = 100,
-                ClipToBounds = true,
-                Children =
+                TestControl target;
+
+                var container = new Canvas
                 {
-                    new Canvas
+                    Width = 100,
+                    Height = 100,
+                    ClipToBounds = true,
+                    Children =
                     {
-                        Width = 100,
-                        Height = 100,
-                        [Canvas.LeftProperty] = 50,
-                        [Canvas.TopProperty] = 50,
-                        Children =
+                        new Canvas
                         {
-                            (target = new TestControl
+                            Width = 100,
+                            Height = 100,
+                            [Canvas.LeftProperty] = 50,
+                            [Canvas.TopProperty] = 50,
+                            Children =
                             {
-                                Width = 10,
-                                Height = 10,
-                                ClipToBounds = true,
-                                [Canvas.LeftProperty] = 50,
-                                [Canvas.TopProperty] = 50,
-                            })
+                                (target = new TestControl
+                                {
+                                    Width = 10,
+                                    Height = 10,
+                                    ClipToBounds = true,
+                                    [Canvas.LeftProperty] = 50,
+                                    [Canvas.TopProperty] = 50,
+                                })
+                            }
                         }
                     }
-                }
-            };
+                };
 
-            Render(container);
+                Render(container);
 
-            Assert.False(target.Rendered);
+                Assert.False(target.Rendered);
+            }
         }
 
         [Fact]
         public void RenderTransform_Should_Be_Respected()
         {
-            TestControl target;
-            var container = new Canvas
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                Width = 100,
-                Height = 100,
-                ClipToBounds = true,
-                Children =
+                TestControl target;
+
+                var container = new Canvas
                 {
-                    (target = new TestControl
+                    Width = 100,
+                    Height = 100,
+                    ClipToBounds = true,
+                    Children =
                     {
-                        Width = 10,
-                        Height = 10,
-                        [Canvas.LeftProperty] = 110,
-                        [Canvas.TopProperty] = 110,
-                        RenderTransform = new TranslateTransform(-100, -100),
-                    })
-                }
-            };
-
-            Render(container);
-
-            Assert.True(target.Rendered);
+                        (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()
         {
-            TestControl target;
-            var container = new Canvas
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                Width = 100,
-                Height = 100,
-                ClipToBounds = true,
-                Children =
+                TestControl target;
+
+                var container = new Canvas
                 {
-                    new Border
+                    Width = 100,
+                    Height = 100,
+                    ClipToBounds = true,
+                    Children =
                     {
-                        Margin = new Thickness(100, 100, 0, 0),
-                        Child = target = new TestControl
+                        new Border
                         {
-                            Width = 10,
-                            Height = 10,
-                            Margin = new Thickness(-100, -100, 0, 0),
+                            Margin = new Thickness(100, 100, 0, 0),
+                            Child = target = new TestControl
+                            {
+                                Width = 10, Height = 10, Margin = new Thickness(-100, -100, 0, 0),
+                            }
                         }
                     }
-                }
-            };
+                };
 
-            Render(container);
+                Render(container);
 
-            Assert.True(target.Rendered);
+                Assert.True(target.Rendered);
+            }
         }
 
         private void Render(IControl control)
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
index 6063a382a0..e58eea42d8 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
@@ -25,698 +25,708 @@ namespace Avalonia.Visuals.UnitTests.Rendering
         [Fact]
         public void First_Frame_Calls_SceneBuilder_UpdateAll()
         {
-            var root = new TestRoot();
-            var sceneBuilder = MockSceneBuilder(root);
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var root = new TestRoot();
+                var sceneBuilder = MockSceneBuilder(root);
 
-            CreateTargetAndRunFrame(root, sceneBuilder: sceneBuilder.Object);
+                CreateTargetAndRunFrame(root, sceneBuilder: sceneBuilder.Object);
 
-            sceneBuilder.Verify(x => x.UpdateAll(It.IsAny<Scene>()));
+                sceneBuilder.Verify(x => x.UpdateAll(It.IsAny<Scene>()));
+            }
         }
 
         [Fact]
         public void Frame_Does_Not_Call_SceneBuilder_If_No_Dirty_Controls()
         {
-            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);
+            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()
         {
-            var dispatcher = new ImmediateDispatcher();
-            var loop = new Mock<IRenderLoop>();
-
-            Border border;
-            Decorator decorator;
-            Canvas canvas;
-            var root = new TestRoot
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                Child = decorator = new Decorator
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                Border border;
+                Decorator decorator;
+                Canvas canvas;
+
+                var root = new TestRoot
                 {
-                    Child = border = new Border
+                    Child = decorator = new Decorator
                     {
-                        Child = canvas = new Canvas()
+                        Child = border = new Border { Child = canvas = new Canvas() }
                     }
-                }
-            };
+                };
 
-            var sceneBuilder = MockSceneBuilder(root);
-            var target = new DeferredRenderer(
-                root,
-                loop.Object,
-                sceneBuilder: sceneBuilder.Object,
-                dispatcher: dispatcher);
+                var sceneBuilder = MockSceneBuilder(root);
 
-            target.Start();
-            IgnoreFirstFrame(target, sceneBuilder);
-            target.AddDirty(border);
-            target.AddDirty(canvas);
-            target.AddDirty(root);
-            target.AddDirty(decorator);
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder.Object,
+                    dispatcher: dispatcher);
 
-            var result = new List<IVisual>();
-            sceneBuilder.Setup(x => x.Update(It.IsAny<Scene>(), It.IsAny<IVisual>()))
-                .Callback<Scene, IVisual>((_, v) => result.Add(v));
+                target.Start();
+                IgnoreFirstFrame(target, sceneBuilder);
+                target.AddDirty(border);
+                target.AddDirty(canvas);
+                target.AddDirty(root);
+                target.AddDirty(decorator);
 
-            RunFrame(target);
+                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);
+                Assert.Equal(new List<IVisual> { root, decorator, border, canvas }, result);
+            }
         }
 
         [Fact]
         public void Should_Add_Dirty_Rect_On_Child_Remove()
         {
-            var dispatcher = new ImmediateDispatcher();
-            var loop = new Mock<IRenderLoop>();
-
-            Decorator decorator;
-            Border border;
-            var root = new TestRoot
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                Width = 100,
-                Height= 100,
-                Child = decorator = new Decorator
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                Decorator decorator;
+                Border border;
+
+                var root = new TestRoot
                 {
-                    Child = border = new Border
+                    Width = 100,
+                    Height = 100,
+                    Child = decorator = new Decorator
                     {
-                        Width = 50,
-                        Height = 50,
-                        Background = Brushes.Red,
-                    },
-                }
-            };
+                        Child = border = new Border { Width = 50, Height = 50, Background = Brushes.Red, },
+                    }
+                };
 
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(root.DesiredSize));
+                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);
+                var sceneBuilder = new SceneBuilder();
 
-            root.Renderer = target;
-            target.Start();
-            RunFrame(target);
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
 
-            decorator.Child = null;
+                root.Renderer = target;
+                target.Start();
+                RunFrame(target);
 
-            RunFrame(target);
+                decorator.Child = null;
 
-            var scene = target.UnitTestScene();
-            var stackNode = scene.FindNode(decorator);
-            var dirty = scene.Layers[0].Dirty.ToList();
+                RunFrame(target);
 
-            Assert.Equal(1, dirty.Count);
-            Assert.Equal(new Rect(25, 25, 50, 50), dirty[0]);
+                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()
         {
-            var dispatcher = new ImmediateDispatcher();
-            var loop = new Mock<IRenderLoop>();
-
-            StackPanel stack;
-            Canvas canvas1;
-            Canvas canvas2;
-            var root = new TestRoot
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                Child = stack = new StackPanel
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                StackPanel stack;
+                Canvas canvas1;
+                Canvas canvas2;
+
+                var root = new TestRoot
                 {
-                    Children=
+                    Child = stack = new StackPanel
                     {
-                        (canvas1 = new Canvas()),
-                        (canvas2 = new Canvas()),
+                        Children = { (canvas1 = new Canvas()), (canvas2 = new Canvas()), }
                     }
-                }
-            };
+                };
 
-            var sceneBuilder = new SceneBuilder();
-            var target = new DeferredRenderer(
-                root,
-                loop.Object,
-                sceneBuilder: sceneBuilder,
-                dispatcher: dispatcher);
+                var sceneBuilder = new SceneBuilder();
 
-            root.Renderer = target;
-            target.Start();
-            RunFrame(target);
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
 
-            stack.Children.Remove(canvas2);
-            stack.Children.Insert(0, canvas2);
+                root.Renderer = target;
+                target.Start();
+                RunFrame(target);
 
-            RunFrame(target);
+                stack.Children.Remove(canvas2);
+                stack.Children.Insert(0, canvas2);
+
+                RunFrame(target);
 
-            var scene = target.UnitTestScene();
-            var stackNode = scene.FindNode(stack);
+                var scene = target.UnitTestScene();
+                var stackNode = scene.FindNode(stack);
 
-            Assert.Same(stackNode.Children[0].Visual, canvas2);
-            Assert.Same(stackNode.Children[1].Visual, canvas1);
+                Assert.Same(stackNode.Children[0].Visual, canvas2);
+                Assert.Same(stackNode.Children[1].Visual, canvas1);
+            }
         }
 
         [Fact]
         public void Should_Update_VisualNode_Order_On_Child_Move()
         {
-            var dispatcher = new ImmediateDispatcher();
-            var loop = new Mock<IRenderLoop>();
-
-            StackPanel stack;
-            Canvas canvas1;
-            Canvas canvas2;
-            var root = new TestRoot
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                Child = stack = new StackPanel
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                StackPanel stack;
+                Canvas canvas1;
+                Canvas canvas2;
+
+                var root = new TestRoot
                 {
-                    Children =
+                    Child = stack = new StackPanel
                     {
-                        (canvas1 = new Canvas()),
-                        (canvas2 = new Canvas()),
+                        Children = { (canvas1 = new Canvas()), (canvas2 = new Canvas()), }
                     }
-                }
-            };
+                };
 
-            var sceneBuilder = new SceneBuilder();
-            var target = new DeferredRenderer(
-                root,
-                loop.Object,
-                sceneBuilder: sceneBuilder,
-                dispatcher: dispatcher);
+                var sceneBuilder = new SceneBuilder();
 
-            root.Renderer = target;
-            target.Start();
-            RunFrame(target);
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
 
-            stack.Children.Move(1, 0);
+                root.Renderer = target;
+                target.Start();
+                RunFrame(target);
 
-            RunFrame(target);
+                stack.Children.Move(1, 0);
 
-            var scene = target.UnitTestScene();
-            var stackNode = scene.FindNode(stack);
+                RunFrame(target);
 
-            Assert.Same(stackNode.Children[0].Visual, canvas2);
-            Assert.Same(stackNode.Children[1].Visual, canvas1);
+                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()
         {
-            var dispatcher = new ImmediateDispatcher();
-            var loop = new Mock<IRenderLoop>();
-
-            StackPanel stack;
-            Canvas canvas1;
-            Canvas canvas2;
-            var root = new TestRoot
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                Child = stack = new StackPanel
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                StackPanel stack;
+                Canvas canvas1;
+                Canvas canvas2;
+
+                var root = new TestRoot
                 {
-                    Children =
+                    Child = stack = new StackPanel
                     {
-                        (canvas1 = new Canvas { ZIndex = 1 }),
-                        (canvas2 = new Canvas { ZIndex = 2 }),
+                        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);
+                var sceneBuilder = new SceneBuilder();
 
-            root.Renderer = target;
-            target.Start();
-            RunFrame(target);
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
 
-            canvas1.ZIndex = 3;
+                root.Renderer = target;
+                target.Start();
+                RunFrame(target);
 
-            RunFrame(target);
+                canvas1.ZIndex = 3;
+
+                RunFrame(target);
 
-            var scene = target.UnitTestScene();
-            var stackNode = scene.FindNode(stack);
+                var scene = target.UnitTestScene();
+                var stackNode = scene.FindNode(stack);
 
-            Assert.Same(stackNode.Children[0].Visual, canvas2);
-            Assert.Same(stackNode.Children[1].Visual, canvas1);
+                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()
         {
-            var dispatcher = new ImmediateDispatcher();
-            var loop = new Mock<IRenderLoop>();
-
-            StackPanel stack;
-            Canvas canvas1;
-            Canvas canvas2;
-            var root = new TestRoot
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                Child = stack = new StackPanel
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                StackPanel stack;
+                Canvas canvas1;
+                Canvas canvas2;
+
+                var root = new TestRoot
                 {
-                    Children =
+                    Child = stack = new StackPanel
                     {
-                        (canvas1 = new Canvas { ZIndex = 1 }),
-                        (canvas2 = new Canvas { ZIndex = 2 }),
+                        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);
+                var sceneBuilder = new SceneBuilder();
 
-            root.Renderer = target;
-            target.Start();
-            RunFrame(target);
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
 
-            root.InvalidateVisual();
-            canvas1.ZIndex = 3;
+                root.Renderer = target;
+                target.Start();
+                RunFrame(target);
 
-            RunFrame(target);
+                root.InvalidateVisual();
+                canvas1.ZIndex = 3;
+
+                RunFrame(target);
 
-            var scene = target.UnitTestScene();
-            var stackNode = scene.FindNode(stack);
+                var scene = target.UnitTestScene();
+                var stackNode = scene.FindNode(stack);
 
-            Assert.Same(stackNode.Children[0].Visual, canvas2);
-            Assert.Same(stackNode.Children[1].Visual, canvas1);
+                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()
         {
-            var dispatcher = new ImmediateDispatcher();
-            var loop = new Mock<IRenderLoop>();
-
-            Decorator moveFrom;
-            Decorator moveTo;
-            Canvas moveMe;
-            var root = new TestRoot
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                Child = new StackPanel
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
+
+                Decorator moveFrom;
+                Decorator moveTo;
+                Canvas moveMe;
+
+                var root = new TestRoot
                 {
-                    Children =
+                    Child = new StackPanel
                     {
-                        (moveFrom = new Decorator
+                        Children =
                         {
-                            Child = moveMe = new Canvas(),
-                        }),
-                        (moveTo = new Decorator()),
+                            (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);
+                var sceneBuilder = new SceneBuilder();
 
-            root.Renderer = target;
-            target.Start();
-            RunFrame(target);
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
 
-            moveFrom.Child = null;
-            moveTo.Child = moveMe;
+                root.Renderer = target;
+                target.Start();
+                RunFrame(target);
 
-            RunFrame(target);
+                moveFrom.Child = null;
+                moveTo.Child = moveMe;
 
-            var scene = target.UnitTestScene();
-            var moveFromNode = (VisualNode)scene.FindNode(moveFrom);
-            var moveToNode = (VisualNode)scene.FindNode(moveTo);
+                RunFrame(target);
 
-            Assert.Empty(moveFromNode.Children);
-            Assert.Equal(1, moveToNode.Children.Count);
-            Assert.Same(moveMe, moveToNode.Children[0].Visual);
+                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()
         {
-            var dispatcher = new ImmediateDispatcher();
-            var loop = new Mock<IRenderLoop>();
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var dispatcher = new ImmediateDispatcher();
+                var loop = new Mock<IRenderLoop>();
 
-            Decorator moveFrom;
-            Decorator moveTo;
-            Canvas moveMe;
+                Decorator moveFrom;
+                Decorator moveTo;
+                Canvas moveMe;
 
-            var root = new TestRoot
-            {
-                Child = new StackPanel
+                var root = new TestRoot
                 {
-                    Children =
+                    Child = new StackPanel
                     {
-                        (moveFrom = new Decorator
-                        {
-                            Child = moveMe = new Canvas(),
-                        })
+                        Children = { (moveFrom = new Decorator { Child = moveMe = new Canvas(), }) }
                     }
-                }
-            };
+                };
 
-            var otherRoot = new TestRoot
-            {
-                Child = new StackPanel
-                {
-                    Children =
-                    {
-                        (moveTo = new Decorator())
-                    }
-                }
-            };
+                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 sceneBuilder = new SceneBuilder();
 
-            var otherSceneBuilder = new SceneBuilder();
-            var otherTarget = new DeferredRenderer(
-                otherRoot,
-                loop.Object,
-                sceneBuilder: otherSceneBuilder,
-                dispatcher: dispatcher);
+                var target = new DeferredRenderer(
+                    root,
+                    loop.Object,
+                    sceneBuilder: sceneBuilder,
+                    dispatcher: dispatcher);
 
-            root.Renderer = target;
-            otherRoot.Renderer = otherTarget;
+                var otherSceneBuilder = new SceneBuilder();
 
-            target.Start();
-            otherTarget.Start();
+                var otherTarget = new DeferredRenderer(
+                    otherRoot,
+                    loop.Object,
+                    sceneBuilder: otherSceneBuilder,
+                    dispatcher: dispatcher);
 
-            RunFrame(target);
-            RunFrame(otherTarget);
+                root.Renderer = target;
+                otherRoot.Renderer = otherTarget;
 
-            moveFrom.Child = null;
-            moveTo.Child = moveMe;
+                target.Start();
+                otherTarget.Start();
 
-            RunFrame(target);
-            RunFrame(otherTarget);
+                RunFrame(target);
+                RunFrame(otherTarget);
+
+                moveFrom.Child = null;
+                moveTo.Child = moveMe;
 
-            var scene = target.UnitTestScene();
-            var otherScene = otherTarget.UnitTestScene();
+                RunFrame(target);
+                RunFrame(otherTarget);
 
-            var moveFromNode = (VisualNode)scene.FindNode(moveFrom);
-            var moveToNode = (VisualNode)otherScene.FindNode(moveTo);
+                var scene = target.UnitTestScene();
+                var otherScene = otherTarget.UnitTestScene();
 
-            Assert.Empty(moveFromNode.Children);
-            Assert.Equal(1, moveToNode.Children.Count);
-            Assert.Same(moveMe, moveToNode.Children[0].Visual);
+                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()
         {
-            var root = new TestRoot
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                Width = 100,
-                Height = 100,
-                Child = new Border
+                var root = new TestRoot
                 {
-                    Background = Brushes.Red,
-                    Opacity = 0.5,
-                }
-            };
+                    Width = 100, Height = 100, Child = new Border { Background = Brushes.Red, Opacity = 0.5, }
+                };
 
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(root.DesiredSize));
+                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);
+                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.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
-            context.Verify(x => x.PopOpacity(), Times.Once);
+                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()
         {
-            var root = new TestRoot
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                Width = 100,
-                Height = 100,
-                Child = new Border
+                var root = new TestRoot
                 {
-                    Background = Brushes.Red,
-                    Opacity = 0,
+                    Width = 100,
+                    Height = 100,
                     Child = new Border
                     {
-                        Background = Brushes.Green,
+                        Background = Brushes.Red,
+                        Opacity = 0,
+                        Child = new Border { Background = Brushes.Green, }
                     }
-                }
-            };
+                };
 
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(root.DesiredSize));
+                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);
+                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.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Never);
-            context.Verify(x => x.PopOpacity(), Times.Never);
+                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()
         {
-            var root = new TestRoot
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                Width = 100,
-                Height = 100,
-                Child = new Border
+                var root = new TestRoot
                 {
-                    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.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
-            context.Verify(x => x.PopOpacityMask(), Times.Once);
+                    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()
         {
-            var root = new TestRoot();
-            var rootLayer = new Mock<IRenderTargetBitmapImpl>();
+            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 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);
+                var renderInterface = new Mock<IPlatformRenderInterface>();
+                var target = CreateTargetAndRunFrame(root, sceneBuilder: sceneBuilder.Object);
 
-            Assert.Single(target.Layers);
+                Assert.Single(target.Layers);
+            }
         }
 
-        [Fact]
+        [Fact(Skip = "Layers are disabled. See #2244")]
         public void Should_Create_And_Delete_Layers_For_Controls_With_Animated_Opacity()
         {
-            Border border;
-            var root = new TestRoot
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                Width = 100,
-                Height = 100,
-                Child = new Border
+                Border border;
+
+                var root = new TestRoot
                 {
-                    Background = Brushes.Red,
-                    Child = border = new Border
+                    Width = 100,
+                    Height = 100,
+                    Child = new Border
                     {
-                        Background = Brushes.Green,
-                        Child = new Canvas(),
-                        Opacity = 0.9,
+                        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));
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
 
-            var timer = new Mock<IRenderTimer>();
-            var target = CreateTargetAndRunFrame(root, timer);
+                var timer = new Mock<IRenderTimer>();
+                var target = CreateTargetAndRunFrame(root, timer);
 
-            Assert.Equal(new[] { root }, target.Layers.Select(x => x.LayerRoot));
+                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);
+                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));
+                Assert.Equal(new IVisual[] { root, border }, target.Layers.Select(x => x.LayerRoot));
 
-            animation.OnCompleted();
-            RunFrame(target);
+                animation.OnCompleted();
+                RunFrame(target);
 
-            Assert.Equal(new[] { root }, target.Layers.Select(x => x.LayerRoot));
+                Assert.Equal(new[] { root }, target.Layers.Select(x => x.LayerRoot));
+            }
         }
 
-        [Fact]
+        [Fact(Skip = "Layers are disabled. See #2244")]
         public void Should_Not_Create_Layer_For_Childless_Control_With_Animated_Opacity()
         {
-            Border border;
-            var root = new TestRoot
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                Width = 100,
-                Height = 100,
-                Child = new Border
+                Border border;
+
+                var root = new TestRoot
                 {
-                    Background = Brushes.Red,
-                    Child = border = new Border
+                    Width = 100,
+                    Height = 100,
+                    Child = new Border
                     {
-                        Background = Brushes.Green,
+                        Background = Brushes.Red, Child = border = new Border { Background = Brushes.Green, }
                     }
-                }
-            };
+                };
 
-            var animation = new BehaviorSubject<double>(0.5);
-            border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
 
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(root.DesiredSize));
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
 
-            var timer = new Mock<IRenderTimer>();
-            var target = CreateTargetAndRunFrame(root, timer);
+                var timer = new Mock<IRenderTimer>();
+                var target = CreateTargetAndRunFrame(root, timer);
 
-            Assert.Single(target.Layers);
+                Assert.Single(target.Layers);
+            }
         }
 
-        [Fact]
+        [Fact(Skip = "Layers are disabled. See #2244")]
         public void Should_Not_Push_Opacity_For_Transparent_Layer_Root_Control()
         {
-            Border border;
-            var root = new TestRoot
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                Width = 100,
-                Height = 100,
-                Child = border = new Border
+                Border border;
+
+                var root = new TestRoot
                 {
-                    Background = Brushes.Red,
-                    Child = new Canvas(),
-                }
-            };
+                    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);
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
 
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(root.DesiredSize));
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
 
-            var target = CreateTargetAndRunFrame(root);
-            var context = GetLayerContext(target, border);
+                var target = CreateTargetAndRunFrame(root);
+                var context = GetLayerContext(target, border);
 
-            context.Verify(x => x.PushOpacity(0.5), Times.Never);
-            context.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once);
-            context.Verify(x => x.PopOpacity(), Times.Never);
+                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]
+        [Fact(Skip = "Layers are disabled. See #2244")]
         public void Should_Draw_Transparent_Layer_With_Correct_Opacity()
         {
-            Border border;
-            var root = new TestRoot
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                Width = 100,
-                Height = 100,
-                Child = border = new Border
+                Border border;
+
+                var root = new TestRoot
                 {
-                    Background = Brushes.Red,
-                    Child = new Canvas(),
-                }
-            };
+                    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);
+                var animation = new BehaviorSubject<double>(0.5);
+                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
 
-            root.Measure(Size.Infinity);
-            root.Arrange(new Rect(root.DesiredSize));
+                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;
+                var target = CreateTargetAndRunFrame(root);
+                var context = Mock.Get(target.RenderTarget.CreateDrawingContext(null));
+                var borderLayer = target.Layers[border].Bitmap;
 
-            context.Verify(x => x.DrawImage(borderLayer, 0.5, It.IsAny<Rect>(), It.IsAny<Rect>(), BitmapInterpolationMode.Default));
+                context.Verify(x => x.DrawBitmap(borderLayer, 0.5, It.IsAny<Rect>(), It.IsAny<Rect>(),
+                    BitmapInterpolationMode.Default));
+            }
         }
 
         [Fact]
         public void Can_Dirty_Control_In_SceneInvalidated()
         {
-            Border border1;
-            Border border2;
-            var root = new TestRoot
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                Width = 100,
-                Height = 100,
-                Child = new StackPanel
+                Border border1;
+                Border border2;
+
+                var root = new TestRoot
                 {
-                    Children =
+                    Width = 100,
+                    Height = 100,
+                    Child = new StackPanel
                     {
-                        (border1 = new Border
-                        {
-                            Background = Brushes.Red,
-                            Child = new Canvas(),
-                        }),
-                        (border2 = new Border
+                        Children =
                         {
-                            Background = Brushes.Red,
-                            Child = new Canvas(),
-                        }),
+                            (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));
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
 
-            var target = CreateTargetAndRunFrame(root);
-            var invalidated = false;
+                var target = CreateTargetAndRunFrame(root);
+                var invalidated = false;
 
-            target.SceneInvalidated += (s, e) =>
-            {
-                invalidated = true;
-                target.AddDirty(border2);
-            };
+                target.SceneInvalidated += (s, e) =>
+                {
+                    invalidated = true;
+                    target.AddDirty(border2);
+                };
 
-            target.AddDirty(border1);
-            target.Paint(new Rect(root.DesiredSize));
+                target.AddDirty(border1);
+                target.Paint(new Rect(root.DesiredSize));
 
-            Assert.True(invalidated);
-            Assert.True(((IRenderLoopTask)target).NeedsUpdate);
+                Assert.True(invalidated);
+                Assert.True(((IRenderLoopTask)target).NeedsUpdate);
+            }
         }
 
         private DeferredRenderer CreateTargetAndRunFrame(
@@ -746,7 +756,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
         private void IgnoreFirstFrame(IRenderLoopTask task, Mock<ISceneBuilder> sceneBuilder)
         {
             RunFrame(task);
-            sceneBuilder.ResetCalls();
+            sceneBuilder.Invocations.Clear();
         }
 
         private void RunFrame(IRenderLoopTask task)
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
index ab5f5f37f7..90b01e2ddb 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System.Linq;
+using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
 using Avalonia.Layout;
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests.cs
index 73e4a14539..acee9a50f5 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests.cs
@@ -17,166 +17,286 @@ namespace Avalonia.Visuals.UnitTests.Rendering
         [Fact]
         public void AddDirty_Call_RenderRoot_Invalidate()
         {
-            var visual = new Mock<Visual>();
-            var child = new Mock<Visual>() { CallBase = true };
-            var renderRoot = visual.As<IRenderRoot>();
+            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));
+                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);
+                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);
+                var target = new ImmediateRenderer(visual.Object);
 
-            target.AddDirty(child.Object);
+                target.AddDirty(child.Object);
 
-            renderRoot.Verify(v => v.Invalidate(new Rect(10, 10, 100, 100)));
+                renderRoot.Verify(v => v.Invalidate(new Rect(10, 10, 100, 100)));
+            }
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/moq/moq4/issues/988")]
         public void AddDirty_With_RenderTransform_Call_RenderRoot_Invalidate()
         {
-            var visual = new Mock<Visual>();
-            var child = new Mock<Visual>() { CallBase = true };
-            var renderRoot = visual.As<IRenderRoot>();
+            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));
+                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 };
+                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);
+                var target = new ImmediateRenderer(visual.Object);
 
-            target.AddDirty(child.Object);
+                target.AddDirty(child.Object);
 
-            renderRoot.Verify(v => v.Invalidate(new Rect(50, 50, 200, 200)));
+                renderRoot.Verify(v => v.Invalidate(new Rect(50, 50, 200, 200)));
+            }
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/moq/moq4/issues/988")]
         public void AddDirty_For_Child_Moved_Should_Invalidate_Previous_Bounds()
         {
-            var visual = new Mock<Visual>() { CallBase = true };
-            var child = new Mock<Visual>() { CallBase = true };
-            var renderRoot = visual.As<IRenderRoot>();
-            var renderTarget = visual.As<IRenderTarget>();
+            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>());
 
-            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.Bounds).Returns(new Rect(0, 0, 400, 400));
-            visual.As<IVisual>().Setup(v => v.VisualChildren).Returns(new AvaloniaList<IVisual>() { child.As<IVisual>().Object });
+                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>());
+                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>();
+                var invalidationCalls = new List<Rect>();
 
-            renderRoot.Setup(v => v.Invalidate(It.IsAny<Rect>())).Callback<Rect>(v => invalidationCalls.Add(v));
+                renderRoot.Setup(v => v.Invalidate(It.IsAny<Rect>())).Callback<Rect>(v => invalidationCalls.Add(v));
 
-            var target = new ImmediateRenderer(visual.Object);
+                var target = new ImmediateRenderer(visual.Object);
 
-            target.AddDirty(child.Object);
+                target.AddDirty(child.Object);
 
-            Assert.Equal(new Rect(0, 0, 100, 100), invalidationCalls[0]);
+                Assert.Equal(new Rect(0, 0, 100, 100), invalidationCalls[0]);
 
-            target.Paint(new Rect(0, 0, 100, 100));
+                target.Paint(new Rect(0, 0, 100, 100));
 
-            //move child 100 pixels bottom/right
-            childBounds = new Rect(100, 100, 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);
+                //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]);
+                //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]);
+                //then new position
+                Assert.Equal(new Rect(100, 100, 100, 100), invalidationCalls[2]);
+            }
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/moq/moq4/issues/988")]
         public void Should_Render_Child_In_Parent_With_RenderTransform()
         {
-            var targetMock = new Mock<Control>() { CallBase = true };
-            var target = targetMock.Object;
-            target.Width = 100;
-            target.Height = 50;
-            var child = new Panel()
+            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))
             {
-                RenderTransform = new RotateTransform() { Angle = 90 },
-                Children =
+                const int RootWidth = 300;
+                const int RootHeight = 300;
+
+                var rootGrid = new Grid { Width = RootWidth, Height = RootHeight, ClipToBounds = true };
+
+                var stackPanel = new StackPanel
                 {
-                    new Panel()
+                    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 =
-                        {
-                            target
-                        }
+                        Children = { new RotateTransform { Angle = 90 }, new TranslateTransform { X = 240 } }
                     }
-                }
-            };
+                };
+
+                rootGrid.Children.Add(stackPanel);
 
-            var visualTarget = targetMock.As<IVisual>();
-            int rendered = 0;
-            visualTarget.Setup(v => v.Render(It.IsAny<DrawingContext>())).Callback(() => rendered++);
+                TestControl CreateControl()
+                    => new TestControl
+                    {
+                        Width = 80, Height = 40, Margin = new Thickness(0, 0, 5, 0), ClipToBounds = true
+                    };
 
-            var root = new TestRoot(child);
-            root.Renderer = new ImmediateRenderer(root);
+                var control1 = CreateControl();
+                var control2 = CreateControl();
+                var control3 = CreateControl();
 
-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+                stackPanel.Children.Add(control1);
+                stackPanel.Children.Add(control2);
+                stackPanel.Children.Add(control3);
 
-            root.Measure(new Size(50, 100));
-            root.Arrange(new Rect(new Size(50, 100)));
+                var root = new TestRoot(rootGrid);
+                root.Renderer = new ImmediateRenderer(root);
+                root.LayoutManager.ExecuteInitialLayoutPass();
 
-            root.Renderer.Paint(root.Bounds);
+                var rootSize = new Size(RootWidth, RootHeight);
+                root.Measure(rootSize);
+                root.Arrange(new Rect(rootSize));
 
-            Assert.Equal(1, rendered);
+                root.Renderer.Paint(root.Bounds);
+
+                Assert.True(control1.Rendered);
+                Assert.True(control2.Rendered);
+                Assert.True(control3.Rendered);
+            }
         }
 
         [Fact]
-        public void Should_Render_Child_In_Parent_With_RenderTransform2()
+        public void Should_Not_Render_Clipped_Child_With_RenderTransform_When_Not_In_Bounds()
         {
-            var targetMock = new Mock<Control>() { CallBase = true };
-            var target = targetMock.Object;
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                const int RootWidth = 300;
+                const int RootHeight = 300;
 
-            target.Width = 100;
-            target.Height = 50;
-            target.HorizontalAlignment = HorizontalAlignment.Center;
-            target.VerticalAlignment = VerticalAlignment.Center;
+                var rootGrid = new Grid { Width = RootWidth, Height = RootHeight, ClipToBounds = true };
 
-            var child = new Panel()
-            {
-                RenderTransform = new RotateTransform() { Angle = 90 },
-                Children =
+                var stackPanel = new StackPanel
                 {
-                    new Panel()
+                    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 =
-                        {
-                            target
-                        }
+                        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 visualTarget = targetMock.As<IVisual>();
-            int rendered = 0;
-            visualTarget.Setup(v => v.Render(It.IsAny<DrawingContext>())).Callback(() => rendered++);
+                var root = new TestRoot(rootGrid);
+                root.Renderer = new ImmediateRenderer(root);
+                root.LayoutManager.ExecuteInitialLayoutPass();
 
-            var root = new TestRoot(child);
-            root.Renderer = new ImmediateRenderer(root);
+                var rootSize = new Size(RootWidth, RootHeight);
+                root.Measure(rootSize);
+                root.Arrange(new Rect(rootSize));
 
-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+                root.Renderer.Paint(root.Bounds);
 
-            root.Measure(new Size(300, 100));
-            root.Arrange(new Rect(new Size(300, 100)));
-            root.Renderer.Paint(root.Bounds);
+                Assert.True(control1.Rendered);
+                Assert.True(control2.Rendered);
+                Assert.False(control3.Rendered);
+            }
+        }
+
+        private class TestControl : Control
+        {
+            public bool Rendered { get; private set; }
 
-            Assert.Equal(1, rendered);
+            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
index 1de6d02a35..c4ef9d5ee7 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
@@ -1,7 +1,4 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
+using System;
 using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
index f57c73c45c..27aa0c55b5 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
@@ -100,20 +100,18 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
 
             using (target.BeginUpdate(node))
             {
-                target.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100));
-                target.DrawRectangle(new Pen(Brushes.Green, 1), new Rect(0, 0, 100, 100));
+                target.DrawRectangle(Brushes.Red, new Pen(Brushes.Green, 1), new Rect(0, 0, 100, 100));
             }
 
-            Assert.Equal(2, node.DrawOperations.Count);
+            Assert.Equal(1, node.DrawOperations.Count);
             Assert.IsType<RectangleNode>(node.DrawOperations[0].Item);
-            Assert.IsType<RectangleNode>(node.DrawOperations[1].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), 0));
+            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);
 
@@ -122,7 +120,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
 
             using (target.BeginUpdate(node))
             {
-                target.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100));
+                target.DrawRectangle(Brushes.Red, null, new Rect(0, 0, 100, 100));
             }
 
             Assert.Equal(1, node.DrawOperations.Count);
@@ -135,7 +133,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
         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), 0));
+            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);
 
@@ -144,7 +142,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
 
             using (target.BeginUpdate(node))
             {
-                target.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100));
+                target.DrawRectangle(Brushes.Green, null, new Rect(0, 0, 100, 100));
             }
 
             Assert.Equal(1, node.DrawOperations.Count);
@@ -157,7 +155,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
         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), 0);
+            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);
 
@@ -165,7 +163,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
 
             using (target.BeginUpdate(node))
             {
-                target.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100));
+                target.DrawRectangle(Brushes.Green, null, new Rect(0, 0, 100, 100));
             }
 
             Assert.Equal(new Rect(0, 0, 100, 100), layers.Single().Dirty.Single());
@@ -192,8 +190,8 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
 
             using (target.BeginUpdate(node))
             {
-                target.FillRectangle(Brushes.Green, new Rect(0, 0, 10, 100));
-                target.FillRectangle(Brushes.Blue, new Rect(0, 0, 20, 100));
+                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);
@@ -208,7 +206,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
         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), 0));
+            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);
 
@@ -218,7 +216,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
 
             using (target.BeginUpdate(node))
             {
-                target.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100));
+                target.DrawRectangle(Brushes.Green, null, new Rect(0, 0, 100, 100));
             }
 
             Assert.Equal(1, node.DrawOperations.Count);
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
index 6a1f08a384..0cdc8827ad 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs
@@ -35,7 +35,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
             double expectedWidth,
             double expectedHeight)
         {
-            var target = new TestDrawOperation(
+            var target = new TestRectangleDrawOperation(
                 new Rect(x, y, width, height),
                 Matrix.CreateScale(scaleX, scaleY),
                 penThickness.HasValue ? new Pen(Brushes.Black, penThickness.Value) : null);
@@ -69,15 +69,28 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 new Matrix(),
                 Brushes.Black,
                 null,
-                geometry);
+                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, pen)
+                :base(bounds, transform)
             {
             }
 
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
index 327ef98c4d..42e573c8a5 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
@@ -34,6 +34,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                         Background = Brushes.Red,
                         Child = textBlock = new TextBlock
                         {
+                            TextWrapping = TextWrapping.NoWrap,
                             Text = "Hello World",
                         }
                     }
@@ -63,8 +64,8 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 Assert.Same(textBlock, textBlockNode.Visual);
                 Assert.Equal(1, textBlockNode.DrawOperations.Count);
 
-                var textNode = (TextNode)textBlockNode.DrawOperations[0].Item;
-                Assert.NotNull(textNode.Text);
+                var textNode = (GlyphRunNode)textBlockNode.DrawOperations[0].Item;
+                Assert.NotNull(textNode.GlyphRun);
             }
         }
 
@@ -360,7 +361,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
 
                 var result = initial.CloneScene();
                 sceneBuilder.Update(result, border);
-                
+
                 var borderNode = (VisualNode)result.Root.Children[0];
                 Assert.Same(border, borderNode.Visual);
 
@@ -371,7 +372,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 var textBlockNode = (VisualNode)borderNode.Children[0];
                 Assert.Same(textBlock, textBlockNode.Visual);
 
-                var textNode = (TextNode)textBlockNode.DrawOperations[0].Item;
+                var textNode = (GlyphRunNode)textBlockNode.DrawOperations[0].Item;
                 Assert.Same(initialTextNode.Item, textNode);
             }
         }
@@ -653,7 +654,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 };
 
                 var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass(tree);
+                layout.ExecuteInitialLayoutPass();
 
                 var scene = new Scene(tree);
                 var sceneBuilder = new SceneBuilder();
@@ -696,7 +697,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 };
 
                 var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass(tree);
+                layout.ExecuteInitialLayoutPass();
 
                 var scene = new Scene(tree);
                 var sceneBuilder = new SceneBuilder();
@@ -744,7 +745,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 };
 
                 var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass(tree);
+                layout.ExecuteInitialLayoutPass();
 
                 var scene = new Scene(tree);
                 var sceneBuilder = new SceneBuilder();
@@ -810,7 +811,9 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 };
 
                 Assert.Equal(expected, scene.Layers[tree].Dirty.ToArray());
-                Assert.Equal(expected, scene.Layers[border].Dirty.ToArray());
+                
+                // Layers are disabled. See #2244
+                // Assert.Equal(expected, scene.Layers[border].Dirty.ToArray());
             }
         }
 
@@ -880,16 +883,24 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
         {
             using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                var bitmap = RefCountable.Create(Mock.Of<IBitmapImpl>());
+                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)
+                        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;
 
@@ -912,16 +923,24 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
         {
             using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
             {
-                var bitmap = RefCountable.Create(Mock.Of<IBitmapImpl>());
+                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)
+                        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);
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
index 1bece3ae22..19b4c7e606 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
@@ -14,7 +14,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
 {
     public partial class SceneBuilderTests
     {
-        [Fact]
+        [Fact(Skip = "Layers are disabled. See #2244")]
         public void Control_With_Animated_Opacity_And_Children_Should_Start_New_Layer()
         {
             using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
@@ -40,7 +40,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 };
 
                 var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass(tree);
+                layout.ExecuteInitialLayoutPass();
 
                 var animation = new BehaviorSubject<double>(0.5);
                 border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
@@ -105,7 +105,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 };
 
                 var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass(tree);
+                layout.ExecuteInitialLayoutPass();
 
                 var animation = new BehaviorSubject<double>(0.5);
                 border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
@@ -118,7 +118,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
             }
         }
 
-        [Fact]
+        [Fact(Skip = "Layers are disabled. See #2244")]
         public void Removing_Control_With_Animated_Opacity_Should_Remove_Layers()
         {
             using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
@@ -147,7 +147,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 };
 
                 var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass(tree);
+                layout.ExecuteInitialLayoutPass();
 
                 var animation = new BehaviorSubject<double>(0.5);
                 border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
@@ -168,7 +168,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
             }
         }
 
-        [Fact]
+        [Fact(Skip = "Layers are disabled. See #2244")]
         public void Hiding_Transparent_Control_Should_Remove_Layers()
         {
             using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
@@ -197,7 +197,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 };
 
                 var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass(tree);
+                layout.ExecuteInitialLayoutPass();
 
                 var animation = new BehaviorSubject<double>(0.5);
                 border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
@@ -218,7 +218,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
             }
         }
 
-        [Fact]
+        [Fact(Skip = "Layers are disabled. See #2244")]
         public void GeometryClip_Should_Affect_Child_Layers()
         {
             using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
@@ -241,7 +241,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 };
 
                 var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass(tree);
+                layout.ExecuteInitialLayoutPass();
 
                 var animation = new BehaviorSubject<double>(0.5);
                 border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
diff --git a/tests/Avalonia.Visuals.UnitTests/SizeTests.cs b/tests/Avalonia.Visuals.UnitTests/SizeTests.cs
index 10a012bb7f..96197785b9 100644
--- a/tests/Avalonia.Visuals.UnitTests/SizeTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/SizeTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Xunit;
 
 namespace Avalonia.Visuals.UnitTests
diff --git a/tests/Avalonia.Visuals.UnitTests/TestVisual.cs b/tests/Avalonia.Visuals.UnitTests/TestVisual.cs
index dfd3d180ba..29d61ddefc 100644
--- a/tests/Avalonia.Visuals.UnitTests/TestVisual.cs
+++ b/tests/Avalonia.Visuals.UnitTests/TestVisual.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs b/tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs
index ac4c6bc781..e85a9d5b85 100644
--- a/tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System.Globalization;
 using Xunit;
 
diff --git a/tests/Avalonia.Visuals.UnitTests/Utilities/ReadOnlySpanTests.cs b/tests/Avalonia.Visuals.UnitTests/Utilities/ReadOnlySpanTests.cs
new file mode 100644
index 0000000000..1afd84e546
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Utilities/ReadOnlySpanTests.cs
@@ -0,0 +1,37 @@
+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
index 1bcc165aef..0e72cd7c7f 100644
--- a/tests/Avalonia.Visuals.UnitTests/VectorTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/VectorTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using Xunit;
 using Avalonia;
 using System;
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualExtensionsTests.cs b/tests/Avalonia.Visuals.UnitTests/VisualExtensionsTests.cs
index a8d8c07d8b..781169cfa6 100644
--- a/tests/Avalonia.Visuals.UnitTests/VisualExtensionsTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/VisualExtensionsTests.cs
@@ -2,12 +2,184 @@
 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()
         {
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTests.cs b/tests/Avalonia.Visuals.UnitTests/VisualTests.cs
index 936a5d16a2..38131fbfca 100644
--- a/tests/Avalonia.Visuals.UnitTests/VisualTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/VisualTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -176,7 +173,7 @@ namespace Avalonia.Visuals.UnitTests
             };
 
             root.Child = child;
-            renderer.ResetCalls();
+            renderer.Invocations.Clear();
             root.Child = null;
 
             renderer.Verify(x => x.AddDirty(child));
@@ -238,6 +235,25 @@ namespace Avalonia.Visuals.UnitTests
             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()
         {
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
index 032b6582a9..02236e4107 100644
--- a/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
+++ b/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
@@ -3,13 +3,13 @@ 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 IEnumerable<string> InstalledFontNames => new string[0];
-
         public IFormattedTextImpl CreateFormattedText(
             string text,
             Typeface typeface,
@@ -47,17 +47,26 @@ namespace Avalonia.Visuals.UnitTests.VisualTree
             throw new NotImplementedException();
         }
 
-        public IBitmapImpl LoadBitmap(PixelFormat format, IntPtr data, PixelSize size, Vector dpi, int stride)
+        public IBitmapImpl LoadBitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride)
         {
             throw new NotImplementedException();
         }
 
-        public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)
+        public IGlyphRunImpl CreateGlyphRun(GlyphRun glyphRun, out double width)
         {
             throw new NotImplementedException();
         }
 
-        public IWriteableBitmapImpl CreateWriteableBitmap(PixelSize size, Vector dpi, PixelFormat? fmt)
+        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();
         }
@@ -77,6 +86,21 @@ namespace Avalonia.Visuals.UnitTests.VisualTree
             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();
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTree/TransformedBoundsTests.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/TransformedBoundsTests.cs
index 7bc0b72bef..8202735e5d 100644
--- a/tests/Avalonia.Visuals.UnitTests/VisualTree/TransformedBoundsTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/VisualTree/TransformedBoundsTests.cs
@@ -1,6 +1,3 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/tests/TestFiles/Direct2D1/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png b/tests/TestFiles/Direct2D1/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png
new file mode 100644
index 0000000000..c5a0a14e52
Binary files /dev/null and b/tests/TestFiles/Direct2D1/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue.expected.png b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue.expected.png
new file mode 100644
index 0000000000..8e08d02f66
Binary files /dev/null and b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Center.expected.png b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Center.expected.png
new file mode 100644
index 0000000000..8e08d02f66
Binary files /dev/null and b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Center.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Center_and_Rotation.expected.png b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Center_and_Rotation.expected.png
new file mode 100644
index 0000000000..8e08d02f66
Binary files /dev/null and b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Center_and_Rotation.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Rotation.expected.png b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Rotation.expected.png
new file mode 100644
index 0000000000..8e08d02f66
Binary files /dev/null and b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Rotation.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_SoftEdge.expected.png b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_SoftEdge.expected.png
new file mode 100644
index 0000000000..8e08d02f66
Binary files /dev/null and b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_SoftEdge.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_Umbrella.expected.png b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_Umbrella.expected.png
new file mode 100644
index 0000000000..8e08d02f66
Binary files /dev/null and b/tests/TestFiles/Direct2D1/Media/ConicGradientBrush/ConicGradientBrush_Umbrella.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedBlue_Offset_Inside.expected.png b/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedBlue_Offset_Inside.expected.png
new file mode 100644
index 0000000000..4d690abee5
Binary files /dev/null and b/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedBlue_Offset_Inside.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedBlue_Offset_Outside.expected.png b/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedBlue_Offset_Outside.expected.png
new file mode 100644
index 0000000000..667aa9151e
Binary files /dev/null and b/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedBlue_Offset_Outside.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedGreenBlue_Offset_Inside.expected.png b/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedGreenBlue_Offset_Inside.expected.png
new file mode 100644
index 0000000000..1d660f79d1
Binary files /dev/null and b/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedGreenBlue_Offset_Inside.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedGreenBlue_Offset_Outside.expected.png b/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedGreenBlue_Offset_Outside.expected.png
new file mode 100644
index 0000000000..ea1009b54a
Binary files /dev/null and b/tests/TestFiles/Direct2D1/Media/RadialGradientBrush/RadialGradientBrush_RedGreenBlue_Offset_Outside.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Fill_NoTile.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Fill_NoTile.expected.png
index 6638456643..ea81296017 100644
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Fill_NoTile.expected.png and b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Fill_NoTile.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_InTree_Visual.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_InTree_Visual.expected.png
index 3725f2acbc..a8ec09df99 100644
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_InTree_Visual.expected.png and b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_InTree_Visual.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipXY_TopLeftDest.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipXY_TopLeftDest.expected.png
index e6b0098c25..485b03acd3 100644
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipXY_TopLeftDest.expected.png and b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipXY_TopLeftDest.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipX_TopLeftDest.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipX_TopLeftDest.expected.png
index c64b88dc68..a6bc0daee3 100644
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipX_TopLeftDest.expected.png and b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipX_TopLeftDest.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipY_TopLeftDest.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipY_TopLeftDest.expected.png
index a6e8b0688c..8c622c37b5 100644
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipY_TopLeftDest.expected.png and b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_FlipY_TopLeftDest.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_Alignment_Center.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_Alignment_Center.expected.png
index 5d75c9cc6c..bfe5fd7fbb 100644
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_Alignment_Center.expected.png and b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_Alignment_Center.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_BottomRightQuarterDest.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_BottomRightQuarterDest.expected.png
index 8664cafbdf..f3c3c4aee2 100644
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_BottomRightQuarterDest.expected.png and b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_NoStretch_NoTile_BottomRightQuarterDest.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_UniformToFill_NoTile.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_UniformToFill_NoTile.expected.png
index fefd9c0d30..80116d81c6 100644
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_UniformToFill_NoTile.expected.png and b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_UniformToFill_NoTile.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Uniform_NoTile.expected.png b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Uniform_NoTile.expected.png
index ca7d498ba4..f366912df5 100644
Binary files a/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Uniform_NoTile.expected.png and b/tests/TestFiles/Direct2D1/Media/VisualBrush/VisualBrush_Uniform_NoTile.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/Path_Expander_With_Border.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/Path_Expander_With_Border.expected.png
index 4a7f4c26b0..7a7d70a521 100644
Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/Path_Expander_With_Border.expected.png and b/tests/TestFiles/Direct2D1/Shapes/Path/Path_Expander_With_Border.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
new file mode 100644
index 0000000000..c5a0a14e52
Binary files /dev/null and b/tests/TestFiles/Skia/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/ConicGradientBrush/ConicGradientBrush_RedBlue.expected.png b/tests/TestFiles/Skia/Media/ConicGradientBrush/ConicGradientBrush_RedBlue.expected.png
new file mode 100644
index 0000000000..563bbfcc61
Binary files /dev/null and b/tests/TestFiles/Skia/Media/ConicGradientBrush/ConicGradientBrush_RedBlue.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Center.expected.png b/tests/TestFiles/Skia/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Center.expected.png
new file mode 100644
index 0000000000..424ac52059
Binary files /dev/null and b/tests/TestFiles/Skia/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Center.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Center_and_Rotation.expected.png b/tests/TestFiles/Skia/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Center_and_Rotation.expected.png
new file mode 100644
index 0000000000..a8719e2e70
Binary files /dev/null and b/tests/TestFiles/Skia/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Center_and_Rotation.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Rotation.expected.png b/tests/TestFiles/Skia/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Rotation.expected.png
new file mode 100644
index 0000000000..1c79db413b
Binary files /dev/null and b/tests/TestFiles/Skia/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_Rotation.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_SoftEdge.expected.png b/tests/TestFiles/Skia/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_SoftEdge.expected.png
new file mode 100644
index 0000000000..4cf8eddd81
Binary files /dev/null and b/tests/TestFiles/Skia/Media/ConicGradientBrush/ConicGradientBrush_RedBlue_SoftEdge.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/ConicGradientBrush/ConicGradientBrush_Umbrella.expected.png b/tests/TestFiles/Skia/Media/ConicGradientBrush/ConicGradientBrush_Umbrella.expected.png
new file mode 100644
index 0000000000..98dfda782d
Binary files /dev/null and b/tests/TestFiles/Skia/Media/ConicGradientBrush/ConicGradientBrush_Umbrella.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_Fill_NoTile.expected.png b/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_Fill_NoTile.expected.png
index 73d147bf77..6fa53f6f82 100644
Binary files a/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_Fill_NoTile.expected.png and b/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_Fill_NoTile.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_Tile_Fill.expected.png b/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_Tile_Fill.expected.png
index 53e51f0424..5ef32152df 100644
Binary files a/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_Tile_Fill.expected.png and b/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_Tile_Fill.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_Tile_UniformToFill.expected.png b/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_Tile_UniformToFill.expected.png
index 32bdfd44d2..b54b55358f 100644
Binary files a/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_Tile_UniformToFill.expected.png and b/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_Tile_UniformToFill.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_UniformToFill_NoTile.expected.png b/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_UniformToFill_NoTile.expected.png
index e173fa6cee..22bca987ff 100644
Binary files a/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_UniformToFill_NoTile.expected.png and b/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_UniformToFill_NoTile.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_Uniform_NoTile.expected.png b/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_Uniform_NoTile.expected.png
index de73af8170..abb33c3121 100644
Binary files a/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_Uniform_NoTile.expected.png and b/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_Uniform_NoTile.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/RadialGradientBrush/RadialGradientBrush_RedBlue_Offset_Inside.expected.png b/tests/TestFiles/Skia/Media/RadialGradientBrush/RadialGradientBrush_RedBlue_Offset_Inside.expected.png
new file mode 100644
index 0000000000..4d690abee5
Binary files /dev/null and b/tests/TestFiles/Skia/Media/RadialGradientBrush/RadialGradientBrush_RedBlue_Offset_Inside.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/RadialGradientBrush/RadialGradientBrush_RedBlue_Offset_Outside.expected.png b/tests/TestFiles/Skia/Media/RadialGradientBrush/RadialGradientBrush_RedBlue_Offset_Outside.expected.png
new file mode 100644
index 0000000000..667aa9151e
Binary files /dev/null and b/tests/TestFiles/Skia/Media/RadialGradientBrush/RadialGradientBrush_RedBlue_Offset_Outside.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/RadialGradientBrush/RadialGradientBrush_RedGreenBlue_Offset_Inside.expected.png b/tests/TestFiles/Skia/Media/RadialGradientBrush/RadialGradientBrush_RedGreenBlue_Offset_Inside.expected.png
new file mode 100644
index 0000000000..1d660f79d1
Binary files /dev/null and b/tests/TestFiles/Skia/Media/RadialGradientBrush/RadialGradientBrush_RedGreenBlue_Offset_Inside.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/RadialGradientBrush/RadialGradientBrush_RedGreenBlue_Offset_Outside.expected.png b/tests/TestFiles/Skia/Media/RadialGradientBrush/RadialGradientBrush_RedGreenBlue_Offset_Outside.expected.png
new file mode 100644
index 0000000000..ea1009b54a
Binary files /dev/null and b/tests/TestFiles/Skia/Media/RadialGradientBrush/RadialGradientBrush_RedGreenBlue_Offset_Outside.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_Fill_NoTile.expected.png b/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_Fill_NoTile.expected.png
index 6638456643..474e2bb2bf 100644
Binary files a/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_Fill_NoTile.expected.png and b/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_Fill_NoTile.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_InTree_Visual.expected.png b/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_InTree_Visual.expected.png
index 3725f2acbc..4ca25db112 100644
Binary files a/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_InTree_Visual.expected.png and b/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_InTree_Visual.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_NoStretch_FlipXY_TopLeftDest.expected.png b/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_NoStretch_FlipXY_TopLeftDest.expected.png
index e6b0098c25..3c9c88e8f1 100644
Binary files a/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_NoStretch_FlipXY_TopLeftDest.expected.png and b/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_NoStretch_FlipXY_TopLeftDest.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_NoStretch_FlipX_TopLeftDest.expected.png b/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_NoStretch_FlipX_TopLeftDest.expected.png
index c64b88dc68..e9efe1e796 100644
Binary files a/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_NoStretch_FlipX_TopLeftDest.expected.png and b/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_NoStretch_FlipX_TopLeftDest.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_NoStretch_FlipY_TopLeftDest.expected.png b/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_NoStretch_FlipY_TopLeftDest.expected.png
index a6e8b0688c..b864ffca33 100644
Binary files a/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_NoStretch_FlipY_TopLeftDest.expected.png and b/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_NoStretch_FlipY_TopLeftDest.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_NoStretch_NoTile_Alignment_Center.expected.png b/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_NoStretch_NoTile_Alignment_Center.expected.png
index 5d75c9cc6c..fa359eac11 100644
Binary files a/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_NoStretch_NoTile_Alignment_Center.expected.png and b/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_NoStretch_NoTile_Alignment_Center.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_NoStretch_NoTile_BottomRightQuarterDest.expected.png b/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_NoStretch_NoTile_BottomRightQuarterDest.expected.png
index 8664cafbdf..778e3f6c13 100644
Binary files a/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_NoStretch_NoTile_BottomRightQuarterDest.expected.png and b/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_NoStretch_NoTile_BottomRightQuarterDest.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_UniformToFill_NoTile.expected.png b/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_UniformToFill_NoTile.expected.png
index fefd9c0d30..d7ef920967 100644
Binary files a/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_UniformToFill_NoTile.expected.png and b/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_UniformToFill_NoTile.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_Uniform_NoTile.expected.png b/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_Uniform_NoTile.expected.png
index ca7d498ba4..152c703f93 100644
Binary files a/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_Uniform_NoTile.expected.png and b/tests/TestFiles/Skia/Media/VisualBrush/VisualBrush_Uniform_NoTile.expected.png differ
diff --git a/tests/TestFiles/Skia/Shapes/Path/Path_Expander_With_Border.expected.png b/tests/TestFiles/Skia/Shapes/Path/Path_Expander_With_Border.expected.png
index 4a7f4c26b0..7727284050 100644
Binary files a/tests/TestFiles/Skia/Shapes/Path/Path_Expander_With_Border.expected.png and b/tests/TestFiles/Skia/Shapes/Path/Path_Expander_With_Border.expected.png differ